From c5b19f45df8ea9e8ef5d7757341b8c5eeadab9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 30 Nov 2015 16:50:23 +0100
Subject: [PATCH 001/197] Feature #4215: Create new Virtual Router pool

---
 SConstruct                             |   2 +
 include/Nebula.h                       |  11 +-
 include/PoolObjectSQL.h                |   4 +-
 include/RequestManagerAllocate.h       |  35 ++++
 include/RequestManagerChmod.h          |  18 ++
 include/RequestManagerChown.h          |  24 +++
 include/RequestManagerDelete.h         |  18 ++
 include/RequestManagerInfo.h           |  18 ++
 include/RequestManagerPoolInfoFilter.h |  19 ++
 include/RequestManagerRename.h         |  22 +++
 include/RequestManagerUpdateTemplate.h |  18 ++
 include/VirtualRouter.h                | 146 +++++++++++++++
 include/VirtualRouterPool.h            | 138 ++++++++++++++
 src/nebula/Nebula.cc                   |   2 +
 src/nebula/SConstruct                  |   1 +
 src/rm/Request.cc                      |   2 +
 src/rm/RequestManager.cc               |  20 ++
 src/rm/RequestManagerAllocate.cc       |  16 ++
 src/vrouter/SConstruct                 |  29 +++
 src/vrouter/VirtualRouter.cc           | 250 +++++++++++++++++++++++++
 20 files changed, 791 insertions(+), 2 deletions(-)
 create mode 100644 include/VirtualRouter.h
 create mode 100644 include/VirtualRouterPool.h
 create mode 100644 src/vrouter/SConstruct
 create mode 100644 src/vrouter/VirtualRouter.cc

diff --git a/SConstruct b/SConstruct
index a575fa3036..d210fc29a2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -84,6 +84,7 @@ main_env.Append(LIBPATH=[
     cwd+'/src/client',
     cwd+'/src/secgroup',
     cwd+'/src/vdc',
+    cwd+'/src/vrouter',
 ])
 
 # Compile flags
@@ -244,6 +245,7 @@ build_scripts=[
     'src/zone/SConstruct',
     'src/secgroup/SConstruct',
     'src/vdc/SConstruct',
+    'src/vrouter/SConstruct',
     'share/man/SConstruct',
     'src/sunstone/public/locale/languages/SConstruct',
     'src/sunstone/public/SConstruct',
diff --git a/include/Nebula.h b/include/Nebula.h
index cf3fd14741..c3a1f2cae5 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -34,6 +34,7 @@
 #include "ZonePool.h"
 #include "SecurityGroupPool.h"
 #include "VdcPool.h"
+#include "VirtualRouterPool.h"
 
 #include "VirtualMachineManager.h"
 #include "LifeCycleManager.h"
@@ -136,6 +137,11 @@ public:
         return vdcpool;
     };
 
+    VirtualRouterPool * get_vrouterpool()
+    {
+        return vrouterpool;
+    };
+
     // --------------------------------------------------------------
     // Manager Accessors
     // --------------------------------------------------------------
@@ -657,7 +663,8 @@ private:
                             "/DEFAULT_GROUP_QUOTAS/VM_QUOTA"),
         system_db(0), db(0),
         vmpool(0), hpool(0), vnpool(0), upool(0), ipool(0), gpool(0), tpool(0),
-        dspool(0), clpool(0), docpool(0), zonepool(0), secgrouppool(0), vdcpool(0),
+        dspool(0), clpool(0), docpool(0), zonepool(0),
+        secgrouppool(0), vdcpool(0), vrouterpool(0),
         lcm(0), vmm(0), im(0), tm(0), dm(0), rm(0), hm(0), authm(0),
         aclm(0), imagem(0)
     {
@@ -707,6 +714,7 @@ private:
         delete zonepool;
         delete secgrouppool;
         delete vdcpool;
+        delete vrouterpool;
         delete vmm;
         delete lcm;
         delete im;
@@ -786,6 +794,7 @@ private:
     ZonePool           * zonepool;
     SecurityGroupPool  * secgrouppool;
     VdcPool            * vdcpool;
+    VirtualRouterPool  * vrouterpool;
 
     // ---------------------------------------------------------------
     // Nebula Managers
diff --git a/include/PoolObjectSQL.h b/include/PoolObjectSQL.h
index dd24f93a9f..0aff690c42 100644
--- a/include/PoolObjectSQL.h
+++ b/include/PoolObjectSQL.h
@@ -62,7 +62,8 @@ public:
         DOCUMENT    = 0x0000400000000000LL,
         ZONE        = 0x0000800000000000LL,
         SECGROUP    = 0x0001000000000000LL,
-        VDC         = 0x0002000000000000LL
+        VDC         = 0x0002000000000000LL,
+        VROUTER     = 0x0004000000000000LL
     };
 
     static string type_to_str(ObjectType ob)
@@ -83,6 +84,7 @@ public:
             case ZONE:      return "ZONE" ; break;
             case SECGROUP:  return "SECGROUP" ; break;
             case VDC:       return "VDC" ; break;
+            case VROUTER:   return "VROUTER" ; break;
             default:        return "";
         }
     };
diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h
index 0076f2d7bc..97013c78ae 100644
--- a/include/RequestManagerAllocate.h
+++ b/include/RequestManagerAllocate.h
@@ -583,6 +583,41 @@ public:
                       string& error_str,
                       RequestAttributes& att);
 };
+
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterAllocate : public RequestManagerAllocate
+{
+public:
+    VirtualRouterAllocate():
+        RequestManagerAllocate("VirtualRouterAllocate",
+                               "Allocates a new virtual router",
+                               "A:ss",
+                               true)
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~VirtualRouterAllocate(){};
+
+    /* --------------------------------------------------------------------- */
+
+    Template * get_object_template()
+    {
+        return new Template;
+    };
+
+    int pool_allocate(xmlrpc_c::paramList const& _paramList,
+                      Template * tmpl,
+                      int& id,
+                      string& error_str,
+                      RequestAttributes& att);
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerChmod.h b/include/RequestManagerChmod.h
index 18520f3181..c3bdab76ad 100644
--- a/include/RequestManagerChmod.h
+++ b/include/RequestManagerChmod.h
@@ -171,6 +171,24 @@ public:
 
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterChmod: public RequestManagerChmod
+{
+public:
+    VirtualRouterChmod():
+        RequestManagerChmod("VirtualRouterChmod",
+                            "Changes permission bits of a virtual router")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~VirtualRouterChmod(){};
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerChown.h b/include/RequestManagerChown.h
index df88d6e4a7..e61bd8e208 100644
--- a/include/RequestManagerChown.h
+++ b/include/RequestManagerChown.h
@@ -268,6 +268,30 @@ public:
         return static_cast<SecurityGroupPool*>(pool)->get(name, uid, lock);
     };
 };
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterChown: public RequestManagerChown
+{
+public:
+    VirtualRouterChown():
+        RequestManagerChown("VirtualRouterChown",
+                            "Changes ownership of a virtual router")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~VirtualRouterChown(){};
+
+    PoolObjectSQL * get(const string& name, int uid, bool lock)
+    {
+        return static_cast<VirtualRouterPool*>(pool)->get(name, uid, lock);
+    };
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerDelete.h b/include/RequestManagerDelete.h
index 25f23adeb7..652cb853b9 100644
--- a/include/RequestManagerDelete.h
+++ b/include/RequestManagerDelete.h
@@ -354,6 +354,24 @@ public:
     ~VdcDelete(){};
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterDelete : public RequestManagerDelete
+{
+public:
+    VirtualRouterDelete():
+        RequestManagerDelete("VirtualRouterDelete",
+                             "Deletes a virtual router")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~VirtualRouterDelete(){};
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerInfo.h b/include/RequestManagerInfo.h
index c978be23d9..dc2021f688 100644
--- a/include/RequestManagerInfo.h
+++ b/include/RequestManagerInfo.h
@@ -318,6 +318,24 @@ public:
     ~VdcInfo(){};
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterInfo : public RequestManagerInfo
+{
+public:
+    VirtualRouterInfo():
+        RequestManagerInfo("VirtualRouterInfo",
+                           "Returns virtual router information")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~VirtualRouterInfo(){};
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerPoolInfoFilter.h b/include/RequestManagerPoolInfoFilter.h
index 1708e39346..656df43cd4 100644
--- a/include/RequestManagerPoolInfoFilter.h
+++ b/include/RequestManagerPoolInfoFilter.h
@@ -494,6 +494,25 @@ public:
             xmlrpc_c::paramList const& paramList, RequestAttributes& att);
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterPoolInfo : public RequestManagerPoolInfoFilter
+{
+public:
+    VirtualRouterPoolInfo():
+        RequestManagerPoolInfoFilter("VirtualRouterPoolInfo",
+                                     "Returns the virtual router pool",
+                                     "A:siii")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~VirtualRouterPoolInfo(){};
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerRename.h b/include/RequestManagerRename.h
index 539c2f7c5b..1c3dac65d9 100644
--- a/include/RequestManagerRename.h
+++ b/include/RequestManagerRename.h
@@ -334,6 +334,28 @@ public:
     ~VdcRename(){};
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterRename: public RequestManagerRename
+{
+public:
+    VirtualRouterRename():
+        RequestManagerRename("VirtualRouterRename", "Renames a virtual router")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~VirtualRouterRename(){};
+
+    PoolObjectSQL * get(const string& name, int uid, bool lock)
+    {
+        return static_cast<VirtualRouterPool*>(pool)->get(name, uid, lock);
+    };
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerUpdateTemplate.h b/include/RequestManagerUpdateTemplate.h
index abffc3aa48..965be43745 100644
--- a/include/RequestManagerUpdateTemplate.h
+++ b/include/RequestManagerUpdateTemplate.h
@@ -286,6 +286,24 @@ public:
     ~VdcUpdateTemplate(){};
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterUpdateTemplate : public RequestManagerUpdateTemplate
+{
+public:
+    VirtualRouterUpdateTemplate():
+        RequestManagerUpdateTemplate("VirtualRouterUpdateTemplate",
+                                     "Updates a virtual router template")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~VirtualRouterUpdateTemplate(){};
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
new file mode 100644
index 0000000000..40a512a459
--- /dev/null
+++ b/include/VirtualRouter.h
@@ -0,0 +1,146 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef VIRTUAL_ROUTER_H_
+#define VIRTUAL_ROUTER_H_
+
+#include "PoolObjectSQL.h"
+#include "Template.h"
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+/**
+ *  The VirtualRouter class.
+ */
+class VirtualRouter : public PoolObjectSQL
+{
+public:
+
+    /**
+     * Function to print the VirtualRouter object into a string in XML format
+     *  @param xml the resulting XML string
+     *  @return a reference to the generated string
+     */
+    string& to_xml(string& xml) const;
+
+    // ------------------------------------------------------------------------
+    // Template Contents
+    // ------------------------------------------------------------------------
+
+    /**
+     *  Factory method for VirtualRouter templates
+     */
+    Template * get_new_template() const
+    {
+        return new Template;
+    }
+
+    /**
+     *  Returns a copy of the Template
+     *    @return A copy of the VirtualMachineTemplate
+     */
+    Template * clone_template() const
+    {
+        return new Template(
+                *(static_cast<Template *>(obj_template)));
+    };
+
+private:
+    // -------------------------------------------------------------------------
+    // Friends
+    // -------------------------------------------------------------------------
+
+    friend class VirtualRouterPool;
+
+    // *************************************************************************
+    // DataBase implementation (Private)
+    // *************************************************************************
+
+    /**
+     *  Execute an INSERT or REPLACE Sql query.
+     *    @param db The SQL DB
+     *    @param replace Execute an INSERT or a REPLACE
+     *    @param error_str Returns the error reason, if any
+     *    @return 0 one success
+     */
+    int insert_replace(SqlDB *db, bool replace, string& error_str);
+
+    /**
+     *  Bootstraps the database table(s) associated to the VirtualRouter
+     *    @return 0 on success
+     */
+    static int bootstrap(SqlDB * db)
+    {
+        ostringstream oss(VirtualRouter::db_bootstrap);
+
+        return db->exec(oss);
+    };
+
+    /**
+     *  Rebuilds the object from an xml formatted string
+     *    @param xml_str The xml-formatted string
+     *
+     *    @return 0 on success, -1 otherwise
+     */
+    int from_xml(const string &xml_str);
+
+protected:
+
+    // *************************************************************************
+    // Constructor
+    // *************************************************************************
+    VirtualRouter(  int id,
+                    int uid,
+                    int gid,
+                    const string& uname,
+                    const string& gname,
+                    int umask,
+                    Template * _template_contents);
+
+    ~VirtualRouter();
+
+    // *************************************************************************
+    // DataBase implementation
+    // *************************************************************************
+
+    static const char * db_names;
+
+    static const char * db_bootstrap;
+
+    static const char * table;
+
+    /**
+     *  Writes the VirtualRouter in the database.
+     *    @param db pointer to the db
+     *    @param error_str Returns the error reason, if any
+     *    @return 0 on success
+     */
+    int insert(SqlDB *db, string& error_str);
+
+    /**
+     *  Writes/updates the VirtualRouter data fields in the database.
+     *    @param db pointer to the db
+     *    @return 0 on success
+     */
+    int update(SqlDB *db)
+    {
+        string err;
+        return insert_replace(db, true, err);
+    };
+};
+
+#endif /*VIRTUAL_ROUTER_H_*/
diff --git a/include/VirtualRouterPool.h b/include/VirtualRouterPool.h
new file mode 100644
index 0000000000..b43075b9d3
--- /dev/null
+++ b/include/VirtualRouterPool.h
@@ -0,0 +1,138 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef VIRTUAL_ROUTER_POOL_H_
+#define VIRTUAL_ROUTER_POOL_H_
+
+#include "PoolSQL.h"
+#include "VirtualRouter.h"
+
+/**
+ *  The VirtualRouter Pool class.
+ */
+class VirtualRouterPool : public PoolSQL
+{
+public:
+
+    VirtualRouterPool(SqlDB * db) : PoolSQL(db, VirtualRouter::table, true, true){};
+
+    ~VirtualRouterPool(){};
+
+    /**
+     *  Allocates a new object, writing it in the pool database. No memory is
+     *  allocated for the object.
+     *    @param uid user id (the owner of the VirtualRouter)
+     *    @param gid the id of the group this object is assigned to
+     *    @param uname name of the owner user
+     *    @param gname name of the group
+     *    @param umask permissions umask
+     *    @param template_contents a Template object
+     *    @param oid the id assigned to the VirtualRouter
+     *    @param error_str Returns the error reason, if any
+     *
+     *    @return the oid assigned to the object, -1 in case of failure
+     */
+    int allocate(int                      uid,
+                 int                      gid,
+                 const string&            uname,
+                 const string&            gname,
+                 int                      umask,
+                 Template *               template_contents,
+                 int *                    oid,
+                 string&                  error_str)
+    {
+        *oid = PoolSQL::allocate(
+            new VirtualRouter(-1, uid, gid, uname, gname, umask, template_contents),
+            error_str);
+
+        return *oid;
+    }
+
+    /**
+     *  Gets an object from the pool (if needed the object is loaded from the
+     *  database).
+     *   @param oid the object unique identifier
+     *   @param lock locks the object if true
+     *
+     *   @return a pointer to the object, 0 in case of failure
+     */
+    VirtualRouter * get(int oid, bool lock)
+    {
+        return static_cast<VirtualRouter *>(PoolSQL::get(oid,lock));
+    };
+
+    /**
+     *  Gets an object from the pool (if needed the object is loaded from the
+     *  database).
+     *   @param name of the object
+     *   @param uid id of owner
+     *   @param lock locks the object if true
+     *
+     *   @return a pointer to the object, 0 in case of failure
+     */
+    VirtualRouter * get(const string& name, int uid, bool lock)
+    {
+        return static_cast<VirtualRouter *>(PoolSQL::get(name,uid,lock));
+    };
+
+    /**
+     *  Updates the object's data in the data base. The object mutex SHOULD be
+     *  locked.
+     *    @param objsql a pointer to the object
+     *
+     *    @return 0 on success.
+     */
+    int update(VirtualRouter * VirtualRouter)
+    {
+        return VirtualRouter->update(db);
+    };
+
+    /**
+     *  Dumps the pool in XML format. A filter can be also added to the
+     *  query
+     *  @param oss the output stream to dump the pool contents
+     *  @param where filter for the objects, defaults to all
+     *  @param limit parameters used for pagination
+     *
+     *  @return 0 on success
+     */
+    int dump(ostringstream& oss, const string& where, const string& limit)
+    {
+        return PoolSQL::dump(oss, "VROUTER_POOL", VirtualRouter::table, where,
+                             limit);
+    };
+
+    /**
+     *  Bootstraps the database table(s) associated to the pool
+     *    @return 0 on success
+     */
+    static int bootstrap(SqlDB *_db)
+    {
+        return VirtualRouter::bootstrap(_db);
+    };
+
+private:
+    /**
+     *  Factory method to produce objects
+     *    @return a pointer to the new object
+     */
+    PoolObjectSQL * create()
+    {
+        return new VirtualRouter(-1,-1,-1,"","",0,0);
+    };
+};
+
+#endif /*VIRTUAL_ROUTER_POOL_H_*/
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index f3116703f6..db18d4d736 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -346,6 +346,7 @@ void Nebula::start(bool bootstrap_only)
             rc += UserQuotas::bootstrap(db);
             rc += GroupQuotas::bootstrap(db);
             rc += SecurityGroupPool::bootstrap(db);
+            rc += VirtualRouterPool::bootstrap(db);
 
             // Create the system tables only if bootstrap went well
             if (rc == 0)
@@ -491,6 +492,7 @@ void Nebula::start(bool bootstrap_only)
         docpool = new DocumentPool(db);
         zonepool= new ZonePool(db, is_federation_slave());
         vdcpool = new VdcPool(db, is_federation_slave());
+        vrouterpool = new VirtualRouterPool(db);
 
         nebula_configuration->get("VM_HOOK", vm_hooks);
         nebula_configuration->get("HOST_HOOK",  host_hooks);
diff --git a/src/nebula/SConstruct b/src/nebula/SConstruct
index d970365ad9..15501fc88f 100644
--- a/src/nebula/SConstruct
+++ b/src/nebula/SConstruct
@@ -64,6 +64,7 @@ env.Prepend(LIBS=[
     'nebula_xml',
     'nebula_secgroup',
     'nebula_vdc',
+    'nebula_vrouter',
     'crypto',
     'xml2'
 ])
diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index 1ad3268c1d..38130da14e 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -622,6 +622,8 @@ string Request::object_name(PoolObjectSQL::ObjectType ob)
             return "security group";
         case PoolObjectSQL::VDC:
             return "VDC";
+        case PoolObjectSQL::VROUTER:
+            return "virtual router";
         default:
             return "-";
       }
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index 15f57cdf20..9ab5bbce91 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -349,6 +349,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr doc_update(new DocumentUpdateTemplate());
     xmlrpc_c::methodPtr cluster_update(new ClusterUpdateTemplate());
     xmlrpc_c::methodPtr secg_update(new SecurityGroupUpdateTemplate());
+    xmlrpc_c::methodPtr vrouter_update(new VirtualRouterUpdateTemplate());
 
     // Allocate Methods
     xmlrpc_c::methodPtr vm_allocate(new VirtualMachineAllocate());
@@ -360,6 +361,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr cluster_allocate(new ClusterAllocate());
     xmlrpc_c::methodPtr doc_allocate(new DocumentAllocate());
     xmlrpc_c::methodPtr secg_allocate(new SecurityGroupAllocate());
+    xmlrpc_c::methodPtr vrouter_allocate(new VirtualRouterAllocate());
 
     // Clone Methods
     xmlrpc_c::methodPtr template_clone(new VMTemplateClone());
@@ -375,6 +377,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr cluster_delete(new ClusterDelete());
     xmlrpc_c::methodPtr doc_delete(new DocumentDelete());
     xmlrpc_c::methodPtr secg_delete(new SecurityGroupDelete());
+    xmlrpc_c::methodPtr vrouter_delete(new VirtualRouterDelete());
 
     // Info Methods
     xmlrpc_c::methodPtr vm_info(new VirtualMachineInfo());
@@ -386,6 +389,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr cluster_info(new ClusterInfo());
     xmlrpc_c::methodPtr doc_info(new DocumentInfo());
     xmlrpc_c::methodPtr secg_info(new SecurityGroupInfo());
+    xmlrpc_c::methodPtr vrouter_info(new VirtualRouterInfo());
 
     // Lock Methods
     xmlrpc_c::methodPtr doc_lock(new DocumentLock());
@@ -401,6 +405,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr clusterpool_info(new ClusterPoolInfo());
     xmlrpc_c::methodPtr docpool_info(new DocumentPoolInfo());
     xmlrpc_c::methodPtr secgpool_info(new SecurityGroupPoolInfo());
+    xmlrpc_c::methodPtr vrouter_pool_info(new VirtualRouterPoolInfo());
 
     // Host Methods
     xmlrpc_c::methodPtr host_enable(new HostEnable());
@@ -427,6 +432,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr datastore_chown(new DatastoreChown());
     xmlrpc_c::methodPtr doc_chown(new DocumentChown());
     xmlrpc_c::methodPtr secg_chown(new SecurityGroupChown());
+    xmlrpc_c::methodPtr vrouter_chown(new VirtualRouterChown());
 
     // Chmod Methods
     xmlrpc_c::methodPtr vm_chmod(new VirtualMachineChmod());
@@ -436,6 +442,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr datastore_chmod(new DatastoreChmod());
     xmlrpc_c::methodPtr doc_chmod(new DocumentChmod());
     xmlrpc_c::methodPtr secg_chmod(new SecurityGroupChmod());
+    xmlrpc_c::methodPtr vrouter_chmod(new VirtualRouterChmod());
 
     // Cluster Methods
     xmlrpc_c::methodPtr cluster_addhost(new ClusterAddHost());
@@ -459,6 +466,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr datastore_rename(new DatastoreRename());
     xmlrpc_c::methodPtr host_rename(new HostRename());
     xmlrpc_c::methodPtr secg_rename(new SecurityGroupRename());
+    xmlrpc_c::methodPtr vrouter_rename(new VirtualRouterRename());
 
     /* VM related methods  */
     RequestManagerRegistry.addMethod("one.vm.deploy", vm_deploy);
@@ -884,6 +892,18 @@ void RequestManager::register_xml_methods()
 
     RequestManagerRegistry.addMethod("one.vdcpool.info",    vdcpool_info);
 
+    /* Virtual Router related methods*/
+    RequestManagerRegistry.addMethod("one.vrouter.update", vrouter_update);
+    RequestManagerRegistry.addMethod("one.vrouter.allocate",vrouter_allocate);
+    RequestManagerRegistry.addMethod("one.vrouter.delete", vrouter_delete);
+    RequestManagerRegistry.addMethod("one.vrouter.info", vrouter_info);
+    RequestManagerRegistry.addMethod("one.vrouter.chown", vrouter_chown);
+    RequestManagerRegistry.addMethod("one.vrouter.chmod", vrouter_chmod);
+    RequestManagerRegistry.addMethod("one.vrouter.rename", vrouter_rename);
+
+    RequestManagerRegistry.addMethod("one.vrouterpool.info",vrouter_pool_info);
+
+
     /* System related methods */
     RequestManagerRegistry.addMethod("one.system.version", system_version);
     RequestManagerRegistry.addMethod("one.system.config", system_config);
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index e5719ba3a6..133d6ce7ad 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -776,3 +776,19 @@ int VdcAllocate::pool_allocate(
 
     return vdcpool->allocate(tmpl, &id, error_str);
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualRouterAllocate::pool_allocate(
+        xmlrpc_c::paramList const&  paramList,
+        Template *                  tmpl,
+        int&                        id,
+        string&                     error_str,
+        RequestAttributes&          att)
+{
+    VirtualRouterPool * vrpool = static_cast<VirtualRouterPool *>(pool);
+
+    return vrpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
+        tmpl, &id, error_str);
+}
diff --git a/src/vrouter/SConstruct b/src/vrouter/SConstruct
new file mode 100644
index 0000000000..7dc9dcf404
--- /dev/null
+++ b/src/vrouter/SConstruct
@@ -0,0 +1,29 @@
+# SConstruct for src/document
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+Import('env')
+
+lib_name='nebula_vrouter'
+
+# Sources to generate the library
+source_files=[
+    'VirtualRouter.cc'
+]
+
+# Build library
+env.StaticLibrary(lib_name, source_files)
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
new file mode 100644
index 0000000000..6c91771bda
--- /dev/null
+++ b/src/vrouter/VirtualRouter.cc
@@ -0,0 +1,250 @@
+/* ------------------------------------------------------------------------ */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems              */
+/*                                                                          */
+/* 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.                                           */
+/* ------------------------------------------------------------------------ */
+
+#include "VirtualRouter.h"
+
+/* ************************************************************************ */
+/* VirtualRouter :: Constructor/Destructor                                  */
+/* ************************************************************************ */
+
+VirtualRouter::VirtualRouter(   int             id,
+                                int             _uid,
+                                int             _gid,
+                                const string&   _uname,
+                                const string&   _gname,
+                                int             _umask,
+                                Template * _template_contents):
+        PoolObjectSQL(id,VROUTER,"",_uid,_gid,_uname,_gname,table)
+{
+    if (_template_contents != 0)
+    {
+        obj_template = _template_contents;
+    }
+    else
+    {
+        obj_template = new Template;
+    }
+
+    set_umask(_umask);
+}
+
+/* ------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------ */
+
+VirtualRouter::~VirtualRouter()
+{
+    delete obj_template;
+}
+
+/* ************************************************************************ */
+/* VirtualRouter :: Database Access Functions                                    */
+/* ************************************************************************ */
+
+const char * VirtualRouter::table = "vrouter_pool";
+
+const char * VirtualRouter::db_names =
+        "oid, name, body, uid, gid, owner_u, group_u, other_u";
+
+const char * VirtualRouter::db_bootstrap =
+    "CREATE TABLE IF NOT EXISTS vrouter_pool (oid INTEGER PRIMARY KEY, "
+    "name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, "
+    "owner_u INTEGER, group_u INTEGER, other_u INTEGER)";
+
+/* ------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------ */
+
+int VirtualRouter::insert(SqlDB *db, string& error_str)
+{
+    int             rc;
+    ostringstream   oss;
+
+    // ---------------------------------------------------------------------
+    // Check default attributes
+    // ---------------------------------------------------------------------
+
+    erase_template_attribute("NAME", name);
+
+    if ( name.empty() == true )
+    {
+        oss << "vrouter-" << oid;
+        name = oss.str();
+    }
+    else if ( name.length() > 128 )
+    {
+        error_str = "NAME is too long; max length is 128 chars.";
+        return -1;
+    }
+
+    // ------------------------------------------------------------------------
+    // Insert the VirtualRouter
+    // ------------------------------------------------------------------------
+
+    rc = insert_replace(db, false, error_str);
+
+    return rc;
+}
+
+/* ------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------ */
+
+int VirtualRouter::insert_replace(SqlDB *db, bool replace, string& error_str)
+{
+    ostringstream   oss;
+
+    int    rc;
+    string xml_body;
+
+    char * sql_name;
+    char * sql_xml;
+
+   // Update the Object
+
+    sql_name = db->escape_str(name.c_str());
+
+    if ( sql_name == 0 )
+    {
+        goto error_name;
+    }
+
+    sql_xml = db->escape_str(to_xml(xml_body).c_str());
+
+    if ( sql_xml == 0 )
+    {
+        goto error_body;
+    }
+
+    if ( validate_xml(sql_xml) != 0 )
+    {
+        goto error_xml;
+    }
+
+    if(replace)
+    {
+        oss << "REPLACE";
+    }
+    else
+    {
+        oss << "INSERT";
+    }
+
+    // Construct the SQL statement to Insert or Replace
+
+    oss <<" INTO " << table <<" ("<< db_names <<") VALUES ("
+        <<            oid        << ","
+        << "'"     << sql_name   << "',"
+        << "'"     << sql_xml    << "',"
+        <<            uid        << ","
+        <<            gid        << ","
+        <<            owner_u    << ","
+        <<            group_u    << ","
+        <<            other_u    << ")";
+
+    rc = db->exec(oss);
+
+    db->free_str(sql_name);
+    db->free_str(sql_xml);
+
+    return rc;
+
+error_xml:
+    db->free_str(sql_name);
+    db->free_str(sql_xml);
+
+    error_str = "Error transforming the VirtualRouter to XML.";
+
+    goto error_common;
+
+error_body:
+    db->free_str(sql_name);
+    goto error_generic;
+
+error_name:
+    goto error_generic;
+
+error_generic:
+    error_str = "Error inserting VirtualRouter in DB.";
+error_common:
+    return -1;
+}
+
+/* ************************************************************************ */
+/* VirtualRouter :: Misc                                                         */
+/* ************************************************************************ */
+
+string& VirtualRouter::to_xml(string& xml) const
+{
+    ostringstream   oss;
+    string          template_xml;
+    string          perm_str;
+
+    oss << "<VROUTER>"
+            << "<ID>"       << oid        << "</ID>"
+            << "<UID>"      << uid        << "</UID>"
+            << "<GID>"      << gid        << "</GID>"
+            << "<UNAME>"    << uname      << "</UNAME>"
+            << "<GNAME>"    << gname      << "</GNAME>"
+            << "<NAME>"     << name       << "</NAME>"
+            << perms_to_xml(perm_str)
+            << obj_template->to_xml(template_xml)
+        << "</VROUTER>";
+
+    xml = oss.str();
+
+    return xml;
+}
+
+/* ------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------ */
+
+int VirtualRouter::from_xml(const string& xml)
+{
+    vector<xmlNodePtr> content;
+    int rc = 0;
+
+    // Initialize the internal XML object
+    update_from_str(xml);
+
+    // Get class base attributes
+    rc += xpath(oid,        "/VROUTER/ID",      -1);
+    rc += xpath(uid,        "/VROUTER/UID",     -1);
+    rc += xpath(gid,        "/VROUTER/GID",     -1);
+    rc += xpath(uname,      "/VROUTER/UNAME",   "not_found");
+    rc += xpath(gname,      "/VROUTER/GNAME",   "not_found");
+    rc += xpath(name,       "/VROUTER/NAME",    "not_found");
+
+    // Permissions
+    rc += perms_from_xml();
+
+    // Get associated classes
+    ObjectXML::get_nodes("/VROUTER/TEMPLATE", content);
+
+    if (content.empty())
+    {
+        return -1;
+    }
+
+    // Template contents
+    rc += obj_template->from_xml_node(content[0]);
+
+    ObjectXML::free_nodes(content);
+
+    if (rc != 0)
+    {
+        return -1;
+    }
+
+    return 0;
+}

From 64ebcdd5c34b7e6c45c0493848db777bad4ca07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 30 Nov 2015 16:55:22 +0100
Subject: [PATCH 002/197] Feature #4215: Virtual Router pool in ruby oca and
 CLI

---
 install.sh                                    |  18 +-
 share/man/SConstruct                          |   1 +
 src/cli/etc/onevrouter.yaml                   |  25 +++
 src/cli/one_helper/onevrouter_helper.rb       | 116 ++++++++++
 src/cli/onetemplate                           |   2 +-
 src/cli/onevrouter                            | 210 ++++++++++++++++++
 src/oca/ruby/opennebula.rb                    |   2 +
 src/oca/ruby/opennebula/virtual_router.rb     | 167 ++++++++++++++
 .../ruby/opennebula/virtual_router_pool.rb    |  79 +++++++
 9 files changed, 614 insertions(+), 6 deletions(-)
 create mode 100644 src/cli/etc/onevrouter.yaml
 create mode 100644 src/cli/one_helper/onevrouter_helper.rb
 create mode 100755 src/cli/onevrouter
 create mode 100644 src/oca/ruby/opennebula/virtual_router.rb
 create mode 100644 src/oca/ruby/opennebula/virtual_router_pool.rb

diff --git a/install.sh b/install.sh
index 790ee66db0..9c079fd610 100755
--- a/install.sh
+++ b/install.sh
@@ -584,6 +584,7 @@ BIN_FILES="src/nebula/oned \
            src/cli/oneflow-template \
            src/cli/onesecgroup \
            src/cli/onevdc \
+           src/cli/onevrouter \
            src/cli/onevcenter \
            src/onedb/onedb \
            src/mad/utils/tty_expect \
@@ -1376,7 +1377,9 @@ RUBY_OPENNEBULA_LIB_FILES="src/oca/ruby/opennebula/acl_pool.rb \
                             src/oca/ruby/opennebula/xml_pool.rb \
                             src/oca/ruby/opennebula/xml_utils.rb \
                             src/oca/ruby/opennebula/zone_pool.rb \
-                            src/oca/ruby/opennebula/zone.rb"
+                            src/oca/ruby/opennebula/zone.rb \
+                            src/oca/ruby/opennebula/virtual_router_pool.rb \
+                            src/oca/ruby/opennebula/virtual_router.rb"
 
 #-------------------------------------------------------------------------------
 # Common Cloud Files
@@ -1526,7 +1529,8 @@ ONE_CLI_LIB_FILES="src/cli/one_helper/onegroup_helper.rb \
                    src/cli/one_helper/onezone_helper.rb \
                    src/cli/one_helper/onevdc_helper.rb \
                    src/cli/one_helper/oneacct_helper.rb \
-                   src/cli/one_helper/onesecgroup_helper.rb"
+                   src/cli/one_helper/onesecgroup_helper.rb \
+                   src/cli/one_helper/onevrouter_helper.rb"
 
 CLI_BIN_FILES="src/cli/onevm \
                src/cli/onehost \
@@ -1544,7 +1548,8 @@ CLI_BIN_FILES="src/cli/onevm \
                src/cli/oneacct \
                src/cli/onesecgroup \
                src/cli/oneshowback \
-               src/cli/onevdc"
+               src/cli/onevdc \
+               src/cli/onevrouter"
 
 CLI_CONF_FILES="src/cli/etc/onegroup.yaml \
                 src/cli/etc/onehost.yaml \
@@ -1560,7 +1565,8 @@ CLI_CONF_FILES="src/cli/etc/onegroup.yaml \
                 src/cli/etc/oneacct.yaml \
                 src/cli/etc/onesecgroup.yaml \
                 src/cli/etc/oneshowback.yaml \
-                src/cli/etc/onevdc.yaml"
+                src/cli/etc/onevdc.yaml \
+                src/cli/etc/onevrouter.yaml"
 
 #-----------------------------------------------------------------------------
 # Sunstone files
@@ -1603,7 +1609,8 @@ SUNSTONE_MODELS_JSON_FILES="src/sunstone/models/OpenNebulaJSON/HostJSON.rb \
                     src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb \
                     src/sunstone/models/OpenNebulaJSON/ZoneJSON.rb \
                     src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb \
-                    src/sunstone/models/OpenNebulaJSON/VdcJSON.rb"
+                    src/sunstone/models/OpenNebulaJSON/VdcJSON.rb \
+                    src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb"
 
 SUNSTONE_VIEWS_FILES="src/sunstone/views/index.erb \
                       src/sunstone/views/login.erb \
@@ -1831,6 +1838,7 @@ MAN_FILES="share/man/oneacct.1.gz \
         share/man/oneflow-template.1.gz \
         share/man/onesecgroup.1.gz \
         share/man/onevdc.1.gz \
+        share/man/onevrouter.1.gz \
         share/man/econe-allocate-address.1.gz \
         share/man/econe-associate-address.1.gz \
         share/man/econe-attach-volume.1.gz \
diff --git a/share/man/SConstruct b/share/man/SConstruct
index c81a2e6558..6a0dcd2822 100644
--- a/share/man/SConstruct
+++ b/share/man/SConstruct
@@ -64,6 +64,7 @@ env.Man('onezone')
 env.Man('onevcenter')
 env.Man('onesecgroup')
 env.Man('onevdc')
+env.Man('onevrouter')
 
 env.Man('oneflow')
 env.Man('oneflow-template')
diff --git a/src/cli/etc/onevrouter.yaml b/src/cli/etc/onevrouter.yaml
new file mode 100644
index 0000000000..4ccb9028dc
--- /dev/null
+++ b/src/cli/etc/onevrouter.yaml
@@ -0,0 +1,25 @@
+---
+:ID:
+  :desc: ONE identifier for the Virtual Router
+  :size: 4
+
+:NAME:
+  :desc: Name of the Virtual Router
+  :size: 27
+  :left: true
+
+:USER:
+  :desc: Username of the Virtual Router owner
+  :size: 15
+  :left: true
+
+:GROUP:
+  :desc: Group of the Virtual Router
+  :size: 15
+  :left: true
+
+:default:
+- :ID
+- :USER
+- :GROUP
+- :NAME
diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb
new file mode 100644
index 0000000000..05a03ebf12
--- /dev/null
+++ b/src/cli/one_helper/onevrouter_helper.rb
@@ -0,0 +1,116 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'one_helper'
+
+class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
+    def self.rname
+        "VROUTER"
+    end
+
+    def self.conf_file
+        "onevrouter.yaml"
+    end
+
+    def show_resource(id, options)
+        resource = retrieve_resource(id)
+
+        if !options[:extended].nil?
+            rc = resource.info(options[:extended])
+        else
+            rc = resource.info
+        end
+
+        return -1, rc.message if OpenNebula.is_error?(rc)
+
+        if options[:xml]
+            return 0, resource.to_xml(true)
+        else
+            format_resource(resource, options)
+            return 0
+        end
+    end
+
+    def format_pool(options)
+        config_file = self.class.table_conf
+
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, "ONE identifier for the Virtual Router", :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "Name of the Virtual Router", :left, :size=>27 do |d|
+                d["NAME"]
+            end
+
+            column :USER, "Username of the Virtual Router owner", :left,
+                    :size=>15 do |d|
+                helper.user_name(d, options)
+            end
+
+            column :GROUP, "Group of the Virtual Router", :left, :size=>15 do |d|
+                helper.group_name(d, options)
+            end
+
+            default :ID, :USER, :GROUP, :NAME
+        end
+
+        table
+    end
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::VirtualRouter.new_with_id(id, @client)
+        else
+            xml=OpenNebula::VirtualRouter.build_xml
+            OpenNebula::VirtualRouter.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::VirtualRouterPool.new(@client, user_flag)
+    end
+
+    def format_resource(obj, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(
+            str_h1 % "VIRTUAL ROUTER #{obj['ID']} INFORMATION")
+        puts str % ["ID", obj.id.to_s]
+        puts str % ["NAME", obj.name]
+        puts str % ["USER", obj['UNAME']]
+        puts str % ["GROUP", obj['GNAME']]
+        puts
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if obj["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if obj["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if obj["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e,  mask]
+        }
+        puts
+
+        CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
+        puts obj.template_str
+    end
+end
diff --git a/src/cli/onetemplate b/src/cli/onetemplate
index 9a0cde0285..a505a6da3f 100755
--- a/src/cli/onetemplate
+++ b/src/cli/onetemplate
@@ -160,7 +160,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     delete_desc = <<-EOT.unindent
-        Deletes the given Image
+        Deletes the given Template
     EOT
 
     command :delete, delete_desc, [:range, :templateid_list] do
diff --git a/src/cli/onevrouter b/src/cli/onevrouter
new file mode 100755
index 0000000000..a8ea141932
--- /dev/null
+++ b/src/cli/onevrouter
@@ -0,0 +1,210 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
+else
+    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+end
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+
+require 'command_parser'
+require 'one_helper/onevrouter_helper'
+require 'one_helper/onevm_helper'
+
+cmd=CommandParser::CmdParser.new(ARGV) do
+    usage "`onevrouter` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneVirtualRouterHelper.new
+
+    before_proc do
+        helper.set_client(options)
+    end
+
+    ########################################################################
+    # Global Options
+    ########################################################################
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+
+    list_options = CLIHelper::OPTIONS
+    list_options << OpenNebulaHelper::XML
+    list_options << OpenNebulaHelper::NUMERIC
+    list_options << OpenNebulaHelper::DESCRIBE
+
+    ########################################################################
+    # Formatters for arguments
+    ########################################################################
+    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "GROUP")
+    end
+
+    set :format, :userid, OpenNebulaHelper.rname_to_id_desc("USER") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "USER")
+    end
+
+    set :format, :vrouterid, OneVirtualRouterHelper.to_id_desc do |arg|
+        helper.to_id(arg)
+    end
+
+    set :format, :vrouterid_list, OneVirtualRouterHelper.list_to_id_desc do |arg|
+        helper.list_to_id(arg)
+    end
+
+    set :format, :filterflag, OneVirtualRouterHelper.filterflag_to_i_desc do |arg|
+        helper.filterflag_to_i(arg)
+    end
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new Virtual Router from the given description
+    EOT
+
+    command :create, create_desc, :file do
+        helper.create_resource(options) do |obj|
+            begin
+                template = File.read(args[0])
+
+                obj.allocate(template)
+            rescue => e
+                STDERR.puts e.messsage
+                exit -1
+            end
+        end
+    end
+
+# TODO: implement or remove
+=begin
+    clone_desc = <<-EOT.unindent
+        Creates a new Virtual Router from an existing one
+    EOT
+
+    command :clone, clone_desc, :vrouterid, :name do
+        helper.perform_action(args[0],options,"cloned") do |t|
+            res = t.clone(args[1])
+
+            if !OpenNebula.is_error?(res)
+                puts "ID: #{res}"
+            else
+                puts res.message
+            end
+        end
+    end
+=end
+
+    delete_desc = <<-EOT.unindent
+        Deletes the given Virtual Router
+    EOT
+
+    command :delete, delete_desc, [:range, :vrouterid_list] do
+        helper.perform_actions(args[0],options,"deleted") do |obj|
+            obj.delete
+        end
+    end
+
+    chgrp_desc = <<-EOT.unindent
+        Changes the Virtual Router group
+    EOT
+
+    command :chgrp, chgrp_desc,[:range, :vrouterid_list], :groupid do
+        helper.perform_actions(args[0],options,"Group changed") do |obj|
+            obj.chown(-1, args[1].to_i)
+        end
+    end
+
+    chown_desc = <<-EOT.unindent
+        Changes the Virtual Router owner and group
+    EOT
+
+    command :chown, chown_desc, [:range, :vrouterid_list], :userid,
+            [:groupid,nil] do
+        gid = args[2].nil? ? -1 : args[2].to_i
+        helper.perform_actions(args[0],options,"Owner/Group changed") do |obj|
+            obj.chown(args[1].to_i, gid)
+        end
+    end
+
+    chmod_desc = <<-EOT.unindent
+        Changes the Virtual Router permissions
+    EOT
+
+    command :chmod, chmod_desc, [:range, :vrouterid_list], :octet do
+        helper.perform_actions(args[0],options, "Permissions changed") do |obj|
+            obj.chmod_octet(args[1])
+        end
+    end
+
+    update_desc = <<-EOT.unindent
+        Update the Virtual Router contents. If a path is not provided the editor
+        will be launched to modify the current content.
+    EOT
+
+    command :update, update_desc, :vrouterid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            obj.update(str, options[:append])
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Virtual Router
+    EOT
+
+    command :rename, rename_desc, :vrouterid, :name do
+        helper.perform_action(args[0],options,"renamed") do |obj|
+            obj.rename(args[1])
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists the Virtual Routers in the pool
+    EOT
+
+    command :list, list_desc, [:filterflag, nil], :options=>list_options do
+        helper.list_pool(options, false, args[0])
+    end
+
+    show_desc = <<-EOT.unindent
+        Shows information for the given Virtual Router
+    EOT
+
+    command :show, show_desc, :secgroupid, :options=>OpenNebulaHelper::XML do
+        helper.show_resource(args[0],options)
+    end
+
+    top_desc = <<-EOT.unindent
+        Lists Virtual Routers continuously
+    EOT
+
+    command :top, top_desc, [:filterflag, nil], :options=>list_options do
+        helper.list_pool(options, true, args[0])
+    end
+end
diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb
index 287e1b7971..fae0ac63b2 100644
--- a/src/oca/ruby/opennebula.rb
+++ b/src/oca/ruby/opennebula.rb
@@ -56,6 +56,8 @@ require 'opennebula/security_group_pool'
 require 'opennebula/vdc'
 require 'opennebula/vdc_pool'
 require 'opennebula/system'
+require 'opennebula/virtual_router'
+require 'opennebula/virtual_router_pool'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/opennebula/virtual_router.rb b/src/oca/ruby/opennebula/virtual_router.rb
new file mode 100644
index 0000000000..e3b9829c3a
--- /dev/null
+++ b/src/oca/ruby/opennebula/virtual_router.rb
@@ -0,0 +1,167 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'opennebula/pool_element'
+
+module OpenNebula
+    class VirtualRouter < PoolElement
+        #######################################################################
+        # Constants and Class Methods
+        #######################################################################
+
+        VIRTUAL_ROUTER_METHODS = {
+            :allocate    => "vrouter.allocate",
+            :info        => "vrouter.info",
+            :update      => "vrouter.update",
+            :delete      => "vrouter.delete",
+            :chown       => "vrouter.chown",
+            :chmod       => "vrouter.chmod",
+# TODO: remove or implement
+#            :clone       => "vrouter.clone",
+            :rename      => "vrouter.rename"
+        }
+
+        # Creates a VirtualRouter description with just its identifier
+        # this method should be used to create plain VirtualRouter objects.
+        # +id+ the id of the user
+        #
+        # Example:
+        #   vrouter = VirtualRouter.new(VirtualRouter.build_xml(3),rpc_client)
+        #
+        def VirtualRouter.build_xml(pe_id=nil)
+            if pe_id
+                obj_xml = "<VROUTER><ID>#{pe_id}</ID></VROUTER>"
+            else
+                obj_xml = "<VROUTER></VROUTER>"
+            end
+
+            XMLElement.build_xml(obj_xml,'VROUTER')
+        end
+
+        # Class constructor
+        def initialize(xml, client)
+            super(xml,client)
+
+            @client = client
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the VirtualRouter Object
+        #######################################################################
+
+        # Retrieves the information of the given Virtual Router
+        def info()
+            super(VIRTUAL_ROUTER_METHODS[:info], 'VROUTER')
+        end
+
+        alias_method :info!, :info
+
+        # Allocates a new VirtualRouter in OpenNebula
+        #
+        # @param description [String] The contents of the VirtualRouter.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def allocate(description)
+            super(VIRTUAL_ROUTER_METHODS[:allocate], description)
+        end
+
+        # Deletes the VirtualRouter
+        def delete()
+            super(VIRTUAL_ROUTER_METHODS[:delete])
+        end
+
+        # Replaces the template contents
+        #
+        # @param new_template [String] New template contents
+        # @param append [true, false] True to append new attributes instead of
+        #   replace the whole template
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def update(new_template, append=false)
+            super(VIRTUAL_ROUTER_METHODS[:update], new_template, append ? 1 : 0)
+        end
+
+        # Changes the owner/group
+        # @param uid [Integer] the new owner id. Set to -1 to leave the current one
+        # @param gid [Integer] the new group id. Set to -1 to leave the current one
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chown(uid, gid)
+            super(VIRTUAL_ROUTER_METHODS[:chown], uid, gid)
+        end
+
+        # Changes the VirtualRouter permissions.
+        #
+        # @param octet [String] Permissions octed , e.g. 640
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod_octet(octet)
+            super(VIRTUAL_ROUTER_METHODS[:chmod], octet)
+        end
+
+        # Changes the VirtualRouter permissions.
+        # Each [Integer] argument must be 1 to allow, 0 deny, -1 do not change
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a)
+            super(VIRTUAL_ROUTER_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
+                group_m, group_a, other_u, other_m, other_a)
+        end
+=begin
+        # Clones this VirtualRouter into a new one
+        #
+        # @param [String] name for the new VirtualRouter.
+        #
+        # @return [Integer, OpenNebula::Error] The new VirtualRouter ID in case
+        #   of success, Error otherwise
+        def clone(name)
+            return Error.new('ID not defined') if !@pe_id
+
+            rc = @client.call(VIRTUAL_ROUTER_METHODS[:clone], @pe_id, name)
+
+            return rc
+        end
+=end
+        # Renames this VirtualRouter
+        #
+        # @param name [String] New name for the VirtualRouter.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def rename(name)
+            return call(VIRTUAL_ROUTER_METHODS[:rename], @pe_id, name)
+        end
+
+        #######################################################################
+        # Helpers to get VirtualRouter information
+        #######################################################################
+
+        # Returns the group identifier
+        # @return [Integer] the element's group ID
+        def gid
+            self['GID'].to_i
+        end
+
+        def owner_id
+            self['UID'].to_i
+        end
+    end
+end
diff --git a/src/oca/ruby/opennebula/virtual_router_pool.rb b/src/oca/ruby/opennebula/virtual_router_pool.rb
new file mode 100644
index 0000000000..3d75d6c5fb
--- /dev/null
+++ b/src/oca/ruby/opennebula/virtual_router_pool.rb
@@ -0,0 +1,79 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'opennebula/pool'
+
+module OpenNebula
+    class VirtualRouterPool < Pool
+        #######################################################################
+        # Constants and Class attribute accessors
+        #######################################################################
+
+
+        VIRTUAL_ROUTER_POOL_METHODS = {
+            :info => "vrouterpool.info"
+        }
+
+        #######################################################################
+        # Class constructor & Pool Methods
+        #######################################################################
+
+        # +client+ a Client object that represents an XML-RPC connection
+        # +user_id+ used to refer to a Pool with Virtual Routers from that user
+        def initialize(client, user_id=-1)
+            super('VROUTER_POOL','VROUTER',client)
+
+            @user_id  = user_id
+        end
+
+        # Factory method to create Virtual Router objects
+        def factory(element_xml)
+            OpenNebula::VirtualRouter.new(element_xml,@client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the Virtual Router Object
+        #######################################################################
+
+        # Retrieves all or part of the Virtual Routers in the pool.
+        def info(*args)
+            case args.size
+                when 0
+                    info_filter(VIRTUAL_ROUTER_POOL_METHODS[:info],@user_id,-1,-1)
+                when 3
+                    info_filter(VIRTUAL_ROUTER_POOL_METHODS[:info],args[0],args[1],args[2])
+            end
+        end
+
+        def info_all()
+            return super(VIRTUAL_ROUTER_POOL_METHODS[:info])
+        end
+
+        def info_mine()
+            return super(VIRTUAL_ROUTER_POOL_METHODS[:info])
+        end
+
+        def info_group()
+            return super(VIRTUAL_ROUTER_POOL_METHODS[:info])
+        end
+
+        alias_method :info!, :info
+        alias_method :info_all!, :info_all
+        alias_method :info_mine!, :info_mine
+        alias_method :info_group!, :info_group
+    end
+end

From cca441ef0d334037c0bac626ea68b4057f8156e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 30 Nov 2015 17:02:45 +0100
Subject: [PATCH 003/197] Feature #4215: Virtual Router pool in Sunstone

---
 src/sunstone/etc/sunstone-views/admin.yaml    |  20 +++
 .../etc/sunstone-views/admin_vcenter.yaml     |  20 +++
 src/sunstone/etc/sunstone-views/user.yaml     |  20 +++
 src/sunstone/models/OpenNebulaJSON.rb         |   1 +
 .../models/OpenNebulaJSON/PoolJSON.rb         |   1 +
 .../OpenNebulaJSON/VirtualRouterJSON.rb       |  91 ++++++++++
 src/sunstone/models/SunstoneServer.rb         |   3 +
 src/sunstone/public/app/main.js               |   1 +
 src/sunstone/public/app/opennebula.js         |   8 +-
 .../public/app/opennebula/virtualrouter.js    |  66 +++++++
 src/sunstone/public/app/tabs/vrouters-tab.js  |  61 +++++++
 .../public/app/tabs/vrouters-tab/actions.js   |  70 ++++++++
 .../public/app/tabs/vrouters-tab/buttons.js   |  62 +++++++
 .../public/app/tabs/vrouters-tab/datatable.js |  99 +++++++++++
 .../app/tabs/vrouters-tab/dialogs/clone.js    | 113 ++++++++++++
 .../vrouters-tab/dialogs/clone/dialogId.js    |  19 ++
 .../tabs/vrouters-tab/dialogs/clone/html.hbs  |  45 +++++
 .../tabs/vrouters-tab/form-panels/create.js   | 162 ++++++++++++++++++
 .../form-panels/create/advanced.hbs           |  28 +++
 .../form-panels/create/formPanelId.js         |  19 ++
 .../form-panels/create/wizard.hbs             |  33 ++++
 .../app/tabs/vrouters-tab/panels/info.js      | 101 +++++++++++
 .../tabs/vrouters-tab/panels/info/html.hbs    |  42 +++++
 .../tabs/vrouters-tab/panels/info/panelId.js  |  19 ++
 .../public/app/tabs/vrouters-tab/tabId.js     |  19 ++
 25 files changed, 1120 insertions(+), 3 deletions(-)
 create mode 100644 src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
 create mode 100644 src/sunstone/public/app/opennebula/virtualrouter.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/actions.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/buttons.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/datatable.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/dialogId.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/html.hbs
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/advanced.hbs
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/formPanelId.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/panels/info/panelId.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/tabId.js

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index a72ef24739..057cf30468 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -18,6 +18,7 @@ enabled_tabs:
     - datastores-tab
     - vnets-tab
     - secgroups-tab
+    - vrouters-tab
     - zones-tab
     - marketplace-tab
     - oneflow-dashboard
@@ -426,6 +427,25 @@ tabs:
             SecurityGroup.chmod: true
             SecurityGroup.clone_dialog: true
             SecurityGroup.delete: true
+    vrouters-tab:
+        panel_tabs:
+            virtual_router_info_tab: true
+        table_columns:
+            - 0         # Checkbox
+            - 1         # ID
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
+        actions:
+            VirtualRouter.refresh: true
+            VirtualRouter.create_dialog: true
+            VirtualRouter.update_dialog: true
+            VirtualRouter.rename: true
+            VirtualRouter.chown: true
+            VirtualRouter.chgrp: true
+            VirtualRouter.chmod: true
+            VirtualRouter.clone_dialog: true
+            VirtualRouter.delete: true
     marketplace-tab:
         panel_tabs:
             marketplace_info_tab: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index e198a6c33e..47c59f245f 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -18,6 +18,7 @@ enabled_tabs:
     #- datastores-tab
     - vnets-tab
     #- secgroups-tab
+    - vrouters-tab
     - zones-tab
     #- marketplace-tab
     - oneflow-dashboard
@@ -426,6 +427,25 @@ tabs:
             SecurityGroup.chmod: true
             SecurityGroup.clone_dialog: true
             SecurityGroup.delete: true
+    vrouters-tab:
+        panel_tabs:
+            virtual_router_info_tab: true
+        table_columns:
+            - 0         # Checkbox
+            - 1         # ID
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
+        actions:
+            VirtualRouter.refresh: true
+            VirtualRouter.create_dialog: true
+            VirtualRouter.update_dialog: true
+            VirtualRouter.rename: true
+            VirtualRouter.chown: true
+            VirtualRouter.chgrp: true
+            VirtualRouter.chmod: true
+            VirtualRouter.clone_dialog: true
+            VirtualRouter.delete: true
     marketplace-tab:
         panel_tabs:
             marketplace_info_tab: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 0a2f6b38c1..a61e9bfc9c 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -18,6 +18,7 @@ enabled_tabs:
     - datastores-tab
     - vnets-tab
     - secgroups-tab
+    - vrouters-tab
     #- zones-tab
     - marketplace-tab
     - oneflow-dashboard
@@ -427,6 +428,25 @@ tabs:
             SecurityGroup.chmod: true
             SecurityGroup.clone_dialog: true
             SecurityGroup.delete: true
+    vrouters-tab:
+        panel_tabs:
+            virtual_router_info_tab: true
+        table_columns:
+            - 0         # Checkbox
+            - 1         # ID
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
+        actions:
+            VirtualRouter.refresh: true
+            VirtualRouter.create_dialog: true
+            VirtualRouter.update_dialog: true
+            VirtualRouter.rename: true
+            VirtualRouter.chown: true
+            VirtualRouter.chgrp: true
+            VirtualRouter.chmod: true
+            VirtualRouter.clone_dialog: true
+            VirtualRouter.delete: true
     marketplace-tab:
         panel_tabs:
             marketplace_info_tab: true
diff --git a/src/sunstone/models/OpenNebulaJSON.rb b/src/sunstone/models/OpenNebulaJSON.rb
index 77891e302d..4b84b7c2be 100644
--- a/src/sunstone/models/OpenNebulaJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON.rb
@@ -32,6 +32,7 @@ require 'OpenNebulaJSON/DatastoreJSON'
 require 'OpenNebulaJSON/ZoneJSON'
 require 'OpenNebulaJSON/SecurityGroupJSON'
 require 'OpenNebulaJSON/VdcJSON'
+require 'OpenNebulaJSON/VirtualRouterJSON'
 
 module OpenNebula
     class Error
diff --git a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb
index 6db16b3511..f10384a220 100644
--- a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb
@@ -30,4 +30,5 @@ module OpenNebulaJSON
     class ZonePoolJSON < OpenNebula::ZonePool; include JSONUtils; end
     class SecurityGroupPoolJSON < OpenNebula::SecurityGroupPool; include JSONUtils; end
     class VdcPoolJSON < OpenNebula::VdcPool; include JSONUtils; end
+    class VirtualRouterPoolJSON < OpenNebula::VirtualRouterPool; include JSONUtils; end
 end
diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
new file mode 100644
index 0000000000..6b584e8b26
--- /dev/null
+++ b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
@@ -0,0 +1,91 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'OpenNebulaJSON/JSONUtils'
+
+module OpenNebulaJSON
+    class VirtualRouterJSON < OpenNebula::VirtualRouter
+        include JSONUtils
+
+        def create(template_json)
+            vrouter_hash = parse_json(template_json, 'virtual_router')
+
+            if OpenNebula.is_error?(vrouter_hash)
+                return vrouter_hash
+            end
+
+            if vrouter_hash['virtual_router_raw']
+                template = vrouter_hash['virtual_router_raw']
+            else
+                template = template_to_str(vrouter_hash)
+            end
+
+            self.allocate(template)
+
+        end
+
+       def perform_action(template_json)
+            action_hash = parse_json(template_json, 'action')
+            if OpenNebula.is_error?(action_hash)
+                return action_hash
+            end
+
+            rc = case action_hash['perform']
+                 when "update"      then self.update(action_hash['params'])
+                 when "chown"       then self.chown(action_hash['params'])
+                 when "chmod"       then self.chmod_json(action_hash['params'])
+                 when "clone"       then self.clone(action_hash['params'])
+                 when "rename"      then self.rename(action_hash['params'])
+                 else
+                     error_msg = "#{action_hash['perform']} action not " <<
+                         " available for this resource"
+                     OpenNebula::Error.new(error_msg)
+                 end
+        end
+
+        def update(params=Hash.new)
+            super(params['template_raw'])
+        end
+
+        def chown(params=Hash.new)
+            super(params['owner_id'].to_i,params['group_id'].to_i)
+        end
+
+        def chmod_json(params=Hash.new)
+            if params['octet']
+                self.chmod_octet(params['octet'])
+            else
+                self.chmod((params['owner_u']||-1),
+                    (params['owner_m']||-1),
+                    (params['owner_a']||-1),
+                    (params['group_u']||-1),
+                    (params['group_m']||-1),
+                    (params['group_a']||-1),
+                    (params['other_u']||-1),
+                    (params['other_m']||-1),
+                    (params['other_a']||-1))
+            end
+        end
+
+        def clone(params=Hash.new)
+            super(params['name'])
+        end
+
+        def rename(params=Hash.new)
+            super(params['name'])
+        end
+    end
+end
diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
index a5a74a0fa4..fd6e709317 100644
--- a/src/sunstone/models/SunstoneServer.rb
+++ b/src/sunstone/models/SunstoneServer.rb
@@ -65,6 +65,7 @@ class SunstoneServer < CloudServer
             when "zone"       then ZonePoolJSON.new(client)
             when "security_group"   then SecurityGroupPoolJSON.new(client, user_flag)
             when "vdc"        then VdcPoolJSON.new(client)
+            when "vrouter"    then VirtualRouterPoolJSON.new(client, user_flag)
             else
                 error = Error.new("Error: #{kind} resource not supported")
                 return [404, error.to_json]
@@ -122,6 +123,7 @@ class SunstoneServer < CloudServer
             when "zone"       then ZoneJSON.new(Zone.build_xml, @client)
             when "security_group"   then SecurityGroupJSON.new(SecurityGroup.build_xml, @client)
             when "vdc"        then VdcJSON.new(Vdc.build_xml, @client)
+            when "vrouter"    then VirtualRouterJSON.new(VirtualRouter.build_xml, @client)
             else
                 error = Error.new("Error: #{kind} resource not supported")
                 return [404, error.to_json]
@@ -443,6 +445,7 @@ class SunstoneServer < CloudServer
             when "zone"       then ZoneJSON.new_with_id(id, @client)
             when "security_group"   then SecurityGroupJSON.new_with_id(id, @client)
             when "vdc"        then VdcJSON.new_with_id(id, @client)
+            when "vrouter"    then VirtualRouterJSON.new_with_id(id, @client)
             else
                 error = Error.new("Error: #{kind} resource not supported")
                 return error
diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js
index 5126ed0099..60191f65ae 100644
--- a/src/sunstone/public/app/main.js
+++ b/src/sunstone/public/app/main.js
@@ -133,6 +133,7 @@ require.config({
         'tabs/datastores-tab',
         'tabs/vnets-tab',
         'tabs/secgroups-tab',
+        'tabs/vrouters-tab',
         'tabs/zones-tab',
         'tabs/marketplace-tab',
         'tabs/oneflow-dashboard',
diff --git a/src/sunstone/public/app/opennebula.js b/src/sunstone/public/app/opennebula.js
index f242276aa8..3b718ed58d 100644
--- a/src/sunstone/public/app/opennebula.js
+++ b/src/sunstone/public/app/opennebula.js
@@ -39,7 +39,8 @@ define(function(require) {
       User            = require('./opennebula/user'),
       Vdc             = require('./opennebula/vdc'),
       Vm              = require('./opennebula/vm'),
-      Zone            = require('./opennebula/zone')
+      Zone            = require('./opennebula/zone'),
+      VirtualRouter   = require('./opennebula/virtualrouter');
 
   if (typeof(csrftoken) != "undefined") {
     $.ajaxPrefilter(function(options, originalOptions, jqXHR) {
@@ -88,8 +89,9 @@ define(function(require) {
     'User': User,
     'Vdc': Vdc,
     'VM': Vm,
-    'Zone': Zone
-  }
+    'Zone': Zone,
+    'VirtualRouter': VirtualRouter
+  };
 
   return OpenNebula;
 });
diff --git a/src/sunstone/public/app/opennebula/virtualrouter.js b/src/sunstone/public/app/opennebula/virtualrouter.js
new file mode 100644
index 0000000000..487b72ed7e
--- /dev/null
+++ b/src/sunstone/public/app/opennebula/virtualrouter.js
@@ -0,0 +1,66 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var OpenNebulaAction = require('./action');
+
+  var RESOURCE = "VROUTER";
+
+  var VirtualRouter = {
+    "resource" : RESOURCE,
+
+    "create" : function(params) {
+      OpenNebulaAction.create(params, RESOURCE);
+    },
+    "del" : function(params) {
+      OpenNebulaAction.del(params, RESOURCE);
+    },
+    "list" : function(params) {
+      OpenNebulaAction.list(params, RESOURCE);
+    },
+    "show" : function(params) {
+      OpenNebulaAction.show(params, RESOURCE);
+    },
+    "chown" : function(params) {
+      OpenNebulaAction.chown(params, RESOURCE);
+    },
+    "chgrp" : function(params) {
+      OpenNebulaAction.chgrp(params, RESOURCE);
+    },
+    "chmod" : function(params) {
+      var action_obj = params.data.extra_param;
+      OpenNebulaAction.simple_action(params, RESOURCE, "chmod", action_obj);
+    },
+    "update": function(params) {
+      var action_obj = {"template_raw" : params.data.extra_param};
+      OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj);
+    },
+    "clone" : function(params) {
+      var name = params.data.extra_param ? params.data.extra_param : "";
+      var action_obj = {"name" : name};
+      OpenNebulaAction.simple_action(params, RESOURCE, "clone", action_obj);
+    },
+    "rename" : function(params) {
+      var action_obj = params.data.extra_param;
+      OpenNebulaAction.simple_action(params, RESOURCE, "rename", action_obj);
+    },
+    "getName": function(id){
+      return OpenNebulaAction.getName(id, RESOURCE);
+    }
+  };
+
+  return VirtualRouter;
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab.js b/src/sunstone/public/app/tabs/vrouters-tab.js
new file mode 100644
index 0000000000..f54e7e5e27
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab.js
@@ -0,0 +1,61 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Locale = require('utils/locale');
+  var Buttons = require('./vrouters-tab/buttons');
+  var Actions = require('./vrouters-tab/actions');
+  var Table = require('./vrouters-tab/datatable');
+
+  var TAB_ID = require('./vrouters-tab/tabId');
+  var DATATABLE_ID = "dataTableVirtualRouters";
+
+  var _dialogs = [
+    require('./vrouters-tab/dialogs/clone')
+  ];
+
+  var _panels = [
+    require('./vrouters-tab/panels/info')
+  ];
+
+  var _panelsHooks = [
+    require('../utils/hooks/header')
+  ];
+
+  var _formPanels = [
+    require('./vrouters-tab/form-panels/create')
+  ];
+
+  var Tab = {
+    tabId: TAB_ID,
+    title: Locale.tr("Virtual Routers"),
+    tabClass: "subTab",
+    parentTab: "infra-tab",
+    listHeader: '<i class="fa fa-fw fa-random"></i>&emsp;'+Locale.tr("Virtual Routers"),
+    infoHeader: '<i class="fa fa-fw fa-random"></i>&emsp;'+Locale.tr("Virtual Router"),
+    subheader: '<span/> <small></small>&emsp;',
+    resource: 'VirtualRouter',
+    buttons: Buttons,
+    actions: Actions,
+    dataTable: new Table(DATATABLE_ID, {actions: true, info: true}),
+    panels: _panels,
+    panelsHooks: _panelsHooks,
+    formPanels: _formPanels,
+    dialogs: _dialogs
+  };
+
+  return Tab;
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/actions.js b/src/sunstone/public/app/tabs/vrouters-tab/actions.js
new file mode 100644
index 0000000000..b239569381
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/actions.js
@@ -0,0 +1,70 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Sunstone = require('sunstone');
+  var Notifier = require('utils/notifier');
+  var Locale = require('utils/locale');
+  var DataTable = require('./datatable');
+  var OpenNebulaResource = require('opennebula/virtualrouter');
+  var CommonActions = require('utils/common-actions');
+
+  var RESOURCE = "VirtualRouter";
+  var XML_ROOT = "VROUTER";
+  var TAB_ID = require('./tabId');
+  var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId');
+  var CLONE_DIALOG_ID = require('./dialogs/clone/dialogId');
+
+  var _commonActions = new CommonActions(OpenNebulaResource, RESOURCE, TAB_ID, XML_ROOT);
+
+  var _actions = {
+    "VirtualRouter.create" : _commonActions.create(CREATE_DIALOG_ID),
+    "VirtualRouter.create_dialog" : _commonActions.showCreate(CREATE_DIALOG_ID),
+    "VirtualRouter.list" : _commonActions.list(),
+    "VirtualRouter.show" : _commonActions.show(),
+    "VirtualRouter.refresh" : _commonActions.refresh(),
+    "VirtualRouter.delete" : _commonActions.del(),
+    "VirtualRouter.chown": _commonActions.multipleAction('chown'),
+    "VirtualRouter.chgrp": _commonActions.multipleAction('chgrp'),
+    "VirtualRouter.chmod": _commonActions.singleAction('chmod'),
+    "VirtualRouter.rename": _commonActions.singleAction('rename'),
+    "VirtualRouter.update" : _commonActions.update(),
+    "VirtualRouter.update_template" : _commonActions.updateTemplate(),
+    "VirtualRouter.update_dialog" : _commonActions.checkAndShowUpdate(),
+    "VirtualRouter.show_to_update" : _commonActions.showUpdate(CREATE_DIALOG_ID),
+
+    "VirtualRouter.clone_dialog" : {
+      type: "custom",
+      call: function(){
+        Sunstone.getDialog(CLONE_DIALOG_ID).show();
+      }
+    },
+
+    "VirtualRouter.clone" : {
+      type: "single",
+      call: OpenNebulaResource.clone,
+      callback: function(request, response) {
+        Sunstone.getDialog(CLONE_DIALOG_ID).hide();
+        Sunstone.getDialog(CLONE_DIALOG_ID).reset();
+        Sunstone.runAction('VirtualRouter.refresh');
+      },
+      error: Notifier.onError,
+      notify: true
+    }
+  };
+
+  return _actions;
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
new file mode 100644
index 0000000000..49ddc6c4bd
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
@@ -0,0 +1,62 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Locale = require('utils/locale');
+
+  var Buttons = {
+    "VirtualRouter.refresh" : {
+      type: "action",
+      layout: "refresh",
+      alwaysActive: true
+    },
+    "VirtualRouter.create_dialog" : {
+      type: "create_dialog",
+      layout: "create"
+    },
+    "VirtualRouter.update_dialog" : {
+      type: "action",
+      layout: "main",
+      text: Locale.tr("Update")
+    },
+    "VirtualRouter.chown" : {
+      type: "confirm_with_select",
+      text: Locale.tr("Change owner"),
+      layout: "user_select",
+      select: "User",
+      tip: Locale.tr("Select the new owner")+":"
+    },
+    "VirtualRouter.chgrp" : {
+      type: "confirm_with_select",
+      text: Locale.tr("Change group"),
+      layout: "user_select",
+      select: "Group",
+      tip: Locale.tr("Select the new group")+":"
+    },
+    "VirtualRouter.clone_dialog" : {
+      type: "action",
+      layout: "main",
+      text: Locale.tr("Clone")
+    },
+    "VirtualRouter.delete" : {
+      type: "confirm",
+      layout: "del",
+      text: Locale.tr("Delete")
+    }
+  };
+
+  return Buttons;
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
new file mode 100644
index 0000000000..c9a6b79610
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
@@ -0,0 +1,99 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var TabDataTable = require('utils/tab-datatable');
+  var SunstoneConfig = require('sunstone-config');
+  var Locale = require('utils/locale');
+
+  /*
+    CONSTANTS
+   */
+
+  var RESOURCE = "VirtualRouter";
+  var XML_ROOT = "VROUTER";
+  var TAB_NAME = require('./tabId');
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Table(dataTableId, conf) {
+    this.conf = conf || {};
+    this.tabId = TAB_NAME;
+    this.dataTableId = dataTableId;
+    this.resource = RESOURCE;
+    this.xmlRoot = XML_ROOT;
+
+    this.dataTableOptions = {
+      "bAutoWidth": false,
+      "bSortClasses" : false,
+      "bDeferRender": true,
+      "aoColumnDefs": [
+          {"bSortable": false, "aTargets": ["check"]},
+          {"sWidth": "35px", "aTargets": [0]},
+          {"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)},
+          {"bVisible": false, "aTargets": ['_all']}
+      ]
+    };
+
+    this.columns = [
+      Locale.tr("ID"),
+      Locale.tr("Owner"),
+      Locale.tr("Group"),
+      Locale.tr("Name")
+    ];
+
+    this.selectOptions = {
+      "id_index": 1,
+      "name_index": 4,
+      "select_resource": Locale.tr("Please select a virtual router from the list"),
+      "you_selected": Locale.tr("You selected the following virtual router:"),
+      "select_resource_multiple": Locale.tr("Please select one or more virtual routers from the list"),
+      "you_selected_multiple": Locale.tr("You selected the following virtual routers:")
+    };
+
+    TabDataTable.call(this);
+  }
+
+  Table.prototype = Object.create(TabDataTable.prototype);
+  Table.prototype.constructor = Table;
+  Table.prototype.elementArray = _elementArray;
+
+  return Table;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _elementArray(element_json) {
+    var element = element_json[XML_ROOT];
+
+    return [
+        '<input class="check_item" type="checkbox" id="'+RESOURCE.toLowerCase()+'_' +
+                             element.ID + '" name="selected_items" value="' +
+                             element.ID + '"/>',
+        element.ID,
+        element.UNAME,
+        element.GNAME,
+        element.NAME
+    ];
+  }
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone.js
new file mode 100644
index 0000000000..ab74201251
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone.js
@@ -0,0 +1,113 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var BaseDialog = require('utils/dialogs/dialog');
+  var TemplateHTML = require('hbs!./clone/html');
+  var Sunstone = require('sunstone');
+  var Notifier = require('utils/notifier');
+  var Locale = require('utils/locale');
+  var OpenNebulaVirtualRouter = require('opennebula/virtualrouter');
+
+  /*
+    CONSTANTS
+   */
+
+  var DIALOG_ID = require('./clone/dialogId');
+  var TAB_ID = require('../tabId');
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Dialog() {
+    this.dialogId = DIALOG_ID;
+
+    BaseDialog.call(this);
+  }
+
+  Dialog.DIALOG_ID = DIALOG_ID;
+  Dialog.prototype = Object.create(BaseDialog.prototype);
+  Dialog.prototype.constructor = Dialog;
+  Dialog.prototype.html = _html;
+  Dialog.prototype.onShow = _onShow;
+  Dialog.prototype.setup = _setup;
+
+  return Dialog;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _html() {
+    return TemplateHTML({
+      'dialogId': this.dialogId
+    });
+  }
+
+  function _setup(context) {
+    var that = this;
+
+    context.foundation('abide', 'reflow');
+    context.off('invalid.fndtn.abide', '#' + DIALOG_ID + 'Form');
+    context.off('valid.fndtn.abide', '#' + DIALOG_ID + 'Form');
+
+    context.on('invalid.fndtn.abide', '#' + DIALOG_ID + 'Form', function(e) {
+      Notifier.notifyError(Locale.tr("One or more required fields are missing or malformed."));
+    }).on('valid.fndtn.abide', '#' + DIALOG_ID + 'Form', function(e) {
+      var name = $('input', this).val();
+      var sel_elems = Sunstone.getDataTable(TAB_ID).elements();
+
+      if (sel_elems.length > 1){
+        for (var i=0; i< sel_elems.length; i++)
+          //use name as prefix if several items selected
+          Sunstone.runAction('VirtualRouter.clone',
+            sel_elems[i],
+            name + OpenNebulaVirtualRouter.getName(sel_elems[i]));
+      } else {
+        Sunstone.runAction('VirtualRouter.clone',sel_elems[0],name);
+      }
+
+      return false;
+    });
+
+    return false;
+  }
+
+  function _onShow(context) {
+    var sel_elems = Sunstone.getDataTable(TAB_ID).elements();
+
+    //show different text depending on how many elements are selected
+    if (sel_elems.length > 1) {
+      $('.clone_one', context).hide();
+      $('.clone_several', context).show();
+      $('input',context).val('Copy of ');
+    } else {
+      $('.clone_one', context).show();
+      $('.clone_several', context).hide();
+
+      $('input',context).val('Copy of ' + OpenNebulaVirtualRouter.getName(sel_elems[0]));
+    }
+
+    $("input[name='name']",context).focus();
+
+    return false;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/dialogId.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/dialogId.js
new file mode 100644
index 0000000000..611c0526b3
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/dialogId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'cloneVirtualRouterDialog';
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/html.hbs
new file mode 100644
index 0000000000..3a6552a959
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/html.hbs
@@ -0,0 +1,45 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<div id="{{dialogId}}" class="reveal-modal" role="dialog" data-reveal >
+  <div class="row">
+    <h3 class="subheader">{{tr "Clone Virtual Router"}}</h3>
+  </div>
+  <form data-abide="ajax" id="{{dialogId}}Form">
+    <div class="row">
+      <div class="large-12 columns">
+        <div class="clone_one"></div>
+        <div class="clone_several">
+          {{tr "Several virtual routers are selected, please choose a prefix to name the new copies"}}
+          <br>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="large-12 columns">
+        <label class="clone_one">{{tr "Name"}}</label>
+        <label class="clone_several">{{tr "Prefix"}}</label>
+        <input required type="text" name="name"></input>
+      </div>
+    </div>
+    <div class="form_buttons row">
+      <button type="submit" class="button radius right">
+        {{tr "Clone"}}
+      </button>
+    </div>
+    <a class="close-reveal-modal">&#215;</a>
+  </form>
+</div>
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
new file mode 100644
index 0000000000..6aad3f9514
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -0,0 +1,162 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  require('foundation.tab');
+  var BaseFormPanel = require('utils/form-panels/form-panel');
+  var Sunstone = require('sunstone');
+  var Locale = require('utils/locale');
+  var Tips = require('utils/tips');
+  var TemplateUtils = require('utils/template-utils');
+  var WizardFields = require('utils/wizard-fields');
+
+  /*
+    TEMPLATES
+   */
+
+  var TemplateWizardHTML = require('hbs!./create/wizard');
+  var TemplateAdvancedHTML = require('hbs!./create/advanced');
+
+  /*
+    CONSTANTS
+   */
+
+  var FORM_PANEL_ID = require('./create/formPanelId');
+  var TAB_ID = require('../tabId');
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function FormPanel() {
+    this.formPanelId = FORM_PANEL_ID;
+    this.tabId = TAB_ID;
+    this.actions = {
+      'create': {
+        'title': Locale.tr("Create Virtual Router"),
+        'buttonText': Locale.tr("Create"),
+        'resetButton': true
+      },
+      'update': {
+        'title': Locale.tr("Update Virtual Router"),
+        'buttonText': Locale.tr("Update"),
+        'resetButton': false
+      }
+    };
+
+    BaseFormPanel.call(this);
+  }
+
+  FormPanel.FORM_PANEL_ID = FORM_PANEL_ID;
+  FormPanel.prototype = Object.create(BaseFormPanel.prototype);
+  FormPanel.prototype.constructor = FormPanel;
+  FormPanel.prototype.htmlWizard = _htmlWizard;
+  FormPanel.prototype.htmlAdvanced = _htmlAdvanced;
+  FormPanel.prototype.submitWizard = _submitWizard;
+  FormPanel.prototype.submitAdvanced = _submitAdvanced;
+  FormPanel.prototype.onShow = _onShow;
+  FormPanel.prototype.fill = _fill;
+  FormPanel.prototype.setup = _setup;
+
+  return FormPanel;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _htmlWizard() {
+    return TemplateWizardHTML({
+      'formPanelId': this.formPanelId
+    });
+  }
+
+  function _htmlAdvanced() {
+    return TemplateAdvancedHTML({formPanelId: this.formPanelId});
+  }
+
+  function _setup(context) {
+    var that = this;
+
+    Tips.setup();
+
+    return false;
+  }
+
+  function _submitWizard(context) {
+
+    var name = $('#virtual_router_name', context).val();
+    var description = $('#virtual_router_description', context).val();
+
+    var virtual_router_json = {
+      "NAME" : name,
+      "DESCRIPTION": description
+    };
+
+    if (this.action == "create") {
+      virtual_router_json = {
+        "virtual_router" : virtual_router_json
+      };
+
+      Sunstone.runAction("VirtualRouter.create",virtual_router_json);
+      return false;
+    } else if (this.action == "update") {
+      delete virtual_router_json["NAME"];
+
+      Sunstone.runAction(
+        "VirtualRouter.update",
+        this.resourceId,
+        TemplateUtils.templateToString(virtual_router_json));
+
+      return false;
+    }
+  }
+
+  function _submitAdvanced(context) {
+    if (this.action == "create") {
+      var template = $('textarea#template', context).val();
+      var virtual_router_json = {virtual_router: {virtual_router_raw: template}};
+      Sunstone.runAction("VirtualRouter.create",virtual_router_json);
+      return false;
+    } else if (this.action == "update") {
+      var template_raw = $('textarea#template', context).val();
+      Sunstone.runAction("VirtualRouter.update", this.resourceId, template_raw);
+      return false;
+    }
+  }
+
+  function _onShow(context) {
+  }
+
+  function _fill(context, element) {
+    var that = this;
+
+    this.resourceId = element.ID;
+
+    // Populates the Avanced mode Tab
+    $('#template', context).val(TemplateUtils.templateToString(element.TEMPLATE).replace(/^[\r\n]+$/g, ""));
+
+    $('#virtual_router_name',context).val(
+      TemplateUtils.escapeDoubleQuotes(TemplateUtils.htmlDecode( element.NAME ))).
+      prop("disabled", true);
+
+    $('#virtual_router_description', context).val(
+      TemplateUtils.escapeDoubleQuotes(TemplateUtils.htmlDecode( element.TEMPLATE.DESCRIPTION )) );
+  }
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/advanced.hbs
new file mode 100644
index 0000000000..8807bf3da4
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/advanced.hbs
@@ -0,0 +1,28 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<form data-abide="ajax" id="{{formPanelId}}Advanced" class="custom creation">
+  <div class="row">
+    <div class="large-12 columns">
+      <p>{{tr "Write the Virtual Router template here"}}</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-12 columns">
+      <textarea id="template" rows="15" required></textarea>
+    </div>
+  </div>
+</form>
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/formPanelId.js
new file mode 100644
index 0000000000..bd1cd4665b
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/formPanelId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'createVirtualRouterForm';
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
new file mode 100644
index 0000000000..f712b800ba
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
@@ -0,0 +1,33 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<div id="create_virtual_router_form_wrapper">
+  <form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
+    <div class="row">
+      <div class="medium-4 columns">
+        <label for="virtual_router_name">{{tr "Virtual Router Name"}}:</label>
+        <input required type="text" name="virtual_router_name" id="virtual_router_name"/>
+      </div>
+      <div class="medium-8 columns">
+        <label for="virtual_router_description">{{tr "Description"}}
+          <span class="tip">{{tr "Description for the Virtual Router"}}</span>
+        </label>
+        <textarea type="text" id="virtual_router_description" name="virtual_router_description" style="height: 70px;"/>
+      </div>
+    </div>
+    <hr/>
+  </form>
+</div>
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
new file mode 100644
index 0000000000..9bddedcf31
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
@@ -0,0 +1,101 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var TemplateInfo = require('hbs!./info/html');
+  var Locale = require('utils/locale');
+  var PermissionsTable = require('utils/panel/permissions-table');
+  var RenameTr = require('utils/panel/rename-tr');
+  var OpenNebulaVirtualRouter = require('opennebula/virtualrouter');
+
+  /*
+    TEMPLATES
+   */
+
+  var TemplateTable = require('utils/panel/template-table');
+
+  /*
+    CONSTANTS
+   */
+
+  var TAB_ID = require('../tabId');
+  var PANEL_ID = require('./info/panelId');
+  var RESOURCE = "VirtualRouter";
+  var XML_ROOT = "VROUTER";
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Panel(info) {
+    this.title = Locale.tr("Info");
+    this.icon = "fa-info-circle";
+
+    this.element = info[XML_ROOT];
+
+    return this;
+  }
+
+  Panel.PANEL_ID = PANEL_ID;
+  Panel.prototype.html = _html;
+  Panel.prototype.setup = _setup;
+
+  return Panel;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _html() {
+    var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME);
+    var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
+
+    // TODO: simplify interface?
+    var strippedTemplate = $.extend({}, this.element.TEMPLATE);
+    //delete strippedTemplate[""];
+
+    var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE,
+                                              Locale.tr("Attributes"));
+    //====
+
+    return TemplateInfo({
+      'element': this.element,
+      'renameTrHTML': renameTrHTML,
+      'permissionsTableHTML': permissionsTableHTML,
+      'templateTableHTML': templateTableHTML
+    });
+  }
+
+  function _setup(context) {
+    RenameTr.setup(TAB_ID, RESOURCE, this.element.ID, context);
+    PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
+
+    // TODO: simplify interface?
+    var strippedTemplate = $.extend({}, this.element.TEMPLATE);
+    //delete strippedTemplate[""];
+
+    var hiddenValues = {RULE: this.element.TEMPLATE.RULE};
+
+    TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, hiddenValues);
+    //===
+
+    return false;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
new file mode 100644
index 0000000000..cdf7437679
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -0,0 +1,42 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<div class="row">
+  <div class="large-6 columns">
+    <table id="info_virtual_router_table" class="dataTable">
+      <thead>
+         <tr>
+          <th colspan="3">{{tr "Information"}}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="key_td">{{tr "ID"}}</td>
+          <td class="value_td" colspan="2">{{element.ID}}</td>
+        </tr>
+        {{{renameTrHTML}}}
+      </tbody>
+    </table>
+  </div>
+  <div class="large-6 columns">
+    {{{permissionsTableHTML}}}
+  </div>
+</div>
+<div class="row">
+  <div class="large-9 columns">
+    {{{templateTableHTML}}}
+  </div>
+</div>
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/panelId.js
new file mode 100644
index 0000000000..b7e04c011e
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/panelId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'virtual_router_info_tab';
+})
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/tabId.js b/src/sunstone/public/app/tabs/vrouters-tab/tabId.js
new file mode 100644
index 0000000000..a9222d2cb0
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/tabId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'vrouters-tab';
+});

From 4b6aaa8b19ff561fd082841b531e101f4888cc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 1 Dec 2015 15:35:33 +0100
Subject: [PATCH 004/197] Feature #4215: Store a list of VR inside each vnet

---
 include/VirtualMachine.h         | 16 +++++++++++++++-
 include/VirtualNetwork.h         | 24 ++++++++++++++++++++++--
 include/VirtualNetworkPool.h     |  2 ++
 src/dm/DispatchManagerActions.cc |  9 ++++++---
 src/vm/VirtualMachine.cc         | 30 ++++++++++++++++++++++++------
 src/vm/VirtualMachinePool.cc     | 12 +++++++-----
 src/vnm/VirtualNetwork.cc        | 24 +++++++++++++++++++++++-
 src/vnm/VirtualNetworkPool.cc    |  3 ++-
 8 files changed, 101 insertions(+), 19 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 0b6fe56480..8d416e0c2b 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1262,10 +1262,12 @@ public:
      *
      * @param nic NIC to be released
      * @param vmid Virtual Machine oid
+     * @param vrid Virtual Router id if the VM is a VR, or -1
      *
      * @return 0 on success, -1 otherwise
      */
-    static int release_network_leases(VectorAttribute const * nic, int vmid);
+    static int release_network_leases(
+            VectorAttribute const * nic, int vmid, int vrid);
 
     /**
      *  Releases all disk images taken by this Virtual Machine
@@ -1317,6 +1319,16 @@ public:
      */
     const VectorAttribute* get_disk(int disk_id) const;
 
+    // ------------------------------------------------------------------------
+    // Virtual Router related functions
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the Virtual Router ID if this VM is a VR, or -1
+     * @return VR ID or -1
+     */
+    int get_vrouter_id();
+
     // ------------------------------------------------------------------------
     // Context related functions
     // ------------------------------------------------------------------------
@@ -1532,6 +1544,7 @@ public:
      *
      * @param vm_id Id of the VM where this nic will be attached
      * @param vm_sgs the securty group ids already present in the VM
+     * @param vm_vrid Virtual Router id if the VM is a VR, or -1
      * @param new_nic New NIC vector attribute, obtained from get_attach_nic_info
      * @param rules Security Group rules will be added at the end of this
      * vector. If not used, the VectorAttributes must be freed by the calling
@@ -1544,6 +1557,7 @@ public:
     static int set_up_attach_nic(
                             int                      vm_id,
                             set<int>&                vm_sgs,
+                            int                      vm_vrid,
                             VectorAttribute *        new_nic,
                             vector<VectorAttribute*> &rules,
                             int                      max_nic_id,
diff --git a/include/VirtualNetwork.h b/include/VirtualNetwork.h
index 424c35563a..2febc3f722 100644
--- a/include/VirtualNetwork.h
+++ b/include/VirtualNetwork.h
@@ -22,6 +22,7 @@
 #include "VirtualNetworkTemplate.h"
 #include "Clusterable.h"
 #include "AddressRangePool.h"
+#include "ObjectCollection.h"
 
 #include <vector>
 #include <string>
@@ -199,21 +200,33 @@ public:
      *  Release previously given address lease
      *    @param arid of the address range where the address was leased from
      *    @param vid the ID of the VM
+     *    @param vrid Virtual Router id if the VM is a VR, or -1
      *    @param mac MAC address identifying the lease
      */
-    void free_addr(unsigned int arid, int vid, const string& mac)
+    void free_addr(unsigned int arid, int vid, int vrid, const string& mac)
     {
         ar_pool.free_addr(arid, PoolObjectSQL::VM, vid, mac);
+
+        if (vrid != -1)
+        {
+            vrouters.del_collection_id(vrid);
+        }
     }
 
     /**
      *  Release previously given address lease
      *    @param vid the ID of the VM
+     *    @param vrid Virtual Router id if the VM is a VR, or -1
      *    @param mac MAC address identifying the lease
      */
-    void free_addr(int vid, const string& mac)
+    void free_addr(int vid, int vrid, const string& mac)
     {
         ar_pool.free_addr(PoolObjectSQL::VM, vid, mac);
+
+        if (vrid != -1)
+        {
+            vrouters.del_collection_id(vrid);
+        }
     }
 
     /**
@@ -246,6 +259,7 @@ public:
      *  * BRIDGE: for this virtual network
      *  @param nic attribute for the VM template
      *  @param vid of the VM getting the lease
+     *  @param vrid Virtual Router id if the VM is a VR, or -1
      *  @param inherit_attrs Attributes to be inherited from the vnet template
      *      into the nic
      *  @return 0 on success
@@ -253,6 +267,7 @@ public:
     int nic_attribute(
             VectorAttribute *       nic,
             int                     vid,
+            int                     vrid,
             const vector<string>&   inherit_attrs);
 
     /**
@@ -458,6 +473,11 @@ private:
      */
     AddressRangePool ar_pool;
 
+    /**
+     *  Set of Virtual Router IDs
+     */
+    ObjectCollection vrouters;
+
     // *************************************************************************
     // DataBase implementation (Private)
     // *************************************************************************
diff --git a/include/VirtualNetworkPool.h b/include/VirtualNetworkPool.h
index e175f41742..cfc3298c9c 100644
--- a/include/VirtualNetworkPool.h
+++ b/include/VirtualNetworkPool.h
@@ -107,6 +107,7 @@ public:
      *    @param nic_id the id for this NIC
      *    @param uid of the VM owner
      *    @param vid of the VM requesting the lease
+     *    @param vrid Virtual Router id if the VM is a VR, or -1
      *    @param error_str string describing the error
      *    @return 0 on success,
      *            -1 error,
@@ -117,6 +118,7 @@ public:
             int                 nic_id,
             int                 uid,
             int                 vid,
+            int                 vrid,
             string&             error_str);
 
     /**
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index 66a5aac144..5160854b3c 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -1442,6 +1442,7 @@ int DispatchManager::attach_nic(
     int max_nic_id;
     int uid;
     int oid;
+    int vrid;
     int rc;
 
     set<int> vm_sgs;
@@ -1496,8 +1497,9 @@ int DispatchManager::attach_nic(
 
     vm->set_resched(false);
 
-    uid = vm->get_uid();
-    oid = vm->get_oid();
+    uid  = vm->get_uid();
+    oid  = vm->get_oid();
+    vrid = vm->get_vrouter_id();
 
     vmpool->update(vm);
 
@@ -1505,6 +1507,7 @@ int DispatchManager::attach_nic(
 
     rc = VirtualMachine::set_up_attach_nic(oid,
                                     vm_sgs,
+                                    vrid,
                                     nic,
                                     sg_rules,
                                     max_nic_id,
@@ -1518,7 +1521,7 @@ int DispatchManager::attach_nic(
 
         if ( rc == 0 )
         {
-            VirtualMachine::release_network_leases(nic, vid);
+            VirtualMachine::release_network_leases(nic, vid, vrid);
 
             vector<VectorAttribute*>::iterator it;
             for(it = sg_rules.begin(); it != sg_rules.end(); it++)
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 13f2ea549d..0fddafff9e 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -2551,6 +2551,7 @@ VectorAttribute * VirtualMachine::get_attach_nic_info(
 int VirtualMachine::set_up_attach_nic(
                         int                      vm_id,
                         set<int>&                vm_sgs,
+                        int                      vm_vrid,
                         VectorAttribute *        new_nic,
                         vector<VectorAttribute*> &rules,
                         int                      max_nic_id,
@@ -2562,7 +2563,8 @@ int VirtualMachine::set_up_attach_nic(
 
     set<int> nic_sgs;
 
-    int rc = vnpool->nic_attribute(new_nic, max_nic_id+1, uid, vm_id, error_str);
+    int rc = vnpool->nic_attribute(new_nic, max_nic_id+1, uid, vm_id,
+                                    vm_vrid, error_str);
 
     if ( rc == -1 ) //-2 is not using a pre-defined network
     {
@@ -2962,7 +2964,7 @@ int VirtualMachine::get_network_leases(string& estr)
 
         merge_nic_defaults(nic);
 
-        rc = vnpool->nic_attribute(nic, i, uid, oid, estr);
+        rc = vnpool->nic_attribute(nic, i, uid, oid, get_vrouter_id(), estr);
 
         if (rc == -1)
         {
@@ -3028,14 +3030,15 @@ void VirtualMachine::release_network_leases()
         VectorAttribute const *  nic =
             dynamic_cast<VectorAttribute const * >(nics[i]);
 
-        release_network_leases(nic, oid);
+        release_network_leases(nic, oid, get_vrouter_id());
     }
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualMachine::release_network_leases(VectorAttribute const * nic, int vmid)
+int VirtualMachine::release_network_leases(
+        VectorAttribute const * nic, int vmid, int vrid)
 {
     VirtualNetworkPool* vnpool = Nebula::instance().get_vnpool();
     VirtualNetwork*     vn;
@@ -3073,11 +3076,11 @@ int VirtualMachine::release_network_leases(VectorAttribute const * nic, int vmid
 
     if (nic->vector_value("AR_ID", ar_id) == 0)
     {
-        vn->free_addr(ar_id, vmid, mac);
+        vn->free_addr(ar_id, vmid, vrid, mac);
     }
     else
     {
-        vn->free_addr(vmid, mac);
+        vn->free_addr(vmid, vrid, mac);
     }
 
     vnpool->update(vn);
@@ -3207,6 +3210,21 @@ void VirtualMachine::release_security_groups(int id, const VectorAttribute *nic)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+int VirtualMachine::get_vrouter_id()
+{
+    int vrid;
+
+    if (!user_obj_template->get("VROUTER_ID", vrid))
+    {
+        vrid = -1;
+    }
+
+    return vrid;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int VirtualMachine::generate_context(string &files, int &disk_id,
         string& token_password)
 {
diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc
index b3c4a7220e..bba8042927 100644
--- a/src/vm/VirtualMachinePool.cc
+++ b/src/vm/VirtualMachinePool.cc
@@ -1119,6 +1119,7 @@ void VirtualMachinePool::delete_attach_nic(int vid)
     int uid;
     int gid;
     int oid;
+    int vrid;
 
     vm = get(vid,true);
 
@@ -1127,10 +1128,11 @@ void VirtualMachinePool::delete_attach_nic(int vid)
         return;
     }
 
-    nic = vm->delete_attach_nic();
-    uid = vm->get_uid();
-    gid = vm->get_gid();
-    oid = vm->get_oid();
+    nic  = vm->delete_attach_nic();
+    uid  = vm->get_uid();
+    gid  = vm->get_gid();
+    oid  = vm->get_oid();
+    vrid = vm->get_vrouter_id();
 
     update(vm);
 
@@ -1144,6 +1146,6 @@ void VirtualMachinePool::delete_attach_nic(int vid)
 
         Quotas::quota_del(Quotas::NETWORK, uid, gid, &tmpl);
 
-        VirtualMachine::release_network_leases(nic, oid);
+        VirtualMachine::release_network_leases(nic, oid, vrid);
     }
 }
diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc
index 5db50b9557..7068f4d9d2 100644
--- a/src/vnm/VirtualNetwork.cc
+++ b/src/vnm/VirtualNetwork.cc
@@ -46,7 +46,8 @@ VirtualNetwork::VirtualNetwork(int                      _uid,
             PoolObjectSQL(-1,NET,"",_uid,_gid,_uname,_gname,table),
             Clusterable(_cluster_id, _cluster_name),
             bridge(""),
-            parent_vid(_pvid)
+            parent_vid(_pvid),
+            vrouters("VROUTERS")
 {
     if (_vn_template != 0)
     {
@@ -418,6 +419,7 @@ string& VirtualNetwork::to_xml_extended(string& xml, bool extended,
 {
     ostringstream   os;
 
+    string vrouters_xml;
     string template_xml;
     string leases_xml;
     string perm_str;
@@ -464,6 +466,8 @@ string& VirtualNetwork::to_xml_extended(string& xml, bool extended,
     }
     os  << "<USED_LEASES>"<< ar_pool.get_used_addr() << "</USED_LEASES>";
 
+    os << vrouters.to_xml(vrouters_xml);
+
     os  << obj_template->to_xml(template_xml);
 
     os  << ar_pool.to_xml(leases_xml, extended, vms, vnets);
@@ -506,6 +510,18 @@ int VirtualNetwork::from_xml(const string &xml_str)
     xpath(vlan_id,"/VNET/VLAN_ID","");
     xpath(parent_vid,"/VNET/PARENT_NETWORK_ID",-1);
 
+    ObjectXML::get_nodes("/VNET/VROUTERS", content);
+
+    if (content.empty())
+    {
+        return -1;
+    }
+
+    rc += vrouters.from_xml_node(content[0]);
+
+    ObjectXML::free_nodes(content);
+    content.clear();
+
     // Virtual Network template
     ObjectXML::get_nodes("/VNET/TEMPLATE", content);
 
@@ -553,6 +569,7 @@ int VirtualNetwork::from_xml(const string &xml_str)
 int VirtualNetwork::nic_attribute(
         VectorAttribute *       nic,
         int                     vid,
+        int                     vrid,
         const vector<string>&   inherit_attrs)
 {
     string inherit_val;
@@ -642,6 +659,11 @@ int VirtualNetwork::nic_attribute(
     nic->replace("SECURITY_GROUPS",
         one_util::join(nic_sgs.begin(), nic_sgs.end(), ','));
 
+    if (rc == 0 && vrid != -1)
+    {
+        vrouters.add_collection_id(vrid);
+    }
+
     return rc;
 }
 
diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc
index c38724a835..1b702d2c78 100644
--- a/src/vnm/VirtualNetworkPool.cc
+++ b/src/vnm/VirtualNetworkPool.cc
@@ -243,6 +243,7 @@ int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
                                       int     nic_id,
                                       int     uid,
                                       int     vid,
+                                      int     vrid,
                                       string& error)
 {
     string           network;
@@ -268,7 +269,7 @@ int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
         return -1;
     }
 
-    int rc = vnet->nic_attribute(nic, vid, inherit_attrs);
+    int rc = vnet->nic_attribute(nic, vid, vrid, inherit_attrs);
 
     if ( rc == 0 )
     {

From 35f28651faa0bd4bf2781a7db3aa579ed8946853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 1 Dec 2015 15:39:30 +0100
Subject: [PATCH 005/197] Feature #4215: Show list of VR in vnet output, cli &
 sunstone

---
 src/cli/one_helper/onevnet_helper.rb          |  7 ++
 src/oca/ruby/opennebula/virtual_network.rb    | 11 +++
 src/sunstone/etc/sunstone-views/admin.yaml    |  1 +
 .../etc/sunstone-views/admin_vcenter.yaml     |  1 +
 src/sunstone/etc/sunstone-views/user.yaml     |  1 +
 src/sunstone/public/app/tabs/vnets-tab.js     |  3 +-
 .../app/tabs/vnets-tab/panels/vrouters.js     | 88 +++++++++++++++++++
 .../tabs/vnets-tab/panels/vrouters/panelId.js | 19 ++++
 8 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 src/sunstone/public/app/tabs/vnets-tab/panels/vrouters.js
 create mode 100644 src/sunstone/public/app/tabs/vnets-tab/panels/vrouters/panelId.js

diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb
index e422527517..c92a160d87 100644
--- a/src/cli/one_helper/onevnet_helper.rb
+++ b/src/cli/one_helper/onevnet_helper.rb
@@ -324,6 +324,13 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
             end
         end.show(leases, {})
 
+        puts
+
+        CLIHelper.print_header("%-15s" % "VIRTUAL ROUTERS")
+        vn.vrouter_ids.each do |id|
+            puts "%-15s" % [id]
+        end
+
         if options[:show_ar]
             ar_list.each do |ar_id|
                 puts
diff --git a/src/oca/ruby/opennebula/virtual_network.rb b/src/oca/ruby/opennebula/virtual_network.rb
index d13a333a79..463e372eba 100644
--- a/src/oca/ruby/opennebula/virtual_network.rb
+++ b/src/oca/ruby/opennebula/virtual_network.rb
@@ -324,6 +324,17 @@ module OpenNebula
             end
         end
 
+        # Returns an array with the numeric virtual router ids
+        def vrouter_ids
+            array = Array.new
+
+            self.each("VROUTERS/ID") do |id|
+                array << id.text.to_i
+            end
+
+            return array
+        end
+
     private
         def set_publish(published)
             group_u = published ? 1 : 0
diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 057cf30468..44be4d43aa 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -381,6 +381,7 @@ tabs:
             vnet_ar_list_tab: true
             vnet_leases_tab: true
             vnet_sg_list_tab: true
+            vnet_vr_list_tab: true
         table_columns:
             - 0         # Checkbox
             - 1         # ID
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 47c59f245f..fa0511f49b 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -381,6 +381,7 @@ tabs:
             vnet_ar_list_tab: true
             vnet_leases_tab: true
             vnet_sg_list_tab: true
+            vnet_vr_list_tab: true
         table_columns:
             - 0         # Checkbox
             - 1         # ID
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index a61e9bfc9c..0f45d4ef8a 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -382,6 +382,7 @@ tabs:
             vnet_ar_list_tab: true
             vnet_leases_tab: true
             vnet_sg_list_tab: true
+            vnet_vr_list_tab: true
         table_columns:
             - 0         # Checkbox
             - 1         # ID
diff --git a/src/sunstone/public/app/tabs/vnets-tab.js b/src/sunstone/public/app/tabs/vnets-tab.js
index 095464034f..603ac35726 100644
--- a/src/sunstone/public/app/tabs/vnets-tab.js
+++ b/src/sunstone/public/app/tabs/vnets-tab.js
@@ -33,7 +33,8 @@ define(function(require) {
     require('./vnets-tab/panels/info'),
     require('./vnets-tab/panels/ar'),
     require('./vnets-tab/panels/leases'),
-    require('./vnets-tab/panels/secgroups')
+    require('./vnets-tab/panels/secgroups'),
+    require('./vnets-tab/panels/vrouters')
   ];
 
   var _panelsHooks = [
diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters.js b/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters.js
new file mode 100644
index 0000000000..6df69d6455
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters.js
@@ -0,0 +1,88 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var Locale = require('utils/locale');
+  var VirtualRoutersTable = require('tabs/vrouters-tab/datatable');
+
+  /*
+    CONSTANTS
+   */
+
+  var PANEL_ID = require('./vrouters/panelId');
+  var VR_TABLE_ID = PANEL_ID + "VirtualRoutersTable";
+  var RESOURCE = "Network";
+  var XML_ROOT = "VNET";
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Panel(info) {
+    this.title = Locale.tr("V. Routers");
+    this.icon = "fa-random";
+
+    this.element = info[XML_ROOT];
+
+    return this;
+  }
+
+  Panel.PANEL_ID = PANEL_ID;
+  Panel.prototype.html = _html;
+  Panel.prototype.setup = _setup;
+
+  return Panel;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _html() {
+    var vrs = [];
+
+    if (this.element.VROUTERS.ID != undefined){
+      vrs = this.element.VROUTERS.ID;
+
+      if (!$.isArray(vrs)){
+        vrs = [vrs];
+      }
+    }
+
+    var opts = {
+      info: true,
+      select: true,
+      selectOptions: {
+        read_only: true,
+        fixed_ids: vrs
+      }
+    };
+
+    this.vroutersTable = new VirtualRoutersTable(VR_TABLE_ID, opts);
+
+    return this.vroutersTable.dataTableHTML;
+  }
+
+  function _setup(context) {
+    this.vroutersTable.initialize();
+    this.vroutersTable.refreshResourceTableSelect();
+
+    return false;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters/panelId.js b/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters/panelId.js
new file mode 100644
index 0000000000..a189897582
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters/panelId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'vnet_vr_list_tab';
+})

From 5a0b3d357c780adb1a1df78ca1451c5fc0b8ae1f Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Tue, 1 Dec 2015 16:09:31 +0100
Subject: [PATCH 006/197] feature #4217: Base classes for MarketPlace pool

---
 SConstruct                    |   2 +
 include/MarketPlace.h         | 243 ++++++++++++++++++++++
 include/MarketPlacePool.h     | 170 ++++++++++++++++
 include/MarketPlaceTemplate.h |  37 ++++
 include/NebulaUtil.h          |  27 +++
 include/PoolObjectSQL.h       |  36 ++--
 src/market/MarketPlace.cc     | 365 ++++++++++++++++++++++++++++++++++
 src/market/SConstruct         |  29 +++
 8 files changed, 892 insertions(+), 17 deletions(-)
 create mode 100644 include/MarketPlace.h
 create mode 100644 include/MarketPlacePool.h
 create mode 100644 include/MarketPlaceTemplate.h
 create mode 100644 src/market/MarketPlace.cc
 create mode 100644 src/market/SConstruct

diff --git a/SConstruct b/SConstruct
index d210fc29a2..cd90d7f44c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -85,6 +85,7 @@ main_env.Append(LIBPATH=[
     cwd+'/src/secgroup',
     cwd+'/src/vdc',
     cwd+'/src/vrouter',
+    cwd+'/src/market'
 ])
 
 # Compile flags
@@ -246,6 +247,7 @@ build_scripts=[
     'src/secgroup/SConstruct',
     'src/vdc/SConstruct',
     'src/vrouter/SConstruct',
+    'src/market/SConstruct',
     'share/man/SConstruct',
     'src/sunstone/public/locale/languages/SConstruct',
     'src/sunstone/public/SConstruct',
diff --git a/include/MarketPlace.h b/include/MarketPlace.h
new file mode 100644
index 0000000000..8586b4f9bc
--- /dev/null
+++ b/include/MarketPlace.h
@@ -0,0 +1,243 @@
+/* ------------------------------------------------------------------------ */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems              */
+/*                                                                          */
+/* 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.                                           */
+/* -------------------------------------------------------------------------*/
+
+#ifndef MARKETPLACE_H_
+#define MARKETPLACE_H_
+
+#include "PoolSQL.h"
+#include "ObjectCollection.h"
+#include "MarketPlaceTemplate.h"
+
+/**
+ *  The MarketPlace class. It represents an abstract container for OpenNebula
+ *  objects (Image, VM Templates or Flows)
+ */
+class MarketPlace : public PoolObjectSQL, ObjectCollection
+{
+public:
+    /**
+     *  MarketPlace container types
+     */
+    enum MarketPlaceType
+    {
+		UNKNOWN       = 0, /** < Unknown types     */
+        IMAGE_MP      = 1, /** < Image MarketPlace */
+        VMTEMPLATE_MP = 2, /** < VM Template MarketPlace */
+        FLOW_MP       = 3  /** < Flow MarketPlace */
+    };
+
+    /**
+     *  Return the string representation of a MarketPlaceType
+     *    @param ob the type
+     *    @return the string
+     */
+    static string type_to_str(MarketPlaceType ob)
+    {
+        switch (ob)
+        {
+            case IMAGE_MP:      return "IMAGE_MP"; break;
+            case VMTEMPLATE_MP: return "VMTEMPLATE_MP"; break;
+            case FLOW_MP:       return "FLOW_MP"; break;
+            default:            return "";
+        }
+    };
+
+    /**
+     *  Return the string representation of a MarketPlaceType, By default it will
+     *  return IMAGE_MP.
+     *    @param str_type string representing the type
+     *    @return the MarketPlaceType
+     */
+    static MarketPlaceType str_to_type(string& str_type);
+
+    /**
+     * Function to print the MarketPlace object into a string in XML format
+     *  @param xml the resulting XML string
+     *  @return a reference to the generated string
+     */
+    string& to_xml(string& xml) const;
+
+    /**
+     *  Rebuilds the object from an xml formatted string
+     *    @param xml_str The xml-formatted string
+     *
+     *    @return 0 on success, -1 otherwise
+     */
+    int from_xml(const string &xml_str);
+
+    /**
+     *  Adds this image's ID to the set.
+     *    @param id of the app to be added to the MarketPlace
+     *    @return 0 on success
+     */
+    int add_mpapp(int id)
+    {
+        return add_collection_id(id);
+    };
+
+    /**
+     *  Deletes this image's ID from the set.
+     *    @param id of the image to be deleted from the MarketPlace
+     *    @return 0 on success
+     */
+    int del_mpapp(int id)
+    {
+        return del_collection_id(id);
+    };
+
+    /**
+     *  Returns a copy of the Image IDs set
+     */
+    set<int> get_mpapp_ids()
+    {
+        return get_collection_copy();
+    }
+
+    /**
+     *  Retrieves marketplace mad name
+     *    @return string mp mad name
+     */
+    const string& get_mp_mad() const
+    {
+        return mp_mad;
+    };
+
+    /**
+     * Returns the marketplace type
+     *    @return marketplace type
+     */
+    MarketPlaceType get_type() const
+    {
+        return type;
+    };
+
+    /**
+     *  Set monitor information for the MarketPlace
+     *    @param total_mb
+     *    @param free_mb
+     *    @param used_mb
+     */
+    void update_monitor(long long total, long long free, long long used)
+    {
+        total_mb = total;
+        free_mb  = free;
+        used_mb  = used;
+    }
+
+private:
+
+    friend class MarketPlacePool;
+
+    // *************************************************************************
+    // MarketPlace Attributes
+    // *************************************************************************
+
+    /**
+     * Name of the marketplace driver used to import apps
+     */
+    string mp_mad;
+
+    /**
+     * The marketplace type
+     */
+    MarketPlaceType type;
+
+    /**
+     * Total capacity in MB
+     */
+     long long total_mb;
+
+    /**
+     * Available capacity in MB
+     */
+     long long free_mb;
+
+    /**
+     * Used capacity in MB
+     */
+     long long used_mb;
+
+    // *************************************************************************
+    // Constructor
+    // *************************************************************************
+    MarketPlace(
+            int                 uid,
+            int                 gid,
+            const string&       uname,
+            const string&       gname,
+            int                 umask,
+            MarketPlaceTemplate*  ds_template);
+
+    virtual ~MarketPlace();
+
+    // *************************************************************************
+    // DataBase implementation (Private)
+    // *************************************************************************
+
+    static const char * db_names;
+
+    static const char * db_bootstrap;
+
+    static const char * table;
+
+    /**
+     *  Execute an INSERT or REPLACE Sql query.
+     *    @param db The SQL DB
+     *    @param replace Execute an INSERT or a REPLACE
+     *    @param error_str Returns the error reason, if any
+     *    @return 0 one success
+     */
+    int insert_replace(SqlDB *db, bool replace, string& error_str);
+
+    /**
+     *  Bootstraps the database table(s) associated to the MarketPlace
+     *    @return 0 on success
+     */
+    static int bootstrap(SqlDB * db)
+    {
+        ostringstream oss(db_bootstrap);
+
+        return db->exec(oss);
+    };
+
+    /**
+     *  Writes the MarketPlace in the database.
+     *    @param db pointer to the db
+     *    @return 0 on success
+     */
+    int insert(SqlDB *db, string& error_str);
+
+    /**
+     *  Writes/updates the MarketPlace's data fields in the database.
+     *    @param db pointer to the db
+     *    @return 0 on success
+     */
+    int update(SqlDB *db)
+    {
+        string error_str;
+        return insert_replace(db, true, error_str);
+    }
+
+    /**
+     * Child classes can process the new template set with replace_template or
+     * append_template with this method
+     *    @param error string describing the error if any
+     *    @return 0 on success
+     */
+    int post_update_template(string& error);
+};
+
+#endif /*MARKETPLACE_H*/
diff --git a/include/MarketPlacePool.h b/include/MarketPlacePool.h
new file mode 100644
index 0000000000..5dd6c8b4c5
--- /dev/null
+++ b/include/MarketPlacePool.h
@@ -0,0 +1,170 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef MARKETPLACE_POOL_H_
+#define MARKETPLACE_POOL_H_
+
+#include "Marketplace.h"
+#include "SqlDB.h"
+
+class SqlDB;
+
+class MarketPlacePool : public PoolSQL
+{
+public:
+    MarketPlacePool(SqlDB * db):PoolSQL(db, MarketPlace::table, true, true){};
+
+    ~MarketPlacePool(){};
+
+    /* ---------------------------------------------------------------------- */
+    /* Methods for DB management                                              */
+    /* ---------------------------------------------------------------------- */
+
+    /**
+     *  Allocates a new Datastore, writing it in the pool database. No memory is
+     *  allocated for the object.
+     *    @param uid the user id of the Datastore owner
+     *    @param gid the id of the group this object is assigned to
+     *    @param uname name of the user
+     *    @param gname name of the group
+     *    @param umask permissions umask
+     *    @param mp_template MarketPlace definition template
+     *    @param oid the id assigned to the MarketPlace
+     *    @param error_str Returns the error reason, if any
+     *
+     *    @return the oid assigned to the object, -1 in case of failure
+     */
+    int allocate(
+            int                uid,
+            int                gid,
+            const std::string& uname,
+            const std::string& gname,
+            int                umask,
+            MarketPlaceTemplate * mp_template,
+            int *              oid,
+            std::string&       error_str);
+
+    /**
+     *  Function to get a MarketPlace from the pool, the object is loaded if not
+     *  in memory
+     *    @param oid Datastore unique id
+     *    @param lock locks the MarketPlace mutex
+     *    @return a pointer to the MarketPlace, 0 if not loaded
+     */
+    MarketPlace * get(int oid, bool lock)
+    {
+        return static_cast<MarketPlace *>(PoolSQL::get(oid,lock));
+    };
+
+    /**
+     *  Gets an object from the pool (if needed the object is loaded from the
+     *  database).
+     *   @param name of the object
+     *   @param lock locks the object if true
+     *
+     *   @return a pointer to the object, 0 in case of failure
+     */
+    Datastore * get(const std::string& name, bool lock)
+    {
+        return static_cast<Datastore *>(PoolSQL::get(name,-1,lock));
+    };
+
+    /**
+     *  Generate an index key for the object
+     *    @param name of the object
+     *    @param uid owner of the object, only used if needed
+     *
+     *    @return the key, a string
+     */
+    string key(const std::string& name, int uid)
+    {
+        return name;
+    };
+
+    /** Update a particular Datastore
+     *    @param user pointer to Datastore
+     *    @return 0 on success
+     */
+    int update(Datastore * datastore)
+    {
+        return datastore->update(db);
+    };
+
+    /**
+     *  Drops the MarketPlac data in the data base. The object mutex SHOULD be
+     *  locked.
+     *    @param objsql a pointer to the Datastore object
+     *    @param error_msg Error reason, if any
+     *    @return 0 on success, -1 DB error
+     *            -3 Datastore's Image IDs set is not empty
+     */
+    int drop(PoolObjectSQL * objsql, std::string& error_msg)
+	{
+		MarketPlace *mp  = static_cast<MarketPlace *>(objsql);
+
+    	if( mp->get_collection_size() > 0 )
+		{
+			std::ostringstream oss;
+
+			oss << "MarketPlace " << datastore->get_oid() << " is not empty.";
+			error_msg = oss.str();
+
+			NebulaLog::log("MARKETPLACE", Log::ERROR, error_msg);
+
+			return -3;
+		}
+
+		return PoolSQL::drop(objsql, error_msg);
+	}
+
+    /**
+     *  Bootstraps the database table(s) associated to the Datastore pool
+     *    @return 0 on success
+     */
+    static int bootstrap(SqlDB * _db)
+    {
+        return MarketPlace::bootstrap(_db);
+    };
+
+    /**
+     *  Dumps the MarketPlace pool in XML format. A filter can be also added to
+     *  the query
+     *  @param oss the output stream to dump the pool contents
+     *  @param where filter for the objects, defaults to all
+     *  @param limit parameters used for pagination
+     *
+     *  @return 0 on success
+     */
+    int dump(std::ostringstream& oss, const std::string& where,
+		const std::string& limit)
+    {
+        return PoolSQL::dump(oss, "MARKETPLACE_POOL", MarketPlace::table, where,
+                             limit);
+    };
+
+private:
+
+    /**
+     *  Factory method to produce objects
+     *    @return a pointer to the new object
+     */
+    PoolObjectSQL * create()
+    {
+        return new MarketPlace(-1,-1,"","", 0, 0);
+    };
+};
+
+#endif /*MARKETPLACE_POOL_H_*/
diff --git a/include/MarketPlaceTemplate.h b/include/MarketPlaceTemplate.h
new file mode 100644
index 0000000000..9aef6cc91b
--- /dev/null
+++ b/include/MarketPlaceTemplate.h
@@ -0,0 +1,37 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef MARKETPLACE_TEMPLATE_H_
+#define MARKETPLACE_TEMPLATE_H_
+
+#include "Template.h"
+
+/**
+ *  Datastore Template class
+ */
+class MarketPlaceTemplate : public Template
+{
+public:
+    MarketPlaceTemplate():
+        Template(false,'=',"TEMPLATE"){};
+
+    ~MarketPlaceTemplate(){};
+};
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+#endif /*MARKETPLACE_TEMPLATE_H_*/
diff --git a/include/NebulaUtil.h b/include/NebulaUtil.h
index 441e24df4a..e676f09f55 100644
--- a/include/NebulaUtil.h
+++ b/include/NebulaUtil.h
@@ -159,6 +159,33 @@ namespace one_util
      */
     std::string float_to_str(const float &num);
 
+    /**
+     *  Returns a scaped version of a value in the from "<op><val><cl>"
+     *    @param v the value to be escaped
+     *    @param op the opening escape string
+     *    @param cl the closing escape string
+     */
+    template <typename ValueType> inline
+    std::string escape(const ValueType& v, const char * op, const char * cl)
+    {
+        std::ostringstream oss;
+
+        oss << op << v << cl;
+
+        return oss.str();
+    }
+
+    template <typename ValueType> inline
+    std::string escape_xml(const ValueType &v)
+    {
+        return escape(v, "<![CDATA[", "]]>");
+    }
+
+    template <typename ValueType> inline
+    std::string escape_xml_attr(const ValueType &v)
+    {
+        return escape(v, "'", "'");
+    }
     /**
      * Checks if a strings matches a regular expression
      *
diff --git a/include/PoolObjectSQL.h b/include/PoolObjectSQL.h
index 0aff690c42..460d326eba 100644
--- a/include/PoolObjectSQL.h
+++ b/include/PoolObjectSQL.h
@@ -63,29 +63,31 @@ public:
         ZONE        = 0x0000800000000000LL,
         SECGROUP    = 0x0001000000000000LL,
         VDC         = 0x0002000000000000LL,
-        VROUTER     = 0x0004000000000000LL
+        VROUTER     = 0x0004000000000000LL,
+        MARKETPLACE = 0x0008000000000000LL
     };
 
     static string type_to_str(ObjectType ob)
     {
         switch (ob)
         {
-            case VM:        return "VM" ; break;
-            case HOST:      return "HOST" ; break;
-            case NET:       return "NET" ; break;
-            case IMAGE:     return "IMAGE" ; break;
-            case USER:      return "USER" ; break;
-            case TEMPLATE:  return "TEMPLATE" ; break;
-            case GROUP:     return "GROUP" ; break;
-            case ACL:       return "ACL" ; break;
-            case DATASTORE: return "DATASTORE" ; break;
-            case CLUSTER:   return "CLUSTER" ; break;
-            case DOCUMENT:  return "DOCUMENT" ; break;
-            case ZONE:      return "ZONE" ; break;
-            case SECGROUP:  return "SECGROUP" ; break;
-            case VDC:       return "VDC" ; break;
-            case VROUTER:   return "VROUTER" ; break;
-            default:        return "";
+            case VM:          return "VM" ; break;
+            case HOST:        return "HOST" ; break;
+            case NET:         return "NET" ; break;
+            case IMAGE:       return "IMAGE" ; break;
+            case USER:        return "USER" ; break;
+            case TEMPLATE:    return "TEMPLATE" ; break;
+            case GROUP:       return "GROUP" ; break;
+            case ACL:         return "ACL" ; break;
+            case DATASTORE:   return "DATASTORE" ; break;
+            case CLUSTER:     return "CLUSTER" ; break;
+            case DOCUMENT:    return "DOCUMENT" ; break;
+            case ZONE:        return "ZONE" ; break;
+            case SECGROUP:    return "SECGROUP" ; break;
+            case VDC:         return "VDC" ; break;
+            case VROUTER:     return "VROUTER" ; break;
+            case MARKETPLACE: return "MARKETPLACE" ; break;
+            default:          return "";
         }
     };
 
diff --git a/src/market/MarketPlace.cc b/src/market/MarketPlace.cc
new file mode 100644
index 0000000000..b30886b0ca
--- /dev/null
+++ b/src/market/MarketPlace.cc
@@ -0,0 +1,365 @@
+/* ------------------------------------------------------------------------ */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems              */
+/*                                                                          */
+/* 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.                                           */
+/* -------------------------------------------------------------------------*/
+
+#include <sstream>
+#include "MarketPlace.h"
+#include "NebulaLog.h"
+#include "NebulaUtil.h"
+
+/* ************************************************************************ */
+/* MarketPlace:: Database Definition                                        */
+/* ************************************************************************ */
+
+const char * MarketPlace::table = "marketplace_pool";
+
+const char * MarketPlace::db_names =
+        "oid, name, body, uid, gid, owner_u, group_u, other_u";
+
+const char * MarketPlace::db_bootstrap =
+    "CREATE TABLE IF NOT EXISTS marketplace_pool (oid INTEGER PRIMARY KEY, "
+    "name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, "
+    "owner_u INTEGER, group_u INTEGER, other_u INTEGER)";
+
+/* ************************************************************************ */
+/* MarketPlace:: Constructor / Destructor                                   */
+/* ************************************************************************ */
+
+MarketPlace::MarketPlace(
+    int                   uid,
+    int                   gid,
+    const std::string&    uname,
+    const std::string&    gname,
+    int                   umask,
+    MarketPlaceTemplate*  mp_template):
+        PoolObjectSQL(-1, MARKETPLACE, "", uid, gid, uname, gname, table),
+        ObjectCollection("MARKETPLACEAPPS"),
+        mp_mad(""),
+        type(IMAGE_MP),
+        total_mb(0),
+        free_mb(0),
+        used_mb(0)
+{
+    if (mp_template != 0)
+    {
+        obj_template = mp_template;
+    }
+    else
+    {
+        obj_template = new MarketPlaceTemplate;
+    }
+
+    set_umask(umask);
+};
+
+MarketPlace::~MarketPlace()
+{
+    delete obj_template;
+};
+
+/* *************************************************************************** */
+/* MartketPlace :: Database Access Functions                                   */
+/* *************************************************************************** */
+
+int MarketPlace::insert(SqlDB *db, string& error_str)
+{
+    std::ostringstream oss;
+
+    std::string s_mp_type;
+
+    // -------------------------------------------------------------------------
+    // Check default marketplace attributes
+    // -------------------------------------------------------------------------
+
+	//MarketPlacePool::allocate checks NAME
+    erase_template_attribute("NAME", name);
+
+    get_template_attribute("MP_MAD", mp_mad);
+
+    if ( mp_mad.empty() == true )
+    {
+        goto error_mad;
+    }
+
+    erase_template_attribute("TYPE", s_mp_type);
+
+    type = str_to_type(s_mp_type);
+
+	if ( type == UNKNOWN )
+	{
+		goto error_type;
+	}
+
+    add_template_attribute("TYPE", type_to_str(type));
+
+    //--------------------------------------------------------------------------
+
+    return insert_replace(db, false, error_str);
+
+error_mad:
+    error_str = "No MarketPlace driver (MP_MAD) in template.";
+    goto error_common;
+error_type:
+	error_str = "Unknown MarketPlace type: " + s_mp_type;
+	goto error_common;
+
+error_common:
+    NebulaLog::log("MARKETPLACE", Log::ERROR, error_str);
+    return -1;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+int MarketPlace::insert_replace(SqlDB *db, bool replace, string& error_str)
+{
+    std::ostringstream   oss;
+
+    int rc;
+    std::string xml_body;
+
+    char * sql_name;
+    char * sql_xml;
+
+    sql_name = db->escape_str(name.c_str());
+
+    if ( sql_name == 0 )
+    {
+        goto error_name;
+    }
+
+    sql_xml = db->escape_str(to_xml(xml_body).c_str());
+
+    if ( sql_xml == 0 )
+    {
+        goto error_body;
+    }
+
+    if ( validate_xml(sql_xml) != 0 )
+    {
+        goto error_xml;
+    }
+
+    if ( replace )
+    {
+        oss << "REPLACE";
+    }
+    else
+    {
+        oss << "INSERT";
+    }
+
+    // Construct the SQL statement to Insert or Replace
+    oss <<" INTO "<<table <<" ("<< db_names <<") VALUES ("
+        <<          oid                 << ","
+        << "'" <<   sql_name            << "',"
+        << "'" <<   sql_xml             << "',"
+        <<          uid                 << ","
+        <<          gid                 << ","
+        <<          owner_u             << ","
+        <<          group_u             << ","
+        <<          other_u             << ")";
+
+    rc = db->exec(oss);
+
+    db->free_str(sql_name);
+    db->free_str(sql_xml);
+
+    return rc;
+
+error_xml:
+    db->free_str(sql_name);
+    db->free_str(sql_xml);
+
+    error_str = "Error transforming the MarketPlace to XML.";
+
+    goto error_common;
+
+error_body:
+    db->free_str(sql_name);
+    goto error_generic;
+
+error_name:
+    goto error_generic;
+
+error_generic:
+    error_str = "Error inserting MarketPlace in DB.";
+error_common:
+    return -1;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+/* *************************************************************************** */
+/* MartketPlace :: Template Functions                                          */
+/* *************************************************************************** */
+std::string& MarketPlace::to_xml(std::string& xml) const
+{
+	std::ostringstream oss;
+	std::string        template_xml;
+	std::string        collection_xml;
+	std::string        perm_str;
+
+    ObjectCollection::to_xml(collection_xml);
+
+    oss << "<MARKETPLACE>"
+			"<ID>"    << oid   << "</ID>"  <<
+			"<UID>"   << uid   << "</UID>" <<
+			"<GID>"   << gid   << "</GID>" <<
+			"<UNAME>" << uname << "</UNAME>" <<
+			"<GNAME>" << gname << "</GNAME>" <<
+			"<NAME>"  << name  << "</NAME>"  <<
+			"<MP_MAD>"<< one_util::escape_xml(mp_mad) << "</MP_MAD>" <<
+			"<TOTAL_MB>" << total_mb << "</TOTAL_MB>" <<
+			"<FREE_MB>"  << free_mb  << "</FREE_MB>"  <<
+			"<USED_MB>"  << used_mb  << "</USED_MB>"  <<
+			collection_xml <<
+			perms_to_xml(perm_str) <<
+			obj_template->to_xml(template_xml) <<
+        "</MARKETPLACE>";
+
+    xml = oss.str();
+
+    return xml;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+int MarketPlace::from_xml(const std::string &xml_str)
+{
+    int rc = 0;
+    int itype;
+    std::vector<xmlNodePtr> content;
+
+    // Initialize the internal XML object
+    update_from_str(xml_str);
+
+    // ----- MARKETPLACE base attributes -----
+    rc += xpath(oid,    "/MARKETPLACE/ID",     -1);
+    rc += xpath(uid,    "/MARKETPLACE/UID",    -1);
+    rc += xpath(gid,    "/MARKETPLACE/GID",    -1);
+    rc += xpath(uname,  "/MARKETPLACE/UNAME",  "not_found");
+    rc += xpath(gname,  "/MARKETPLACE/GNAME",  "not_found");
+    rc += xpath(name,   "/MARKETPLACE/NAME",   "not_found");
+    rc += xpath(mp_mad, "/MARKETPLACE/MP_MAD", "not_found");
+    rc += xpath(itype,  "/MARKETPLACE/TYPE",   -1);
+
+    rc += xpath(total_mb, "/MARKETPLACE/TOTAL_MB", 0);
+    rc += xpath(free_mb,  "/MARKETPLACE/FREE_MB",  0);
+    rc += xpath(used_mb,  "/MARKETPLACE/USED_MB",  0);
+
+    type = static_cast<MarketPlace::MarketPlaceType>(itype);
+
+	// ----- Permissions -----
+    rc += perms_from_xml();
+
+	// ----- MARKETPLACEAPP Collection  -----
+    ObjectXML::get_nodes("/MARKETPLACE/MARKETPLACEAPPS", content);
+
+    if (content.empty())
+    {
+        return -1;
+    }
+
+    rc += ObjectCollection::from_xml_node(content[0]);
+
+    ObjectXML::free_nodes(content);
+
+    content.clear();
+
+	// ----- TEMPLATE -----
+    ObjectXML::get_nodes("/MARKETPLACE/TEMPLATE", content);
+
+    if (content.empty())
+    {
+        return -1;
+    }
+
+    rc += obj_template->from_xml_node(content[0]);
+
+    ObjectXML::free_nodes(content);
+
+    if (rc != 0)
+    {
+        return -1;
+    }
+
+    return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+int MarketPlace::post_update_template(string& error)
+{
+	std::string new_s_type;
+	std::string new_mp_mad;
+
+	MarketPlaceType new_type;
+
+	// -------------------------------------------------------------------------
+    // Sanitize TYPE and MP_MAD attributes
+    // -------------------------------------------------------------------------
+    erase_template_attribute("TYPE", new_s_type);
+
+    new_type = str_to_type(new_s_type);
+
+	if ( new_type == UNKNOWN )
+	{
+		error = "Unknown MarketPlace type: " + new_s_type;
+		return -1;
+	}
+
+	type = new_type;
+
+    add_template_attribute("TYPE", type_to_str(type));
+
+    erase_template_attribute("MP_MAD", new_mp_mad);
+
+    if (!new_mp_mad.empty())
+    {
+        mp_mad = new_mp_mad;
+    }
+
+    add_template_attribute("MP_MAD", mp_mad);
+
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+MarketPlace::MarketPlaceType MarketPlace::str_to_type(string& str_type)
+{
+    one_util::toupper(str_type);
+
+    if ( str_type == "IMAGE_MP" )
+    {
+        return IMAGE_MP;
+    }
+    else if ( str_type == "VMTEMPLATE_MP" )
+    {
+        return VMTEMPLATE_MP;
+    }
+    else if ( str_type == "FLOW_MP" )
+    {
+        return FLOW_MP;
+    }
+
+    return UNKNOWN;
+}
+
diff --git a/src/market/SConstruct b/src/market/SConstruct
new file mode 100644
index 0000000000..145e4681a7
--- /dev/null
+++ b/src/market/SConstruct
@@ -0,0 +1,29 @@
+# SConstruct for src/datastore
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+Import('env')
+
+lib_name='nebula_marketplace'
+
+# Sources to generate the library
+source_files=[
+    'MarketPlace.cc'
+]
+
+# Build library
+env.StaticLibrary(lib_name, source_files)

From eafd5143c4bf72d4494f1d75cfd8ccb00f6dc732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 1 Dec 2015 16:36:50 +0100
Subject: [PATCH 007/197] Feature #4215: Store VM - VR id reference

---
 include/VirtualMachine.h                      |  7 ++++
 include/VirtualRouter.h                       | 17 ++++++++
 src/cli/etc/onevrouter.yaml                   |  5 +++
 src/cli/one_helper/onevrouter_helper.rb       |  7 +++-
 src/sunstone/etc/sunstone-views/admin.yaml    |  7 ++--
 .../etc/sunstone-views/admin_vcenter.yaml     |  7 ++--
 src/sunstone/etc/sunstone-views/user.yaml     |  7 ++--
 .../public/app/tabs/vrouters-tab/datatable.js |  4 +-
 .../app/tabs/vrouters-tab/panels/info.js      | 19 +++++++++
 .../tabs/vrouters-tab/panels/info/html.hbs    | 12 +++++-
 src/vm/VirtualMachine.cc                      | 40 ++++++++++++++++++-
 src/vrouter/VirtualRouter.cc                  |  5 ++-
 12 files changed, 123 insertions(+), 14 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 8d416e0c2b..66246f4fb0 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1968,6 +1968,13 @@ private:
      */
     int parse_defaults(string& error_str);
 
+    /**
+     * Parse virtual router related attributes
+     *    @param error_str Returns the error reason, if any
+     *    @return 0 on success
+     */
+    int parse_vrouter(string& error_str);
+
     /**
      * Known attributes for network contextualization rendered as:
      *   ETH_<nicid>_<context[0]> = $NETWORK[context[1], vnet_name]
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index 40a512a459..53146e29df 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -37,6 +37,16 @@ public:
      */
     string& to_xml(string& xml) const;
 
+    int get_vmid()
+    {
+        return vmid;
+    }
+
+    void set_vmid(int vmid)
+    {
+        this->vmid = vmid;
+    }
+
     // ------------------------------------------------------------------------
     // Template Contents
     // ------------------------------------------------------------------------
@@ -66,6 +76,13 @@ private:
 
     friend class VirtualRouterPool;
 
+
+    // *************************************************************************
+    // Attributes
+    // *************************************************************************
+
+    int vmid;
+
     // *************************************************************************
     // DataBase implementation (Private)
     // *************************************************************************
diff --git a/src/cli/etc/onevrouter.yaml b/src/cli/etc/onevrouter.yaml
index 4ccb9028dc..92404405d5 100644
--- a/src/cli/etc/onevrouter.yaml
+++ b/src/cli/etc/onevrouter.yaml
@@ -3,6 +3,10 @@
   :desc: ONE identifier for the Virtual Router
   :size: 4
 
+:VMID:
+  :desc: VM associated with the Virtual Router
+  :size: 4
+
 :NAME:
   :desc: Name of the Virtual Router
   :size: 27
@@ -20,6 +24,7 @@
 
 :default:
 - :ID
+- :VMID
 - :USER
 - :GROUP
 - :NAME
diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb
index 05a03ebf12..a2fbaf3804 100644
--- a/src/cli/one_helper/onevrouter_helper.rb
+++ b/src/cli/one_helper/onevrouter_helper.rb
@@ -52,6 +52,10 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
                 d["ID"]
             end
 
+            column :VMID, "VM associated with the Virtual Router", :size=>4 do |d|
+                d["VMID"]
+            end
+
             column :NAME, "Name of the Virtual Router", :left, :size=>27 do |d|
                 d["NAME"]
             end
@@ -65,7 +69,7 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
                 helper.group_name(d, options)
             end
 
-            default :ID, :USER, :GROUP, :NAME
+            default :ID, :VMID, :USER, :GROUP, :NAME
         end
 
         table
@@ -94,6 +98,7 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
             str_h1 % "VIRTUAL ROUTER #{obj['ID']} INFORMATION")
         puts str % ["ID", obj.id.to_s]
         puts str % ["NAME", obj.name]
+        puts str % ["VIRTUAL MACHINE", obj['VMID']]
         puts str % ["USER", obj['UNAME']]
         puts str % ["GROUP", obj['GNAME']]
         puts
diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 44be4d43aa..a6d4bb6663 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -434,9 +434,10 @@ tabs:
         table_columns:
             - 0         # Checkbox
             - 1         # ID
-            - 2         # Owner
-            - 3         # Group
-            - 4         # Name
+            - 2         # VMID
+            - 3         # Owner
+            - 4         # Group
+            - 5         # Name
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index fa0511f49b..c01cccf4c2 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -434,9 +434,10 @@ tabs:
         table_columns:
             - 0         # Checkbox
             - 1         # ID
-            - 2         # Owner
-            - 3         # Group
-            - 4         # Name
+            - 2         # VMID
+            - 3         # Owner
+            - 4         # Group
+            - 5         # Name
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 0f45d4ef8a..4d820d9016 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -435,9 +435,10 @@ tabs:
         table_columns:
             - 0         # Checkbox
             - 1         # ID
-            - 2         # Owner
-            - 3         # Group
-            - 4         # Name
+            - 2         # VMID
+            - 3         # Owner
+            - 4         # Group
+            - 5         # Name
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
index c9a6b79610..edced70510 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
@@ -56,6 +56,7 @@ define(function(require) {
 
     this.columns = [
       Locale.tr("ID"),
+      Locale.tr("VMID"),
       Locale.tr("Owner"),
       Locale.tr("Group"),
       Locale.tr("Name")
@@ -63,7 +64,7 @@ define(function(require) {
 
     this.selectOptions = {
       "id_index": 1,
-      "name_index": 4,
+      "name_index": 5,
       "select_resource": Locale.tr("Please select a virtual router from the list"),
       "you_selected": Locale.tr("You selected the following virtual router:"),
       "select_resource_multiple": Locale.tr("Please select one or more virtual routers from the list"),
@@ -91,6 +92,7 @@ define(function(require) {
                              element.ID + '" name="selected_items" value="' +
                              element.ID + '"/>',
         element.ID,
+        element.VMID,
         element.UNAME,
         element.GNAME,
         element.NAME
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
index 9bddedcf31..877baf34ae 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
@@ -24,6 +24,8 @@ define(function(require) {
   var PermissionsTable = require('utils/panel/permissions-table');
   var RenameTr = require('utils/panel/rename-tr');
   var OpenNebulaVirtualRouter = require('opennebula/virtualrouter');
+  var Sunstone = require('sunstone');
+  var Config = require('sunstone-config');
 
   /*
     TEMPLATES
@@ -65,6 +67,13 @@ define(function(require) {
 
   function _html() {
     var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME);
+
+    var vmid = this.element.VMID;
+
+    if (vmid == "-1"){
+      vmid = undefined; // Change made to use {{#if vmid}} in handlebars
+    }
+
     var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
 
     // TODO: simplify interface?
@@ -78,12 +87,22 @@ define(function(require) {
     return TemplateInfo({
       'element': this.element,
       'renameTrHTML': renameTrHTML,
+      'vmid': vmid,
       'permissionsTableHTML': permissionsTableHTML,
       'templateTableHTML': templateTableHTML
     });
   }
 
   function _setup(context) {
+    $("a.vmid", context).on("click", function(){
+      // TODO: this should be checked internally in showElement,
+      // but it won't work because of bug #4198
+
+      if (Config.isTabEnabled("vms-tab")){
+        Sunstone.showElement("vms-tab", "VM.show", $(this).text());
+      }
+    });
+
     RenameTr.setup(TAB_ID, RESOURCE, this.element.ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
 
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
index cdf7437679..c4846490f1 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -18,7 +18,7 @@
   <div class="large-6 columns">
     <table id="info_virtual_router_table" class="dataTable">
       <thead>
-         <tr>
+        <tr>
           <th colspan="3">{{tr "Information"}}</th>
         </tr>
       </thead>
@@ -28,6 +28,16 @@
           <td class="value_td" colspan="2">{{element.ID}}</td>
         </tr>
         {{{renameTrHTML}}}
+        <tr>
+          <td class="key_td">{{tr "VM ID"}}</td>
+          <td class="value_td" colspan="2">
+            {{#if vmid}}
+            <a class="vmid">{{vmid}}</a>
+            {{else}}
+            --
+            {{/if}}
+          </td>
+        </tr>
       </tbody>
     </table>
   </div>
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 0fddafff9e..e04e66cd16 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -428,6 +428,17 @@ int VirtualMachine::insert(SqlDB * db, string& error_str)
         goto error_defaults;
     }
 
+    // ------------------------------------------------------------------------
+    // Parse the virtual router attributes
+    // ------------------------------------------------------------------------
+
+    rc = parse_vrouter(error_str);
+
+    if ( rc != 0 )
+    {
+        goto error_vrouter;
+    }
+
     // ------------------------------------------------------------------------
     // Get network leases
     // ------------------------------------------------------------------------
@@ -584,6 +595,7 @@ error_one_vms:
 
 error_os:
 error_defaults:
+error_vrouter:
 error_public:
 error_name:
 error_common:
@@ -823,6 +835,32 @@ error_cleanup:
     return -1;
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualMachine::parse_vrouter(string& error_str)
+{
+    string st;
+
+    user_obj_template->get("VROUTER", st);
+
+    if (!st.empty())
+    {
+        obj_template->replace("VROUTER", st);
+    }
+
+    user_obj_template->get("VROUTER_ID", st);
+
+    if (!st.empty())
+    {
+        obj_template->replace("VROUTER_ID", st);
+    }
+
+    user_obj_template->erase("VROUTER");
+    user_obj_template->erase("VROUTER_ID");
+
+    return 0;
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -3214,7 +3252,7 @@ int VirtualMachine::get_vrouter_id()
 {
     int vrid;
 
-    if (!user_obj_template->get("VROUTER_ID", vrid))
+    if (!obj_template->get("VROUTER_ID", vrid))
     {
         vrid = -1;
     }
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index 6c91771bda..0dc8c7f94b 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -27,7 +27,8 @@ VirtualRouter::VirtualRouter(   int             id,
                                 const string&   _gname,
                                 int             _umask,
                                 Template * _template_contents):
-        PoolObjectSQL(id,VROUTER,"",_uid,_gid,_uname,_gname,table)
+        PoolObjectSQL(id,VROUTER,"",_uid,_gid,_uname,_gname,table),
+        vmid(-1)
 {
     if (_template_contents != 0)
     {
@@ -197,6 +198,7 @@ string& VirtualRouter::to_xml(string& xml) const
             << "<UNAME>"    << uname      << "</UNAME>"
             << "<GNAME>"    << gname      << "</GNAME>"
             << "<NAME>"     << name       << "</NAME>"
+            << "<VMID>"     << vmid       << "</VMID>"
             << perms_to_xml(perm_str)
             << obj_template->to_xml(template_xml)
         << "</VROUTER>";
@@ -224,6 +226,7 @@ int VirtualRouter::from_xml(const string& xml)
     rc += xpath(uname,      "/VROUTER/UNAME",   "not_found");
     rc += xpath(gname,      "/VROUTER/GNAME",   "not_found");
     rc += xpath(name,       "/VROUTER/NAME",    "not_found");
+    rc += xpath(vmid,       "/VROUTER/VMID",    -1);
 
     // Permissions
     rc += perms_from_xml();

From 2f5ba45c9a6904c165c3dd16ebea61c0f66aa3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 2 Dec 2015 16:33:28 +0100
Subject: [PATCH 008/197] Feature #4215: Add VROUTER to acl rules

---
 src/acl/AclRule.cc                                     |  9 +++++----
 src/cli/etc/oneacl.yaml                                |  6 +++---
 src/cli/one_helper/oneacl_helper.rb                    | 10 ++++++----
 src/group/Group.cc                                     |  6 ++++--
 src/oca/java/src/org/opennebula/client/acl/Acl.java    |  1 +
 src/oca/ruby/opennebula/acl.rb                         |  3 ++-
 src/sunstone/models/SunstoneServer.rb                  |  2 +-
 src/sunstone/public/app/tabs/acls-tab/datatable.js     |  3 +++
 .../app/tabs/acls-tab/form-panels/create/wizard.hbs    |  4 ++++
 9 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/acl/AclRule.cc b/src/acl/AclRule.cc
index e6e49fa686..f3cc487266 100644
--- a/src/acl/AclRule.cc
+++ b/src/acl/AclRule.cc
@@ -28,7 +28,7 @@ const long long AclRule::CLUSTER_ID     = 0x0000000800000000LL;
 
 const long long AclRule::NONE_ID        = 0x1000000000000000LL;
 
-const int AclRule::num_pool_objects = 13;
+const int AclRule::num_pool_objects = 14;
 const PoolObjectSQL::ObjectType AclRule::pool_objects[] = {
             PoolObjectSQL::VM,
             PoolObjectSQL::HOST,
@@ -42,7 +42,8 @@ const PoolObjectSQL::ObjectType AclRule::pool_objects[] = {
             PoolObjectSQL::DOCUMENT,
             PoolObjectSQL::ZONE,
             PoolObjectSQL::SECGROUP,
-            PoolObjectSQL::VDC
+            PoolObjectSQL::VDC,
+            PoolObjectSQL::VROUTER
 };
 
 const int AclRule::num_auth_operations = 4;
@@ -57,7 +58,7 @@ const long long AclRule::INVALID_CLUSTER_OBJECTS =
         PoolObjectSQL::VM | PoolObjectSQL::IMAGE | PoolObjectSQL::USER |
         PoolObjectSQL::TEMPLATE | PoolObjectSQL::GROUP | PoolObjectSQL::ACL |
         PoolObjectSQL::CLUSTER | PoolObjectSQL::DOCUMENT | PoolObjectSQL::ZONE |
-        PoolObjectSQL::SECGROUP | PoolObjectSQL::VDC;
+        PoolObjectSQL::SECGROUP | PoolObjectSQL::VDC | PoolObjectSQL::VROUTER;
 
 const long long AclRule::INVALID_GROUP_OBJECTS =
         PoolObjectSQL::HOST | PoolObjectSQL::GROUP | PoolObjectSQL::CLUSTER |
@@ -233,7 +234,7 @@ bool AclRule::malformed(string& error_str) const
         oss << "[resource] type is missing";
     }
 
-    if ( (resource & 0xFFFC000000000000LL) != 0 )
+    if ( (resource & 0xFFF8000000000000LL) != 0 )
     {
         if ( error )
         {
diff --git a/src/cli/etc/oneacl.yaml b/src/cli/etc/oneacl.yaml
index 0a1e3a5d35..b860218bb7 100644
--- a/src/cli/etc/oneacl.yaml
+++ b/src/cli/etc/oneacl.yaml
@@ -9,9 +9,9 @@
   :size: 8
   :right: true
 
-:RES_VHNIUTGDCOZSv:
+:RES_VHNIUTGDCOZSvR:
   :desc: Which resource the rule applies to
-  :size: 17
+  :size: 18
 
 :RID:
   :desc: Resource ID
@@ -31,7 +31,7 @@
 :default:
 - :ID
 - :USER
-- :RES_VHNIUTGDCOZSv
+- :RES_VHNIUTGDCOZSvR
 - :RID
 - :OPE_UMAC
 - :ZONE
diff --git a/src/cli/one_helper/oneacl_helper.rb b/src/cli/one_helper/oneacl_helper.rb
index e9b2e1da3a..c3f868711b 100644
--- a/src/cli/one_helper/oneacl_helper.rb
+++ b/src/cli/one_helper/oneacl_helper.rb
@@ -44,7 +44,7 @@ private
     def self.resource_mask(str)
         resource_type=str.split("/")[0]
 
-        mask = "-------------"
+        mask = "--------------"
 
         resource_type.split("+").each{|type|
             case type
@@ -74,6 +74,8 @@ private
                     mask[11] = "S"
                 when "VDC"
                     mask[12] = "v"
+                when "VROUTER"
+                    mask[13] = "R"
             end
         }
         mask
@@ -113,8 +115,8 @@ private
                 d['STRING'].split(" ")[0]
             end
 
-            column :RES_VHNIUTGDCOZSv, "Resource to which the rule applies",
-                            :size => 17 do |d|
+            column :RES_VHNIUTGDCOZSvR, "Resource to which the rule applies",
+                            :size => 18 do |d|
                OneAclHelper::resource_mask d['STRING'].split(" ")[1]
             end
 
@@ -131,7 +133,7 @@ private
                 OneAclHelper::right_mask d['STRING'].split(" ")[2]
             end
 
-            default :ID, :USER, :RES_VHNIUTGDCOZSv, :RID, :OPE_UMAC, :ZONE
+            default :ID, :USER, :RES_VHNIUTGDCOZSvR, :RID, :OPE_UMAC, :ZONE
         end
 
         table
diff --git a/src/group/Group.cc b/src/group/Group.cc
index c2c6f9e117..354b14726d 100644
--- a/src/group/Group.cc
+++ b/src/group/Group.cc
@@ -380,7 +380,7 @@ void Group::add_admin_rules(int user_id)
         NebulaLog::log("GROUP",Log::ERROR,error_msg);
     }
 
-    // #<uid> VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP/@<gid> USE+MANAGE *
+    // #<uid> VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER/@<gid> USE+MANAGE *
     rc = aclm->add_rule(
             AclRule::INDIVIDUAL_ID |
             user_id,
@@ -391,6 +391,7 @@ void Group::add_admin_rules(int user_id)
             PoolObjectSQL::TEMPLATE |
             PoolObjectSQL::DOCUMENT |
             PoolObjectSQL::SECGROUP |
+            PoolObjectSQL::VROUTER |
             AclRule::GROUP_ID |
             oid,
 
@@ -463,7 +464,7 @@ void Group::del_admin_rules(int user_id)
         NebulaLog::log("GROUP",Log::ERROR,error_msg);
     }
 
-    // #<uid> VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP/@<gid> USE+MANAGE *
+    // #<uid> VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER/@<gid> USE+MANAGE *
     rc = aclm->del_rule(
             AclRule::INDIVIDUAL_ID |
             user_id,
@@ -474,6 +475,7 @@ void Group::del_admin_rules(int user_id)
             PoolObjectSQL::TEMPLATE |
             PoolObjectSQL::DOCUMENT |
             PoolObjectSQL::SECGROUP |
+            PoolObjectSQL::VROUTER |
             AclRule::GROUP_ID |
             oid,
 
diff --git a/src/oca/java/src/org/opennebula/client/acl/Acl.java b/src/oca/java/src/org/opennebula/client/acl/Acl.java
index ddb15ba7a5..c4424662a0 100644
--- a/src/oca/java/src/org/opennebula/client/acl/Acl.java
+++ b/src/oca/java/src/org/opennebula/client/acl/Acl.java
@@ -71,6 +71,7 @@ public class Acl extends PoolElement{
         tmpResources.put("ZONE"     , 0x0000800000000000L);
         tmpResources.put("SECGROUP" , 0x0001000000000000L);
         tmpResources.put("VDC"      , 0x0002000000000000L);
+        tmpResources.put("VROUTER"  , 0x0004000000000000L);
 
         RESOURCES = Collections.unmodifiableMap(tmpResources);
 
diff --git a/src/oca/ruby/opennebula/acl.rb b/src/oca/ruby/opennebula/acl.rb
index d1e0b5d009..dc529453b0 100644
--- a/src/oca/ruby/opennebula/acl.rb
+++ b/src/oca/ruby/opennebula/acl.rb
@@ -61,7 +61,8 @@ module OpenNebula
             "DOCUMENT"      =>  0x400000000000,
             "ZONE"          =>  0x800000000000,
             "SECGROUP"      => 0x1000000000000,
-            "VDC"           => 0x2000000000000
+            "VDC"           => 0x2000000000000,
+            "VROUTER"       => 0x4000000000000
         }
 
         RIGHTS =
diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
index fd6e709317..f10bb25545 100644
--- a/src/sunstone/models/SunstoneServer.rb
+++ b/src/sunstone/models/SunstoneServer.rb
@@ -119,7 +119,7 @@ class SunstoneServer < CloudServer
             when "vnet"       then VirtualNetworkJSON.new(VirtualNetwork.build_xml, @client)
             when "user"       then UserJSON.new(User.build_xml, @client)
             when "acl"        then AclJSON.new(Acl.build_xml, @client)
-            when "datastore"  then DatastoreJSON.new(Acl.build_xml, @client)
+            when "datastore"  then DatastoreJSON.new(Datastore.build_xml, @client)
             when "zone"       then ZoneJSON.new(Zone.build_xml, @client)
             when "security_group"   then SecurityGroupJSON.new(SecurityGroup.build_xml, @client)
             when "vdc"        then VdcJSON.new(Vdc.build_xml, @client)
diff --git a/src/sunstone/public/app/tabs/acls-tab/datatable.js b/src/sunstone/public/app/tabs/acls-tab/datatable.js
index 4d3b4dafc7..423eacbeb0 100644
--- a/src/sunstone/public/app/tabs/acls-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/acls-tab/datatable.js
@@ -171,6 +171,9 @@ define(function(require) {
       case "VDC":
           resources_str+=Locale.tr("VDCs")+", ";
           break;
+      case "VROUTER":
+          resources_str+=Locale.tr("Virtual Routers")+", ";
+          break;
       }
     }
     //remove ", " from end
diff --git a/src/sunstone/public/app/tabs/acls-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/acls-tab/form-panels/create/wizard.hbs
index ae847c8fa6..5155069c60 100644
--- a/src/sunstone/public/app/tabs/acls-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/acls-tab/form-panels/create/wizard.hbs
@@ -116,6 +116,10 @@
         <input type="checkbox" id="res_vdc" name="res_vdc" class="resource_cb" value="VDC">
         <label for="res_vdc">{{tr "VDCs"}}</label>
       </div>
+      <div class="large-3 medium-6 columns end">
+        <input type="checkbox" id="res_vrouter" name="res_vrouter" class="resource_cb" value="VROUTER">
+        <label for="res_vrouter">{{tr "Virtual Routers"}}</label>
+      </div>
     </div>
   </fieldset>
   <fieldset>

From 08cf5a3e5595c903c93ada8680a05617e47bdabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 4 Dec 2015 16:48:53 +0100
Subject: [PATCH 009/197] Feature #4215: Tmp code to create VR from VM
 Templates

---
 src/rm/RequestManagerVMTemplate.cc | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index 5df7b0c088..606daeadaa 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -136,6 +136,29 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
         tmpl->set(new SingleAttribute("NAME",name));
     }
 
+    //--------------------------------------------------------------------------
+    // Temporary code to create Virtual Routers from regular VM Templates
+
+    bool    is_vrouter;
+    int     vrid;
+    string  vr_error_str;
+
+    VirtualRouterPool* vrpool = Nebula::instance().get_vrouterpool();
+
+    tmpl->get("VROUTER", is_vrouter);
+
+    if (is_vrouter)
+    {
+        Template * vr_tmpl = new Template;
+
+        vrpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
+            vr_tmpl, &vrid, vr_error_str);
+
+        tmpl->replace("VROUTER_ID", vrid);
+    }
+
+    //--------------------------------------------------------------------------
+
     if ( att.uid != 0 )
     {
         AuthRequest ar(att.uid, att.group_ids);
@@ -197,6 +220,24 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     delete extended_tmpl;
 
+    //--------------------------------------------------------------------------
+    // Temporary code to create Virtual Routers from regular VM Templates
+    // Final code would need roolback to delete the new VR on error
+
+    VirtualRouter *  vr;
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr != 0)
+    {
+        vr->set_vmid(vid);
+
+        vrpool->update(vr);
+
+        vr->unlock();
+    }
+    //--------------------------------------------------------------------------
+
     success_response(vid, att);
 }
 

From ed9244158225d2cb094842806d5163ec0cb83210 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 5 Dec 2015 23:52:28 +0100
Subject: [PATCH 010/197] feature #4217: OpenNebula core methods for
 MarketPlace class. OCA binding and onemarket tool

---
 include/MarketPlace.h                         |  27 +--
 include/MarketPlacePool.h                     |  30 +--
 include/Nebula.h                              |   9 +-
 include/RequestManagerAllocate.h              |  34 +++-
 include/RequestManagerChmod.h                 |  20 +-
 include/RequestManagerChown.h                 |  24 ++-
 include/RequestManagerDelete.h                |  19 +-
 include/RequestManagerInfo.h                  |  19 +-
 include/RequestManagerPoolInfoFilter.h        |  24 ++-
 include/RequestManagerRename.h                |  25 ++-
 include/RequestManagerUpdateTemplate.h        |  18 +-
 install.sh                                    |  23 ++-
 share/man/SConstruct                          |   1 +
 src/cli/etc/onemarket.yaml                    |  41 ++++
 src/cli/one_helper/onemarket_helper.rb        | 144 +++++++++++++
 src/cli/onemarket                             | 178 ++++++++++++++++
 src/market/MarketPlace.cc                     |  52 ++---
 src/market/MarketPlacePool.cc                 |  73 +++++++
 src/market/SConstruct                         |   3 +-
 src/nebula/Nebula.cc                          |   2 +
 src/nebula/SConstruct                         |   1 +
 src/oca/ruby/opennebula.rb                    |   2 +
 src/oca/ruby/opennebula/datastore_pool.rb     |   4 +-
 src/oca/ruby/opennebula/marketplace.rb        | 190 ++++++++++++++++++
 src/oca/ruby/opennebula/marketplace_pool.rb   |  55 +++++
 src/rm/Request.cc                             |   4 +-
 src/rm/RequestManager.cc                      |  45 +++++
 src/rm/RequestManagerAllocate.cc              |  18 ++
 src/rm/RequestManagerPoolInfoFilter.cc        |  11 +
 .../models/OpenNebulaJSON/MarketPlaceJSON.rb  |  72 +++++++
 30 files changed, 1088 insertions(+), 80 deletions(-)
 create mode 100644 src/cli/etc/onemarket.yaml
 create mode 100644 src/cli/one_helper/onemarket_helper.rb
 create mode 100755 src/cli/onemarket
 create mode 100644 src/market/MarketPlacePool.cc
 create mode 100644 src/oca/ruby/opennebula/marketplace.rb
 create mode 100644 src/oca/ruby/opennebula/marketplace_pool.rb
 create mode 100644 src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb

diff --git a/include/MarketPlace.h b/include/MarketPlace.h
index 8586b4f9bc..da8630feb9 100644
--- a/include/MarketPlace.h
+++ b/include/MarketPlace.h
@@ -79,11 +79,11 @@ public:
     int from_xml(const string &xml_str);
 
     /**
-     *  Adds this image's ID to the set.
+     *  Adds this marketplace app's ID to the set.
      *    @param id of the app to be added to the MarketPlace
      *    @return 0 on success
      */
-    int add_mpapp(int id)
+    int add_marketapp(int id)
     {
         return add_collection_id(id);
     };
@@ -93,7 +93,7 @@ public:
      *    @param id of the image to be deleted from the MarketPlace
      *    @return 0 on success
      */
-    int del_mpapp(int id)
+    int del_marketapp(int id)
     {
         return del_collection_id(id);
     };
@@ -101,7 +101,7 @@ public:
     /**
      *  Returns a copy of the Image IDs set
      */
-    set<int> get_mpapp_ids()
+    set<int> get_marketapp_ids()
     {
         return get_collection_copy();
     }
@@ -110,9 +110,9 @@ public:
      *  Retrieves marketplace mad name
      *    @return string mp mad name
      */
-    const string& get_mp_mad() const
+    const string& get_market_mad() const
     {
-        return mp_mad;
+        return market_mad;
     };
 
     /**
@@ -148,7 +148,7 @@ private:
     /**
      * Name of the marketplace driver used to import apps
      */
-    string mp_mad;
+    string market_mad;
 
     /**
      * The marketplace type
@@ -174,12 +174,12 @@ private:
     // Constructor
     // *************************************************************************
     MarketPlace(
-            int                 uid,
-            int                 gid,
-            const string&       uname,
-            const string&       gname,
-            int                 umask,
-            MarketPlaceTemplate*  ds_template);
+            int                  uid,
+            int                  gid,
+            const string&        uname,
+            const string&        gname,
+            int                  umask,
+            MarketPlaceTemplate* mp_template);
 
     virtual ~MarketPlace();
 
@@ -241,3 +241,4 @@ private:
 };
 
 #endif /*MARKETPLACE_H*/
+
diff --git a/include/MarketPlacePool.h b/include/MarketPlacePool.h
index 5dd6c8b4c5..4119ba96d4 100644
--- a/include/MarketPlacePool.h
+++ b/include/MarketPlacePool.h
@@ -17,7 +17,8 @@
 #ifndef MARKETPLACE_POOL_H_
 #define MARKETPLACE_POOL_H_
 
-#include "Marketplace.h"
+#include "MarketPlace.h"
+#include "NebulaLog.h"
 #include "SqlDB.h"
 
 class SqlDB;
@@ -34,9 +35,9 @@ public:
     /* ---------------------------------------------------------------------- */
 
     /**
-     *  Allocates a new Datastore, writing it in the pool database. No memory is
+     *  Allocates a new MarketPlace, writing it in the pool database. No memory is
      *  allocated for the object.
-     *    @param uid the user id of the Datastore owner
+     *    @param uid the user id of the MarketPlace owner
      *    @param gid the id of the group this object is assigned to
      *    @param uname name of the user
      *    @param gname name of the group
@@ -60,7 +61,7 @@ public:
     /**
      *  Function to get a MarketPlace from the pool, the object is loaded if not
      *  in memory
-     *    @param oid Datastore unique id
+     *    @param oid MarketPlace unique id
      *    @param lock locks the MarketPlace mutex
      *    @return a pointer to the MarketPlace, 0 if not loaded
      */
@@ -77,9 +78,9 @@ public:
      *
      *   @return a pointer to the object, 0 in case of failure
      */
-    Datastore * get(const std::string& name, bool lock)
+    MarketPlace * get(const std::string& name, bool lock)
     {
-        return static_cast<Datastore *>(PoolSQL::get(name,-1,lock));
+        return static_cast<MarketPlace *>(PoolSQL::get(name,-1,lock));
     };
 
     /**
@@ -94,22 +95,21 @@ public:
         return name;
     };
 
-    /** Update a particular Datastore
-     *    @param user pointer to Datastore
+    /** Update a particular MarketPlace
+     *    @param user pointer to MarketPlace
      *    @return 0 on success
      */
-    int update(Datastore * datastore)
+    int update(MarketPlace * mp)
     {
-        return datastore->update(db);
+        return mp->update(db);
     };
 
     /**
      *  Drops the MarketPlac data in the data base. The object mutex SHOULD be
      *  locked.
-     *    @param objsql a pointer to the Datastore object
+     *    @param objsql a pointer to the MarketPlace object
      *    @param error_msg Error reason, if any
-     *    @return 0 on success, -1 DB error
-     *            -3 Datastore's Image IDs set is not empty
+     *    @return 0 on success, -1 DB error -3 MarketPlace's App ID set not empty
      */
     int drop(PoolObjectSQL * objsql, std::string& error_msg)
 	{
@@ -119,7 +119,7 @@ public:
 		{
 			std::ostringstream oss;
 
-			oss << "MarketPlace " << datastore->get_oid() << " is not empty.";
+			oss << "MarketPlace " << mp->get_oid() << " is not empty.";
 			error_msg = oss.str();
 
 			NebulaLog::log("MARKETPLACE", Log::ERROR, error_msg);
@@ -131,7 +131,7 @@ public:
 	}
 
     /**
-     *  Bootstraps the database table(s) associated to the Datastore pool
+     *  Bootstraps the database table(s) associated to the MarketPlace pool
      *    @return 0 on success
      */
     static int bootstrap(SqlDB * _db)
diff --git a/include/Nebula.h b/include/Nebula.h
index c3a1f2cae5..ad2bb79da2 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -35,6 +35,7 @@
 #include "SecurityGroupPool.h"
 #include "VdcPool.h"
 #include "VirtualRouterPool.h"
+#include "MarketPlacePool.h"
 
 #include "VirtualMachineManager.h"
 #include "LifeCycleManager.h"
@@ -142,6 +143,10 @@ public:
         return vrouterpool;
     };
 
+    MarketPlacePool * get_mppool()
+    {
+        return mppool;
+    };
     // --------------------------------------------------------------
     // Manager Accessors
     // --------------------------------------------------------------
@@ -664,7 +669,7 @@ private:
         system_db(0), db(0),
         vmpool(0), hpool(0), vnpool(0), upool(0), ipool(0), gpool(0), tpool(0),
         dspool(0), clpool(0), docpool(0), zonepool(0),
-        secgrouppool(0), vdcpool(0), vrouterpool(0),
+        secgrouppool(0), vdcpool(0), vrouterpool(0), mppool(0),
         lcm(0), vmm(0), im(0), tm(0), dm(0), rm(0), hm(0), authm(0),
         aclm(0), imagem(0)
     {
@@ -715,6 +720,7 @@ private:
         delete secgrouppool;
         delete vdcpool;
         delete vrouterpool;
+        delete mppool;
         delete vmm;
         delete lcm;
         delete im;
@@ -795,6 +801,7 @@ private:
     SecurityGroupPool  * secgrouppool;
     VdcPool            * vdcpool;
     VirtualRouterPool  * vrouterpool;
+    MarketPlacePool    * mppool;
 
     // ---------------------------------------------------------------
     // Nebula Managers
diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h
index 97013c78ae..bdc0c7f001 100644
--- a/include/RequestManagerAllocate.h
+++ b/include/RequestManagerAllocate.h
@@ -618,7 +618,39 @@ public:
                       RequestAttributes& att);
 };
 
-/* -------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAllocate : public RequestManagerAllocate
+{
+public:
+    MarketPlaceAllocate():
+        RequestManagerAllocate("MarketPlaceAllocate",
+                               "Allocates a new marketplace",
+                               "A:ss",
+                               true)
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_mppool();
+        auth_object = PoolObjectSQL::MARKETPLACE;
+    };
+
+    ~MarketPlaceAllocate(){};
+
+    /* --------------------------------------------------------------------- */
+
+    Template * get_object_template()
+    {
+        return new MarketPlaceTemplate;
+    };
+
+    int pool_allocate(xmlrpc_c::paramList const& _paramList,
+                      Template *                 tmpl,
+                      int&                       id,
+                      string&                    error_str,
+                      RequestAttributes&         att);
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerChmod.h b/include/RequestManagerChmod.h
index c3bdab76ad..5aa0c874d9 100644
--- a/include/RequestManagerChmod.h
+++ b/include/RequestManagerChmod.h
@@ -189,7 +189,25 @@ public:
     ~VirtualRouterChmod(){};
 };
 
-/* -------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceChmod: public RequestManagerChmod
+{
+public:
+    MarketPlaceChmod():
+        RequestManagerChmod("MarketPlaceChmod",
+                           "Changes permission bits of a marketplace")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_mppool();
+        auth_object = PoolObjectSQL::MARKETPLACE;
+    };
+
+    ~MarketPlaceChmod(){};
+
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerChown.h b/include/RequestManagerChown.h
index e61bd8e208..e6944626f5 100644
--- a/include/RequestManagerChown.h
+++ b/include/RequestManagerChown.h
@@ -292,7 +292,29 @@ public:
     };
 };
 
-/* -------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceChown: public RequestManagerChown
+{
+public:
+    MarketPlaceChown():
+        RequestManagerChown("MarketPlaceChown",
+                            "Changes ownership of a marketplace")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_mppool();
+        auth_object = PoolObjectSQL::MARKETPLACE;
+    };
+
+    ~MarketPlaceChown(){};
+
+    PoolObjectSQL * get(const string& name, int uid, bool lock)
+    {
+        return 0;
+    };
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerDelete.h b/include/RequestManagerDelete.h
index 652cb853b9..4cdbab0061 100644
--- a/include/RequestManagerDelete.h
+++ b/include/RequestManagerDelete.h
@@ -372,7 +372,24 @@ public:
     ~VirtualRouterDelete(){};
 };
 
-/* -------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceDelete : public RequestManagerDelete
+{
+public:
+    MarketPlaceDelete():
+        RequestManagerDelete("MarketPlaceDelete",
+                             "Deletes a marketplace")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_mppool();
+        auth_object = PoolObjectSQL::MARKETPLACE;
+    };
+
+    ~MarketPlaceDelete(){};
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerInfo.h b/include/RequestManagerInfo.h
index dc2021f688..50399a5c06 100644
--- a/include/RequestManagerInfo.h
+++ b/include/RequestManagerInfo.h
@@ -336,7 +336,24 @@ public:
     ~VirtualRouterInfo(){};
 };
 
-/* -------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceInfo : public RequestManagerInfo
+{
+public:
+    MarketPlaceInfo():
+        RequestManagerInfo("MarketPlaceInfo",
+                           "Returns MarketPlace information")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_mppool();
+        auth_object = PoolObjectSQL::MARKETPLACE;
+    };
+
+    ~MarketPlaceInfo(){};
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerPoolInfoFilter.h b/include/RequestManagerPoolInfoFilter.h
index 656df43cd4..43b7908e44 100644
--- a/include/RequestManagerPoolInfoFilter.h
+++ b/include/RequestManagerPoolInfoFilter.h
@@ -488,10 +488,7 @@ public:
 
     ~VdcPoolInfo(){};
 
-    /* -------------------------------------------------------------------- */
-
-    void request_execute(
-            xmlrpc_c::paramList const& paramList, RequestAttributes& att);
+    void request_execute(xmlrpc_c::paramList const& pl, RequestAttributes& att);
 };
 
 /* ------------------------------------------------------------------------- */
@@ -515,6 +512,23 @@ public:
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
+
+class MarketPlacePoolInfo : public RequestManagerPoolInfoFilter
+{
+public:
+    MarketPlacePoolInfo():
+        RequestManagerPoolInfoFilter("MarketPlacePoolInfo",
+                                     "Returns the market place pool",
+                                     "A:s")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_mppool();
+        auth_object = PoolObjectSQL::MARKETPLACE;
+    };
+
+    ~MarketPlacePoolInfo(){};
+
+    void request_execute(xmlrpc_c::paramList const& pl, RequestAttributes& att);
+};
 
 #endif
diff --git a/include/RequestManagerRename.h b/include/RequestManagerRename.h
index 1c3dac65d9..4a5113a5d4 100644
--- a/include/RequestManagerRename.h
+++ b/include/RequestManagerRename.h
@@ -356,7 +356,30 @@ public:
     };
 };
 
-/* -------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceRename: public RequestManagerRename
+{
+public:
+    MarketPlaceRename():
+        RequestManagerRename("MarketPlaceRename", "Renames a marketplace")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_mppool();
+        auth_object = PoolObjectSQL::MARKETPLACE;
+    };
+
+    ~MarketPlaceRename(){};
+
+    PoolObjectSQL * get(const string& name, int uid, bool lock)
+    {
+        return static_cast<MarketPlacePool*>(pool)->get(name, lock);
+    };
+
+    //TODO implement batch rename for MarketPlaceApps
+    //void batch_rename(int oid);
+};
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerUpdateTemplate.h b/include/RequestManagerUpdateTemplate.h
index 965be43745..3f281575b4 100644
--- a/include/RequestManagerUpdateTemplate.h
+++ b/include/RequestManagerUpdateTemplate.h
@@ -304,7 +304,23 @@ public:
     ~VirtualRouterUpdateTemplate(){};
 };
 
-/* -------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceUpdateTemplate : public RequestManagerUpdateTemplate
+{
+public:
+    MarketPlaceUpdateTemplate():
+        RequestManagerUpdateTemplate("MarketPlaceUpdateTemplate",
+                                     "Updates a virtual router template")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_mppool();
+        auth_object = PoolObjectSQL::MARKETPLACE;
+    };
+
+    ~MarketPlaceUpdateTemplate(){};
+};
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/install.sh b/install.sh
index 9c079fd610..715f8a7641 100755
--- a/install.sh
+++ b/install.sh
@@ -585,6 +585,7 @@ BIN_FILES="src/nebula/oned \
            src/cli/onesecgroup \
            src/cli/onevdc \
            src/cli/onevrouter \
+           src/cli/onemarket \
            src/cli/onevcenter \
            src/onedb/onedb \
            src/mad/utils/tty_expect \
@@ -1379,7 +1380,9 @@ RUBY_OPENNEBULA_LIB_FILES="src/oca/ruby/opennebula/acl_pool.rb \
                             src/oca/ruby/opennebula/zone_pool.rb \
                             src/oca/ruby/opennebula/zone.rb \
                             src/oca/ruby/opennebula/virtual_router_pool.rb \
-                            src/oca/ruby/opennebula/virtual_router.rb"
+                            src/oca/ruby/opennebula/virtual_router.rb \
+                            src/oca/ruby/opennebula/marketplace_pool.rb \
+                            src/oca/ruby/opennebula/marketplace.rb"
 
 #-------------------------------------------------------------------------------
 # Common Cloud Files
@@ -1498,13 +1501,13 @@ ECO_ETC_TEMPLATE_FILES="src/cloud/ec2/etc/templates/m1.small.erb"
 # Marketplace Client
 #-------------------------------------------------------------------------------
 
-MARKET_LIB_FILES="src/cloud/marketplace/lib/marketplace_client.rb"
+#MARKET_LIB_FILES="src/cloud/marketplace/lib/marketplace_client.rb"
 
-MARKET_LIB_CLIENT_FILES="src/cloud/marketplace/lib/marketplace_client.rb"
+#MARKET_LIB_CLIENT_FILES="src/cloud/marketplace/lib/marketplace_client.rb"
 
-MARKET_BIN_FILES="src/cloud/marketplace/bin/onemarket"
+#MARKET_BIN_FILES="src/cloud/marketplace/bin/onemarket"
 
-MARKET_BIN_CLIENT_FILES="src/cloud/marketplace/bin/onemarket"
+#MARKET_BIN_CLIENT_FILES="src/cloud/marketplace/bin/onemarket"
 
 
 #-----------------------------------------------------------------------------
@@ -1530,7 +1533,8 @@ ONE_CLI_LIB_FILES="src/cli/one_helper/onegroup_helper.rb \
                    src/cli/one_helper/onevdc_helper.rb \
                    src/cli/one_helper/oneacct_helper.rb \
                    src/cli/one_helper/onesecgroup_helper.rb \
-                   src/cli/one_helper/onevrouter_helper.rb"
+                   src/cli/one_helper/onevrouter_helper.rb \
+                   src/cli/one_helper/onemarket_helper.rb"
 
 CLI_BIN_FILES="src/cli/onevm \
                src/cli/onehost \
@@ -1549,7 +1553,8 @@ CLI_BIN_FILES="src/cli/onevm \
                src/cli/onesecgroup \
                src/cli/oneshowback \
                src/cli/onevdc \
-               src/cli/onevrouter"
+               src/cli/onevrouter \
+               src/cli/onemarket"
 
 CLI_CONF_FILES="src/cli/etc/onegroup.yaml \
                 src/cli/etc/onehost.yaml \
@@ -1566,7 +1571,8 @@ CLI_CONF_FILES="src/cli/etc/onegroup.yaml \
                 src/cli/etc/onesecgroup.yaml \
                 src/cli/etc/oneshowback.yaml \
                 src/cli/etc/onevdc.yaml \
-                src/cli/etc/onevrouter.yaml"
+                src/cli/etc/onevrouter.yaml \
+                src/cli/etc/onemarket.yaml"
 
 #-----------------------------------------------------------------------------
 # Sunstone files
@@ -1839,6 +1845,7 @@ MAN_FILES="share/man/oneacct.1.gz \
         share/man/onesecgroup.1.gz \
         share/man/onevdc.1.gz \
         share/man/onevrouter.1.gz \
+        share/man/onemarket.1.gz \
         share/man/econe-allocate-address.1.gz \
         share/man/econe-associate-address.1.gz \
         share/man/econe-attach-volume.1.gz \
diff --git a/share/man/SConstruct b/share/man/SConstruct
index 6a0dcd2822..39cfe078c8 100644
--- a/share/man/SConstruct
+++ b/share/man/SConstruct
@@ -65,6 +65,7 @@ env.Man('onevcenter')
 env.Man('onesecgroup')
 env.Man('onevdc')
 env.Man('onevrouter')
+#env.Man('onemarket')
 
 env.Man('oneflow')
 env.Man('oneflow-template')
diff --git a/src/cli/etc/onemarket.yaml b/src/cli/etc/onemarket.yaml
new file mode 100644
index 0000000000..43cfb67b8b
--- /dev/null
+++ b/src/cli/etc/onemarket.yaml
@@ -0,0 +1,41 @@
+---
+:ID:
+  :desc: ONE identifier for the Marketplace  
+  :size: 4
+
+:NAME:
+  :desc: Name of the Marketplace
+  :size: 13
+  :left: true
+
+:SIZE:
+  :desc: Marketplace total size (M)
+  :size: 10
+
+:AVAIL:
+  :desc: MarketPlace free size (%)
+  :size: 5
+  :left: true
+
+:MARKETAPPS:
+  :desc: Number of Marketplace Apps
+  :size: 6
+
+:TYPE:
+  :desc: Marketplace type
+  :size: 4
+  :left: true
+
+:MAD:
+  :desc: Marketplace driver
+  :size: 7
+  :left: true
+
+:default:
+- :ID
+- :NAME
+- :SIZE
+- :AVAIL
+- :MARKETAPPS
+- :TYPE
+- :MAD
diff --git a/src/cli/one_helper/onemarket_helper.rb b/src/cli/one_helper/onemarket_helper.rb
new file mode 100644
index 0000000000..aca83be377
--- /dev/null
+++ b/src/cli/one_helper/onemarket_helper.rb
@@ -0,0 +1,144 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'one_helper'
+
+class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
+    DATASTORE = {
+        :name   => "marketplace",
+        :short  => "-m id|name",
+        :large  => "--marketplace id|name" ,
+        :description => "Selects the marketplace",
+        :format => String,
+        :proc   => lambda { |o, options|
+            OpenNebulaHelper.rname_to_id(o, "MARKETPLACE")
+        }
+    }
+
+    def self.rname
+        "MARKETPLACE"
+    end
+
+    def self.conf_file
+        "onemarket.yaml"
+    end
+
+    def format_pool(options)
+        config_file = self.class.table_conf
+
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, "ONE identifier for the Marketplace", :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "Name of the Marketplace", :left, :size=>13 do |d|
+                d["NAME"]
+            end
+
+            column :SIZE, "Marketplace total size", :size =>10 do |d|
+                OpenNebulaHelper.unit_to_str(d['TOTAL_MB'].to_i, {}, 'M')
+            end
+
+            column :AVAIL, "Marketplace free size", :left, :size =>5 do |d|
+                if d['TOTAL_MB'].to_i == 0
+                    "-"
+                else
+                    "#{((d['FREE_MB'].to_f/d['TOTAL_MB'].to_f) * 100).round()}%"
+                end
+            end
+
+            column :MARKETAPPS, "Number of marketplace apps", :size=>6 do |d|
+                if d["MARKETPLACEAPPS"]["ID"].nil?
+                    "0"
+                else
+                    d["MARKETPLACEAPPS"]["ID"].size
+                end
+            end
+
+            column :TYPE, "Marketplace type", :left, :size=>4 do |d|
+                type = MarketPlace::MARKETPLACE_TYPES[d["TYPE"].to_i]
+                MarketPlace::SHORT_MARKETPLACE_TYPES[type]
+            end
+
+            column :MAD, "Marketplace driver", :left, :size=>7 do |d|
+                d["MARKET_MAD"]
+            end
+
+            default :ID, :NAME, :SIZE, :AVAIL, :MARKETAPPS, :TYPE, :MAD
+        end
+
+        table
+    end
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::MarketPlace.new_with_id(id, @client)
+        else
+            xml=OpenNebula::MarketPlace.build_xml
+            OpenNebula::MarketPlace.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::MarketPlacePool.new(@client)
+    end
+
+    def format_resource(datastore, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE #{datastore['ID']} INFORMATION")
+        puts str % ["ID",    datastore.id.to_s]
+        puts str % ["NAME",  datastore.name]
+        puts str % ["USER",  datastore['UNAME']]
+        puts str % ["GROUP", datastore['GNAME']]
+        puts str % ["TYPE",  datastore.type_str]
+
+        puts str % ["MARKET_MAD", datastore['MARKET_MAD']]
+        puts
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE CAPACITY", false)
+
+        puts str % ["TOTAL:", OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i,{},'M')]
+        puts str % ["FREE:",  OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')]
+        puts str % ["USED: ", OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')]
+        puts
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if datastore["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if datastore["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if datastore["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e,  mask]
+        }
+        puts
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE TEMPLATE", false)
+        puts datastore.template_str
+
+        puts
+
+        CLIHelper.print_header("%-15s" % "MARKETAPPS")
+        datastore.marketapp_ids.each do |id|
+            puts "%-15s" % [id]
+        end
+    end
+end
diff --git a/src/cli/onemarket b/src/cli/onemarket
new file mode 100755
index 0000000000..2bd506e3e4
--- /dev/null
+++ b/src/cli/onemarket
@@ -0,0 +1,178 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
+else
+    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+end
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+
+require 'command_parser'
+require 'one_helper/onemarket_helper'
+
+cmd=CommandParser::CmdParser.new(ARGV) do
+    usage "`onemarket` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneMarketPlaceHelper.new
+
+    before_proc do
+        helper.set_client(options)
+    end
+
+    ########################################################################
+    # Global Options
+    ########################################################################
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+
+    list_options = CLIHelper::OPTIONS
+    list_options << OpenNebulaHelper::XML
+    list_options << OpenNebulaHelper::NUMERIC
+    list_options << OpenNebulaHelper::DESCRIBE
+
+    ########################################################################
+    # Formatters for arguments
+    ########################################################################
+    set :format, :marketplaceid, OneMarketPlaceHelper.to_id_desc do |arg|
+        helper.to_id(arg)
+    end
+
+    set :format, :marketplaceid_list, OneMarketPlaceHelper.list_to_id_desc do |arg|
+        helper.list_to_id(arg)
+    end
+
+    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "GROUP")
+    end
+
+    set :format, :userid, OpenNebulaHelper.rname_to_id_desc("USER") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "USER")
+    end
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new Marketplace from the given template file
+    EOT
+
+    command :create, create_desc, :file do
+
+        helper.create_resource(options) do |marketplace|
+            begin
+                template = File.read(args[0])
+                marketplace.allocate(template)
+            rescue =>e
+                STDERR.puts e.message
+                exit -1
+            end
+        end
+    end
+
+    delete_desc = <<-EOT.unindent
+        Deletes the given Marketplace
+    EOT
+
+    command :delete, delete_desc, [:range, :marketplaceid_list] do
+        helper.perform_actions(args[0],options,"deleted") do |obj|
+            obj.delete
+        end
+    end
+
+    chgrp_desc = <<-EOT.unindent
+        Changes the Marketplace group
+    EOT
+
+    command :chgrp, chgrp_desc,[:range, :marketplaceid_list], :groupid do
+        helper.perform_actions(args[0],options,"Group changed") do |obj|
+            obj.chown(-1, args[1].to_i)
+        end
+    end
+
+    chown_desc = <<-EOT.unindent
+        Changes the Marketplace owner and group
+    EOT
+
+    command :chown, chown_desc, [:range, :marketplaceid_list], :userid,
+            [:groupid,nil] do
+        gid = args[2].nil? ? -1 : args[2].to_i
+        helper.perform_actions(args[0],options,"Owner/Group changed") do |obj|
+            obj.chown(args[1].to_i, gid)
+        end
+    end
+
+    chmod_desc = <<-EOT.unindent
+        Changes the Marketplace permissions
+    EOT
+
+    command :chmod, chmod_desc, [:range, :marketplaceid_list], :octet do
+        helper.perform_actions(args[0],options, "Permissions changed") do |obj|
+            obj.chmod_octet(args[1])
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists Marketplaces
+    EOT
+
+    command :list, list_desc, :options=>list_options do
+        helper.list_pool(options)
+    end
+
+    show_desc = <<-EOT.unindent
+        Shows Marketplace information
+    EOT
+
+    command :show, show_desc, :marketplaceid, :options=>OpenNebulaHelper::XML do
+        helper.show_resource(args[0],options)
+    end
+
+    update_desc = <<-EOT.unindent
+        Update the template contents. If a path is not provided the editor will
+        be launched to modify the current content.
+    EOT
+
+    command :update, update_desc, :marketplaceid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            obj.update(str, options[:append])
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Marketplace
+    EOT
+
+    command :rename, rename_desc, :marketplaceid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
+end
diff --git a/src/market/MarketPlace.cc b/src/market/MarketPlace.cc
index b30886b0ca..4b6ecf680c 100644
--- a/src/market/MarketPlace.cc
+++ b/src/market/MarketPlace.cc
@@ -43,10 +43,10 @@ MarketPlace::MarketPlace(
     const std::string&    uname,
     const std::string&    gname,
     int                   umask,
-    MarketPlaceTemplate*  mp_template):
+    MarketPlaceTemplate * mp_template):
         PoolObjectSQL(-1, MARKETPLACE, "", uid, gid, uname, gname, table),
         ObjectCollection("MARKETPLACEAPPS"),
-        mp_mad(""),
+        market_mad(""),
         type(IMAGE_MP),
         total_mb(0),
         free_mb(0),
@@ -86,9 +86,9 @@ int MarketPlace::insert(SqlDB *db, string& error_str)
 	//MarketPlacePool::allocate checks NAME
     erase_template_attribute("NAME", name);
 
-    get_template_attribute("MP_MAD", mp_mad);
+    erase_template_attribute("MARKET_MAD", market_mad);
 
-    if ( mp_mad.empty() == true )
+    if ( market_mad.empty() == true )
     {
         goto error_mad;
     }
@@ -102,17 +102,15 @@ int MarketPlace::insert(SqlDB *db, string& error_str)
 		goto error_type;
 	}
 
-    add_template_attribute("TYPE", type_to_str(type));
-
     //--------------------------------------------------------------------------
 
     return insert_replace(db, false, error_str);
 
 error_mad:
-    error_str = "No MarketPlace driver (MP_MAD) in template.";
+    error_str = "No marketplace driver (MARKET_MAD) in template.";
     goto error_common;
 error_type:
-	error_str = "Unknown MarketPlace type: " + s_mp_type;
+	error_str = "Unknown marketplace type: " + s_mp_type;
 	goto error_common;
 
 error_common:
@@ -183,7 +181,7 @@ error_xml:
     db->free_str(sql_name);
     db->free_str(sql_xml);
 
-    error_str = "Error transforming the MarketPlace to XML.";
+    error_str = "Error transforming the marketplace to XML.";
 
     goto error_common;
 
@@ -195,7 +193,7 @@ error_name:
     goto error_generic;
 
 error_generic:
-    error_str = "Error inserting MarketPlace in DB.";
+    error_str = "Error inserting marketplace in DB.";
 error_common:
     return -1;
 }
@@ -222,7 +220,8 @@ std::string& MarketPlace::to_xml(std::string& xml) const
 			"<UNAME>" << uname << "</UNAME>" <<
 			"<GNAME>" << gname << "</GNAME>" <<
 			"<NAME>"  << name  << "</NAME>"  <<
-			"<MP_MAD>"<< one_util::escape_xml(mp_mad) << "</MP_MAD>" <<
+            "<TYPE>"  << type  << "</TYPE>"  <<
+			"<MARKET_MAD>"<<one_util::escape_xml(market_mad)<<"</MARKET_MAD>"<<
 			"<TOTAL_MB>" << total_mb << "</TOTAL_MB>" <<
 			"<FREE_MB>"  << free_mb  << "</FREE_MB>"  <<
 			"<USED_MB>"  << used_mb  << "</USED_MB>"  <<
@@ -249,14 +248,15 @@ int MarketPlace::from_xml(const std::string &xml_str)
     update_from_str(xml_str);
 
     // ----- MARKETPLACE base attributes -----
-    rc += xpath(oid,    "/MARKETPLACE/ID",     -1);
-    rc += xpath(uid,    "/MARKETPLACE/UID",    -1);
-    rc += xpath(gid,    "/MARKETPLACE/GID",    -1);
-    rc += xpath(uname,  "/MARKETPLACE/UNAME",  "not_found");
-    rc += xpath(gname,  "/MARKETPLACE/GNAME",  "not_found");
-    rc += xpath(name,   "/MARKETPLACE/NAME",   "not_found");
-    rc += xpath(mp_mad, "/MARKETPLACE/MP_MAD", "not_found");
-    rc += xpath(itype,  "/MARKETPLACE/TYPE",   -1);
+    rc += xpath(oid,   "/MARKETPLACE/ID",    -1);
+    rc += xpath(uid,   "/MARKETPLACE/UID",   -1);
+    rc += xpath(gid,   "/MARKETPLACE/GID",   -1);
+    rc += xpath(uname, "/MARKETPLACE/UNAME", "not_found");
+    rc += xpath(gname, "/MARKETPLACE/GNAME", "not_found");
+    rc += xpath(name,  "/MARKETPLACE/NAME",  "not_found");
+    rc += xpath(itype, "/MARKETPLACE/TYPE",  -1);
+
+    rc += xpath(market_mad, "/MARKETPLACE/MARKET_MAD", "not_found");
 
     rc += xpath(total_mb, "/MARKETPLACE/TOTAL_MB", 0);
     rc += xpath(free_mb,  "/MARKETPLACE/FREE_MB",  0);
@@ -307,12 +307,12 @@ int MarketPlace::from_xml(const std::string &xml_str)
 int MarketPlace::post_update_template(string& error)
 {
 	std::string new_s_type;
-	std::string new_mp_mad;
+	std::string new_market_mad;
 
 	MarketPlaceType new_type;
 
 	// -------------------------------------------------------------------------
-    // Sanitize TYPE and MP_MAD attributes
+    // Sanitize TYPE and MARKET_MAD attributes
     // -------------------------------------------------------------------------
     erase_template_attribute("TYPE", new_s_type);
 
@@ -320,7 +320,7 @@ int MarketPlace::post_update_template(string& error)
 
 	if ( new_type == UNKNOWN )
 	{
-		error = "Unknown MarketPlace type: " + new_s_type;
+		error = "Unknown marketplace type: " + new_s_type;
 		return -1;
 	}
 
@@ -328,14 +328,14 @@ int MarketPlace::post_update_template(string& error)
 
     add_template_attribute("TYPE", type_to_str(type));
 
-    erase_template_attribute("MP_MAD", new_mp_mad);
+    erase_template_attribute("MARKET_MAD", new_market_mad);
 
-    if (!new_mp_mad.empty())
+    if (!new_market_mad.empty())
     {
-        mp_mad = new_mp_mad;
+        market_mad = new_market_mad;
     }
 
-    add_template_attribute("MP_MAD", mp_mad);
+    add_template_attribute("MARKET_MAD", market_mad);
 
 	return 0;
 }
diff --git a/src/market/MarketPlacePool.cc b/src/market/MarketPlacePool.cc
new file mode 100644
index 0000000000..e57f7423fe
--- /dev/null
+++ b/src/market/MarketPlacePool.cc
@@ -0,0 +1,73 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "MarketPlacePool.h"
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlacePool::allocate(
+        int                   uid,
+        int                   gid,
+        const std::string&    uname,
+        const std::string&    gname,
+        int                   umask,
+        MarketPlaceTemplate * mp_template,
+        int *                 oid,
+        std::string&          error_str)
+{
+    MarketPlace * mp;
+    MarketPlace * mp_aux = 0;
+
+    std::string name;
+
+    ostringstream oss;
+
+    mp = new MarketPlace(uid, gid, uname, gname, umask, mp_template);
+
+    // -------------------------------------------------------------------------
+    // Check name & duplicates
+    // -------------------------------------------------------------------------
+
+    mp->get_template_attribute("NAME", name);
+
+    if ( !PoolObjectSQL::name_is_valid(name, error_str) )
+    {
+        goto error_name;
+    }
+
+    mp_aux = get(name, false);
+
+    if( mp_aux != 0 )
+    {
+        goto error_duplicated;
+    }
+
+    *oid = PoolSQL::allocate(mp, error_str);
+
+    return *oid;
+
+error_duplicated:
+    oss << "NAME is already taken by MARKETPLACE " << mp_aux->get_oid() << ".";
+    error_str = oss.str();
+
+error_name:
+    delete mp;
+    *oid = -1;
+
+    return *oid;
+}
+
diff --git a/src/market/SConstruct b/src/market/SConstruct
index 145e4681a7..2bb765fc9e 100644
--- a/src/market/SConstruct
+++ b/src/market/SConstruct
@@ -22,7 +22,8 @@ lib_name='nebula_marketplace'
 
 # Sources to generate the library
 source_files=[
-    'MarketPlace.cc'
+    'MarketPlace.cc',
+    'MarketPlacePool.cc'
 ]
 
 # Build library
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index db18d4d736..465ec65bec 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -347,6 +347,7 @@ void Nebula::start(bool bootstrap_only)
             rc += GroupQuotas::bootstrap(db);
             rc += SecurityGroupPool::bootstrap(db);
             rc += VirtualRouterPool::bootstrap(db);
+            rc += MarketPlacePool::bootstrap(db);
 
             // Create the system tables only if bootstrap went well
             if (rc == 0)
@@ -493,6 +494,7 @@ void Nebula::start(bool bootstrap_only)
         zonepool= new ZonePool(db, is_federation_slave());
         vdcpool = new VdcPool(db, is_federation_slave());
         vrouterpool = new VirtualRouterPool(db);
+        mppool  = new MarketPlacePool(db);
 
         nebula_configuration->get("VM_HOOK", vm_hooks);
         nebula_configuration->get("HOST_HOOK",  host_hooks);
diff --git a/src/nebula/SConstruct b/src/nebula/SConstruct
index 15501fc88f..91f44ef7e4 100644
--- a/src/nebula/SConstruct
+++ b/src/nebula/SConstruct
@@ -65,6 +65,7 @@ env.Prepend(LIBS=[
     'nebula_secgroup',
     'nebula_vdc',
     'nebula_vrouter',
+    'nebula_marketplace',
     'crypto',
     'xml2'
 ])
diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb
index fae0ac63b2..f545391c6c 100644
--- a/src/oca/ruby/opennebula.rb
+++ b/src/oca/ruby/opennebula.rb
@@ -58,6 +58,8 @@ require 'opennebula/vdc_pool'
 require 'opennebula/system'
 require 'opennebula/virtual_router'
 require 'opennebula/virtual_router_pool'
+require 'opennebula/marketplace'
+require 'opennebula/marketplace_pool'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/opennebula/datastore_pool.rb b/src/oca/ruby/opennebula/datastore_pool.rb
index 3ea21a5b33..411759fb9b 100644
--- a/src/oca/ruby/opennebula/datastore_pool.rb
+++ b/src/oca/ruby/opennebula/datastore_pool.rb
@@ -36,9 +36,9 @@ module OpenNebula
             super('DATASTORE_POOL','DATASTORE',client)
         end
 
-        # Factory method to create User objects
+        # Factory method to create datastore objects
         def factory(element_xml)
-            OpenNebula::Group.new(element_xml,@client)
+            OpenNebula::Datastore.new(element_xml,@client)
         end
 
         #######################################################################
diff --git a/src/oca/ruby/opennebula/marketplace.rb b/src/oca/ruby/opennebula/marketplace.rb
new file mode 100644
index 0000000000..c0b6910f58
--- /dev/null
+++ b/src/oca/ruby/opennebula/marketplace.rb
@@ -0,0 +1,190 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'opennebula/pool_element'
+
+module OpenNebula
+    class MarketPlace < PoolElement
+        #######################################################################
+        # Constants and Class Methods
+        #######################################################################
+
+        MARKETPLACE_METHODS = {
+            :info       => "market.info",
+            :allocate   => "market.allocate",
+            :delete     => "market.delete",
+            :update     => "market.update",
+            :chown      => "market.chown",
+            :chmod      => "market.chmod",
+            :rename     => "market.rename"
+        }
+
+        MARKETPLACE_TYPES=%w{UNKNOWN IMAGE_MP VMTEMPLATE_MP FLOW_MP}
+
+        SHORT_MARKETPLACE_TYPES = {
+            "UNKNOWN"   => "unk",
+            "IMAGE_MP"     => "img",
+            "VMTEMPLATE_MP"=> "tpl",
+            "FLOW_MP"      => "flo"
+        }
+
+        # Creates a MarketPlace description with just its identifier
+        # this method should be used to create plain MarketPlace objects.
+        # +id+ the id of the user
+        #
+        # Example:
+        #   marketplace = MarketPlace.new(MarketPlace.build_xml(3),rpc_client)
+        #
+        def MarketPlace.build_xml(pe_id=nil)
+            if pe_id
+                marketplace_xml = "<MARKETPLACE><ID>#{pe_id}</ID></MARKETPLACE>"
+            else
+                marketplace_xml = "<MARKETPLACE></MARKETPLACE>"
+            end
+
+            XMLElement.build_xml(marketplace_xml,'MARKETPLACE')
+        end
+
+        # Class constructor
+        def initialize(xml, client)
+            super(xml,client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the MarketPlace Object
+        #######################################################################
+
+        # Retrieves the information of the given MarketPlace.
+        def info()
+            super(MARKETPLACE_METHODS[:info], 'MARKETPLACE')
+        end
+
+        alias_method :info!, :info
+
+        # Allocates a new MarketPlace in OpenNebula
+        #
+        # @param description [String] The template of the MarketPlace.
+        #
+        # @return [Integer, OpenNebula::Error] the new ID in case of
+        #   success, error otherwise
+        def allocate(description)
+            super(MARKETPLACE_METHODS[:allocate], description)
+        end
+
+        # Deletes the MarketPlace
+        def delete()
+            super(MARKETPLACE_METHODS[:delete])
+        end
+
+        # Replaces the template contents
+        #
+        # @param new_template [String] New template contents
+        # @param append [true, false] True to append new attributes instead of
+        #   replace the whole template
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def update(new_template, append=false)
+            super(MARKETPLACE_METHODS[:update], new_template, append ? 1 : 0)
+        end
+
+        # Changes the owner/group
+        #
+        # @param uid [Integer] the new owner id. Set to -1 to leave the current one
+        # @param gid [Integer] the new group id. Set to -1 to leave the current one
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chown(uid, gid)
+            super(MARKETPLACE_METHODS[:chown], uid, gid)
+        end
+
+        # Changes the marketplace permissions.
+        #
+        # @param octet [String] Permissions octed , e.g. 640
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod_octet(octet)
+            super(MARKETPLACE_METHODS[:chmod], octet)
+        end
+
+        # Changes the marketplace permissions.
+        # Each [Integer] argument must be 1 to allow, 0 deny, -1 do not change
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a)
+            super(MARKETPLACE_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
+                group_m, group_a, other_u, other_m, other_a)
+        end
+
+        # Renames this marketplace
+        #
+        # @param name [String] New name for the marketplace
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def rename(name)
+            return call(MARKETPLACE_METHODS[:rename], @pe_id, name)
+        end
+
+        # ---------------------------------------------------------------------
+        # Helpers to get information
+        # ---------------------------------------------------------------------
+
+        # Returns the marketplace type
+        def type
+            self['TYPE'].to_i
+        end
+
+        # Returns the marketplace type (string value)
+        def type_str
+            MARKETPLACE_TYPES[type]
+        end
+
+        # Returns the marketplace type (string value)
+        def short_type_str
+            SHORT_MARKETPLACE_TYPES[type_str]
+        end
+
+        # Returns the state of the marketplace (numeric value)
+        def state
+            self['STATE'].to_i
+        end
+
+        # Returns whether or not the marketplace app with id 'id' is part of
+        # this marketplace
+        def contains(id)
+            #This doesn't work in ruby 1.8.5
+            #return self["MARKETPLACE/MARKETPLACEAPPS/ID[.=#{uid}]"] != nil
+
+            id_array = retrieve_elements('MARKETPLACEAPPS/ID')
+            return id_array != nil && id_array.include?(uid.to_s)
+        end
+
+        # Returns an array with the numeric image ids
+        def marketapp_ids
+            array = Array.new
+
+            self.each("MARKETPLACEAPPS/ID") do |id|
+                array << id.text.to_i
+            end
+
+            return array
+        end
+    end
+end
diff --git a/src/oca/ruby/opennebula/marketplace_pool.rb b/src/oca/ruby/opennebula/marketplace_pool.rb
new file mode 100644
index 0000000000..06a26d5971
--- /dev/null
+++ b/src/oca/ruby/opennebula/marketplace_pool.rb
@@ -0,0 +1,55 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'opennebula/pool'
+
+module OpenNebula
+    class MarketPlacePool < Pool
+        #######################################################################
+        # Constants and Class attribute accessors
+        #######################################################################
+
+        MARKETPLACE_POOL_METHODS = {
+            :info => "marketpool.info"
+        }
+
+        #######################################################################
+        # Class constructor & Pool Methods
+        #######################################################################
+
+        # +client+ a Client object that represents a XML-RPC connection
+        def initialize(client)
+            super('MARKETPLACE_POOL','MARKETPLACE', client)
+        end
+
+        # Factory method to create MarketPlace objects
+        def factory(element_xml)
+            OpenNebula::MarketPlace.new(element_xml, @client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the User Object
+        #######################################################################
+
+        # Retrieves all the marketplace apps
+        def info()
+            super(MARKETPLACE_POOL_METHODS[:info])
+        end
+
+        alias_method :info!, :info
+    end
+end
diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index 38130da14e..adc66860fe 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -624,8 +624,8 @@ string Request::object_name(PoolObjectSQL::ObjectType ob)
             return "VDC";
         case PoolObjectSQL::VROUTER:
             return "virtual router";
-        default:
-            return "-";
+        case PoolObjectSQL::MARKETPLACE:
+            return "marketplace";
       }
 };
 
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index 9ab5bbce91..28a57fa80c 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -903,6 +903,51 @@ void RequestManager::register_xml_methods()
 
     RequestManagerRegistry.addMethod("one.vrouterpool.info",vrouter_pool_info);
 
+    /* MarketPlace related methods */
+
+    xmlrpc_c::method * market_allocate_pt;
+    xmlrpc_c::method * market_update_pt;
+    xmlrpc_c::method * market_delete_pt;
+    xmlrpc_c::method * market_chmod_pt;
+    xmlrpc_c::method * market_chown_pt;
+
+    if (nebula.is_federation_slave())
+    {
+        market_allocate_pt = new RequestManagerProxy("one.market.allocate");
+        market_update_pt   = new RequestManagerProxy("one.market.update");
+        market_delete_pt   = new RequestManagerProxy("one.market.delete");
+        market_chmod_pt    = new RequestManagerProxy("one.market.chmod");
+        market_chown_pt    = new RequestManagerProxy("one.market.chown");
+    }
+    else
+    {
+        market_allocate_pt = new MarketPlaceAllocate();
+        market_update_pt   = new MarketPlaceUpdateTemplate();
+        market_delete_pt   = new MarketPlaceDelete();
+        market_chmod_pt    = new MarketPlaceChmod();
+        market_chown_pt    = new MarketPlaceChown();
+    }
+
+    xmlrpc_c::methodPtr market_allocate(market_allocate_pt);
+    xmlrpc_c::methodPtr market_update(market_update_pt);
+    xmlrpc_c::methodPtr market_delete(market_delete_pt);
+    xmlrpc_c::methodPtr market_chmod(market_chmod_pt);
+    xmlrpc_c::methodPtr market_chown(market_chown_pt);
+
+    xmlrpc_c::methodPtr market_info(new MarketPlaceInfo());
+    xmlrpc_c::methodPtr market_rename(new MarketPlaceRename());
+    xmlrpc_c::methodPtr marketpool_info(new MarketPlacePoolInfo());
+
+    RequestManagerRegistry.addMethod("one.market.allocate", market_allocate);
+    RequestManagerRegistry.addMethod("one.market.update", market_update);
+    RequestManagerRegistry.addMethod("one.market.delete", market_delete);
+    RequestManagerRegistry.addMethod("one.market.chmod", market_chmod);
+    RequestManagerRegistry.addMethod("one.market.chown", market_chown);
+
+    RequestManagerRegistry.addMethod("one.market.info", market_info);
+    RequestManagerRegistry.addMethod("one.market.rename", market_rename);
+
+    RequestManagerRegistry.addMethod("one.marketpool.info", marketpool_info);
 
     /* System related methods */
     RequestManagerRegistry.addMethod("one.system.version", system_version);
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 133d6ce7ad..8cea628295 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -792,3 +792,21 @@ int VirtualRouterAllocate::pool_allocate(
     return vrpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
         tmpl, &id, error_str);
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlaceAllocate::pool_allocate(
+        xmlrpc_c::paramList const&  paramList,
+        Template *                  tmpl,
+        int&                        id,
+        string&                     error_str,
+        RequestAttributes&          att)
+{
+    MarketPlacePool *     mppool = static_cast<MarketPlacePool *>(pool);
+    MarketPlaceTemplate * ttmpl  = static_cast<MarketPlaceTemplate *>(tmpl);
+
+    return mppool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
+        ttmpl, &id, error_str);
+}
+
diff --git a/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc
index 37480d8307..fb629bb8fb 100644
--- a/src/rm/RequestManagerPoolInfoFilter.cc
+++ b/src/rm/RequestManagerPoolInfoFilter.cc
@@ -551,3 +551,14 @@ void VdcPoolInfo::request_execute(
 {
     dump(att, ALL, -1, -1, "", "");
 }
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+void MarketPlacePoolInfo::request_execute(
+        xmlrpc_c::paramList const& paramList,
+        RequestAttributes& att)
+{
+    dump(att, ALL, -1, -1, "", "");
+}
+
diff --git a/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb b/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb
new file mode 100644
index 0000000000..c615b8c24d
--- /dev/null
+++ b/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb
@@ -0,0 +1,72 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'OpenNebulaJSON/JSONUtils'
+
+module OpenNebulaJSON
+    class MarketPlaceJSON < OpenNebula::MarketPlace
+        include JSONUtils
+
+        def create(template_json)
+            mp_hash = parse_json(template_json, 'marketplace')
+            if OpenNebula.is_error?(mp_hash)
+                return mp_hash
+            end
+
+            if ds_hash['marketplace_raw']
+                template = ds_hash['marketplace_raw']
+            else
+                template = template_to_str(ds_hash)
+            end
+
+            self.allocate(template)
+        end
+
+        def perform_action(template_json)
+            action_hash = parse_json(template_json, 'action')
+            if OpenNebula.is_error?(action_hash)
+                return action_hash
+            end
+
+            rc = case action_hash['perform']
+                 when "update"        then self.update(action_hash['params'])
+                 when "chown"         then self.chown(action_hash['params'])
+                 when "chmod"         then self.chmod_octet(action_hash['params'])
+                 when "rename"        then self.rename(action_hash['params'])
+                 else
+                     error_msg = "#{action_hash['perform']} action not " <<
+                         " available for this resource"
+                     OpenNebula::Error.new(error_msg)
+                 end
+        end
+
+        def update(params=Hash.new)
+            super(params['template_raw'])
+        end
+
+        def chown(params=Hash.new)
+            super(params['owner_id'].to_i,params['group_id'].to_i)
+        end
+
+        def chmod_octet(params=Hash.new)
+            super(params['octet'])
+        end
+
+        def rename(params=Hash.new)
+            super(params['name'])
+        end
+    end
+end

From a4aa7dc798dab22d6fc436be5adfa1dd9e987e8d Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sun, 6 Dec 2015 01:25:37 +0100
Subject: [PATCH 011/197] feature #4217: Add MarketPlace to acl rules

---
 src/acl/AclRule.cc                                  | 10 ++++++----
 src/cli/etc/oneacl.yaml                             |  6 +++---
 src/cli/one_helper/oneacl_helper.rb                 | 10 ++++++----
 src/oca/java/src/org/opennebula/client/acl/Acl.java |  1 +
 src/oca/ruby/opennebula/acl.rb                      |  5 ++++-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/acl/AclRule.cc b/src/acl/AclRule.cc
index f3cc487266..7b5075389e 100644
--- a/src/acl/AclRule.cc
+++ b/src/acl/AclRule.cc
@@ -28,7 +28,7 @@ const long long AclRule::CLUSTER_ID     = 0x0000000800000000LL;
 
 const long long AclRule::NONE_ID        = 0x1000000000000000LL;
 
-const int AclRule::num_pool_objects = 14;
+const int AclRule::num_pool_objects = 15;
 const PoolObjectSQL::ObjectType AclRule::pool_objects[] = {
             PoolObjectSQL::VM,
             PoolObjectSQL::HOST,
@@ -43,7 +43,8 @@ const PoolObjectSQL::ObjectType AclRule::pool_objects[] = {
             PoolObjectSQL::ZONE,
             PoolObjectSQL::SECGROUP,
             PoolObjectSQL::VDC,
-            PoolObjectSQL::VROUTER
+            PoolObjectSQL::VROUTER,
+            PoolObjectSQL::MARKETPLACE
 };
 
 const int AclRule::num_auth_operations = 4;
@@ -58,7 +59,8 @@ const long long AclRule::INVALID_CLUSTER_OBJECTS =
         PoolObjectSQL::VM | PoolObjectSQL::IMAGE | PoolObjectSQL::USER |
         PoolObjectSQL::TEMPLATE | PoolObjectSQL::GROUP | PoolObjectSQL::ACL |
         PoolObjectSQL::CLUSTER | PoolObjectSQL::DOCUMENT | PoolObjectSQL::ZONE |
-        PoolObjectSQL::SECGROUP | PoolObjectSQL::VDC | PoolObjectSQL::VROUTER;
+        PoolObjectSQL::SECGROUP | PoolObjectSQL::VDC | PoolObjectSQL::VROUTER |
+        PoolObjectSQL::MARKETPLACE;
 
 const long long AclRule::INVALID_GROUP_OBJECTS =
         PoolObjectSQL::HOST | PoolObjectSQL::GROUP | PoolObjectSQL::CLUSTER |
@@ -234,7 +236,7 @@ bool AclRule::malformed(string& error_str) const
         oss << "[resource] type is missing";
     }
 
-    if ( (resource & 0xFFF8000000000000LL) != 0 )
+    if ( (resource & 0xFFF0000000000000LL) != 0 )
     {
         if ( error )
         {
diff --git a/src/cli/etc/oneacl.yaml b/src/cli/etc/oneacl.yaml
index b860218bb7..7b0c0d6817 100644
--- a/src/cli/etc/oneacl.yaml
+++ b/src/cli/etc/oneacl.yaml
@@ -9,9 +9,9 @@
   :size: 8
   :right: true
 
-:RES_VHNIUTGDCOZSvR:
+:RES_VHNIUTGDCOZSvRM:
   :desc: Which resource the rule applies to
-  :size: 18
+  :size: 19
 
 :RID:
   :desc: Resource ID
@@ -31,7 +31,7 @@
 :default:
 - :ID
 - :USER
-- :RES_VHNIUTGDCOZSvR
+- :RES_VHNIUTGDCOZSvRM
 - :RID
 - :OPE_UMAC
 - :ZONE
diff --git a/src/cli/one_helper/oneacl_helper.rb b/src/cli/one_helper/oneacl_helper.rb
index c3f868711b..8eec5727da 100644
--- a/src/cli/one_helper/oneacl_helper.rb
+++ b/src/cli/one_helper/oneacl_helper.rb
@@ -44,7 +44,7 @@ private
     def self.resource_mask(str)
         resource_type=str.split("/")[0]
 
-        mask = "--------------"
+        mask = "---------------"
 
         resource_type.split("+").each{|type|
             case type
@@ -76,6 +76,8 @@ private
                     mask[12] = "v"
                 when "VROUTER"
                     mask[13] = "R"
+                when "MARKETPLACE"
+                    mask[14] = "M"
             end
         }
         mask
@@ -115,8 +117,8 @@ private
                 d['STRING'].split(" ")[0]
             end
 
-            column :RES_VHNIUTGDCOZSvR, "Resource to which the rule applies",
-                            :size => 18 do |d|
+            column :RES_VHNIUTGDCOZSvRM, "Resource to which the rule applies",
+                            :size => 19 do |d|
                OneAclHelper::resource_mask d['STRING'].split(" ")[1]
             end
 
@@ -133,7 +135,7 @@ private
                 OneAclHelper::right_mask d['STRING'].split(" ")[2]
             end
 
-            default :ID, :USER, :RES_VHNIUTGDCOZSvR, :RID, :OPE_UMAC, :ZONE
+            default :ID, :USER, :RES_VHNIUTGDCOZSvRM, :RID, :OPE_UMAC, :ZONE
         end
 
         table
diff --git a/src/oca/java/src/org/opennebula/client/acl/Acl.java b/src/oca/java/src/org/opennebula/client/acl/Acl.java
index c4424662a0..acbb33672a 100644
--- a/src/oca/java/src/org/opennebula/client/acl/Acl.java
+++ b/src/oca/java/src/org/opennebula/client/acl/Acl.java
@@ -72,6 +72,7 @@ public class Acl extends PoolElement{
         tmpResources.put("SECGROUP" , 0x0001000000000000L);
         tmpResources.put("VDC"      , 0x0002000000000000L);
         tmpResources.put("VROUTER"  , 0x0004000000000000L);
+        tmpResources.put("MARKETPLACE", 0x0008000000000000L);
 
         RESOURCES = Collections.unmodifiableMap(tmpResources);
 
diff --git a/src/oca/ruby/opennebula/acl.rb b/src/oca/ruby/opennebula/acl.rb
index dc529453b0..6aa8fddb81 100644
--- a/src/oca/ruby/opennebula/acl.rb
+++ b/src/oca/ruby/opennebula/acl.rb
@@ -33,6 +33,8 @@ module OpenNebula
     #                  ACL
     #                  SECGROUP
     #                  VDC
+    #                  VROUTER
+    #                  MARKETPLACE
     #     RIGHTS    -> + separated list
     #                  USE
     #                  MANAGE
@@ -62,7 +64,8 @@ module OpenNebula
             "ZONE"          =>  0x800000000000,
             "SECGROUP"      => 0x1000000000000,
             "VDC"           => 0x2000000000000,
-            "VROUTER"       => 0x4000000000000
+            "VROUTER"       => 0x4000000000000,
+            "MARKETPLACE"   => 0x8000000000000
         }
 
         RIGHTS =

From 43a8034f52bcbb0f8b4d977b938382273d7e3ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 7 Dec 2015 17:02:09 +0100
Subject: [PATCH 012/197] Feature #4215: First version of a network topology
 tab

---
 src/sunstone/etc/sunstone-views/admin.yaml    |   6 +
 src/sunstone/public/app/main.js               |   6 +-
 .../public/app/tabs/vnets-topology-tab.js     | 359 ++++++++++++++++++
 .../app/tabs/vnets-topology-tab/html.hbs      |  17 +
 .../app/tabs/vnets-topology-tab/tabId.js      |  19 +
 src/sunstone/public/bower.json                |   3 +-
 6 files changed, 408 insertions(+), 2 deletions(-)
 create mode 100644 src/sunstone/public/app/tabs/vnets-topology-tab.js
 create mode 100644 src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs
 create mode 100644 src/sunstone/public/app/tabs/vnets-topology-tab/tabId.js

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index a6d4bb6663..73709ebbd9 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -16,6 +16,7 @@ enabled_tabs:
     - clusters-tab
     - hosts-tab
     - datastores-tab
+    - vnets-topology-tab
     - vnets-tab
     - secgroups-tab
     - vrouters-tab
@@ -375,6 +376,11 @@ tabs:
             Datastore.delete: true
             Datastore.enable: true
             Datastore.disable: true
+    vnets-topology-tab:
+        panel_tabs:
+        actions:
+            NetworkTopology.refresh: true
+            NetworkTopology.toggleVMs: true
     vnets-tab:
         panel_tabs:
             vnet_info_tab: true
diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js
index 60191f65ae..a415f40c5b 100644
--- a/src/sunstone/public/app/main.js
+++ b/src/sunstone/public/app/main.js
@@ -109,7 +109,10 @@ require.config({
     'spice-sha1': '../bower_components/spice-html5/thirdparty/sha1',
     'spice-ticket': '../bower_components/spice-html5/ticket',
     'spice-resize': '../bower_components/spice-html5/resize',
-    'spice-filexfer': '../bower_components/spice-html5/filexfer'
+    'spice-filexfer': '../bower_components/spice-html5/filexfer',
+
+    /* vis.js */
+    'vis': '../bower_components/vis/dist/vis'
   },
   shim: {
     /* Tabs */
@@ -131,6 +134,7 @@ require.config({
         'tabs/clusters-tab',
         'tabs/hosts-tab',
         'tabs/datastores-tab',
+        'tabs/vnets-topology-tab',
         'tabs/vnets-tab',
         'tabs/secgroups-tab',
         'tabs/vrouters-tab',
diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js
new file mode 100644
index 0000000000..1668a276ae
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js
@@ -0,0 +1,359 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Locale = require('utils/locale');
+  var Config = require('sunstone-config');
+  var Sunstone = require('sunstone');
+  var Notifier = require('utils/notifier');
+  var OpenNebula = require('opennebula');
+  var VNetUtils = require('tabs/vnets-tab/utils/common');
+
+
+  var Vis = require('vis');
+
+  var TemplateDashboard = require('hbs!./vnets-topology-tab/html');
+
+  var VNETS_TAB_ID = require('tabs/vnets-tab/tabId');
+
+  var VNETS_CREATE_FORM_PANEL_ID = require('tabs/vnets-tab/form-panels/create/formPanelId');
+
+  var _network;
+  var _vnetList;
+
+  var _buttons = {
+    "NetworkTopology.refresh" : {
+      type: "action",
+      layout: "refresh",
+      alwaysActive: true
+    },
+    "NetworkTopology.toggleVMs" : {
+      type: "action",
+      layout: "main",
+      text:  Locale.tr("Toggle VMs"),
+      alwaysActive: true
+    }
+  };
+
+  var _actions = {
+    "NetworkTopology.refresh" : {
+      type: "custom",
+      call: _refresh
+    },
+    "NetworkTopology.toggleVMs" : {
+      type: "custom",
+      call: _toggleVMs
+    }
+  };
+
+  var TAB_ID = require('./vnets-topology-tab/tabId');
+
+  var Tab = {
+    tabId: TAB_ID,
+    resource: 'NetworkTopology',
+    tabClass: "subTab",
+    parentTab: "infra-tab",
+    title: Locale.tr("Network Topology"),
+    listHeader: '<i class="fa fa-fw fa-sitemap"></i>&emsp;' + Locale.tr("Network Topology"),
+    buttons: _buttons,
+    actions: _actions,
+    content: _html()
+  };
+
+  return Tab;
+
+  function _html() {
+    return TemplateDashboard();
+  }
+
+  function _onShow() {
+  }
+
+  function _refresh() {
+
+    OpenNebula.Network.list({
+      timeout: true,
+      success: function (request, item_list) {
+
+        // TODO: naive way to request all the individual networks info. It might
+        // be better to use promises, or a Network.list with an 'extended' option
+
+        var vnetList = [];
+
+        var i = 0;
+
+        function _getVNet(index){
+          var vnetId = item_list[index].VNET.ID;
+
+          OpenNebula.Network.show({
+            data : {
+              id: vnetId
+            },
+            timeout:true,
+            success: function(request,info){
+              vnetList.push(info);
+
+              i += 1;
+              if (i == item_list.length){
+                _doTopology(vnetList);
+              } else {
+                _getVNet(i);
+              }
+            },
+            error: Notifier.onError
+          });
+        }
+
+        _getVNet(i);
+      },
+      error: Notifier.onError
+    });
+  }
+
+  function _doTopology(vnetList){
+    _vnetList = vnetList;
+
+    var nodes = [];
+    var edges = [];
+
+    // Aux object to keep track of duplicated nodes (vms/vr attached to 2 vnets)
+    var nodeIndex = {};
+
+    $.each(vnetList, function(i,element){
+      var vnet = element.VNET;
+      var vnetId = vnet.ID;
+
+      // VNet node
+      // ----------------
+
+      var vnetNodeId = "vnet"+vnetId;
+
+      var group = "vnet";
+
+      if (vnet.PARENT_NETWORK_ID.length > 0){
+        group = "reservation";
+
+        edges.push({from: "vnet"+vnet.PARENT_NETWORK_ID, to: vnetNodeId});
+      }
+
+      nodes.push({
+        id: vnetNodeId,
+        label: "VNet "+vnet.NAME,
+        group: group});
+
+      // VRouter nodes
+      // ----------------
+
+      var vrs = [];
+
+      if (vnet.VROUTERS.ID != undefined){
+        vrs = vnet.VROUTERS.ID;
+
+        if (!$.isArray(vrs)){
+          vrs = [vrs];
+        }
+      }
+
+      $.each(vrs, function(j,vr){
+        var nodeId = "vr"+vr;
+
+        if (!nodeIndex[nodeId]){
+          nodeIndex[nodeId] = true;
+          nodes.push({
+            id: nodeId,
+            label: "VR "+vr,
+            group: "vr"});
+        }
+
+        edges.push({from: vnetNodeId, to: nodeId});
+      });
+
+      // VM nodes
+      // ----------------
+
+      var vms = [];
+
+      var arList = VNetUtils.getARList(vnet);
+
+      for (var i=0; i<arList.length; i++){
+        var ar = arList[i];
+        var id = ar.AR_ID;
+
+        var leases = ar.LEASES.LEASE;
+
+        if (!leases) { //empty
+          continue;
+        } else if (leases.constructor != Array) { //>1 lease
+          leases = [leases];
+        }
+
+        for (var j=0; j<leases.length; j++){
+          var lease = leases[j];
+
+          if (lease.VM != undefined) { //used by a VM
+            var nodeId = "vm"+lease.VM;
+
+            if (!nodeIndex[nodeId]){
+              nodeIndex[nodeId] = true;
+              nodes.push({
+                id: nodeId,
+                label: "VM "+lease.VM,
+                group: "vm",
+                vnet: vnetId});
+
+              // vnetId is only set the first time a VM node is created,
+              // but we only use it to cluster VMs that belong to one VNet.
+              // So it doesn't matter if we don't store the rest of VNet IDs
+            }
+
+            var label = undefined;
+
+            // TODO: IPv6 IPs
+            if (lease.IP != undefined){
+              label = lease.IP;
+            }
+
+            edges.push({from: vnetNodeId, to: nodeId, label: label});
+          }
+
+          /*
+          else if (lease.VM == "-1") { //hold
+          } else  else if (lease.VNET != undefined) { //used by a VNET Reservation
+          } else {
+          }
+          */
+        }
+      }
+    });
+
+    // create a network
+    var container = document.getElementById('visgraph');
+
+    // provide the data in the vis format
+    var data = {
+        nodes: nodes,
+        edges: edges
+    };
+
+    var options = {
+      groups: {
+        vnet: {
+          shape: 'box',
+          color: '#cfcfcf'
+        },
+        reservation: {
+          shape: 'box',
+          color: '#cfcfcf'
+        },
+        vr: {
+          shape: 'circle',
+          color: '#999'
+        },
+        vm: {
+          shape: 'circle',
+          color: '#cfcfcf'
+        },
+        vmCluster: {
+          shape: 'circle',
+          color: '#cfcfcf'
+        }
+      },
+
+      edges: {
+        font: {
+          align: 'middle'
+        },
+        color: '#cfcfcf'
+      },
+
+      interaction: {
+        hover: true
+      },
+
+      layout: {
+        //randomSeed: 2,  // A fixed seed gives predictability to the layout
+
+        hierarchical: true
+      }
+    };
+
+    // Create the vis network
+    _network = new Vis.Network(container, data, options);
+
+    // Open a cluster on selection
+    _network.on("selectNode", function(params) {
+      if (params.nodes.length == 1 && _network.isCluster(params.nodes[0]) == true) {
+        _network.openCluster(params.nodes[0]);
+      }
+    });
+
+    // Open node resource on double click
+    _network.on("doubleClick", function(params) {
+      if (params.nodes.length == 1 && _network.isCluster(params.nodes[0]) == false) {
+        if ( params.nodes[0].match(/vm\d+/) ){
+          // TODO: this should be checked internally in showElement,
+          // but it won't work because of bug #4198
+
+          if (Config.isTabEnabled("vms-tab")){
+            Sunstone.showElement("vms-tab", "VM.show", params.nodes[0].split("vm")[1]);
+          }
+        } else if ( params.nodes[0].match(/vnet\d+/) ){
+          // TODO: this should be checked internally in showElement,
+          // but it won't work because of bug #4198
+
+          if (Config.isTabEnabled("vnets-tab")){
+            Sunstone.showElement("vnets-tab", "Network.show", params.nodes[0].split("vnet")[1]);
+          }
+        } else if ( params.nodes[0].match(/vr\d+/) ){
+          // TODO: this should be checked internally in showElement,
+          // but it won't work because of bug #4198
+
+          if (Config.isTabEnabled("vrouters-tab")){
+            Sunstone.showElement("vrouters-tab", "VirtualRouter.show", params.nodes[0].split("vr")[1]);
+          }
+        }
+      }
+    });
+  }
+
+  function _toggleVMs(){
+
+    // Clusters all VMs for each vnet, except those attached to more than one vnet
+    $.each(_vnetList, function(i,element){
+      var vnet = element.VNET;
+      var vnetId = vnet.ID;
+
+      var clusterOptionsByData = {
+        joinCondition:function(childOptions) {
+          return (childOptions.group == "vm" &&
+            childOptions.vnet == vnetId &&
+            childOptions.amountOfConnections == 1);
+        },
+        clusterNodeProperties: {
+          id:"vmCluster"+vnetId,
+          label: "VMs",
+          group: "vmCluster"
+        },
+        clusterEdgeProperties: {
+          label: ''
+        }
+      };
+
+      _network.cluster(clusterOptionsByData);
+    });
+  }
+
+});
diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs b/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs
new file mode 100644
index 0000000000..c708cb0625
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs
@@ -0,0 +1,17 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<div id="visgraph" style="width: 100%;height: 600px;"></div>
diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab/tabId.js b/src/sunstone/public/app/tabs/vnets-topology-tab/tabId.js
new file mode 100644
index 0000000000..b2aa76cca8
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab/tabId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  return 'vnets-topology-tab';
+});
diff --git a/src/sunstone/public/bower.json b/src/sunstone/public/bower.json
index 9ac2a6d92f..2003bd2242 100644
--- a/src/sunstone/public/bower.json
+++ b/src/sunstone/public/bower.json
@@ -22,7 +22,8 @@
     "requirejs": "2.1.17",
     "almond": "0.3.1",
     "datatables": "1.10.7",
-    "foundation": "5.5.2"
+    "foundation": "5.5.2",
+    "vis": "4.10.0"
   },
   "version": "4.14",
   "authors": [

From e958ed3c2dddb83c176244cac0d88a2913617bd4 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 10 Dec 2015 15:39:23 +0100
Subject: [PATCH 013/197] feature - : Remove unused update methods

---
 include/ClusterPool.h             |  9 ----
 include/DatastorePool.h           |  9 ----
 include/DocumentPool.h            | 12 ------
 include/GroupPool.h               |  2 +-
 include/ImagePool.h               | 10 -----
 include/PoolObjectSQL.h           | 70 ++++++++++++++++---------------
 include/SecurityGroupPool.h       |  6 ---
 include/UserPool.h                |  2 +-
 include/VMTemplatePool.h          | 12 ------
 include/VdcPool.h                 |  2 +-
 include/VirtualMachinePool.h      | 14 +++++--
 include/VirtualRouterPool.h       | 12 ------
 include/ZonePool.h                |  2 +-
 src/group/GroupPool.cc            |  4 +-
 src/secgroup/SecurityGroupPool.cc |  8 ----
 src/um/UserPool.cc                |  4 +-
 src/vdc/VdcPool.cc                |  4 +-
 src/zone/ZonePool.cc              |  4 +-
 18 files changed, 58 insertions(+), 128 deletions(-)

diff --git a/include/ClusterPool.h b/include/ClusterPool.h
index 049942bffc..0c15913dda 100644
--- a/include/ClusterPool.h
+++ b/include/ClusterPool.h
@@ -100,15 +100,6 @@ public:
         return name;
     };
 
-    /** Update a particular Cluster
-     *    @param user pointer to Cluster
-     *    @return 0 on success
-     */
-    int update(Cluster * cluster)
-    {
-        return cluster->update(db);
-    };
-
     /**
      *  Drops the Cluster from the data base. The object mutex SHOULD be
      *  locked.
diff --git a/include/DatastorePool.h b/include/DatastorePool.h
index 711236c37b..3fd2f189c2 100644
--- a/include/DatastorePool.h
+++ b/include/DatastorePool.h
@@ -135,15 +135,6 @@ public:
         return name;
     };
 
-    /** Update a particular Datastore
-     *    @param user pointer to Datastore
-     *    @return 0 on success
-     */
-    int update(Datastore * datastore)
-    {
-        return datastore->update(db);
-    };
-
     /**
      *  Drops the Datastore data in the data base. The object mutex SHOULD be
      *  locked.
diff --git a/include/DocumentPool.h b/include/DocumentPool.h
index faeb61ae40..ee5a5c223a 100644
--- a/include/DocumentPool.h
+++ b/include/DocumentPool.h
@@ -76,18 +76,6 @@ public:
         return static_cast<Document *>(PoolSQL::get(oid,lock));
     };
 
-    /**
-     *  Updates the object's data in the data base. The object mutex SHOULD be
-     *  locked.
-     *    @param objsql a pointer to the object
-     *
-     *    @return 0 on success.
-     */
-    int update(Document * document)
-    {
-        return document->update(db);
-    };
-
     /**
      *  Dumps the pool in XML format. A filter can be also added to the
      *  query
diff --git a/include/GroupPool.h b/include/GroupPool.h
index f2436a0912..9ff6b9ee38 100644
--- a/include/GroupPool.h
+++ b/include/GroupPool.h
@@ -118,7 +118,7 @@ public:
      *    @param user pointer to Group
      *    @return 0 on success
      */
-    int update(Group * group);
+    int update(PoolObjectSQL * objsql);
 
     /**
      * Update a particular Group's Quotas
diff --git a/include/ImagePool.h b/include/ImagePool.h
index 7e5b676342..a1994f06a6 100644
--- a/include/ImagePool.h
+++ b/include/ImagePool.h
@@ -115,16 +115,6 @@ public:
         return static_cast<Image *>(PoolSQL::get(name,uid,lock));
     };
 
-    /**
-     *  Update a particular Image
-     *    @param image pointer to Image
-     *    @return 0 on success
-     */
-    int update(Image * image)
-    {
-        return image->update(db);
-    };
-
     /**
      *  Bootstraps the database table(s) associated to the Image pool
      *    @return 0 on success
diff --git a/include/PoolObjectSQL.h b/include/PoolObjectSQL.h
index 460d326eba..ec4124d1b0 100644
--- a/include/PoolObjectSQL.h
+++ b/include/PoolObjectSQL.h
@@ -49,45 +49,47 @@ public:
      */
     enum ObjectType
     {
-        VM          = 0x0000001000000000LL,
-        HOST        = 0x0000002000000000LL,
-        NET         = 0x0000004000000000LL,
-        IMAGE       = 0x0000008000000000LL,
-        USER        = 0x0000010000000000LL,
-        TEMPLATE    = 0x0000020000000000LL,
-        GROUP       = 0x0000040000000000LL,
-        ACL         = 0x0000080000000000LL,
-        DATASTORE   = 0x0000100000000000LL,
-        CLUSTER     = 0x0000200000000000LL,
-        DOCUMENT    = 0x0000400000000000LL,
-        ZONE        = 0x0000800000000000LL,
-        SECGROUP    = 0x0001000000000000LL,
-        VDC         = 0x0002000000000000LL,
-        VROUTER     = 0x0004000000000000LL,
-        MARKETPLACE = 0x0008000000000000LL
+        VM             = 0x0000001000000000LL,
+        HOST           = 0x0000002000000000LL,
+        NET            = 0x0000004000000000LL,
+        IMAGE          = 0x0000008000000000LL,
+        USER           = 0x0000010000000000LL,
+        TEMPLATE       = 0x0000020000000000LL,
+        GROUP          = 0x0000040000000000LL,
+        ACL            = 0x0000080000000000LL,
+        DATASTORE      = 0x0000100000000000LL,
+        CLUSTER        = 0x0000200000000000LL,
+        DOCUMENT       = 0x0000400000000000LL,
+        ZONE           = 0x0000800000000000LL,
+        SECGROUP       = 0x0001000000000000LL,
+        VDC            = 0x0002000000000000LL,
+        VROUTER        = 0x0004000000000000LL,
+        MARKETPLACE    = 0x0008000000000000LL,
+        MARKETPLACEAPP = 0x0010000000000000LL
     };
 
     static string type_to_str(ObjectType ob)
     {
         switch (ob)
         {
-            case VM:          return "VM" ; break;
-            case HOST:        return "HOST" ; break;
-            case NET:         return "NET" ; break;
-            case IMAGE:       return "IMAGE" ; break;
-            case USER:        return "USER" ; break;
-            case TEMPLATE:    return "TEMPLATE" ; break;
-            case GROUP:       return "GROUP" ; break;
-            case ACL:         return "ACL" ; break;
-            case DATASTORE:   return "DATASTORE" ; break;
-            case CLUSTER:     return "CLUSTER" ; break;
-            case DOCUMENT:    return "DOCUMENT" ; break;
-            case ZONE:        return "ZONE" ; break;
-            case SECGROUP:    return "SECGROUP" ; break;
-            case VDC:         return "VDC" ; break;
-            case VROUTER:     return "VROUTER" ; break;
-            case MARKETPLACE: return "MARKETPLACE" ; break;
-            default:          return "";
+            case VM:             return "VM" ; break;
+            case HOST:           return "HOST" ; break;
+            case NET:            return "NET" ; break;
+            case IMAGE:          return "IMAGE" ; break;
+            case USER:           return "USER" ; break;
+            case TEMPLATE:       return "TEMPLATE" ; break;
+            case GROUP:          return "GROUP" ; break;
+            case ACL:            return "ACL" ; break;
+            case DATASTORE:      return "DATASTORE" ; break;
+            case CLUSTER:        return "CLUSTER" ; break;
+            case DOCUMENT:       return "DOCUMENT" ; break;
+            case ZONE:           return "ZONE" ; break;
+            case SECGROUP:       return "SECGROUP" ; break;
+            case VDC:            return "VDC" ; break;
+            case VROUTER:        return "VROUTER" ; break;
+            case MARKETPLACE:    return "MARKETPLACE" ; break;
+            case MARKETPLACEAPP: return "MARKETPLACEAPP" ; break;
+            default:             return "";
         }
     };
 
@@ -504,7 +506,7 @@ public:
      *  Generates a XML string for the template of the Object
      *    @param xml the string to store the XML description.
      */
-   string&  template_to_xml(string &xml) const
+    string& template_to_xml(string &xml) const
     {
         return obj_template->to_xml(xml);
     }
diff --git a/include/SecurityGroupPool.h b/include/SecurityGroupPool.h
index a4e96e34bc..2b6847b631 100644
--- a/include/SecurityGroupPool.h
+++ b/include/SecurityGroupPool.h
@@ -86,12 +86,6 @@ public:
         return static_cast<SecurityGroup *>(PoolSQL::get(name,uid,lock));
     };
 
-    /** Update a particular SecurityGroup
-     *    @param securitygroup pointer to SecurityGroup
-     *    @return 0 on success
-     */
-    int update(SecurityGroup * securitygroup);
-
     /**
      *  Bootstraps the database table(s) associated to the SecurityGroup pool
      *    @return 0 on success
diff --git a/include/UserPool.h b/include/UserPool.h
index b8ed1961c8..bd60a1f58e 100644
--- a/include/UserPool.h
+++ b/include/UserPool.h
@@ -114,7 +114,7 @@ public:
      *    @param user pointer to User
      *    @return 0 on success
      */
-    int update(User * user);
+    int update(PoolObjectSQL * objsql);
 
     /**
      * Update a particular User's Quotas
diff --git a/include/VMTemplatePool.h b/include/VMTemplatePool.h
index dc8bda90f8..cc43f94a04 100644
--- a/include/VMTemplatePool.h
+++ b/include/VMTemplatePool.h
@@ -81,18 +81,6 @@ public:
         return static_cast<VMTemplate *>(PoolSQL::get(name,uid,lock));
     };
 
-    /**
-     *  Updates the object's data in the data base. The object mutex SHOULD be
-     *  locked.
-     *    @param objsql a pointer to the object
-     *
-     *    @return 0 on success.
-     */
-    int update(VMTemplate * vm_template)
-    {
-        return vm_template->update(db);
-    };
-
     /**
      *  Dumps the pool in XML format. A filter can be also added to the
      *  query
diff --git a/include/VdcPool.h b/include/VdcPool.h
index 164f54c7d2..b16bbea558 100644
--- a/include/VdcPool.h
+++ b/include/VdcPool.h
@@ -90,7 +90,7 @@ public:
      *    @param vdc pointer to Vdc
      *    @return 0 on success
      */
-    int update(Vdc * vdc);
+    int update(PoolObjectSQL * objsql);
 
     /**
      *  Drops the Vdc from the data base. The object mutex SHOULD be
diff --git a/include/VirtualMachinePool.h b/include/VirtualMachinePool.h
index 1551e8054f..ad1c2df112 100644
--- a/include/VirtualMachinePool.h
+++ b/include/VirtualMachinePool.h
@@ -112,14 +112,20 @@ public:
      *
      *    @return 0 on success.
      */
-    virtual int update(
-        VirtualMachine * objsql)
+    virtual int update(PoolObjectSQL * objsql)
     {
+        VirtualMachine * vm = dynamic_cast<VirtualMachine *>(objsql);
+
+        if ( vm == 0 )
+        {
+            return -1;
+        }
+
         do_hooks(objsql, Hook::UPDATE);
 
-        objsql->set_prev_state();
+        vm->set_prev_state();
 
-        return objsql->update(db);
+        return vm->update(db);
     };
 
     /**
diff --git a/include/VirtualRouterPool.h b/include/VirtualRouterPool.h
index b43075b9d3..2821d1cd5f 100644
--- a/include/VirtualRouterPool.h
+++ b/include/VirtualRouterPool.h
@@ -88,18 +88,6 @@ public:
         return static_cast<VirtualRouter *>(PoolSQL::get(name,uid,lock));
     };
 
-    /**
-     *  Updates the object's data in the data base. The object mutex SHOULD be
-     *  locked.
-     *    @param objsql a pointer to the object
-     *
-     *    @return 0 on success.
-     */
-    int update(VirtualRouter * VirtualRouter)
-    {
-        return VirtualRouter->update(db);
-    };
-
     /**
      *  Dumps the pool in XML format. A filter can be also added to the
      *  query
diff --git a/include/ZonePool.h b/include/ZonePool.h
index 825242b3c5..512d6c9121 100644
--- a/include/ZonePool.h
+++ b/include/ZonePool.h
@@ -91,7 +91,7 @@ public:
      *    @param zone pointer to Zone
      *    @return 0 on success
      */
-    int update(Zone * zone);
+    int update(PoolObjectSQL * objsql);
 
     /**
      *  Drops the Zone from the data base. The object mutex SHOULD be
diff --git a/src/group/GroupPool.cc b/src/group/GroupPool.cc
index 53c451a607..9ebddfbe0a 100644
--- a/src/group/GroupPool.cc
+++ b/src/group/GroupPool.cc
@@ -144,7 +144,7 @@ error_name:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int GroupPool::update(Group * group)
+int GroupPool::update(PoolObjectSQL * objsql)
 {
     if (Nebula::instance().is_federation_slave())
     {
@@ -155,7 +155,7 @@ int GroupPool::update(Group * group)
         return -1;
     }
 
-    return group->update(db);
+    return PoolSQL::update(objsql);
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/secgroup/SecurityGroupPool.cc b/src/secgroup/SecurityGroupPool.cc
index 5b0b638549..15c15a0d76 100644
--- a/src/secgroup/SecurityGroupPool.cc
+++ b/src/secgroup/SecurityGroupPool.cc
@@ -133,11 +133,3 @@ error_name:
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
-
-int SecurityGroupPool::update(SecurityGroup * securitygroup)
-{
-    return securitygroup->update(db);
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
diff --git a/src/um/UserPool.cc b/src/um/UserPool.cc
index de9bec07c6..e2df07c883 100644
--- a/src/um/UserPool.cc
+++ b/src/um/UserPool.cc
@@ -399,7 +399,7 @@ int UserPool::drop(PoolObjectSQL * objsql, string& error_msg)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int UserPool::update(User * user)
+int UserPool::update(PoolObjectSQL * objsql)
 {
     if (Nebula::instance().is_federation_slave())
     {
@@ -410,7 +410,7 @@ int UserPool::update(User * user)
         return -1;
     }
 
-    return user->update(db);
+    return PoolSQL::update(objsql);
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/vdc/VdcPool.cc b/src/vdc/VdcPool.cc
index 4d789c7091..a2d5717250 100644
--- a/src/vdc/VdcPool.cc
+++ b/src/vdc/VdcPool.cc
@@ -149,7 +149,7 @@ error_name:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VdcPool::update(Vdc * vdc)
+int VdcPool::update(PoolObjectSQL * objsql)
 {
     if (Nebula::instance().is_federation_slave())
     {
@@ -160,7 +160,7 @@ int VdcPool::update(Vdc * vdc)
         return -1;
     }
 
-    return vdc->update(db);
+    return PoolSQL::update(objsql);
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/zone/ZonePool.cc b/src/zone/ZonePool.cc
index a53071d7f1..3e1d0848a7 100644
--- a/src/zone/ZonePool.cc
+++ b/src/zone/ZonePool.cc
@@ -158,7 +158,7 @@ error_name:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int ZonePool::update(Zone * zone)
+int ZonePool::update(PoolObjectSQL * objsql)
 {
     if (Nebula::instance().is_federation_slave())
     {
@@ -169,7 +169,7 @@ int ZonePool::update(Zone * zone)
         return -1;
     }
 
-    return zone->update(db);
+    return PoolSQL::update(objsql);
 }
 
 /* -------------------------------------------------------------------------- */

From 89599fda2e2149f5308f363ffb37e51a14da6927 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 10 Dec 2015 16:43:45 +0100
Subject: [PATCH 014/197] feature #4217: Add MarketPlaceApp pools and ACL rules

---
 include/MarketPlace.h                         |   8 +
 include/MarketPlaceApp.h                      | 210 +++++++++++
 include/MarketPlaceAppPool.h                  | 133 +++++++
 include/MarketPlaceAppTemplate.h              |  37 ++
 include/MarketPlacePool.h                     |  30 +-
 src/acl/AclRule.cc                            |  11 +-
 src/cli/etc/oneacl.yaml                       |   6 +-
 src/cli/one_helper/oneacl_helper.rb           |  10 +-
 src/market/MarketPlaceApp.cc                  | 338 ++++++++++++++++++
 src/market/MarketPlaceAppPool.cc              | 102 ++++++
 src/market/MarketPlacePool.cc                 |  45 ++-
 src/market/SConstruct                         |   4 +-
 .../src/org/opennebula/client/acl/Acl.java    |   3 +-
 src/oca/ruby/opennebula/acl.rb                |  32 +-
 src/rm/Request.cc                             |   2 +
 15 files changed, 916 insertions(+), 55 deletions(-)
 create mode 100644 include/MarketPlaceApp.h
 create mode 100644 include/MarketPlaceAppPool.h
 create mode 100644 include/MarketPlaceAppTemplate.h
 create mode 100644 src/market/MarketPlaceApp.cc
 create mode 100644 src/market/MarketPlaceAppPool.cc

diff --git a/include/MarketPlace.h b/include/MarketPlace.h
index da8630feb9..e1caee13e2 100644
--- a/include/MarketPlace.h
+++ b/include/MarketPlace.h
@@ -231,6 +231,14 @@ private:
         return insert_replace(db, true, error_str);
     }
 
+    /**
+     *  Factory method for marketplace templates
+     */
+    Template * get_new_template() const
+    {
+        return new MarketPlaceTemplate;
+    }
+
     /**
      * Child classes can process the new template set with replace_template or
      * append_template with this method
diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
new file mode 100644
index 0000000000..92ba1ff6cc
--- /dev/null
+++ b/include/MarketPlaceApp.h
@@ -0,0 +1,210 @@
+/* ------------------------------------------------------------------------ */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems              */
+/*                                                                          */
+/* 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.                                           */
+/* -------------------------------------------------------------------------*/
+
+#ifndef MARKETPLACEAPP_H_
+#define MARKETPLACEAPP_H_
+
+#include "PoolSQL.h"
+#include "ObjectCollection.h"
+#include "MarketPlaceAppTemplate.h"
+
+/**
+ *  The MarketPlaceApp class. It represents an abstract application for
+ *  OpenNebula objects (Image, VM Templates or Flows)
+ */
+class MarketPlaceApp : public PoolObjectSQL
+{
+public:
+    enum MarketPlaceAppState
+    {
+        INIT      = 0, /** < Initialization state */
+        READY     = 1, /** < Ready to use */
+        LOCKED    = 2, /** < Operation in process */
+        ERROR     = 3, /** < Error state the operation failed*/
+    };
+
+    /**
+     * Returns the string representation of an MarketplaceApp State
+     * @param state The state
+     * @return the string representation
+     */
+    static string state_to_str(MarketPlaceAppState state)
+    {
+        switch(state)
+        {
+            case INIT:   return "INIT";   break;
+            case READY:  return "READY";  break;
+            case LOCKED: return "LOCKED"; break;
+            case ERROR:  return "ERROR";  break;
+            default:     return "";
+        }
+    };
+
+
+    /**
+     * Function to print the MarketPlaceApp object into a string in XML format
+     *  @param xml the resulting XML string
+     *  @return a reference to the generated string
+     */
+    string& to_xml(std::string& xml) const;
+
+    /**
+     *  Rebuilds the object from an xml formatted string
+     *    @param xml_str The xml-formatted string
+     *
+     *    @return 0 on success, -1 otherwise
+     */
+    int from_xml(const std::string &xml_str);
+
+private:
+
+    friend class MarketPlaceAppPool;
+
+    // *************************************************************************
+    // MarketPlaceApp Attributes
+    // *************************************************************************
+    /**
+     *  Size of this app
+     */
+    std::string date;
+
+    /**
+     *  Source URL for the marketplace app
+     */
+    std::string source;
+
+    /**
+     *  Source URL for the marketplace app
+     */
+    std::string checksum;
+
+    /**
+     *  Size of this app
+     */
+    long long size_mb;
+
+    /**
+     *  Description of the App
+     */
+    std::string description;
+
+    /**
+     *  User sharing the app
+     */
+    std::string publisher;
+
+    /**
+     *  Version of the app
+     */
+    std::string version;
+
+    /**
+     * App template to import it
+     */
+    std::string apptemplate64;
+
+    /**
+     *  Marketplace ID that holds this app
+     */
+    int mp_id;
+
+    /**
+     *  Marketplace name
+     */
+    std::string mp_name;
+
+    /**
+     *  Marketplace App state
+     */
+    MarketPlaceAppState state;
+
+    /**
+     *  Origin of this App
+     */
+    std::string origin;
+
+    // *************************************************************************
+    // Constructor
+    // *************************************************************************
+    MarketPlaceApp(
+            int                     uid,
+            int                     gid,
+            const std::string&      uname,
+            const std::string&      gname,
+            int                     umask,
+            MarketPlaceAppTemplate* app_template);
+
+    virtual ~MarketPlaceApp();
+
+    // *************************************************************************
+    // DataBase implementation (Private)
+    // *************************************************************************
+
+    static const char * db_names;
+
+    static const char * db_bootstrap;
+
+    static const char * table;
+
+    /**
+     *  Execute an INSERT or REPLACE Sql query.
+     *    @param db The SQL DB
+     *    @param replace Execute an INSERT or a REPLACE
+     *    @param error_str Returns the error reason, if any
+     *    @return 0 one success
+     */
+    int insert_replace(SqlDB *db, bool replace, std::string& error_str);
+
+    /**
+     *  Bootstraps the database table(s) associated to the MarketPlace
+     *    @return 0 on success
+     */
+    static int bootstrap(SqlDB * db)
+    {
+        ostringstream oss(db_bootstrap);
+
+        return db->exec(oss);
+    };
+
+    /**
+     *  Writes the MarketPlace in the database.
+     *    @param db pointer to the db
+     *    @return 0 on success
+     */
+    int insert(SqlDB *db, std::string& error_str);
+
+    /**
+     *  Writes/updates the MarketPlace's data fields in the database.
+     *    @param db pointer to the db
+     *    @return 0 on success
+     */
+    int update(SqlDB *db)
+    {
+        std::string error_str;
+        return insert_replace(db, true, error_str);
+    }
+
+    /**
+     * Child classes can process the new template set with replace_template or
+     * append_template with this method
+     *    @param error string describing the error if any
+     *    @return 0 on success
+     */
+    int post_update_template(std::string& error);
+};
+
+#endif /*MARKETPLACEAPP_H*/
+
diff --git a/include/MarketPlaceAppPool.h b/include/MarketPlaceAppPool.h
new file mode 100644
index 0000000000..4eb859de94
--- /dev/null
+++ b/include/MarketPlaceAppPool.h
@@ -0,0 +1,133 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef MARKETPLACEAPP_POOL_H_
+#define MARKETPLACEAPP_POOL_H_
+
+#include "MarketPlaceApp.h"
+
+class SqlDB;
+
+class MarketPlaceAppPool : public PoolSQL
+{
+public:
+    MarketPlaceAppPool(SqlDB * db):PoolSQL(db,MarketPlaceApp::table,true,true){};
+
+    ~MarketPlaceAppPool(){};
+
+    /* ---------------------------------------------------------------------- */
+    /* Methods for DB management                                              */
+    /* ---------------------------------------------------------------------- */
+
+    /**
+     *  Allocates a new MarketPlaceApp, writing it in the pool database.
+     *    @param uid the user id of the MarketPlace owner
+     *    @param gid the id of the group this object is assigned to
+     *    @param uname name of the user
+     *    @param gname name of the group
+     *    @param umask permissions umask
+     *    @param apptemplate MarketPlaceApp definition template
+     *    @param mp_id of the MarketPlace to store de App
+     *    @param mp_name of the MarketPlace
+     *    @param origin an opaque string with the origin of the App. Used by
+     *    the MARKET_MAD.
+     *    @param oid the id assigned to the MarketPlace
+     *    @param error_str Returns the error reason, if any
+     *
+     *    @return the oid assigned to the object, -1 in case of failure
+     */
+    int allocate(
+            int                uid,
+            int                gid,
+            const std::string& uname,
+            const std::string& gname,
+            int                umask,
+            MarketPlaceAppTemplate * apptemplate,
+            int                mp_id,
+            const std::string& mp_name,
+            const std::string& origin,
+            int *              oid,
+            std::string&       error_str);
+
+    /**
+     *  Function to get a MarketPlaceApp from the pool
+     *    @param oid MarketPlaceApp unique id
+     *    @param lock locks the MarketPlaceApp mutex
+     *    @return a pointer to the MarketPlaceApp, 0 if not loaded
+     */
+    MarketPlaceApp * get(int oid, bool lock)
+    {
+        return static_cast<MarketPlaceApp *>(PoolSQL::get(oid,lock));
+    };
+
+    /**
+     *  Gets an object from the pool (if needed the object is loaded from the
+     *  database).
+     *   @param name of the object
+     *   @param uid id of owner
+     *   @param lock locks the object if true
+     *
+     *   @return a pointer to the object, 0 in case of failure
+     */
+    MarketPlaceApp * get(const std::string& name, int uid, bool lock)
+    {
+        return static_cast<MarketPlaceApp *>(PoolSQL::get(name, uid, lock));
+    };
+
+    /**
+     *  Bootstraps the database table(s) associated to the MarketPlace pool
+     *    @return 0 on success
+     */
+    static int bootstrap(SqlDB * _db)
+    {
+        return MarketPlaceApp::bootstrap(_db);
+    };
+
+    /**
+     *  Dumps the MarketPlace pool in XML format. A filter can be also added to
+     *  the query
+     *  @param oss the output stream to dump the pool contents
+     *  @param where filter for the objects, defaults to all
+     *  @param limit parameters used for pagination
+     *
+     *  @return 0 on success
+     */
+    int dump(std::ostringstream& oss, const std::string& where,
+		const std::string& limit)
+    {
+        return PoolSQL::dump(oss, "MARKETPLACEAPP_POOL", MarketPlaceApp::table,
+                where, limit);
+    };
+
+    /** Update a particular MarketPlaceApp
+     *    @param zone pointer to Zone
+     *    @return 0 on success
+     */
+    int update(PoolObjectSQL * objsql);
+
+private:
+
+    /**
+     *  Factory method to produce objects
+     *    @return a pointer to the new object
+     */
+    PoolObjectSQL * create()
+    {
+        return new MarketPlaceApp(-1,-1,"","", 0, 0);
+    };
+};
+
+#endif /*MARKETPLACE_POOL_H_*/
diff --git a/include/MarketPlaceAppTemplate.h b/include/MarketPlaceAppTemplate.h
new file mode 100644
index 0000000000..a91d961785
--- /dev/null
+++ b/include/MarketPlaceAppTemplate.h
@@ -0,0 +1,37 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef MARKETPLACEAPP_TEMPLATE_H_
+#define MARKETPLACEAPP_TEMPLATE_H_
+
+#include "Template.h"
+
+/**
+ *  Datastore Template class
+ */
+class MarketPlaceAppTemplate : public Template
+{
+public:
+    MarketPlaceAppTemplate():
+        Template(false,'=',"TEMPLATE"){};
+
+    ~MarketPlaceAppTemplate(){};
+};
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+#endif /*MARKETPLACEAPP_TEMPLATE_H_*/
diff --git a/include/MarketPlacePool.h b/include/MarketPlacePool.h
index 4119ba96d4..c95a4a39a7 100644
--- a/include/MarketPlacePool.h
+++ b/include/MarketPlacePool.h
@@ -95,40 +95,20 @@ public:
         return name;
     };
 
-    /** Update a particular MarketPlace
-     *    @param user pointer to MarketPlace
+    /** Update a particular MarketPlaceApp
+     *    @param zone pointer to Zone
      *    @return 0 on success
      */
-    int update(MarketPlace * mp)
-    {
-        return mp->update(db);
-    };
+    int update(PoolObjectSQL * objsql);
 
     /**
-     *  Drops the MarketPlac data in the data base. The object mutex SHOULD be
+     *  Drops the MarketPlace data in the data base. The object mutex SHOULD be
      *  locked.
      *    @param objsql a pointer to the MarketPlace object
      *    @param error_msg Error reason, if any
      *    @return 0 on success, -1 DB error -3 MarketPlace's App ID set not empty
      */
-    int drop(PoolObjectSQL * objsql, std::string& error_msg)
-	{
-		MarketPlace *mp  = static_cast<MarketPlace *>(objsql);
-
-    	if( mp->get_collection_size() > 0 )
-		{
-			std::ostringstream oss;
-
-			oss << "MarketPlace " << mp->get_oid() << " is not empty.";
-			error_msg = oss.str();
-
-			NebulaLog::log("MARKETPLACE", Log::ERROR, error_msg);
-
-			return -3;
-		}
-
-		return PoolSQL::drop(objsql, error_msg);
-	}
+    int drop(PoolObjectSQL * objsql, std::string& error_msg);
 
     /**
      *  Bootstraps the database table(s) associated to the MarketPlace pool
diff --git a/src/acl/AclRule.cc b/src/acl/AclRule.cc
index 7b5075389e..67a1b9cae1 100644
--- a/src/acl/AclRule.cc
+++ b/src/acl/AclRule.cc
@@ -28,7 +28,7 @@ const long long AclRule::CLUSTER_ID     = 0x0000000800000000LL;
 
 const long long AclRule::NONE_ID        = 0x1000000000000000LL;
 
-const int AclRule::num_pool_objects = 15;
+const int AclRule::num_pool_objects = 16;
 const PoolObjectSQL::ObjectType AclRule::pool_objects[] = {
             PoolObjectSQL::VM,
             PoolObjectSQL::HOST,
@@ -44,7 +44,8 @@ const PoolObjectSQL::ObjectType AclRule::pool_objects[] = {
             PoolObjectSQL::SECGROUP,
             PoolObjectSQL::VDC,
             PoolObjectSQL::VROUTER,
-            PoolObjectSQL::MARKETPLACE
+            PoolObjectSQL::MARKETPLACE,
+            PoolObjectSQL::MARKETPLACEAPP
 };
 
 const int AclRule::num_auth_operations = 4;
@@ -60,7 +61,7 @@ const long long AclRule::INVALID_CLUSTER_OBJECTS =
         PoolObjectSQL::TEMPLATE | PoolObjectSQL::GROUP | PoolObjectSQL::ACL |
         PoolObjectSQL::CLUSTER | PoolObjectSQL::DOCUMENT | PoolObjectSQL::ZONE |
         PoolObjectSQL::SECGROUP | PoolObjectSQL::VDC | PoolObjectSQL::VROUTER |
-        PoolObjectSQL::MARKETPLACE;
+        PoolObjectSQL::MARKETPLACE | PoolObjectSQL::MARKETPLACEAPP;
 
 const long long AclRule::INVALID_GROUP_OBJECTS =
         PoolObjectSQL::HOST | PoolObjectSQL::GROUP | PoolObjectSQL::CLUSTER |
@@ -225,7 +226,7 @@ bool AclRule::malformed(string& error_str) const
         oss << "when using the ALL bit, [resource] ID must be 0";
     }
 
-    if ( (resource & 0xFFFF000000000LL) == 0 )
+    if ( (resource & 0xFFFFFFF000000000LL) == 0 )
     {
         if ( error )
         {
@@ -236,7 +237,7 @@ bool AclRule::malformed(string& error_str) const
         oss << "[resource] type is missing";
     }
 
-    if ( (resource & 0xFFF0000000000000LL) != 0 )
+    if ( (resource & 0xFFE0000000000000LL) != 0 )
     {
         if ( error )
         {
diff --git a/src/cli/etc/oneacl.yaml b/src/cli/etc/oneacl.yaml
index 7b0c0d6817..f08817d68b 100644
--- a/src/cli/etc/oneacl.yaml
+++ b/src/cli/etc/oneacl.yaml
@@ -9,9 +9,9 @@
   :size: 8
   :right: true
 
-:RES_VHNIUTGDCOZSvRM:
+:RES_VHNIUTGDCOZSvRMA:
   :desc: Which resource the rule applies to
-  :size: 19
+  :size: 20
 
 :RID:
   :desc: Resource ID
@@ -31,7 +31,7 @@
 :default:
 - :ID
 - :USER
-- :RES_VHNIUTGDCOZSvRM
+- :RES_VHNIUTGDCOZSvRMA
 - :RID
 - :OPE_UMAC
 - :ZONE
diff --git a/src/cli/one_helper/oneacl_helper.rb b/src/cli/one_helper/oneacl_helper.rb
index 8eec5727da..c552c83628 100644
--- a/src/cli/one_helper/oneacl_helper.rb
+++ b/src/cli/one_helper/oneacl_helper.rb
@@ -44,7 +44,7 @@ private
     def self.resource_mask(str)
         resource_type=str.split("/")[0]
 
-        mask = "---------------"
+        mask = "----------------"
 
         resource_type.split("+").each{|type|
             case type
@@ -78,6 +78,8 @@ private
                     mask[13] = "R"
                 when "MARKETPLACE"
                     mask[14] = "M"
+                when "MARKETPLACEAPP"
+                    mask[15] = "A"
             end
         }
         mask
@@ -117,8 +119,8 @@ private
                 d['STRING'].split(" ")[0]
             end
 
-            column :RES_VHNIUTGDCOZSvRM, "Resource to which the rule applies",
-                            :size => 19 do |d|
+            column :RES_VHNIUTGDCOZSvRMA, "Resource to which the rule applies",
+                            :size => 20 do |d|
                OneAclHelper::resource_mask d['STRING'].split(" ")[1]
             end
 
@@ -135,7 +137,7 @@ private
                 OneAclHelper::right_mask d['STRING'].split(" ")[2]
             end
 
-            default :ID, :USER, :RES_VHNIUTGDCOZSvRM, :RID, :OPE_UMAC, :ZONE
+            default :ID, :USER, :RES_VHNIUTGDCOZSvRMA, :RID, :OPE_UMAC, :ZONE
         end
 
         table
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
new file mode 100644
index 0000000000..a2e163386a
--- /dev/null
+++ b/src/market/MarketPlaceApp.cc
@@ -0,0 +1,338 @@
+/* ------------------------------------------------------------------------ */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems              */
+/*                                                                          */
+/* 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.                                           */
+/* -------------------------------------------------------------------------*/
+
+#include <sstream>
+#include "MarketPlaceApp.h"
+#include "NebulaLog.h"
+#include "NebulaUtil.h"
+
+/* ************************************************************************ */
+/* MarketPlaceApp:: Database Definition                                     */
+/* ************************************************************************ */
+
+const char * MarketPlaceApp::table = "marketplaceapp_pool";
+
+const char * MarketPlaceApp::db_names =
+        "oid, name, body, uid, gid, owner_u, group_u, other_u";
+
+const char * MarketPlaceApp::db_bootstrap =
+    "CREATE TABLE IF NOT EXISTS marketplaceapp_pool (oid INTEGER PRIMARY KEY, "
+    "name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, "
+    "owner_u INTEGER, group_u INTEGER, other_u INTEGER, UNIQUE(name,uid))";
+
+/* ************************************************************************ */
+/* MarketPlaceApp:: Constructor / Destructor                                */
+/* ************************************************************************ */
+
+MarketPlaceApp::MarketPlaceApp(
+    int                      uid,
+    int                      gid,
+    const std::string&       uname,
+    const std::string&       gname,
+    int                      umask,
+    MarketPlaceAppTemplate * app_template):
+        PoolObjectSQL(-1, MARKETPLACEAPP, "", uid, gid, uname, gname, table),
+        source(""),
+        checksum(""),
+        size_mb(0),
+        description(""),
+        publisher(""),
+        version(""),
+        apptemplate64(""),
+        mp_id(-1),
+        mp_name(""),
+        state(INIT)
+{
+    if (app_template != 0)
+    {
+        obj_template = app_template;
+    }
+    else
+    {
+        obj_template = new MarketPlaceAppTemplate;
+    }
+
+    set_umask(umask);
+};
+
+MarketPlaceApp::~MarketPlaceApp()
+{
+    delete obj_template;
+};
+
+/* ************************************************************************ */
+/* MartketPlaceApp:: Database Access Functions                              */
+/* ************************************************************************ */
+
+int MarketPlaceApp::insert(SqlDB *db, string& error_str)
+{
+    std::ostringstream oss;
+
+    std::string attr;
+
+    char        str[26];
+    time_t      the_time = time(NULL);
+
+    // -------------------------------------------------------------------------
+    // Check default marketplace app attributes
+    // -------------------------------------------------------------------------
+
+	//MarketPlaceAppPool::allocate checks NAME
+    erase_template_attribute("NAME", name);
+
+    //Atrributes updated after export
+    remove_template_attribute("ORIGIN");
+    remove_template_attribute("SOURCE");
+    remove_template_attribute("SIZE");
+    remove_template_attribute("CHECKSUM");
+
+    ctime_r(&(the_time), str);
+    date = str;
+
+    //Known attributes
+    //DESCRIPTION
+    //APPTEMPLATE64
+    //PUBLISHER
+    //VERSION
+
+    get_template_attribute("DESCRIPTION", description);
+
+    get_template_attribute("APPTEMPLATE64", apptemplate64);
+
+    get_template_attribute("PUBLISHER", attr);
+
+    if (attr.empty())
+    {
+        publisher = uname;
+    }
+
+    get_template_attribute("VERSION", attr);
+
+    if (!attr.empty())
+    {
+        version = attr;
+    }
+
+    state = LOCKED;
+
+    //--------------------------------------------------------------------------
+
+    return insert_replace(db, false, error_str);
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+int MarketPlaceApp::insert_replace(SqlDB *db, bool replace, string& error_str)
+{
+    std::ostringstream   oss;
+
+    int rc;
+    std::string xml_body;
+
+    char * sql_name;
+    char * sql_xml;
+
+    sql_name = db->escape_str(name.c_str());
+
+    if ( sql_name == 0 )
+    {
+        goto error_name;
+    }
+
+    sql_xml = db->escape_str(to_xml(xml_body).c_str());
+
+    if ( sql_xml == 0 )
+    {
+        goto error_body;
+    }
+
+    if ( validate_xml(sql_xml) != 0 )
+    {
+        goto error_xml;
+    }
+
+    if ( replace )
+    {
+        oss << "REPLACE";
+    }
+    else
+    {
+        oss << "INSERT";
+    }
+
+    // Construct the SQL statement to Insert or Replace
+    oss <<" INTO "<<table <<" ("<< db_names <<") VALUES ("
+        <<          oid                 << ","
+        << "'" <<   sql_name            << "',"
+        << "'" <<   sql_xml             << "',"
+        <<          uid                 << ","
+        <<          gid                 << ","
+        <<          owner_u             << ","
+        <<          group_u             << ","
+        <<          other_u             << ")";
+
+    rc = db->exec(oss);
+
+    db->free_str(sql_name);
+    db->free_str(sql_xml);
+
+    return rc;
+
+error_xml:
+    db->free_str(sql_name);
+    db->free_str(sql_xml);
+
+    error_str = "Error transforming the marketplace app to XML.";
+
+    goto error_common;
+
+error_body:
+    db->free_str(sql_name);
+    goto error_generic;
+
+error_name:
+    goto error_generic;
+
+error_generic:
+    error_str = "Error inserting marketplace app in DB.";
+error_common:
+    return -1;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+/* *************************************************************************** */
+/* MartketPlaceApp :: Template Functions                                          */
+/* *************************************************************************** */
+std::string& MarketPlaceApp::to_xml(std::string& xml) const
+{
+	std::ostringstream oss;
+	std::string        template_xml;
+	std::string        perm_str;
+
+    oss << "<MARKETPLACEAPP>"
+			"<ID>"             << oid           << "</ID>"  <<
+			"<UID>"            << uid           << "</UID>" <<
+			"<GID>"            << gid           << "</GID>" <<
+			"<UNAME>"          << uname         << "</UNAME>" <<
+			"<GNAME>"          << gname         << "</GNAME>" <<
+			"<DATE>"           << date          << "</DATE>" <<
+			"<NAME>"           << name          << "</NAME>" <<
+            "<ORIGIN>"         << origin        << "</ORIGIN>" <<
+            "<SOURCE>"         << source        << "</SOURCE>" <<
+            "<CHECKSUM>"       << checksum      << "</CHECKSUM>" <<
+            "<SIZE>"           << size_mb       << "</SIZE>" <<
+            "<DESCRIPTION>"    << description   << "</DESCRIPTION>" <<
+            "<PUBLISHER>"      << publisher     << "</PUBLISHER>" <<
+            "<VERSION>"        << version       << "</VERSION>" <<
+            "<APPTEMPLATE64>"  << apptemplate64 << "</APPTEMPLATE64>" <<
+            "<MARKETPLACE_ID>" << mp_id        << "</MARKETPLACE_ID>" <<
+            "<MARKETPLACE>"    << mp_name       << "</MARKETPLACE>" <<
+            "<STATE>"          << state         << "</STATE>" <<
+			perms_to_xml(perm_str) <<
+			obj_template->to_xml(template_xml) <<
+        "</MARKETPLACEAPP>";
+
+    xml = oss.str();
+
+    return xml;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+int MarketPlaceApp::from_xml(const std::string &xml_str)
+{
+    int rc = 0;
+    int istate;
+    std::vector<xmlNodePtr> content;
+
+    // Initialize the internal XML object
+    update_from_str(xml_str);
+
+    // ----- MARKETPLACEAPP base attributes -----
+    rc += xpath(oid,          "/MARKETPLACEAPP/ID", -1);
+    rc += xpath(uid,          "/MARKETPLACEAPP/UID", -1);
+    rc += xpath(gid,          "/MARKETPLACEAPP/GID", -1);
+    rc += xpath(uname,        "/MARKETPLACEAPP/UNAME", "not_found");
+    rc += xpath(gname,        "/MARKETPLACEAPP/GNAME", "not_found");
+    rc += xpath(name,         "/MARKETPLACEAPP/NAME", "not_found");
+    rc += xpath(date,         "/MARKETPLACEAPP/DATE", "not_found");
+    rc += xpath(source,       "/MARKETPLACEAPP/SOURCE","not_found");
+    rc += xpath(origin,       "/MARKETPLACEAPP/ORIGIN","not_found");
+    rc += xpath(istate,       "/MARKETPLACEAPP/STATE", -1);
+    rc += xpath(description,  "/MARKETPLACEAPP/DESCRIPTION", "not_found");
+    rc += xpath(size_mb,      "/MARKETPLACEAPP/SIZE", -1);
+    rc += xpath(version,      "/MARKETPLACEAPP/VERSION", "not_found");
+    rc += xpath(checksum,     "/MARKETPLACEAPP/CHECKSUM", "not_found");
+    rc += xpath(publisher,    "/MARKETPLACEAPP/PUBLISHER", "not_found");
+    rc += xpath(apptemplate64,"/MARKETPLACEAPP/APPTEMPLATE64", "not_found");
+    rc += xpath(mp_name,      "/MARKETPLACEAPP/MARKETPLACE", "not_found");
+    rc += xpath(mp_id,        "/MARKETPLACEAPP/MARKETPLACE_ID", -1);
+
+    state = static_cast<MarketPlaceAppState>(istate);
+
+	// ----- Permissions -----
+    rc += perms_from_xml();
+
+	// ----- TEMPLATE -----
+    ObjectXML::get_nodes("/MARKETPLACEAPP/TEMPLATE", content);
+
+    if (content.empty())
+    {
+        return -1;
+    }
+
+    rc += obj_template->from_xml_node(content[0]);
+
+    ObjectXML::free_nodes(content);
+
+    if (rc != 0)
+    {
+        return -1;
+    }
+
+    return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+int MarketPlaceApp::post_update_template(string& error)
+{
+	std::string n_description;
+	std::string n_apptemplate64;
+	std::string n_publisher;
+	std::string n_version;
+
+	// -------------------------------------------------------------------------
+    // Update well known attributes
+    // -------------------------------------------------------------------------
+    get_template_attribute("DESCRIPTION",   n_description);
+    get_template_attribute("APPTEMPLATE64", n_apptemplate64);
+    get_template_attribute("PUBLISHER",     n_publisher);
+    get_template_attribute("VERSION",       n_version);
+
+    description   = n_description;
+    apptemplate64 = n_apptemplate64;
+    publisher     = n_publisher;
+    version       = n_version;
+
+	return 0;
+}
+
diff --git a/src/market/MarketPlaceAppPool.cc b/src/market/MarketPlaceAppPool.cc
new file mode 100644
index 0000000000..4b798c576d
--- /dev/null
+++ b/src/market/MarketPlaceAppPool.cc
@@ -0,0 +1,102 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "MarketPlaceAppPool.h"
+#include "Nebula.h"
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlaceAppPool:: allocate(
+            int                uid,
+            int                gid,
+            const std::string& uname,
+            const std::string& gname,
+            int                umask,
+            MarketPlaceAppTemplate * apptemplate,
+            int                mp_id,
+            const std::string& mp_name,
+            const std::string& origin,
+            int *              oid,
+            std::string&       error_str)
+{
+    MarketPlaceApp * mp;
+    MarketPlaceApp * mp_aux = 0;
+
+    std::string name;
+
+    std::ostringstream oss;
+
+    mp = new MarketPlaceApp(uid, gid, uname, gname, umask, apptemplate);
+
+    mp->mp_id   = mp_id;
+    mp->mp_name = mp_name;
+    mp->state   = MarketPlaceApp::INIT;
+    mp->origin  = origin;
+
+    // -------------------------------------------------------------------------
+    // Check name & duplicates
+    // -------------------------------------------------------------------------
+
+    mp->get_template_attribute("NAME", name);
+
+    if ( !PoolObjectSQL::name_is_valid(name, error_str) )
+    {
+        goto error_name;
+    }
+
+    mp_aux = get(name, uid, false);
+
+    if( mp_aux != 0 )
+    {
+        goto error_duplicated;
+    }
+
+    *oid = PoolSQL::allocate(mp, error_str);
+
+    return *oid;
+
+error_duplicated:
+    oss << "NAME is already taken by MARKETPLACEAPP " << mp_aux->get_oid();
+    error_str = oss.str();
+
+error_name:
+    delete mp;
+    *oid = -1;
+
+    return *oid;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlaceAppPool::update(PoolObjectSQL * objsql)
+{
+    if (Nebula::instance().is_federation_slave())
+    {
+        NebulaLog::log("ONE",Log::ERROR,
+                "MarketPlaceAppPool::update called, but this "
+                "OpenNebula is a federation slave");
+
+        return -1;
+    }
+
+    return PoolSQL::update(objsql);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
diff --git a/src/market/MarketPlacePool.cc b/src/market/MarketPlacePool.cc
index e57f7423fe..512c2f547d 100644
--- a/src/market/MarketPlacePool.cc
+++ b/src/market/MarketPlacePool.cc
@@ -15,6 +15,7 @@
 /* -------------------------------------------------------------------------- */
 
 #include "MarketPlacePool.h"
+#include "Nebula.h"
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -61,7 +62,7 @@ int MarketPlacePool::allocate(
     return *oid;
 
 error_duplicated:
-    oss << "NAME is already taken by MARKETPLACE " << mp_aux->get_oid() << ".";
+    oss << "NAME is already taken by MARKETPLACE " << mp_aux->get_oid();
     error_str = oss.str();
 
 error_name:
@@ -71,3 +72,45 @@ error_name:
     return *oid;
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlacePool::drop(PoolObjectSQL * objsql, std::string& error_msg)
+{
+    MarketPlace *mp  = static_cast<MarketPlace *>(objsql);
+
+    if( mp->get_collection_size() > 0 )
+    {
+        std::ostringstream oss;
+
+        oss << "MarketPlace " << mp->get_oid() << " is not empty.";
+        error_msg = oss.str();
+
+        NebulaLog::log("MARKETPLACE", Log::ERROR, error_msg);
+
+        return -3;
+    }
+
+    return PoolSQL::drop(objsql, error_msg);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlacePool::update(PoolObjectSQL * objsql)
+{
+    if (Nebula::instance().is_federation_slave())
+    {
+        NebulaLog::log("ONE",Log::ERROR,
+                "MarketPlacePool::update called, but this "
+                "OpenNebula is a federation slave");
+
+        return -1;
+    }
+
+    return PoolSQL::update(objsql);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
diff --git a/src/market/SConstruct b/src/market/SConstruct
index 2bb765fc9e..5f5ebd67da 100644
--- a/src/market/SConstruct
+++ b/src/market/SConstruct
@@ -23,7 +23,9 @@ lib_name='nebula_marketplace'
 # Sources to generate the library
 source_files=[
     'MarketPlace.cc',
-    'MarketPlacePool.cc'
+    'MarketPlacePool.cc',
+    'MarketPlaceApp.cc',
+    'MarketPlaceAppPool.cc'
 ]
 
 # Build library
diff --git a/src/oca/java/src/org/opennebula/client/acl/Acl.java b/src/oca/java/src/org/opennebula/client/acl/Acl.java
index acbb33672a..682b09fa3e 100644
--- a/src/oca/java/src/org/opennebula/client/acl/Acl.java
+++ b/src/oca/java/src/org/opennebula/client/acl/Acl.java
@@ -72,7 +72,8 @@ public class Acl extends PoolElement{
         tmpResources.put("SECGROUP" , 0x0001000000000000L);
         tmpResources.put("VDC"      , 0x0002000000000000L);
         tmpResources.put("VROUTER"  , 0x0004000000000000L);
-        tmpResources.put("MARKETPLACE", 0x0008000000000000L);
+        tmpResources.put("MARKETPLACE",    0x0008000000000000L);
+        tmpResources.put("MARKETPLACEAPP", 0x0010000000000000L);
 
         RESOURCES = Collections.unmodifiableMap(tmpResources);
 
diff --git a/src/oca/ruby/opennebula/acl.rb b/src/oca/ruby/opennebula/acl.rb
index 6aa8fddb81..3ce77198e5 100644
--- a/src/oca/ruby/opennebula/acl.rb
+++ b/src/oca/ruby/opennebula/acl.rb
@@ -35,6 +35,7 @@ module OpenNebula
     #                  VDC
     #                  VROUTER
     #                  MARKETPLACE
+    #                  MARKETPLACEAPP
     #     RIGHTS    -> + separated list
     #                  USE
     #                  MANAGE
@@ -51,21 +52,22 @@ module OpenNebula
 
         RESOURCES =
         {
-            "VM"            =>    0x1000000000,
-            "HOST"          =>    0x2000000000,
-            "NET"           =>    0x4000000000,
-            "IMAGE"         =>    0x8000000000,
-            "USER"          =>   0x10000000000,
-            "TEMPLATE"      =>   0x20000000000,
-            "GROUP"         =>   0x40000000000,
-            "DATASTORE"     =>  0x100000000000,
-            "CLUSTER"       =>  0x200000000000,
-            "DOCUMENT"      =>  0x400000000000,
-            "ZONE"          =>  0x800000000000,
-            "SECGROUP"      => 0x1000000000000,
-            "VDC"           => 0x2000000000000,
-            "VROUTER"       => 0x4000000000000,
-            "MARKETPLACE"   => 0x8000000000000
+            "VM"            =>     0x1000000000,
+            "HOST"          =>     0x2000000000,
+            "NET"           =>     0x4000000000,
+            "IMAGE"         =>     0x8000000000,
+            "USER"          =>    0x10000000000,
+            "TEMPLATE"      =>    0x20000000000,
+            "GROUP"         =>    0x40000000000,
+            "DATASTORE"     =>   0x100000000000,
+            "CLUSTER"       =>   0x200000000000,
+            "DOCUMENT"      =>   0x400000000000,
+            "ZONE"          =>   0x800000000000,
+            "SECGROUP"      =>  0x1000000000000,
+            "VDC"           =>  0x2000000000000,
+            "VROUTER"       =>  0x4000000000000,
+            "MARKETPLACE"   =>  0x8000000000000,
+            "MARKETPLACEAPP"=> 0x10000000000000
         }
 
         RIGHTS =
diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index adc66860fe..3075da89e4 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -626,6 +626,8 @@ string Request::object_name(PoolObjectSQL::ObjectType ob)
             return "virtual router";
         case PoolObjectSQL::MARKETPLACE:
             return "marketplace";
+        case PoolObjectSQL::MARKETPLACEAPP:
+            return "marketplaceapp";
       }
 };
 

From 3991404826cb21e36cd8d29dc7e78ff209714f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 11 Dec 2015 11:45:34 +0100
Subject: [PATCH 015/197] Feature #4215: VRs now have a collection of VM IDs

---
 include/VirtualRouter.h                       | 12 +--
 src/cli/etc/onevrouter.yaml                   |  5 --
 src/cli/one_helper/onevrouter_helper.rb       | 14 +--
 src/oca/ruby/opennebula/virtual_router.rb     | 11 +++
 src/rm/RequestManagerVMTemplate.cc            |  9 +-
 src/sunstone/etc/sunstone-views/admin.yaml    |  8 +-
 .../etc/sunstone-views/admin_vcenter.yaml     |  8 +-
 src/sunstone/etc/sunstone-views/user.yaml     |  8 +-
 src/sunstone/public/app/tabs/vrouters-tab.js  |  3 +-
 .../public/app/tabs/vrouters-tab/datatable.js |  4 +-
 .../app/tabs/vrouters-tab/panels/info.js      |  7 --
 .../tabs/vrouters-tab/panels/info/html.hbs    | 10 ---
 .../app/tabs/vrouters-tab/panels/vms.js       | 88 +++++++++++++++++++
 .../tabs/vrouters-tab/panels/vms/panelId.js   | 19 ++++
 src/vrouter/VirtualRouter.cc                  | 19 +++-
 15 files changed, 167 insertions(+), 58 deletions(-)
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/panels/vms.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/panels/vms/panelId.js

diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index 53146e29df..d9b613bdd9 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -19,6 +19,7 @@
 
 #include "PoolObjectSQL.h"
 #include "Template.h"
+#include "ObjectCollection.h"
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -37,14 +38,9 @@ public:
      */
     string& to_xml(string& xml) const;
 
-    int get_vmid()
+    int add_vmid(int vmid)
     {
-        return vmid;
-    }
-
-    void set_vmid(int vmid)
-    {
-        this->vmid = vmid;
+        return vms.add_collection_id(vmid);
     }
 
     // ------------------------------------------------------------------------
@@ -81,7 +77,7 @@ private:
     // Attributes
     // *************************************************************************
 
-    int vmid;
+    ObjectCollection vms;
 
     // *************************************************************************
     // DataBase implementation (Private)
diff --git a/src/cli/etc/onevrouter.yaml b/src/cli/etc/onevrouter.yaml
index 92404405d5..4ccb9028dc 100644
--- a/src/cli/etc/onevrouter.yaml
+++ b/src/cli/etc/onevrouter.yaml
@@ -3,10 +3,6 @@
   :desc: ONE identifier for the Virtual Router
   :size: 4
 
-:VMID:
-  :desc: VM associated with the Virtual Router
-  :size: 4
-
 :NAME:
   :desc: Name of the Virtual Router
   :size: 27
@@ -24,7 +20,6 @@
 
 :default:
 - :ID
-- :VMID
 - :USER
 - :GROUP
 - :NAME
diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb
index a2fbaf3804..098b3e80ed 100644
--- a/src/cli/one_helper/onevrouter_helper.rb
+++ b/src/cli/one_helper/onevrouter_helper.rb
@@ -52,10 +52,6 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
                 d["ID"]
             end
 
-            column :VMID, "VM associated with the Virtual Router", :size=>4 do |d|
-                d["VMID"]
-            end
-
             column :NAME, "Name of the Virtual Router", :left, :size=>27 do |d|
                 d["NAME"]
             end
@@ -69,7 +65,7 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
                 helper.group_name(d, options)
             end
 
-            default :ID, :VMID, :USER, :GROUP, :NAME
+            default :ID, :USER, :GROUP, :NAME
         end
 
         table
@@ -98,7 +94,6 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
             str_h1 % "VIRTUAL ROUTER #{obj['ID']} INFORMATION")
         puts str % ["ID", obj.id.to_s]
         puts str % ["NAME", obj.name]
-        puts str % ["VIRTUAL MACHINE", obj['VMID']]
         puts str % ["USER", obj['UNAME']]
         puts str % ["GROUP", obj['GNAME']]
         puts
@@ -117,5 +112,12 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
 
         CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
         puts obj.template_str
+
+        puts
+
+        CLIHelper.print_header("%-15s" % "VIRTUAL MACHINES")
+        obj.vm_ids.each do |id|
+            puts "%-15s" % [id]
+        end
     end
 end
diff --git a/src/oca/ruby/opennebula/virtual_router.rb b/src/oca/ruby/opennebula/virtual_router.rb
index e3b9829c3a..fb6f11970d 100644
--- a/src/oca/ruby/opennebula/virtual_router.rb
+++ b/src/oca/ruby/opennebula/virtual_router.rb
@@ -163,5 +163,16 @@ module OpenNebula
         def owner_id
             self['UID'].to_i
         end
+
+        # Returns an array with the numeric VM ids
+        def vm_ids
+            array = Array.new
+
+            self.each("VMS/ID") do |id|
+                array << id.text.to_i
+            end
+
+            return array
+        end
     end
 end
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index 606daeadaa..b3d0afefc7 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -140,6 +140,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
     // Temporary code to create Virtual Routers from regular VM Templates
 
     bool    is_vrouter;
+    bool    has_vrouter_id;
     int     vrid;
     string  vr_error_str;
 
@@ -147,7 +148,9 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     tmpl->get("VROUTER", is_vrouter);
 
-    if (is_vrouter)
+    has_vrouter_id = tmpl->get("VROUTER_ID", vrid);
+
+    if (is_vrouter && !has_vrouter_id)
     {
         Template * vr_tmpl = new Template;
 
@@ -222,7 +225,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     //--------------------------------------------------------------------------
     // Temporary code to create Virtual Routers from regular VM Templates
-    // Final code would need roolback to delete the new VR on error
+    // Final code would need rollback to delete the new VR on error
 
     VirtualRouter *  vr;
 
@@ -230,7 +233,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     if (vr != 0)
     {
-        vr->set_vmid(vid);
+        vr->add_vmid(vid);
 
         vrpool->update(vr);
 
diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 73709ebbd9..06e9fa6c2d 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -437,13 +437,13 @@ tabs:
     vrouters-tab:
         panel_tabs:
             virtual_router_info_tab: true
+            virtual_router_vms_tab: true
         table_columns:
             - 0         # Checkbox
             - 1         # ID
-            - 2         # VMID
-            - 3         # Owner
-            - 4         # Group
-            - 5         # Name
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index c01cccf4c2..488a67b080 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -431,13 +431,13 @@ tabs:
     vrouters-tab:
         panel_tabs:
             virtual_router_info_tab: true
+            virtual_router_vms_tab: true
         table_columns:
             - 0         # Checkbox
             - 1         # ID
-            - 2         # VMID
-            - 3         # Owner
-            - 4         # Group
-            - 5         # Name
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 4d820d9016..6ba2462f11 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -432,13 +432,13 @@ tabs:
     vrouters-tab:
         panel_tabs:
             virtual_router_info_tab: true
+            virtual_router_vms_tab: true
         table_columns:
             - 0         # Checkbox
             - 1         # ID
-            - 2         # VMID
-            - 3         # Owner
-            - 4         # Group
-            - 5         # Name
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
diff --git a/src/sunstone/public/app/tabs/vrouters-tab.js b/src/sunstone/public/app/tabs/vrouters-tab.js
index f54e7e5e27..aac508e532 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab.js
@@ -28,7 +28,8 @@ define(function(require) {
   ];
 
   var _panels = [
-    require('./vrouters-tab/panels/info')
+    require('./vrouters-tab/panels/info'),
+    require('./vrouters-tab/panels/vms')
   ];
 
   var _panelsHooks = [
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
index edced70510..c9a6b79610 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
@@ -56,7 +56,6 @@ define(function(require) {
 
     this.columns = [
       Locale.tr("ID"),
-      Locale.tr("VMID"),
       Locale.tr("Owner"),
       Locale.tr("Group"),
       Locale.tr("Name")
@@ -64,7 +63,7 @@ define(function(require) {
 
     this.selectOptions = {
       "id_index": 1,
-      "name_index": 5,
+      "name_index": 4,
       "select_resource": Locale.tr("Please select a virtual router from the list"),
       "you_selected": Locale.tr("You selected the following virtual router:"),
       "select_resource_multiple": Locale.tr("Please select one or more virtual routers from the list"),
@@ -92,7 +91,6 @@ define(function(require) {
                              element.ID + '" name="selected_items" value="' +
                              element.ID + '"/>',
         element.ID,
-        element.VMID,
         element.UNAME,
         element.GNAME,
         element.NAME
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
index 877baf34ae..05a7baa90e 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
@@ -68,12 +68,6 @@ define(function(require) {
   function _html() {
     var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME);
 
-    var vmid = this.element.VMID;
-
-    if (vmid == "-1"){
-      vmid = undefined; // Change made to use {{#if vmid}} in handlebars
-    }
-
     var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
 
     // TODO: simplify interface?
@@ -87,7 +81,6 @@ define(function(require) {
     return TemplateInfo({
       'element': this.element,
       'renameTrHTML': renameTrHTML,
-      'vmid': vmid,
       'permissionsTableHTML': permissionsTableHTML,
       'templateTableHTML': templateTableHTML
     });
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
index c4846490f1..04f34b052e 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -28,16 +28,6 @@
           <td class="value_td" colspan="2">{{element.ID}}</td>
         </tr>
         {{{renameTrHTML}}}
-        <tr>
-          <td class="key_td">{{tr "VM ID"}}</td>
-          <td class="value_td" colspan="2">
-            {{#if vmid}}
-            <a class="vmid">{{vmid}}</a>
-            {{else}}
-            --
-            {{/if}}
-          </td>
-        </tr>
       </tbody>
     </table>
   </div>
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/vms.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/vms.js
new file mode 100644
index 0000000000..e3b87e5cfc
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/vms.js
@@ -0,0 +1,88 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  /*
+    DEPENDENCIES
+   */
+
+  var Locale = require('utils/locale');
+  var VMsTable = require('tabs/vms-tab/datatable');
+
+  /*
+    CONSTANTS
+   */
+
+  var PANEL_ID = require('./vms/panelId');
+  var VMS_TABLE_ID = PANEL_ID + "VMsTable";
+  var RESOURCE = "VirtualRouter";
+  var XML_ROOT = "VROUTER";
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Panel(info) {
+    this.title = Locale.tr("VMs");
+    this.icon = "fa-cloud";
+
+    this.element = info[XML_ROOT];
+
+    return this;
+  }
+
+  Panel.PANEL_ID = PANEL_ID;
+  Panel.prototype.html = _html;
+  Panel.prototype.setup = _setup;
+
+  return Panel;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _html() {
+    var vms = [];
+
+    if (this.element.VMS.ID != undefined){
+      vms = this.element.VMS.ID;
+
+      if (!$.isArray(vms)){
+        vms = [vms];
+      }
+    }
+
+    var opts = {
+      info: true,
+      select: true,
+      selectOptions: {
+        read_only: true,
+        fixed_ids: vms
+      }
+    };
+
+    this.vmsTable = new VMsTable(VMS_TABLE_ID, opts);
+
+    return this.vmsTable.dataTableHTML;
+  }
+
+  function _setup(context) {
+    this.vmsTable.initialize();
+    this.vmsTable.refreshResourceTableSelect();
+
+    return false;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/vms/panelId.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/vms/panelId.js
new file mode 100644
index 0000000000..3cac7cb55c
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/vms/panelId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'virtual_router_vms_tab';
+})
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index 0dc8c7f94b..a94584a0c1 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -28,7 +28,7 @@ VirtualRouter::VirtualRouter(   int             id,
                                 int             _umask,
                                 Template * _template_contents):
         PoolObjectSQL(id,VROUTER,"",_uid,_gid,_uname,_gname,table),
-        vmid(-1)
+        vms("VMS")
 {
     if (_template_contents != 0)
     {
@@ -189,6 +189,7 @@ string& VirtualRouter::to_xml(string& xml) const
 {
     ostringstream   oss;
     string          template_xml;
+    string          vm_collection_xml;
     string          perm_str;
 
     oss << "<VROUTER>"
@@ -198,8 +199,8 @@ string& VirtualRouter::to_xml(string& xml) const
             << "<UNAME>"    << uname      << "</UNAME>"
             << "<GNAME>"    << gname      << "</GNAME>"
             << "<NAME>"     << name       << "</NAME>"
-            << "<VMID>"     << vmid       << "</VMID>"
             << perms_to_xml(perm_str)
+            << vms.to_xml(vm_collection_xml)
             << obj_template->to_xml(template_xml)
         << "</VROUTER>";
 
@@ -226,12 +227,23 @@ int VirtualRouter::from_xml(const string& xml)
     rc += xpath(uname,      "/VROUTER/UNAME",   "not_found");
     rc += xpath(gname,      "/VROUTER/GNAME",   "not_found");
     rc += xpath(name,       "/VROUTER/NAME",    "not_found");
-    rc += xpath(vmid,       "/VROUTER/VMID",    -1);
 
     // Permissions
     rc += perms_from_xml();
 
     // Get associated classes
+    ObjectXML::get_nodes("/VROUTER/VMS", content);
+
+    if (content.empty())
+    {
+        return -1;
+    }
+
+    rc += vms.from_xml_node(content[0]);
+
+    ObjectXML::free_nodes(content);
+    content.clear();
+
     ObjectXML::get_nodes("/VROUTER/TEMPLATE", content);
 
     if (content.empty())
@@ -243,6 +255,7 @@ int VirtualRouter::from_xml(const string& xml)
     rc += obj_template->from_xml_node(content[0]);
 
     ObjectXML::free_nodes(content);
+    content.clear();
 
     if (rc != 0)
     {

From a4cf0cc387a099687fbc0eef4e79d418dac35cb6 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 11 Dec 2015 15:53:19 +0100
Subject: [PATCH 016/197] feautre #4217: API, OCA and command line tools for
 marketplace apps. Fix minor bugs

---
 include/MarketPlaceApp.h               | 40 +++++++++++++++++++---
 include/MarketPlaceAppPool.h           |  3 --
 include/MarketPlacePool.h              |  4 +--
 include/Nebula.h                       | 19 ++++++++---
 include/RequestManagerAllocate.h       | 38 ++++++++++++++++++++-
 include/RequestManagerChmod.h          | 21 +++++++++++-
 include/RequestManagerChown.h          | 25 +++++++++++++-
 include/RequestManagerDelete.h         | 19 ++++++++++-
 include/RequestManagerInfo.h           | 21 ++++++++++--
 include/RequestManagerPoolInfoFilter.h | 23 +++++++++++--
 include/RequestManagerRename.h         | 28 ++++++++++++++--
 include/RequestManagerUpdateTemplate.h | 23 +++++++++++--
 install.sh                             |  9 ++++-
 src/cli/etc/onemarket.yaml             |  4 +--
 src/cli/one_helper/onemarket_helper.rb |  6 ++--
 src/market/MarketPlaceApp.cc           | 45 ++++++++++++++-----------
 src/market/MarketPlaceAppPool.cc       |  9 +++--
 src/nebula/Nebula.cc                   |  5 ++-
 src/oca/ruby/opennebula.rb             |  2 ++
 src/oca/ruby/opennebula/image_pool.rb  |  1 -
 src/oca/ruby/opennebula/marketplace.rb | 13 +++-----
 src/rm/Request.cc                      |  2 ++
 src/rm/RequestManager.cc               | 46 ++++++++++++++++++++++++++
 src/rm/RequestManagerAllocate.cc       | 46 ++++++++++++++++++++++++++
 src/rm/RequestManagerRename.cc         | 38 +++++++++++++++++++++
 25 files changed, 421 insertions(+), 69 deletions(-)

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index 92ba1ff6cc..720353a811 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -69,6 +69,30 @@ public:
      */
     int from_xml(const std::string &xml_str);
 
+    /**
+     * Returns the marketplace ID
+     */
+    int get_market_id() const
+    {
+        return market_id;
+    };
+
+    /**
+     * Returns the marketplace name
+     */
+    const std::string& get_market_name() const
+    {
+        return market_name;
+    };
+
+    /**
+     * Updates the marketplace name
+     */
+    void set_market_name(const std::string& name)
+    {
+        market_name = name;
+    };
+
 private:
 
     friend class MarketPlaceAppPool;
@@ -77,9 +101,9 @@ private:
     // MarketPlaceApp Attributes
     // *************************************************************************
     /**
-     *  Size of this app
+     *  Publishing date
      */
-    std::string date;
+    time_t      date;
 
     /**
      *  Source URL for the marketplace app
@@ -119,12 +143,12 @@ private:
     /**
      *  Marketplace ID that holds this app
      */
-    int mp_id;
+    int market_id;
 
     /**
      *  Marketplace name
      */
-    std::string mp_name;
+    std::string market_name;
 
     /**
      *  Marketplace App state
@@ -204,6 +228,14 @@ private:
      *    @return 0 on success
      */
     int post_update_template(std::string& error);
+
+    /**
+     *  Factory method for marketplace app templates
+     */
+    Template * get_new_template() const
+    {
+        return new MarketPlaceAppTemplate;
+    }
 };
 
 #endif /*MARKETPLACEAPP_H*/
diff --git a/include/MarketPlaceAppPool.h b/include/MarketPlaceAppPool.h
index 4eb859de94..6a2a0e6640 100644
--- a/include/MarketPlaceAppPool.h
+++ b/include/MarketPlaceAppPool.h
@@ -42,8 +42,6 @@ public:
      *    @param apptemplate MarketPlaceApp definition template
      *    @param mp_id of the MarketPlace to store de App
      *    @param mp_name of the MarketPlace
-     *    @param origin an opaque string with the origin of the App. Used by
-     *    the MARKET_MAD.
      *    @param oid the id assigned to the MarketPlace
      *    @param error_str Returns the error reason, if any
      *
@@ -58,7 +56,6 @@ public:
             MarketPlaceAppTemplate * apptemplate,
             int                mp_id,
             const std::string& mp_name,
-            const std::string& origin,
             int *              oid,
             std::string&       error_str);
 
diff --git a/include/MarketPlacePool.h b/include/MarketPlacePool.h
index c95a4a39a7..9b21829800 100644
--- a/include/MarketPlacePool.h
+++ b/include/MarketPlacePool.h
@@ -95,8 +95,8 @@ public:
         return name;
     };
 
-    /** Update a particular MarketPlaceApp
-     *    @param zone pointer to Zone
+    /** Update a particular MarketPlace
+     *    @param  objsql points to the market
      *    @return 0 on success
      */
     int update(PoolObjectSQL * objsql);
diff --git a/include/Nebula.h b/include/Nebula.h
index ad2bb79da2..7ca5724ada 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -36,6 +36,7 @@
 #include "VdcPool.h"
 #include "VirtualRouterPool.h"
 #include "MarketPlacePool.h"
+#include "MarketPlaceAppPool.h"
 
 #include "VirtualMachineManager.h"
 #include "LifeCycleManager.h"
@@ -143,10 +144,16 @@ public:
         return vrouterpool;
     };
 
-    MarketPlacePool * get_mppool()
+    MarketPlacePool * get_marketpool()
     {
-        return mppool;
+        return marketpool;
     };
+
+    MarketPlaceAppPool * get_apppool()
+    {
+        return apppool;
+    };
+
     // --------------------------------------------------------------
     // Manager Accessors
     // --------------------------------------------------------------
@@ -669,7 +676,7 @@ private:
         system_db(0), db(0),
         vmpool(0), hpool(0), vnpool(0), upool(0), ipool(0), gpool(0), tpool(0),
         dspool(0), clpool(0), docpool(0), zonepool(0),
-        secgrouppool(0), vdcpool(0), vrouterpool(0), mppool(0),
+        secgrouppool(0), vdcpool(0), vrouterpool(0), marketpool(0), apppool(0),
         lcm(0), vmm(0), im(0), tm(0), dm(0), rm(0), hm(0), authm(0),
         aclm(0), imagem(0)
     {
@@ -720,7 +727,8 @@ private:
         delete secgrouppool;
         delete vdcpool;
         delete vrouterpool;
-        delete mppool;
+        delete marketpool;
+        delete apppool;
         delete vmm;
         delete lcm;
         delete im;
@@ -801,7 +809,8 @@ private:
     SecurityGroupPool  * secgrouppool;
     VdcPool            * vdcpool;
     VirtualRouterPool  * vrouterpool;
-    MarketPlacePool    * mppool;
+    MarketPlacePool    * marketpool;
+    MarketPlaceAppPool * apppool;
 
     // ---------------------------------------------------------------
     // Nebula Managers
diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h
index bdc0c7f001..08aced6a80 100644
--- a/include/RequestManagerAllocate.h
+++ b/include/RequestManagerAllocate.h
@@ -631,7 +631,7 @@ public:
                                true)
     {
         Nebula& nd  = Nebula::instance();
-        pool        = nd.get_mppool();
+        pool        = nd.get_marketpool();
         auth_object = PoolObjectSQL::MARKETPLACE;
     };
 
@@ -651,6 +651,42 @@ public:
                       RequestAttributes&         att);
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAppAllocate : public RequestManagerAllocate
+{
+public:
+    MarketPlaceAppAllocate():
+        RequestManagerAllocate("MarketPlaceAppAllocate",
+                               "Allocates a new marketplace app",
+                               "A:ssi",
+                               true)
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_apppool();
+        mppool      = nd.get_marketpool();
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+    };
+
+    ~MarketPlaceAppAllocate(){};
+
+    /* --------------------------------------------------------------------- */
+
+    Template * get_object_template()
+    {
+        return new MarketPlaceAppTemplate;
+    };
+
+    int pool_allocate(xmlrpc_c::paramList const& _paramList,
+                      Template *                 tmpl,
+                      int&                       id,
+                      string&                    error_str,
+                      RequestAttributes&         att);
+private:
+    MarketPlacePool * mppool;
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerChmod.h b/include/RequestManagerChmod.h
index 5aa0c874d9..a48474a7da 100644
--- a/include/RequestManagerChmod.h
+++ b/include/RequestManagerChmod.h
@@ -200,7 +200,7 @@ public:
                            "Changes permission bits of a marketplace")
     {
         Nebula& nd  = Nebula::instance();
-        pool        = nd.get_mppool();
+        pool        = nd.get_marketpool();
         auth_object = PoolObjectSQL::MARKETPLACE;
     };
 
@@ -208,6 +208,25 @@ public:
 
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAppChmod: public RequestManagerChmod
+{
+public:
+    MarketPlaceAppChmod():
+        RequestManagerChmod("MarketPlaceAppChmod",
+                           "Changes permission bits of a marketplace app")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_apppool();
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+    };
+
+    ~MarketPlaceAppChmod(){};
+
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerChown.h b/include/RequestManagerChown.h
index e6944626f5..4f069cab93 100644
--- a/include/RequestManagerChown.h
+++ b/include/RequestManagerChown.h
@@ -303,7 +303,7 @@ public:
                             "Changes ownership of a marketplace")
     {
         Nebula& nd  = Nebula::instance();
-        pool        = nd.get_mppool();
+        pool        = nd.get_marketpool();
         auth_object = PoolObjectSQL::MARKETPLACE;
     };
 
@@ -315,6 +315,29 @@ public:
     };
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAppChown: public RequestManagerChown
+{
+public:
+    MarketPlaceAppChown():
+        RequestManagerChown("MarketPlaceAppChown",
+                            "Changes ownership of a marketplace app")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_apppool();
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+    };
+
+    ~MarketPlaceAppChown(){};
+
+    PoolObjectSQL * get(const string& name, int uid, bool lock)
+    {
+        return static_cast<MarketPlaceAppPool *>(pool)->get(name, uid, lock);
+    };
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerDelete.h b/include/RequestManagerDelete.h
index 4cdbab0061..ea560d553e 100644
--- a/include/RequestManagerDelete.h
+++ b/include/RequestManagerDelete.h
@@ -383,13 +383,30 @@ public:
                              "Deletes a marketplace")
     {
         Nebula& nd  = Nebula::instance();
-        pool        = nd.get_mppool();
+        pool        = nd.get_marketpool();
         auth_object = PoolObjectSQL::MARKETPLACE;
     };
 
     ~MarketPlaceDelete(){};
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAppDelete : public RequestManagerDelete
+{
+public:
+    MarketPlaceAppDelete():
+        RequestManagerDelete("MarketPlaceAppDelete",
+                             "Deletes a marketplace app")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_apppool();
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+    };
+
+    ~MarketPlaceAppDelete(){};
+};
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerInfo.h b/include/RequestManagerInfo.h
index 50399a5c06..d50b5cf7b7 100644
--- a/include/RequestManagerInfo.h
+++ b/include/RequestManagerInfo.h
@@ -344,16 +344,33 @@ class MarketPlaceInfo : public RequestManagerInfo
 public:
     MarketPlaceInfo():
         RequestManagerInfo("MarketPlaceInfo",
-                           "Returns MarketPlace information")
+                           "Returns marketplace information")
     {
         Nebula& nd  = Nebula::instance();
-        pool        = nd.get_mppool();
+        pool        = nd.get_marketpool();
         auth_object = PoolObjectSQL::MARKETPLACE;
     };
 
     ~MarketPlaceInfo(){};
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAppInfo : public RequestManagerInfo
+{
+public:
+    MarketPlaceAppInfo():
+        RequestManagerInfo("MarketPlaceAppInfo",
+                           "Returns marketplace app information")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_apppool();
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+    };
+
+    ~MarketPlaceAppInfo(){};
+};
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerPoolInfoFilter.h b/include/RequestManagerPoolInfoFilter.h
index 43b7908e44..c0ac51a9f5 100644
--- a/include/RequestManagerPoolInfoFilter.h
+++ b/include/RequestManagerPoolInfoFilter.h
@@ -518,11 +518,11 @@ class MarketPlacePoolInfo : public RequestManagerPoolInfoFilter
 public:
     MarketPlacePoolInfo():
         RequestManagerPoolInfoFilter("MarketPlacePoolInfo",
-                                     "Returns the market place pool",
+                                     "Returns the marketplace pool",
                                      "A:s")
     {
         Nebula& nd  = Nebula::instance();
-        pool        = nd.get_mppool();
+        pool        = nd.get_marketpool();
         auth_object = PoolObjectSQL::MARKETPLACE;
     };
 
@@ -531,4 +531,23 @@ public:
     void request_execute(xmlrpc_c::paramList const& pl, RequestAttributes& att);
 };
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+class MarketPlaceAppPoolInfo : public RequestManagerPoolInfoFilter
+{
+public:
+    MarketPlaceAppPoolInfo():
+        RequestManagerPoolInfoFilter("MarketPlacePoolInfo",
+                                     "Returns the market place pool",
+                                     "A:siii")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_apppool();
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+    };
+
+    ~MarketPlaceAppPoolInfo(){};
+};
+
 #endif
diff --git a/include/RequestManagerRename.h b/include/RequestManagerRename.h
index 4a5113a5d4..e726589d73 100644
--- a/include/RequestManagerRename.h
+++ b/include/RequestManagerRename.h
@@ -366,7 +366,7 @@ public:
         RequestManagerRename("MarketPlaceRename", "Renames a marketplace")
     {
         Nebula& nd  = Nebula::instance();
-        pool        = nd.get_mppool();
+        pool        = nd.get_marketpool();
         auth_object = PoolObjectSQL::MARKETPLACE;
     };
 
@@ -377,9 +377,31 @@ public:
         return static_cast<MarketPlacePool*>(pool)->get(name, lock);
     };
 
-    //TODO implement batch rename for MarketPlaceApps
-    //void batch_rename(int oid);
+    void batch_rename(int oid);
 };
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAppRename: public RequestManagerRename
+{
+public:
+    MarketPlaceAppRename():
+        RequestManagerRename("MarketPlaceRename", "Renames a marketplace app")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_apppool();
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+    };
+
+    ~MarketPlaceAppRename(){};
+
+    PoolObjectSQL * get(const string& name, int uid, bool lock)
+    {
+        return static_cast<MarketPlaceAppPool*>(pool)->get(name, uid, lock);
+    };
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/include/RequestManagerUpdateTemplate.h b/include/RequestManagerUpdateTemplate.h
index 3f281575b4..c3f0bf9085 100644
--- a/include/RequestManagerUpdateTemplate.h
+++ b/include/RequestManagerUpdateTemplate.h
@@ -312,15 +312,34 @@ class MarketPlaceUpdateTemplate : public RequestManagerUpdateTemplate
 public:
     MarketPlaceUpdateTemplate():
         RequestManagerUpdateTemplate("MarketPlaceUpdateTemplate",
-                                     "Updates a virtual router template")
+                                     "Updates a marketplace template")
     {
         Nebula& nd  = Nebula::instance();
-        pool        = nd.get_mppool();
+        pool        = nd.get_marketpool();
         auth_object = PoolObjectSQL::MARKETPLACE;
     };
 
     ~MarketPlaceUpdateTemplate(){};
 };
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAppUpdateTemplate : public RequestManagerUpdateTemplate
+{
+public:
+    MarketPlaceAppUpdateTemplate():
+        RequestManagerUpdateTemplate("MarketPlaceUpdateTemplate",
+                                     "Updates a marketplace app template")
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_apppool();
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+    };
+
+    ~MarketPlaceAppUpdateTemplate(){};
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/install.sh b/install.sh
index 715f8a7641..d5e6141842 100755
--- a/install.sh
+++ b/install.sh
@@ -586,6 +586,7 @@ BIN_FILES="src/nebula/oned \
            src/cli/onevdc \
            src/cli/onevrouter \
            src/cli/onemarket \
+           src/cli/onemarketapp \
            src/cli/onevcenter \
            src/onedb/onedb \
            src/mad/utils/tty_expect \
@@ -1382,7 +1383,9 @@ RUBY_OPENNEBULA_LIB_FILES="src/oca/ruby/opennebula/acl_pool.rb \
                             src/oca/ruby/opennebula/virtual_router_pool.rb \
                             src/oca/ruby/opennebula/virtual_router.rb \
                             src/oca/ruby/opennebula/marketplace_pool.rb \
-                            src/oca/ruby/opennebula/marketplace.rb"
+                            src/oca/ruby/opennebula/marketplace.rb \
+                            src/oca/ruby/opennebula/marketplaceapp_pool.rb \
+                            src/oca/ruby/opennebula/marketplaceapp.rb"
 
 #-------------------------------------------------------------------------------
 # Common Cloud Files
@@ -1534,6 +1537,7 @@ ONE_CLI_LIB_FILES="src/cli/one_helper/onegroup_helper.rb \
                    src/cli/one_helper/oneacct_helper.rb \
                    src/cli/one_helper/onesecgroup_helper.rb \
                    src/cli/one_helper/onevrouter_helper.rb \
+                   src/cli/one_helper/onemarketapp_helper.rb \
                    src/cli/one_helper/onemarket_helper.rb"
 
 CLI_BIN_FILES="src/cli/onevm \
@@ -1554,6 +1558,7 @@ CLI_BIN_FILES="src/cli/onevm \
                src/cli/oneshowback \
                src/cli/onevdc \
                src/cli/onevrouter \
+               src/cli/onemarketapp \
                src/cli/onemarket"
 
 CLI_CONF_FILES="src/cli/etc/onegroup.yaml \
@@ -1572,6 +1577,7 @@ CLI_CONF_FILES="src/cli/etc/onegroup.yaml \
                 src/cli/etc/oneshowback.yaml \
                 src/cli/etc/onevdc.yaml \
                 src/cli/etc/onevrouter.yaml \
+                src/cli/etc/onemarketapp.yaml \
                 src/cli/etc/onemarket.yaml"
 
 #-----------------------------------------------------------------------------
@@ -1846,6 +1852,7 @@ MAN_FILES="share/man/oneacct.1.gz \
         share/man/onevdc.1.gz \
         share/man/onevrouter.1.gz \
         share/man/onemarket.1.gz \
+        share/man/onemarketapp.1.gz \
         share/man/econe-allocate-address.1.gz \
         share/man/econe-associate-address.1.gz \
         share/man/econe-attach-volume.1.gz \
diff --git a/src/cli/etc/onemarket.yaml b/src/cli/etc/onemarket.yaml
index 43cfb67b8b..b57e69f7dc 100644
--- a/src/cli/etc/onemarket.yaml
+++ b/src/cli/etc/onemarket.yaml
@@ -17,7 +17,7 @@
   :size: 5
   :left: true
 
-:MARKETAPPS:
+:APPS:
   :desc: Number of Marketplace Apps
   :size: 6
 
@@ -36,6 +36,6 @@
 - :NAME
 - :SIZE
 - :AVAIL
-- :MARKETAPPS
+- :APPS
 - :TYPE
 - :MAD
diff --git a/src/cli/one_helper/onemarket_helper.rb b/src/cli/one_helper/onemarket_helper.rb
index aca83be377..328e943cfa 100644
--- a/src/cli/one_helper/onemarket_helper.rb
+++ b/src/cli/one_helper/onemarket_helper.rb
@@ -17,7 +17,7 @@
 require 'one_helper'
 
 class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
-    DATASTORE = {
+    MARKETPLACE = {
         :name   => "marketplace",
         :short  => "-m id|name",
         :large  => "--marketplace id|name" ,
@@ -60,7 +60,7 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            column :MARKETAPPS, "Number of marketplace apps", :size=>6 do |d|
+            column :APPS, "Number of marketplace apps", :size=>6 do |d|
                 if d["MARKETPLACEAPPS"]["ID"].nil?
                     "0"
                 else
@@ -77,7 +77,7 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
                 d["MARKET_MAD"]
             end
 
-            default :ID, :NAME, :SIZE, :AVAIL, :MARKETAPPS, :TYPE, :MAD
+            default :ID, :NAME, :SIZE, :AVAIL, :APPS, :TYPE, :MAD
         end
 
         table
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index a2e163386a..279dfa6321 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -52,8 +52,8 @@ MarketPlaceApp::MarketPlaceApp(
         publisher(""),
         version(""),
         apptemplate64(""),
-        mp_id(-1),
-        mp_name(""),
+        market_id(-1),
+        market_name(""),
         state(INIT)
 {
     if (app_template != 0)
@@ -81,11 +81,6 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
 {
     std::ostringstream oss;
 
-    std::string attr;
-
-    char        str[26];
-    time_t      the_time = time(NULL);
-
     // -------------------------------------------------------------------------
     // Check default marketplace app attributes
     // -------------------------------------------------------------------------
@@ -94,36 +89,41 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
     erase_template_attribute("NAME", name);
 
     //Atrributes updated after export
-    remove_template_attribute("ORIGIN");
     remove_template_attribute("SOURCE");
     remove_template_attribute("SIZE");
     remove_template_attribute("CHECKSUM");
 
-    ctime_r(&(the_time), str);
-    date = str;
+    date = time(NULL);
 
     //Known attributes
+    //ORIGIN
     //DESCRIPTION
     //APPTEMPLATE64
     //PUBLISHER
     //VERSION
+    erase_template_attribute("ORIGIN", origin);
+
+    if (origin.empty())
+    {
+        goto error_origin;
+    }
 
     get_template_attribute("DESCRIPTION", description);
 
     get_template_attribute("APPTEMPLATE64", apptemplate64);
 
-    get_template_attribute("PUBLISHER", attr);
+    get_template_attribute("PUBLISHER", publisher);
 
-    if (attr.empty())
+    if (publisher.empty())
     {
         publisher = uname;
     }
 
-    get_template_attribute("VERSION", attr);
+    get_template_attribute("VERSION", version);
 
-    if (!attr.empty())
+    if (version.empty())
     {
-        version = attr;
+        version = "0.0";
     }
 
     state = LOCKED;
@@ -131,6 +131,11 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
     //--------------------------------------------------------------------------
 
     return insert_replace(db, false, error_str);
+
+error_origin:
+    error_str = "Missing ORIGIN for the MARKETPLACEAPP";
+    NebulaLog::log("MRK", Log::ERROR, error_str);
+    return -1;
 }
 
 /* --------------------------------------------------------------------------- */
@@ -241,8 +246,8 @@ std::string& MarketPlaceApp::to_xml(std::string& xml) const
             "<PUBLISHER>"      << publisher     << "</PUBLISHER>" <<
             "<VERSION>"        << version       << "</VERSION>" <<
             "<APPTEMPLATE64>"  << apptemplate64 << "</APPTEMPLATE64>" <<
-            "<MARKETPLACE_ID>" << mp_id        << "</MARKETPLACE_ID>" <<
-            "<MARKETPLACE>"    << mp_name       << "</MARKETPLACE>" <<
+            "<MARKETPLACE_ID>" << market_id     << "</MARKETPLACE_ID>" <<
+            "<MARKETPLACE>"    << market_name   << "</MARKETPLACE>" <<
             "<STATE>"          << state         << "</STATE>" <<
 			perms_to_xml(perm_str) <<
 			obj_template->to_xml(template_xml) <<
@@ -272,7 +277,7 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
     rc += xpath(uname,        "/MARKETPLACEAPP/UNAME", "not_found");
     rc += xpath(gname,        "/MARKETPLACEAPP/GNAME", "not_found");
     rc += xpath(name,         "/MARKETPLACEAPP/NAME", "not_found");
-    rc += xpath(date,         "/MARKETPLACEAPP/DATE", "not_found");
+    rc += xpath(date,         "/MARKETPLACEAPP/DATE", -1);
     rc += xpath(source,       "/MARKETPLACEAPP/SOURCE","not_found");
     rc += xpath(origin,       "/MARKETPLACEAPP/ORIGIN","not_found");
     rc += xpath(istate,       "/MARKETPLACEAPP/STATE", -1);
@@ -282,8 +287,8 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
     rc += xpath(checksum,     "/MARKETPLACEAPP/CHECKSUM", "not_found");
     rc += xpath(publisher,    "/MARKETPLACEAPP/PUBLISHER", "not_found");
     rc += xpath(apptemplate64,"/MARKETPLACEAPP/APPTEMPLATE64", "not_found");
-    rc += xpath(mp_name,      "/MARKETPLACEAPP/MARKETPLACE", "not_found");
-    rc += xpath(mp_id,        "/MARKETPLACEAPP/MARKETPLACE_ID", -1);
+    rc += xpath(market_name,  "/MARKETPLACEAPP/MARKETPLACE", "not_found");
+    rc += xpath(market_id,    "/MARKETPLACEAPP/MARKETPLACE_ID", -1);
 
     state = static_cast<MarketPlaceAppState>(istate);
 
diff --git a/src/market/MarketPlaceAppPool.cc b/src/market/MarketPlaceAppPool.cc
index 4b798c576d..12fee4a354 100644
--- a/src/market/MarketPlaceAppPool.cc
+++ b/src/market/MarketPlaceAppPool.cc
@@ -29,7 +29,6 @@ int MarketPlaceAppPool:: allocate(
             MarketPlaceAppTemplate * apptemplate,
             int                mp_id,
             const std::string& mp_name,
-            const std::string& origin,
             int *              oid,
             std::string&       error_str)
 {
@@ -42,10 +41,10 @@ int MarketPlaceAppPool:: allocate(
 
     mp = new MarketPlaceApp(uid, gid, uname, gname, umask, apptemplate);
 
-    mp->mp_id   = mp_id;
-    mp->mp_name = mp_name;
-    mp->state   = MarketPlaceApp::INIT;
-    mp->origin  = origin;
+    mp->market_id   = mp_id;
+    mp->market_name = mp_name;
+
+    mp->state = MarketPlaceApp::INIT;
 
     // -------------------------------------------------------------------------
     // Check name & duplicates
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 465ec65bec..a69c4dd312 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -348,6 +348,7 @@ void Nebula::start(bool bootstrap_only)
             rc += SecurityGroupPool::bootstrap(db);
             rc += VirtualRouterPool::bootstrap(db);
             rc += MarketPlacePool::bootstrap(db);
+            rc += MarketPlaceAppPool::bootstrap(db);
 
             // Create the system tables only if bootstrap went well
             if (rc == 0)
@@ -493,8 +494,10 @@ void Nebula::start(bool bootstrap_only)
         docpool = new DocumentPool(db);
         zonepool= new ZonePool(db, is_federation_slave());
         vdcpool = new VdcPool(db, is_federation_slave());
+
         vrouterpool = new VirtualRouterPool(db);
-        mppool  = new MarketPlacePool(db);
+        marketpool  = new MarketPlacePool(db);
+        apppool     = new MarketPlaceAppPool(db);
 
         nebula_configuration->get("VM_HOOK", vm_hooks);
         nebula_configuration->get("HOST_HOOK",  host_hooks);
diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb
index f545391c6c..6eea9d95ff 100644
--- a/src/oca/ruby/opennebula.rb
+++ b/src/oca/ruby/opennebula.rb
@@ -60,6 +60,8 @@ require 'opennebula/virtual_router'
 require 'opennebula/virtual_router_pool'
 require 'opennebula/marketplace'
 require 'opennebula/marketplace_pool'
+require 'opennebula/marketplaceapp'
+require 'opennebula/marketplaceapp_pool'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/opennebula/image_pool.rb b/src/oca/ruby/opennebula/image_pool.rb
index 5316ffcbdb..89402cdbd3 100644
--- a/src/oca/ruby/opennebula/image_pool.rb
+++ b/src/oca/ruby/opennebula/image_pool.rb
@@ -23,7 +23,6 @@ module OpenNebula
         # Constants and Class attribute accessors
         #######################################################################
 
-
         IMAGE_POOL_METHODS = {
             :info => "imagepool.info"
         }
diff --git a/src/oca/ruby/opennebula/marketplace.rb b/src/oca/ruby/opennebula/marketplace.rb
index c0b6910f58..3b83dc1f82 100644
--- a/src/oca/ruby/opennebula/marketplace.rb
+++ b/src/oca/ruby/opennebula/marketplace.rb
@@ -67,16 +67,16 @@ module OpenNebula
         # XML-RPC Methods for the MarketPlace Object
         #######################################################################
 
-        # Retrieves the information of the given MarketPlace.
+        # Retrieves the information of the given marketplace.
         def info()
             super(MARKETPLACE_METHODS[:info], 'MARKETPLACE')
         end
 
         alias_method :info!, :info
 
-        # Allocates a new MarketPlace in OpenNebula
+        # Allocates a new marketplace in OpenNebula
         #
-        # @param description [String] The template of the MarketPlace.
+        # @param description [String] The template of the marketplace.
         #
         # @return [Integer, OpenNebula::Error] the new ID in case of
         #   success, error otherwise
@@ -84,7 +84,7 @@ module OpenNebula
             super(MARKETPLACE_METHODS[:allocate], description)
         end
 
-        # Deletes the MarketPlace
+        # Deletes the marketplace
         def delete()
             super(MARKETPLACE_METHODS[:delete])
         end
@@ -161,11 +161,6 @@ module OpenNebula
             SHORT_MARKETPLACE_TYPES[type_str]
         end
 
-        # Returns the state of the marketplace (numeric value)
-        def state
-            self['STATE'].to_i
-        end
-
         # Returns whether or not the marketplace app with id 'id' is part of
         # this marketplace
         def contains(id)
diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index 3075da89e4..840d01ba53 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -629,6 +629,8 @@ string Request::object_name(PoolObjectSQL::ObjectType ob)
         case PoolObjectSQL::MARKETPLACEAPP:
             return "marketplaceapp";
       }
+
+    return "unknown";
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index 28a57fa80c..14417a70e6 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -949,6 +949,52 @@ void RequestManager::register_xml_methods()
 
     RequestManagerRegistry.addMethod("one.marketpool.info", marketpool_info);
 
+    /* MarketPlaceApp related methods */
+
+    xmlrpc_c::method * marketapp_allocate_pt;
+    xmlrpc_c::method * marketapp_update_pt;
+    xmlrpc_c::method * marketapp_delete_pt;
+    xmlrpc_c::method * marketapp_chmod_pt;
+    xmlrpc_c::method * marketapp_chown_pt;
+
+    if (nebula.is_federation_slave())
+    {
+        marketapp_allocate_pt = new RequestManagerProxy("one.marketapp.allocate");
+        marketapp_update_pt   = new RequestManagerProxy("one.marketapp.update");
+        marketapp_delete_pt   = new RequestManagerProxy("one.marketapp.delete");
+        marketapp_chmod_pt    = new RequestManagerProxy("one.marketapp.chmod");
+        marketapp_chown_pt    = new RequestManagerProxy("one.marketapp.chown");
+    }
+    else
+    {
+        marketapp_allocate_pt = new MarketPlaceAppAllocate();
+        marketapp_update_pt   = new MarketPlaceAppUpdateTemplate();
+        marketapp_delete_pt   = new MarketPlaceAppDelete();
+        marketapp_chmod_pt    = new MarketPlaceAppChmod();
+        marketapp_chown_pt    = new MarketPlaceAppChown();
+    }
+
+    xmlrpc_c::methodPtr marketapp_allocate(marketapp_allocate_pt);
+    xmlrpc_c::methodPtr marketapp_update(marketapp_update_pt);
+    xmlrpc_c::methodPtr marketapp_delete(marketapp_delete_pt);
+    xmlrpc_c::methodPtr marketapp_chmod(marketapp_chmod_pt);
+    xmlrpc_c::methodPtr marketapp_chown(marketapp_chown_pt);
+
+    xmlrpc_c::methodPtr marketapp_info(new MarketPlaceAppInfo());
+    xmlrpc_c::methodPtr marketapp_rename(new MarketPlaceAppRename());
+    xmlrpc_c::methodPtr marketapppool_info(new MarketPlaceAppPoolInfo());
+
+    RequestManagerRegistry.addMethod("one.marketapp.allocate", marketapp_allocate);
+    RequestManagerRegistry.addMethod("one.marketapp.update", marketapp_update);
+    RequestManagerRegistry.addMethod("one.marketapp.delete", marketapp_delete);
+    RequestManagerRegistry.addMethod("one.marketapp.chmod", marketapp_chmod);
+    RequestManagerRegistry.addMethod("one.marketapp.chown", marketapp_chown);
+
+    RequestManagerRegistry.addMethod("one.marketapp.info", marketapp_info);
+    RequestManagerRegistry.addMethod("one.marketapp.rename", marketapp_rename);
+
+    RequestManagerRegistry.addMethod("one.marketapppool.info", marketapppool_info);
+
     /* System related methods */
     RequestManagerRegistry.addMethod("one.system.version", system_version);
     RequestManagerRegistry.addMethod("one.system.config", system_config);
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 8cea628295..999048f88b 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -810,3 +810,49 @@ int MarketPlaceAllocate::pool_allocate(
         ttmpl, &id, error_str);
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlaceAppAllocate::pool_allocate(
+        xmlrpc_c::paramList const&  paramList,
+        Template *                  tmpl,
+        int&                        id,
+        string&                     error_str,
+        RequestAttributes&          att)
+{
+    MarketPlaceAppPool *     appool = static_cast<MarketPlaceAppPool *>(pool);
+    MarketPlaceAppTemplate * ttmpl  = static_cast<MarketPlaceAppTemplate *>(tmpl);
+
+    int mp_id = xmlrpc_c::value_int(paramList.getInt(2));
+
+    MarketPlace * mp = mppool->get(mp_id, true);
+
+    if ( mp == 0 )
+    {
+        error_str = "Cannot find associated MARKETPLACE";
+        return -1;
+    }
+
+    std::string mp_name = mp->get_name();
+
+    mp->unlock();
+
+    int rc = appool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
+        ttmpl, mp_id, mp_name, &id, error_str);
+
+	if (rc < 0)
+	{
+		return rc;
+	}
+
+    mp = mppool->get(mp_id, true);
+
+    if ( mp != 0 )  // TODO: error otherwise or leave app in ERROR?
+    {
+        mp->add_marketapp(id);
+
+        mppool->update(mp);
+
+        mp->unlock();
+    }
+}
diff --git a/src/rm/RequestManagerRename.cc b/src/rm/RequestManagerRename.cc
index 27722a0ea2..81b819cb92 100644
--- a/src/rm/RequestManagerRename.cc
+++ b/src/rm/RequestManagerRename.cc
@@ -302,3 +302,41 @@ void HostRename::batch_rename(int oid)
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
+
+void MarketPlaceRename::batch_rename(int oid)
+{
+    MarketPlace * market = static_cast<MarketPlacePool*>(pool)->get(oid, true);
+
+    if (market == 0)
+    {
+        return;
+    }
+
+    const std::set<int> & apps = market->get_marketapp_ids();
+
+    std::set<int>::iterator it;
+
+    std::string market_name = market->get_name();
+
+    market->unlock();
+
+    MarketPlaceApp *     app;
+    MarketPlaceAppPool * apppool = Nebula::instance().get_apppool();
+
+    for (it = apps.begin(); it != apps.end(); it++)
+    {
+        app = apppool->get(*it, true);
+
+        if (app != 0)
+        {
+            if (app->get_market_id() == oid)
+            {
+                app->set_market_name(market_name);
+                apppool->update(app);
+            }
+
+            app->unlock();
+        }
+    }
+}
+

From e98b5fb2c6b4cc4be45e82ac3c92beb729d5798e Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 11 Dec 2015 16:10:39 +0100
Subject: [PATCH 017/197] feature #4217: Add missing files. Default ACL for
 marketplace and apps

---
 src/acl/AclManager.cc                         |   9 +
 src/cli/etc/onemarketapp.yaml                 |  47 +++++
 src/cli/one_helper/onemarketapp_helper.rb     | 141 +++++++++++++
 src/cli/onemarketapp                          | 193 ++++++++++++++++++
 src/oca/ruby/opennebula/marketplaceapp.rb     | 165 +++++++++++++++
 .../ruby/opennebula/marketplaceapp_pool.rb    |  77 +++++++
 6 files changed, 632 insertions(+)
 create mode 100644 src/cli/etc/onemarketapp.yaml
 create mode 100644 src/cli/one_helper/onemarketapp_helper.rb
 create mode 100755 src/cli/onemarketapp
 create mode 100644 src/oca/ruby/opennebula/marketplaceapp.rb
 create mode 100644 src/oca/ruby/opennebula/marketplaceapp_pool.rb

diff --git a/src/acl/AclManager.cc b/src/acl/AclManager.cc
index 2f89a0b5b5..1670f20378 100644
--- a/src/acl/AclManager.cc
+++ b/src/acl/AclManager.cc
@@ -103,6 +103,15 @@ AclManager::AclManager(
                  AuthRequest::USE,
                  AclRule::ALL_ID,
                  error_str);
+
+        // * MARKETPLACE+MARKETPLACEAPP/* USE *
+        add_rule(AclRule::ALL_ID,
+                 AclRule::ALL_ID |
+                    PoolObjectSQL::MARKETPLACE |
+                    PoolObjectSQL::MARKETPLACEAPP,
+                 AuthRequest::USE,
+                 AclRule::ALL_ID,
+                 error_str);
     }
 }
 
diff --git a/src/cli/etc/onemarketapp.yaml b/src/cli/etc/onemarketapp.yaml
new file mode 100644
index 0000000000..e832aa256e
--- /dev/null
+++ b/src/cli/etc/onemarketapp.yaml
@@ -0,0 +1,47 @@
+---
+:ID:
+  :desc: ONE identifier for the marketplace app
+  :size: 4
+
+:NAME:
+  :desc: Name of the marketplace app
+  :size: 13
+  :left: true
+
+:PUBLISHER:
+  :desc: Publisher of the marketplace app
+  :size: 15
+  :left: true
+
+:VERSION:
+  :desc: Version of the marketplace app
+  :size: 10
+  :left: true
+
+:SIZE:
+  :desc: Marketplace app size (M)
+  :size: 8
+
+:STAT:
+  :desc: State of the app
+  :size: 4
+  :left: true
+
+:DATE:
+  :desc: Publishing date for the marketplace app
+  :size: 15
+
+:MARKET:
+  :desc: Name of the marketplace 
+  :size: 10
+  :left: true
+
+:default:
+- :ID
+- :NAME
+- :PUBLISHER
+- :VERSION
+- :SIZE
+- :STAT
+- :DATE
+- :MARKET
diff --git a/src/cli/one_helper/onemarketapp_helper.rb b/src/cli/one_helper/onemarketapp_helper.rb
new file mode 100644
index 0000000000..2a86b3c600
--- /dev/null
+++ b/src/cli/one_helper/onemarketapp_helper.rb
@@ -0,0 +1,141 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'one_helper'
+
+class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
+    def self.rname
+        "MARKETPLACEAPP"
+    end
+
+    def self.conf_file
+        "onemarketapp.yaml"
+    end
+
+    def self.state_to_str(id)
+        id = id.to_i
+        state_str = MarketPlaceApp::MARKETPLACEAPP_STATES[id]
+        return MarketPlaceApp::SHORT_MARKETPLACEAPP_STATES[state_str]
+    end
+
+    def format_pool(options)
+        config_file = self.class.table_conf
+
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, "ONE identifier for the marketplace app", :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "Name of the marketplace app", :left, :size=>13 do |d|
+                d["NAME"]
+            end
+
+            column :PUBLISHER, "Publisher of the App", :left, :size=>15 do |d|
+                d["PUBLISHER"]
+            end
+
+            column :VERSION, "Version of the app", :left, :size=>10 do |d|
+                d["VERSION"]
+            end
+
+            column :SIZE, "App size", :size =>8 do |d|
+                OpenNebulaHelper.unit_to_str(d['SIZE'].to_i, {}, 'M')
+            end
+
+            column :STAT, "State of the app", :left, :size=>4 do |d|
+                OneMarketPlaceAppHelper.state_to_str(d["STATE"])
+            end
+
+            column :DATE, "Publishing date of the app",
+                    :size=>15 do |d|
+                OpenNebulaHelper.time_to_str(d["DATE"])
+            end
+
+            column :MARKET, "Name of the marketplace", :left, :size=>10 do |d|
+                d["MARKETPLACE"]
+            end
+
+            default :ID,:NAME,:PUBLISHER,:VERSION,:SIZE,:STAT,:DATE,:MARKET
+        end
+
+        table
+    end
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::MarketPlaceApp.new_with_id(id, @client)
+        else
+            xml=OpenNebula::MarketPlaceApp.build_xml
+            OpenNebula::MarketPlaceApp.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::MarketPlaceAppPool.new(@client, user_flag)
+    end
+
+    def format_resource(app, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE APP #{app['ID']} INFORMATION")
+        puts str % ["ID",    app.id.to_s]
+        puts str % ["NAME",  app.name]
+        puts str % ["USER",  app['UNAME']]
+        puts str % ["GROUP", app['GNAME']]
+        puts str % ["MARKETPLACE", app['MARKETPLACE']]
+        puts str % ["STATE", OneMarketPlaceAppHelper.state_to_str(app["STATE"])]
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if app["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if app["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if app["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e, mask]
+        }
+        puts
+
+        CLIHelper.print_header(str_h1 % "DETAILS", false)
+
+        puts str % ["SOURCE", app['SOURCE']]
+        puts str % ["CHECKSUM", app['CHECKSUM']]
+        puts str % ["PUBLISHER", app['PUBLISHER']]
+        puts str % ["PUB. DATE", OpenNebulaHelper.time_to_str(app["DATE"])]
+        puts str % ["VERSION", app['VERSION']]
+        puts str % ["DESCRIPTION", app['DESCRIPTION']]
+        puts str % ["SIZE", OpenNebulaHelper.unit_to_str(app['SIZE'].to_i,{},'M')]
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "IMPORT TEMPLATE", false)
+
+        puts Base64.decode64(app['APPTEMPLATE64'])
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE APP TEMPLATE", false)
+        puts app.template_str
+
+        puts
+    end
+end
diff --git a/src/cli/onemarketapp b/src/cli/onemarketapp
new file mode 100755
index 0000000000..c624f8f9fe
--- /dev/null
+++ b/src/cli/onemarketapp
@@ -0,0 +1,193 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
+else
+    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+end
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+
+require 'command_parser'
+require 'one_helper/onemarketapp_helper'
+require 'one_helper/onemarket_helper'
+
+CommandParser::CmdParser.new(ARGV) do
+    usage "`onemarket` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneMarketPlaceAppHelper.new
+
+    before_proc do
+        helper.set_client(options)
+    end
+
+    ########################################################################
+    # Global Options
+    ########################################################################
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+
+    list_options = CLIHelper::OPTIONS
+    list_options << OpenNebulaHelper::XML
+    list_options << OpenNebulaHelper::NUMERIC
+    list_options << OpenNebulaHelper::DESCRIBE
+
+    CREATE_OPTIONS = [OneMarketPlaceHelper::MARKETPLACE]
+
+    ########################################################################
+    # Formatters for arguments
+    ########################################################################
+    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "GROUP")
+    end
+
+    set :format, :userid, OpenNebulaHelper.rname_to_id_desc("USER") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "USER")
+    end
+
+    set :format, :appid, OneMarketPlaceAppHelper.to_id_desc do |arg|
+        helper.to_id(arg)
+    end
+
+    set :format, :appid_list, OneMarketPlaceAppHelper.list_to_id_desc do |arg|
+        helper.list_to_id(arg)
+    end
+
+    set :format, :filterflag, OneMarketPlaceAppHelper.filterflag_to_i_desc do |arg|
+        helper.filterflag_to_i(arg)
+    end
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new marketplace app in the given marketplace
+    EOT
+
+    command :create, create_desc, :file, :options=>CREATE_OPTIONS do
+
+        if options[:marketplace].nil?
+            STDERR.puts "Marketplace to save the app is mandatory: "
+            STDERR.puts "\t -m marketplace_id"
+            exit(-1)
+        end
+
+        helper.create_resource(options) do |app|
+            begin
+                template=File.read(args[0])
+                app.allocate(template, options[:marketplace])
+            rescue => e
+                STDERR.puts e.messsage
+                exit(-1)
+            end
+        end
+    end
+
+    delete_desc = <<-EOT.unindent
+        Deletes the given marketplace app
+    EOT
+
+    command :delete, delete_desc, [:range, :appid_list] do
+        helper.perform_actions(args[0],options,"deleted") do |app|
+            app.delete
+        end
+    end
+
+    update_desc = <<-EOT.unindent
+        Update the template contents for the app. If a path is not provided the
+        editor will be launched to modify the current content.
+    EOT
+
+    command :update, update_desc, :appid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            obj.update(str, options[:append])
+        end
+    end
+
+    chgrp_desc = <<-EOT.unindent
+        Changes the marketplace app group
+    EOT
+
+    command :chgrp, chgrp_desc,[:range, :appid_list], :groupid do
+        helper.perform_actions(args[0],options,"Group changed") do |app|
+            app.chown(-1, args[1].to_i)
+        end
+    end
+
+    chown_desc = <<-EOT.unindent
+        Changes the marketplace app owner and group
+    EOT
+
+    command :chown, chown_desc, [:range, :appid_list], :userid,
+            [:groupid,nil] do
+        gid = args[2].nil? ? -1 : args[2].to_i
+        helper.perform_actions(args[0],options,
+                "Owner/Group changed") do |app|
+            app.chown(args[1].to_i, gid)
+        end
+    end
+
+    chmod_desc = <<-EOT.unindent
+        Changes the marketplace app permissions
+    EOT
+
+    command :chmod, chmod_desc, [:range, :appid_list], :octet do
+        helper.perform_actions(args[0],options,
+                "Permissions changed") do |app|
+            app.chmod_octet(args[1])
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the marketplace app
+    EOT
+
+    command :rename, rename_desc, :appid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists marketplace apps
+    EOT
+
+    command :list, list_desc, [:filterflag, nil], :options=>list_options do
+        helper.list_pool(options, false, args[0])
+    end
+
+    show_desc = <<-EOT.unindent
+        Shows information for the given marketplace app
+    EOT
+
+    command :show, show_desc, :appid, :options=>OpenNebulaHelper::XML do
+        helper.show_resource(args[0],options)
+    end
+end
diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb
new file mode 100644
index 0000000000..e1df6721eb
--- /dev/null
+++ b/src/oca/ruby/opennebula/marketplaceapp.rb
@@ -0,0 +1,165 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'opennebula/pool_element'
+
+module OpenNebula
+    class MarketPlaceApp < PoolElement
+        #######################################################################
+        # Constants and Class Methods
+        #######################################################################
+
+        MARKETPLACEAPP_METHODS = {
+            :info       => "marketapp.info",
+            :allocate   => "marketapp.allocate",
+            :delete     => "marketapp.delete",
+            :update     => "marketapp.update",
+            :chown      => "marketapp.chown",
+            :chmod      => "marketapp.chmod",
+            :rename     => "marketapp.rename"
+        }
+
+        MARKETPLACEAPP_STATES=%w{INIT READY LOCKED ERROR}
+
+        SHORT_MARKETPLACEAPP_STATES={
+            "INIT"      => "init",
+            "READY"     => "rdy",
+            "LOCKED"    => "lock",
+            "ERROR"     => "err",
+        }
+
+        # Creates a MarketPlace description with just its identifier
+        # this method should be used to create plain MarketPlace objects.
+        # +id+ the id of the user
+        #
+        # Example:
+        #  app = MarketPlaceApp.new(MarketPlace.build_xml(3),rpc_client)
+        #
+        def MarketPlaceApp.build_xml(pe_id=nil)
+            if pe_id
+                app_xml = "<MARKETPLACEAPP><ID>#{pe_id}</ID></MARKETPLACEAPP>"
+            else
+                app_xml = "<MARKETPLACEAPP></MARKETPLACEAPP>"
+            end
+
+            XMLElement.build_xml(app_xml,'MARKETPLACEAPP')
+        end
+
+        # Class constructor
+        def initialize(xml, client)
+            super(xml, client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the MarketPlace Object
+        #######################################################################
+
+        # Retrieves the information of the given marketplace app
+        def info()
+            super(MARKETPLACEAPP_METHODS[:info], 'MARKETPLACEAPP')
+        end
+
+        alias_method :info!, :info
+
+        # Allocates a new MarketPlace in OpenNebula
+        #
+        # @param description [String] The template of the marketplace app
+        # @param mp_id [Integer] The id of the marketplace to create the app
+        #
+        # @return [Integer, OpenNebula::Error] the new ID in case of
+        #   success, error otherwise
+        def allocate(description, mp_id)
+            super(MARKETPLACEAPP_METHODS[:allocate], description, mp_id)
+        end
+
+        # Deletes the marketplace app
+        def delete()
+            super(MARKETPLACEAPP_METHODS[:delete])
+        end
+
+        # Replaces the template contents
+        #
+        # @param new_template [String] New template contents
+        # @param append [true, false] True to append new attributes instead of
+        #   replace the whole template
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def update(new_template, append=false)
+            super(MARKETPLACEAPP_METHODS[:update], new_template, append ? 1 : 0)
+        end
+
+        # Changes the owner/group
+        #
+        # @param uid [Integer] the new owner id. Set to -1 to leave the current one
+        # @param gid [Integer] the new group id. Set to -1 to leave the current one
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chown(uid, gid)
+            super(MARKETPLACEAPP_METHODS[:chown], uid, gid)
+        end
+
+        # Changes the marketplace app permissions.
+        #
+        # @param octet [String] Permissions octed , e.g. 640
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod_octet(octet)
+            super(MARKETPLACEAPP_METHODS[:chmod], octet)
+        end
+
+        # Changes the marketplace app permissions.
+        # Each [Integer] argument must be 1 to allow, 0 deny, -1 do not change
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a)
+            super(MARKETPLACEAPP_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
+                group_m, group_a, other_u, other_m, other_a)
+        end
+
+        # Renames this marketplace app
+        #
+        # @param name [String] New name for the marketplace app
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def rename(name)
+            return call(MARKETPLACEAPP_METHODS[:rename], @pe_id, name)
+        end
+
+        # ---------------------------------------------------------------------
+        # Helpers to get information
+        # ---------------------------------------------------------------------
+
+        # Returns the state of the marketplace app (numeric value)
+        def state
+            self['STATE'].to_i
+        end
+
+        # Returns the state of the marketplace app (string value)
+        def state_str
+            MARKETPLACEAPP_STATES[state]
+        end
+
+        # Returns the state of the marketplace app (string value)
+        def short_state_str
+            SHORT_MARKETPLACEAPP_STATES[state_str]
+        end
+    end
+end
diff --git a/src/oca/ruby/opennebula/marketplaceapp_pool.rb b/src/oca/ruby/opennebula/marketplaceapp_pool.rb
new file mode 100644
index 0000000000..f17d8b98a9
--- /dev/null
+++ b/src/oca/ruby/opennebula/marketplaceapp_pool.rb
@@ -0,0 +1,77 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'opennebula/pool'
+
+module OpenNebula
+    class MarketPlaceAppPool < Pool
+        #######################################################################
+        # Constants and Class attribute accessors
+        #######################################################################
+
+        MARKETPLACEAPP_POOL_METHODS = {
+            :info => "marketapppool.info"
+        }
+
+        #######################################################################
+        # Class constructor & Pool Methods
+        #######################################################################
+
+        # +client+ a Client object that represents a XML-RPC connection
+        def initialize(client, user_id=-1)
+            super('MARKETPLACEAPP_POOL','MARKETPLACEAPP', client)
+
+            @user_id  = user_id
+        end
+
+        # Factory method to create MarketPlaceApp objects
+        def factory(element_xml)
+            OpenNebula::MarketPlaceApp.new(element_xml, @client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the User Object
+        #######################################################################
+
+        # Retrieves all or part of the Images in the pool.
+        def info(*args)
+            case args.size
+                when 0
+                    info_filter(MARKETPLACEAPP_POOL_METHODS[:info],@user_id,-1,-1)
+                when 3
+                    info_filter(MARKETPLACEAPP_POOL_METHODS[:info],args[0],args[1],args[2])
+            end
+        end
+
+        def info_all()
+            return super(MARKETPLACEAPP_POOL_METHODS[:info])
+        end
+
+        def info_mine()
+            return super(MARKETPLACEAPP_POOL_METHODS[:info])
+        end
+
+        def info_group()
+            return super(MARKETPLACEAPP_POOL_METHODS[:info])
+        end
+
+        alias_method :info!, :info
+        alias_method :info_all!, :info_all
+        alias_method :info_mine!, :info_mine
+        alias_method :info_group!, :info_group
+    end
+end

From 042b3467c64664fdd3888159ef1806a342284a5b Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 11 Dec 2015 23:51:42 +0100
Subject: [PATCH 018/197] feature #4217: Manpages for onemarket tools

---
 share/man/onemarket.1    | 94 ++++++++++++++++++++++++++++++++++++++
 share/man/onemarketapp.1 | 98 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+)
 create mode 100644 share/man/onemarket.1
 create mode 100644 share/man/onemarketapp.1

diff --git a/share/man/onemarket.1 b/share/man/onemarket.1
new file mode 100644
index 0000000000..9e8d6d3158
--- /dev/null
+++ b/share/man/onemarket.1
@@ -0,0 +1,94 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "ONEMARKET" "1" "December 2015" "" "onemarket(1) -- manages OpenNebula marketplaces"
+.
+.SH "NAME"
+\fBonemarket\fR \- manages OpenNebula marketplaces
+.
+.SH "SYNOPSIS"
+\fBonemarket\fR \fIcommand\fR [\fIargs\fR] [\fIoptions\fR]
+.
+.SH "OPTIONS"
+.
+.nf
+
+ \-l, \-\-list x,y,z          Selects columns to display with list command
+ \-d, \-\-delay x             Sets the delay in seconds for top command
+ \-f, \-\-filter x,y,z        Filter data\. An array is specified with
+                           column=value pairs\.
+ \-\-csv                     Write table in csv format
+ \-x, \-\-xml                 Show the resource in xml format
+ \-n, \-\-numeric             Do not translate user and group IDs
+ \-\-describe                Describe list columns
+ \-a, \-\-append              Append new attributes to the current template
+ \-v, \-\-verbose             Verbose mode
+ \-h, \-\-help                Show this message
+ \-V, \-\-version             Show version and copyright information
+ \-\-user name               User name used to connect to OpenNebula
+ \-\-password password       Password to authenticate with OpenNebula
+ \-\-endpoint endpoint       URL of OpenNebula xmlrpc frontend
+.
+.fi
+.
+.SH "COMMANDS"
+.
+.IP "\(bu" 4
+create \fIfile\fR Creates a new Marketplace from the given template file
+.
+.IP "\(bu" 4
+delete \fIrange|marketplaceid_list\fR Deletes the given Marketplace
+.
+.IP "\(bu" 4
+chgrp \fIrange|marketplaceid_list\fR \fIgroupid\fR Changes the Marketplace group
+.
+.IP "\(bu" 4
+chown \fIrange|marketplaceid_list\fR \fIuserid\fR [\fIgroupid\fR] Changes the Marketplace owner and group
+.
+.IP "\(bu" 4
+chmod \fIrange|marketplaceid_list\fR \fIoctet\fR Changes the Marketplace permissions
+.
+.IP "\(bu" 4
+list Lists Marketplaces valid options: list, delay, filter, csv, xml, numeric, describe
+.
+.IP "\(bu" 4
+show \fImarketplaceid\fR Shows Marketplace information valid options: xml
+.
+.IP "\(bu" 4
+update \fImarketplaceid\fR [\fIfile\fR] Update the template contents\. If a path is not provided the editor will be launched to modify the current content\. valid options: append
+.
+.IP "\(bu" 4
+rename \fImarketplaceid\fR \fIname\fR Renames the Marketplace
+.
+.IP "" 0
+.
+.SH "ARGUMENT FORMATS"
+.
+.IP "\(bu" 4
+file Path to a file
+.
+.IP "\(bu" 4
+range List of id\'s in the form 1,8\.\.15
+.
+.IP "\(bu" 4
+text String
+.
+.IP "\(bu" 4
+marketplaceid OpenNebula MARKETPLACE name or id
+.
+.IP "\(bu" 4
+marketplaceid_list Comma\-separated list of OpenNebula MARKETPLACE names or ids
+.
+.IP "\(bu" 4
+groupid OpenNebula GROUP name or id
+.
+.IP "\(bu" 4
+userid OpenNebula USER name or id
+.
+.IP "" 0
+.
+.SH "LICENSE"
+OpenNebula 4\.14\.1 Copyright 2002\-2015, OpenNebula Project, OpenNebula Systems
+.
+.P
+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
diff --git a/share/man/onemarketapp.1 b/share/man/onemarketapp.1
new file mode 100644
index 0000000000..243a5864f8
--- /dev/null
+++ b/share/man/onemarketapp.1
@@ -0,0 +1,98 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "ONEMARKETAPP" "1" "December 2015" "" "onemarketapp(1) -- manages OpenNebula marketplace apps"
+.
+.SH "NAME"
+\fBonemarketapp\fR \- manages OpenNebula marketplace apps
+.
+.SH "SYNOPSIS"
+\fBonemarket\fR \fIcommand\fR [\fIargs\fR] [\fIoptions\fR]
+.
+.SH "OPTIONS"
+.
+.nf
+
+ \-m, \-\-marketplace id|name Selects the marketplace
+ \-a, \-\-append              Append new attributes to the current template
+ \-l, \-\-list x,y,z          Selects columns to display with list command
+ \-d, \-\-delay x             Sets the delay in seconds for top command
+ \-f, \-\-filter x,y,z        Filter data\. An array is specified with
+                           column=value pairs\.
+ \-\-csv                     Write table in csv format
+ \-x, \-\-xml                 Show the resource in xml format
+ \-n, \-\-numeric             Do not translate user and group IDs
+ \-\-describe                Describe list columns
+ \-v, \-\-verbose             Verbose mode
+ \-h, \-\-help                Show this message
+ \-V, \-\-version             Show version and copyright information
+ \-\-user name               User name used to connect to OpenNebula
+ \-\-password password       Password to authenticate with OpenNebula
+ \-\-endpoint endpoint       URL of OpenNebula xmlrpc frontend
+.
+.fi
+.
+.SH "COMMANDS"
+.
+.IP "\(bu" 4
+create \fIfile\fR Creates a new marketplace app in the given marketplace valid options: marketplace
+.
+.IP "\(bu" 4
+delete \fIrange|appid_list\fR Deletes the given marketplace app
+.
+.IP "\(bu" 4
+update \fIappid\fR [\fIfile\fR] Update the template contents for the app\. If a path is not provided the editor will be launched to modify the current content\. valid options: append
+.
+.IP "\(bu" 4
+chgrp \fIrange|appid_list\fR \fIgroupid\fR Changes the marketplace app group
+.
+.IP "\(bu" 4
+chown \fIrange|appid_list\fR \fIuserid\fR [\fIgroupid\fR] Changes the marketplace app owner and group
+.
+.IP "\(bu" 4
+chmod \fIrange|appid_list\fR \fIoctet\fR Changes the marketplace app permissions
+.
+.IP "\(bu" 4
+rename \fIappid\fR \fIname\fR Renames the marketplace app
+.
+.IP "\(bu" 4
+list [\fIfilterflag\fR] Lists marketplace apps valid options: list, delay, filter, csv, xml, numeric, describe
+.
+.IP "\(bu" 4
+show \fIappid\fR Shows information for the given marketplace app valid options: xml
+.
+.IP "" 0
+.
+.SH "ARGUMENT FORMATS"
+.
+.IP "\(bu" 4
+file Path to a file
+.
+.IP "\(bu" 4
+range List of id\'s in the form 1,8\.\.15
+.
+.IP "\(bu" 4
+text String
+.
+.IP "\(bu" 4
+groupid OpenNebula GROUP name or id
+.
+.IP "\(bu" 4
+userid OpenNebula USER name or id
+.
+.IP "\(bu" 4
+appid OpenNebula MARKETPLACEAPP name or id
+.
+.IP "\(bu" 4
+appid_list Comma\-separated list of OpenNebula MARKETPLACEAPP names or ids
+.
+.IP "\(bu" 4
+filterflag a, all all the known MARKETPLACEAPPs m, mine the MARKETPLACEAPP belonging to the user in ONE_AUTH g, group \'mine\' plus the MARKETPLACEAPP belonging to the groups the user is member of uid MARKETPLACEAPP of the user identified by this uid user MARKETPLACEAPP of the user identified by the username
+.
+.IP "" 0
+.
+.SH "LICENSE"
+OpenNebula 4\.14\.1 Copyright 2002\-2015, OpenNebula Project, OpenNebula Systems
+.
+.P
+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

From 753c88571418c8102f57885e6049ee13f13e4dfb Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 11 Dec 2015 23:55:04 +0100
Subject: [PATCH 019/197] feature #4217: Adds manpages to scons file

---
 share/man/SConstruct | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/man/SConstruct b/share/man/SConstruct
index 39cfe078c8..eaae4e13ad 100644
--- a/share/man/SConstruct
+++ b/share/man/SConstruct
@@ -65,7 +65,8 @@ env.Man('onevcenter')
 env.Man('onesecgroup')
 env.Man('onevdc')
 env.Man('onevrouter')
-#env.Man('onemarket')
+env.Man('onemarket')
+env.Man('onemarketapp')
 
 env.Man('oneflow')
 env.Man('oneflow-template')

From 91f7ec5bb2d5d080c40d4467baa7ef2aa0cb56af Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 12 Dec 2015 21:10:14 +0100
Subject: [PATCH 020/197] feautre #4217: Moved TYPE to the marketplace app

---
 include/MarketPlace.h                     | 49 -----------------
 include/MarketPlaceApp.h                  | 51 ++++++++++++++++++
 include/MarketPlacePool.h                 | 11 ++++
 src/cli/etc/onemarket.yaml                |  6 ---
 src/cli/etc/onemarketapp.yaml             |  6 +++
 src/cli/one_helper/onemarket_helper.rb    | 31 ++++++-----
 src/cli/one_helper/onemarketapp_helper.rb |  8 ++-
 src/market/MarketPlace.cc                 | 65 +----------------------
 src/market/MarketPlaceApp.cc              | 34 +++++++++++-
 src/nebula/Nebula.cc                      |  2 +
 src/oca/ruby/opennebula/marketplace.rb    | 24 ---------
 src/oca/ruby/opennebula/marketplaceapp.rb | 23 ++++++++
 src/rm/RequestManagerAllocate.cc          |  2 +
 13 files changed, 150 insertions(+), 162 deletions(-)

diff --git a/include/MarketPlace.h b/include/MarketPlace.h
index e1caee13e2..833fee370f 100644
--- a/include/MarketPlace.h
+++ b/include/MarketPlace.h
@@ -28,41 +28,6 @@
 class MarketPlace : public PoolObjectSQL, ObjectCollection
 {
 public:
-    /**
-     *  MarketPlace container types
-     */
-    enum MarketPlaceType
-    {
-		UNKNOWN       = 0, /** < Unknown types     */
-        IMAGE_MP      = 1, /** < Image MarketPlace */
-        VMTEMPLATE_MP = 2, /** < VM Template MarketPlace */
-        FLOW_MP       = 3  /** < Flow MarketPlace */
-    };
-
-    /**
-     *  Return the string representation of a MarketPlaceType
-     *    @param ob the type
-     *    @return the string
-     */
-    static string type_to_str(MarketPlaceType ob)
-    {
-        switch (ob)
-        {
-            case IMAGE_MP:      return "IMAGE_MP"; break;
-            case VMTEMPLATE_MP: return "VMTEMPLATE_MP"; break;
-            case FLOW_MP:       return "FLOW_MP"; break;
-            default:            return "";
-        }
-    };
-
-    /**
-     *  Return the string representation of a MarketPlaceType, By default it will
-     *  return IMAGE_MP.
-     *    @param str_type string representing the type
-     *    @return the MarketPlaceType
-     */
-    static MarketPlaceType str_to_type(string& str_type);
-
     /**
      * Function to print the MarketPlace object into a string in XML format
      *  @param xml the resulting XML string
@@ -115,15 +80,6 @@ public:
         return market_mad;
     };
 
-    /**
-     * Returns the marketplace type
-     *    @return marketplace type
-     */
-    MarketPlaceType get_type() const
-    {
-        return type;
-    };
-
     /**
      *  Set monitor information for the MarketPlace
      *    @param total_mb
@@ -150,11 +106,6 @@ private:
      */
     string market_mad;
 
-    /**
-     * The marketplace type
-     */
-    MarketPlaceType type;
-
     /**
      * Total capacity in MB
      */
diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index 720353a811..d66fb19fdc 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -28,6 +28,9 @@
 class MarketPlaceApp : public PoolObjectSQL
 {
 public:
+    /**
+     *  MarketPlaceApp states
+     */
     enum MarketPlaceAppState
     {
         INIT      = 0, /** < Initialization state */
@@ -53,6 +56,40 @@ public:
         }
     };
 
+    /**
+     *  MarketPlaceApp container types
+     */
+    enum MarketPlaceAppType
+    {
+		UNKNOWN    = 0, /** < Unknown types     */
+        IMAGE      = 1, /** < Image MarketPlace App*/
+        VMTEMPLATE = 2, /** < VM Template MarketPlace App*/
+        FLOW       = 3  /** < Flow MarketPlace App*/
+    };
+
+    /**
+     *  Return the string representation of a MarketPlaceType
+     *    @param ob the type
+     *    @return the string
+     */
+    static string type_to_str(MarketPlaceAppType ob)
+    {
+        switch (ob)
+        {
+            case IMAGE:      return "IMAGE"; break;
+            case VMTEMPLATE: return "VMTEMPLATE"; break;
+            case FLOW:       return "FLOW"; break;
+            default:         return "";
+        }
+    };
+
+    /**
+     *  Return the string representation of a MarketPlaceType, By default it will
+     *  return IMAGE_MP.
+     *    @param str_type string representing the type
+     *    @return the MarketPlaceType
+     */
+    static MarketPlaceAppType str_to_type(string& str_type);
 
     /**
      * Function to print the MarketPlaceApp object into a string in XML format
@@ -93,6 +130,15 @@ public:
         market_name = name;
     };
 
+    /**
+     * Returns the marketplace app type
+     *    @return marketplace app type
+     */
+    MarketPlaceAppType get_type() const
+    {
+        return type;
+    };
+
 private:
 
     friend class MarketPlaceAppPool;
@@ -155,6 +201,11 @@ private:
      */
     MarketPlaceAppState state;
 
+    /**
+     * The marketplace type
+     */
+    MarketPlaceAppType type;
+
     /**
      *  Origin of this App
      */
diff --git a/include/MarketPlacePool.h b/include/MarketPlacePool.h
index 9b21829800..f796860664 100644
--- a/include/MarketPlacePool.h
+++ b/include/MarketPlacePool.h
@@ -135,6 +135,17 @@ public:
                              limit);
     };
 
+    /**
+     *  Lists the Datastore ids
+     *  @param oids a vector with the oids of the objects.
+     *
+     *  @return 0 on success
+     */
+     int list(std::vector<int>& oids)
+     {
+        return PoolSQL::list(oids, MarketPlace::table);
+     }
+
 private:
 
     /**
diff --git a/src/cli/etc/onemarket.yaml b/src/cli/etc/onemarket.yaml
index b57e69f7dc..7d6bfca2a6 100644
--- a/src/cli/etc/onemarket.yaml
+++ b/src/cli/etc/onemarket.yaml
@@ -21,11 +21,6 @@
   :desc: Number of Marketplace Apps
   :size: 6
 
-:TYPE:
-  :desc: Marketplace type
-  :size: 4
-  :left: true
-
 :MAD:
   :desc: Marketplace driver
   :size: 7
@@ -37,5 +32,4 @@
 - :SIZE
 - :AVAIL
 - :APPS
-- :TYPE
 - :MAD
diff --git a/src/cli/etc/onemarketapp.yaml b/src/cli/etc/onemarketapp.yaml
index e832aa256e..4c40749109 100644
--- a/src/cli/etc/onemarketapp.yaml
+++ b/src/cli/etc/onemarketapp.yaml
@@ -31,6 +31,11 @@
   :desc: Publishing date for the marketplace app
   :size: 15
 
+:TYPE:
+  :desc: Marketplace app type
+  :size: 4
+  :left: true
+
 :MARKET:
   :desc: Name of the marketplace 
   :size: 10
@@ -44,4 +49,5 @@
 - :SIZE
 - :STAT
 - :DATE
+- :TYPE
 - :MARKET
diff --git a/src/cli/one_helper/onemarket_helper.rb b/src/cli/one_helper/onemarket_helper.rb
index 328e943cfa..7f584cfb3d 100644
--- a/src/cli/one_helper/onemarket_helper.rb
+++ b/src/cli/one_helper/onemarket_helper.rb
@@ -98,46 +98,45 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
         OpenNebula::MarketPlacePool.new(@client)
     end
 
-    def format_resource(datastore, options = {})
+    def format_resource(market, options = {})
         str="%-15s: %-20s"
         str_h1="%-80s"
 
-        CLIHelper.print_header(str_h1 % "MARKETPLACE #{datastore['ID']} INFORMATION")
-        puts str % ["ID",    datastore.id.to_s]
-        puts str % ["NAME",  datastore.name]
-        puts str % ["USER",  datastore['UNAME']]
-        puts str % ["GROUP", datastore['GNAME']]
-        puts str % ["TYPE",  datastore.type_str]
+        CLIHelper.print_header(str_h1 % "MARKETPLACE #{market['ID']} INFORMATION")
+        puts str % ["ID",    market.id.to_s]
+        puts str % ["NAME",  market.name]
+        puts str % ["USER",  market['UNAME']]
+        puts str % ["GROUP", market['GNAME']]
 
-        puts str % ["MARKET_MAD", datastore['MARKET_MAD']]
+        puts str % ["MARKET_MAD", market['MARKET_MAD']]
         puts
 
         CLIHelper.print_header(str_h1 % "MARKETPLACE CAPACITY", false)
 
-        puts str % ["TOTAL:", OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i,{},'M')]
-        puts str % ["FREE:",  OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')]
-        puts str % ["USED: ", OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')]
+        puts str % ["TOTAL:", OpenNebulaHelper.unit_to_str(market['TOTAL_MB'].to_i,{},'M')]
+        puts str % ["FREE:",  OpenNebulaHelper.unit_to_str(market['FREE_MB'].to_i, {},'M')]
+        puts str % ["USED: ", OpenNebulaHelper.unit_to_str(market['USED_MB'].to_i, {},'M')]
         puts
 
         CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
 
         ["OWNER", "GROUP", "OTHER"].each { |e|
             mask = "---"
-            mask[0] = "u" if datastore["PERMISSIONS/#{e}_U"] == "1"
-            mask[1] = "m" if datastore["PERMISSIONS/#{e}_M"] == "1"
-            mask[2] = "a" if datastore["PERMISSIONS/#{e}_A"] == "1"
+            mask[0] = "u" if market["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if market["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if market["PERMISSIONS/#{e}_A"] == "1"
 
             puts str % [e,  mask]
         }
         puts
 
         CLIHelper.print_header(str_h1 % "MARKETPLACE TEMPLATE", false)
-        puts datastore.template_str
+        puts market.template_str
 
         puts
 
         CLIHelper.print_header("%-15s" % "MARKETAPPS")
-        datastore.marketapp_ids.each do |id|
+        market.marketapp_ids.each do |id|
             puts "%-15s" % [id]
         end
     end
diff --git a/src/cli/one_helper/onemarketapp_helper.rb b/src/cli/one_helper/onemarketapp_helper.rb
index 2a86b3c600..0973acd55b 100644
--- a/src/cli/one_helper/onemarketapp_helper.rb
+++ b/src/cli/one_helper/onemarketapp_helper.rb
@@ -64,11 +64,16 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.time_to_str(d["DATE"])
             end
 
+            column :TYPE, "Marketplace app type", :left, :size=>4 do |d|
+                type = MarketPlaceApp::MARKETPLACEAPP_TYPES[d["TYPE"].to_i]
+                MarketPlaceApp::SHORT_MARKETPLACEAPP_TYPES[type]
+            end
+
             column :MARKET, "Name of the marketplace", :left, :size=>10 do |d|
                 d["MARKETPLACE"]
             end
 
-            default :ID,:NAME,:PUBLISHER,:VERSION,:SIZE,:STAT,:DATE,:MARKET
+            default :ID,:NAME,:PUBLISHER,:VERSION,:SIZE,:STAT,:DATE,:TYPE,:MARKET
         end
 
         table
@@ -96,6 +101,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
         CLIHelper.print_header(str_h1 % "MARKETPLACE APP #{app['ID']} INFORMATION")
         puts str % ["ID",    app.id.to_s]
         puts str % ["NAME",  app.name]
+        puts str % ["TYPE",  app.type_str]
         puts str % ["USER",  app['UNAME']]
         puts str % ["GROUP", app['GNAME']]
         puts str % ["MARKETPLACE", app['MARKETPLACE']]
diff --git a/src/market/MarketPlace.cc b/src/market/MarketPlace.cc
index 4b6ecf680c..e53916edd3 100644
--- a/src/market/MarketPlace.cc
+++ b/src/market/MarketPlace.cc
@@ -47,7 +47,6 @@ MarketPlace::MarketPlace(
         PoolObjectSQL(-1, MARKETPLACE, "", uid, gid, uname, gname, table),
         ObjectCollection("MARKETPLACEAPPS"),
         market_mad(""),
-        type(IMAGE_MP),
         total_mb(0),
         free_mb(0),
         used_mb(0)
@@ -77,8 +76,6 @@ int MarketPlace::insert(SqlDB *db, string& error_str)
 {
     std::ostringstream oss;
 
-    std::string s_mp_type;
-
     // -------------------------------------------------------------------------
     // Check default marketplace attributes
     // -------------------------------------------------------------------------
@@ -93,15 +90,6 @@ int MarketPlace::insert(SqlDB *db, string& error_str)
         goto error_mad;
     }
 
-    erase_template_attribute("TYPE", s_mp_type);
-
-    type = str_to_type(s_mp_type);
-
-	if ( type == UNKNOWN )
-	{
-		goto error_type;
-	}
-
     //--------------------------------------------------------------------------
 
     return insert_replace(db, false, error_str);
@@ -109,12 +97,9 @@ int MarketPlace::insert(SqlDB *db, string& error_str)
 error_mad:
     error_str = "No marketplace driver (MARKET_MAD) in template.";
     goto error_common;
-error_type:
-	error_str = "Unknown marketplace type: " + s_mp_type;
-	goto error_common;
 
 error_common:
-    NebulaLog::log("MARKETPLACE", Log::ERROR, error_str);
+    NebulaLog::log("MKP", Log::ERROR, error_str);
     return -1;
 }
 
@@ -220,7 +205,6 @@ std::string& MarketPlace::to_xml(std::string& xml) const
 			"<UNAME>" << uname << "</UNAME>" <<
 			"<GNAME>" << gname << "</GNAME>" <<
 			"<NAME>"  << name  << "</NAME>"  <<
-            "<TYPE>"  << type  << "</TYPE>"  <<
 			"<MARKET_MAD>"<<one_util::escape_xml(market_mad)<<"</MARKET_MAD>"<<
 			"<TOTAL_MB>" << total_mb << "</TOTAL_MB>" <<
 			"<FREE_MB>"  << free_mb  << "</FREE_MB>"  <<
@@ -241,7 +225,6 @@ std::string& MarketPlace::to_xml(std::string& xml) const
 int MarketPlace::from_xml(const std::string &xml_str)
 {
     int rc = 0;
-    int itype;
     std::vector<xmlNodePtr> content;
 
     // Initialize the internal XML object
@@ -254,7 +237,6 @@ int MarketPlace::from_xml(const std::string &xml_str)
     rc += xpath(uname, "/MARKETPLACE/UNAME", "not_found");
     rc += xpath(gname, "/MARKETPLACE/GNAME", "not_found");
     rc += xpath(name,  "/MARKETPLACE/NAME",  "not_found");
-    rc += xpath(itype, "/MARKETPLACE/TYPE",  -1);
 
     rc += xpath(market_mad, "/MARKETPLACE/MARKET_MAD", "not_found");
 
@@ -262,8 +244,6 @@ int MarketPlace::from_xml(const std::string &xml_str)
     rc += xpath(free_mb,  "/MARKETPLACE/FREE_MB",  0);
     rc += xpath(used_mb,  "/MARKETPLACE/USED_MB",  0);
 
-    type = static_cast<MarketPlace::MarketPlaceType>(itype);
-
 	// ----- Permissions -----
     rc += perms_from_xml();
 
@@ -306,28 +286,8 @@ int MarketPlace::from_xml(const std::string &xml_str)
 
 int MarketPlace::post_update_template(string& error)
 {
-	std::string new_s_type;
 	std::string new_market_mad;
 
-	MarketPlaceType new_type;
-
-	// -------------------------------------------------------------------------
-    // Sanitize TYPE and MARKET_MAD attributes
-    // -------------------------------------------------------------------------
-    erase_template_attribute("TYPE", new_s_type);
-
-    new_type = str_to_type(new_s_type);
-
-	if ( new_type == UNKNOWN )
-	{
-		error = "Unknown marketplace type: " + new_s_type;
-		return -1;
-	}
-
-	type = new_type;
-
-    add_template_attribute("TYPE", type_to_str(type));
-
     erase_template_attribute("MARKET_MAD", new_market_mad);
 
     if (!new_market_mad.empty())
@@ -340,26 +300,3 @@ int MarketPlace::post_update_template(string& error)
 	return 0;
 }
 
-/* --------------------------------------------------------------------------- */
-/* --------------------------------------------------------------------------- */
-
-MarketPlace::MarketPlaceType MarketPlace::str_to_type(string& str_type)
-{
-    one_util::toupper(str_type);
-
-    if ( str_type == "IMAGE_MP" )
-    {
-        return IMAGE_MP;
-    }
-    else if ( str_type == "VMTEMPLATE_MP" )
-    {
-        return VMTEMPLATE_MP;
-    }
-    else if ( str_type == "FLOW_MP" )
-    {
-        return FLOW_MP;
-    }
-
-    return UNKNOWN;
-}
-
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 279dfa6321..eddaacee40 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -54,7 +54,8 @@ MarketPlaceApp::MarketPlaceApp(
         apptemplate64(""),
         market_id(-1),
         market_name(""),
-        state(INIT)
+        state(INIT),
+        type(IMAGE)
 {
     if (app_template != 0)
     {
@@ -95,6 +96,8 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
 
     date = time(NULL);
 
+    type = IMAGE;
+
     //Known attributes
     //ORIGIN
     //DESCRIPTION
@@ -134,7 +137,7 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
 
 error_origin:
     error_str = "Missing ORIGIN for the MARKETPLACEAPP";
-    NebulaLog::log("MRK", Log::ERROR, error_str);
+    NebulaLog::log("MKP", Log::ERROR, error_str);
     return -1;
 }
 
@@ -249,6 +252,7 @@ std::string& MarketPlaceApp::to_xml(std::string& xml) const
             "<MARKETPLACE_ID>" << market_id     << "</MARKETPLACE_ID>" <<
             "<MARKETPLACE>"    << market_name   << "</MARKETPLACE>" <<
             "<STATE>"          << state         << "</STATE>" <<
+            "<TYPE>"           << type          << "</TYPE>"  <<
 			perms_to_xml(perm_str) <<
 			obj_template->to_xml(template_xml) <<
         "</MARKETPLACEAPP>";
@@ -265,6 +269,7 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
 {
     int rc = 0;
     int istate;
+    int itype;
     std::vector<xmlNodePtr> content;
 
     // Initialize the internal XML object
@@ -281,6 +286,7 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
     rc += xpath(source,       "/MARKETPLACEAPP/SOURCE","not_found");
     rc += xpath(origin,       "/MARKETPLACEAPP/ORIGIN","not_found");
     rc += xpath(istate,       "/MARKETPLACEAPP/STATE", -1);
+    rc += xpath(itype,        "/MARKETPLACEAPP/TYPE",  -1);
     rc += xpath(description,  "/MARKETPLACEAPP/DESCRIPTION", "not_found");
     rc += xpath(size_mb,      "/MARKETPLACEAPP/SIZE", -1);
     rc += xpath(version,      "/MARKETPLACEAPP/VERSION", "not_found");
@@ -291,6 +297,7 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
     rc += xpath(market_id,    "/MARKETPLACEAPP/MARKETPLACE_ID", -1);
 
     state = static_cast<MarketPlaceAppState>(istate);
+    type  = static_cast<MarketPlaceAppType>(itype);
 
 	// ----- Permissions -----
     rc += perms_from_xml();
@@ -341,3 +348,26 @@ int MarketPlaceApp::post_update_template(string& error)
 	return 0;
 }
 
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+MarketPlaceApp::MarketPlaceAppType MarketPlaceApp::str_to_type(string& str_type)
+{
+    one_util::toupper(str_type);
+
+    if ( str_type == "IMAGE" )
+    {
+        return IMAGE;
+    }
+    else if ( str_type == "VMTEMPLATE" )
+    {
+        return VMTEMPLATE;
+    }
+    else if ( str_type == "FLOW" )
+    {
+        return FLOW;
+    }
+
+    return UNKNOWN;
+}
+
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index a69c4dd312..5d3474578c 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -910,6 +910,8 @@ void Nebula::start(bool bootstrap_only)
 
     lcm->init_managers();
 
+    marketm->init_managers();
+
     // ---- Start the Request Manager ----
 
     rc = rm->start();
diff --git a/src/oca/ruby/opennebula/marketplace.rb b/src/oca/ruby/opennebula/marketplace.rb
index 3b83dc1f82..439f42c5a7 100644
--- a/src/oca/ruby/opennebula/marketplace.rb
+++ b/src/oca/ruby/opennebula/marketplace.rb
@@ -32,15 +32,6 @@ module OpenNebula
             :rename     => "market.rename"
         }
 
-        MARKETPLACE_TYPES=%w{UNKNOWN IMAGE_MP VMTEMPLATE_MP FLOW_MP}
-
-        SHORT_MARKETPLACE_TYPES = {
-            "UNKNOWN"   => "unk",
-            "IMAGE_MP"     => "img",
-            "VMTEMPLATE_MP"=> "tpl",
-            "FLOW_MP"      => "flo"
-        }
-
         # Creates a MarketPlace description with just its identifier
         # this method should be used to create plain MarketPlace objects.
         # +id+ the id of the user
@@ -146,21 +137,6 @@ module OpenNebula
         # Helpers to get information
         # ---------------------------------------------------------------------
 
-        # Returns the marketplace type
-        def type
-            self['TYPE'].to_i
-        end
-
-        # Returns the marketplace type (string value)
-        def type_str
-            MARKETPLACE_TYPES[type]
-        end
-
-        # Returns the marketplace type (string value)
-        def short_type_str
-            SHORT_MARKETPLACE_TYPES[type_str]
-        end
-
         # Returns whether or not the marketplace app with id 'id' is part of
         # this marketplace
         def contains(id)
diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb
index e1df6721eb..94c44c068c 100644
--- a/src/oca/ruby/opennebula/marketplaceapp.rb
+++ b/src/oca/ruby/opennebula/marketplaceapp.rb
@@ -41,6 +41,14 @@ module OpenNebula
             "ERROR"     => "err",
         }
 
+        MARKETPLACEAPP_TYPES=%w{UNKNOWN IMAGE VMTEMPLATE FLOW}
+
+        SHORT_MARKETPLACEAPP_TYPES = {
+            "UNKNOWN"   => "unk",
+            "IMAGE"     => "img",
+            "VMTEMPLATE"=> "tpl",
+            "FLOW"      => "flo"
+        }
         # Creates a MarketPlace description with just its identifier
         # this method should be used to create plain MarketPlace objects.
         # +id+ the id of the user
@@ -147,6 +155,21 @@ module OpenNebula
         # Helpers to get information
         # ---------------------------------------------------------------------
 
+        # Returns the marketplace app type
+        def type
+            self['TYPE'].to_i
+        end
+
+        # Returns the marketplace app type (string value)
+        def type_str
+            MARKETPLACEAPP_TYPES[type]
+        end
+
+        # Returns the marketplace app type (string value)
+        def short_type_str
+            SHORT_MARKETPLACEAPP_TYPES[type_str]
+        end
+
         # Returns the state of the marketplace app (numeric value)
         def state
             self['STATE'].to_i
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 999048f88b..93c3929f0a 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -855,4 +855,6 @@ int MarketPlaceAppAllocate::pool_allocate(
 
         mp->unlock();
     }
+
+    return rc;
 }

From 949fa9504a00cabaf05dd5dd52b4142667e7c2b3 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sun, 13 Dec 2015 18:17:29 +0100
Subject: [PATCH 021/197] feature #4217: MarketPlaceManager for Markets and
 Apps

---
 include/MarketPlaceManger.h      | 200 ++++++++++++++++++++++++
 src/market/MarketPlaceManager.cc | 258 +++++++++++++++++++++++++++++++
 2 files changed, 458 insertions(+)
 create mode 100644 include/MarketPlaceManger.h
 create mode 100644 src/market/MarketPlaceManager.cc

diff --git a/include/MarketPlaceManger.h b/include/MarketPlaceManger.h
new file mode 100644
index 0000000000..d2421b6ff9
--- /dev/null
+++ b/include/MarketPlaceManger.h
@@ -0,0 +1,200 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef MARKETPLACE_MANAGER_H_
+#define MARKETPLACE_MANAGER_H_
+
+#include "MadManager.h"
+#include "ActionManager.h"
+#include "MarketPlaceManagerDriver.h"
+
+extern "C" void * marketplace_action_loop(void *arg);
+
+class MarketPlace;
+class MarketPlaceApp;
+
+class MarketPlaceManager : public MadManager, public ActionListener
+{
+public:
+
+    MarketPlaceManager(
+            time_t _timer_period,
+            time_t _monitor_period,
+            std::vector<const Attribute*>& _mads):
+        MadManager(_mads),
+        timer_period(_timer_period),
+        monitor_period(_monitor_period),
+        mppool(0),
+        apppool(0)
+    {
+        am.addListener(this);
+    };
+
+    ~MarketPlaceManager(){};
+
+    /**
+     *  This functions starts the associated listener thread, and creates a
+     *  new thread for the MarketPlace Manager. This thread will wait in
+     *  an action loop till it receives ACTION_FINALIZE.
+     *    @return 0 on success.
+     */
+    int start();
+
+    /**
+     *  Loads the MarketPlace Driver defined in configuration file
+     *   @param uid of the user executing the driver. When uid is 0 the nebula
+     *   identity will be used. Otherwise the Mad will be loaded through the
+     *   sudo application.
+     */
+    int load_mads(int uid=0);
+
+    /**
+     *  Gets the thread identification.
+     *    @return pthread_t for the manager thread (that in the action loop).
+     */
+    pthread_t get_thread_id() const
+    {
+        return marektm_thread;
+    };
+
+    /**
+     *  Finalizes the Image Manager
+     */
+    void finalize()
+    {
+        am.trigger(ACTION_FINALIZE,0);
+    };
+
+    /**
+     *  Imports a new app into the marketplace. The marketplace app needs to
+     *  include the ORIGIN attribute so the driver can locate the app. An
+     *  optional template maybe provided to export the app to a cloud.
+     *    @param appid of the app
+     *    @param market_data of the associated marketplace in XML format
+     *    @param error descrition
+     *
+     *    @return 0 on success
+     */
+    int import_app(int appid, const std::string& market_data, std::string& error);
+
+    /**
+     *  Exports the app to this cloud. If an APPTEMPLATE64 is provided associated
+     *  objects can also be created.
+     *    @param appid of the app
+     *    @param market_data of the associated marketplace in XML format
+     *    @param error descrition
+     *
+     *    @return 0 on success
+     */
+    int export_app(int appid, const std::string& market_data, std::string& error);
+
+    /**
+     *  Deletes an app from the marketplace.
+     *    @param iid id of image
+     *    @param error_str Error reason, if any
+     *
+     *    @return 0 on success
+     */
+    int delete_app(int iid, std::string& error_str);
+
+     /**
+      *  Trigger a monitor action for the marketplace .
+      *    @param ds_id id of the datastore to monitor
+      */
+     void monitor_market(int ds_id);
+
+private:
+    /**
+     *  Generic name for the marketplace driver
+     */
+     static const char *  market_driver_name;
+
+    /**
+     *  Thread id for the MarketPlace Manager
+     */
+    pthread_t             marketm_thread;
+
+    /**
+     *  Timer period for the Image Manager.
+     */
+    time_t                timer_period;
+
+    /**
+     *  Marketplace monitor interval
+     */
+    time_t                monitor_period;
+
+    /**
+     *  Pointer to the marketplace pool
+     */
+    MarketPlacePool *     mppool;
+
+    /**
+     *  Pointer to the app pool
+     */
+    MarketPlaceAppPool * apppool;
+
+    /**
+     *  Action engine for the Manager
+     */
+    ActionManager         am;
+
+    /**
+     *  Returns a pointer to the marketplace driver.
+     *    @return the marketplace manager driver or 0 in not found
+     */
+    const MarketPlaceManagerDriver * get()
+    {
+        std::string name("NAME");
+
+        return static_cast<const MarketPlaceManagerDriver *>
+               (MadManager::get(0, name, market_driver_name));
+    };
+
+    /**
+     *  Function to execute the Manager action loop method within a new pthread
+     * (requires C linkage)
+     */
+    friend void * marketplace_action_loop(void *arg);
+
+    /**
+     *  The action function executed when an action is triggered.
+     *    @param action the name of the action
+     *    @param arg arguments for the action function
+     */
+    void do_action(const std::string& action, void * arg);
+
+    /**
+     * Formats an XML message for the MAD
+     *
+     *    @param app_data marketplace app XML representation
+     *    @param market_data marketplace XML representation
+     *    @param extra_data additional XML formatted data for the driver
+     *
+     *    @return the XML message
+     */
+    static std::string * format_message(
+            const std::string& app_data,
+            const std::string& market_data,
+            const std::string& extra_data);
+    /**
+     *  This function is executed periodically to monitor marketplaces..
+     */
+    void timer_action();
+};
+
+#endif /*MARKETPLACE_MANAGER_H*/
+
diff --git a/src/market/MarketPlaceManager.cc b/src/market/MarketPlaceManager.cc
new file mode 100644
index 0000000000..65b4a52fa6
--- /dev/null
+++ b/src/market/MarketPlaceManager.cc
@@ -0,0 +1,258 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "MarketPlaceManager.h"
+#include "NebulaLog.h"
+#include "MarketPlacePool.h"
+#include "MarketPlaceAppPool.h"
+#include "Nebula.h"
+
+const char * MarketPlaceManager::market_driver_name = "market_exe";
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+extern "C" void * marketplace_action_loop(void *arg)
+{
+    MarketPlaceManager * mpm;
+
+    if ( arg == 0 )
+    {
+        return 0;
+    }
+
+    NebulaLog::log("MKP", Log::INFO, "Marketplace Manager started.");
+
+    mpm = static_cast<MarketPlaceManager *>(arg);
+
+    mpm->am.loop(mpm->timer_period, 0);
+
+    NebulaLog::log("MKP", Log::INFO, "Marketplace Manager stopped.");
+
+    return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlaceManager::load_mads(int uid)
+{
+    MarketPlaceManagerDriver * marketm_mad;
+
+    std::ostringstream      oss;
+    const VectorAttribute * vattr = 0;
+
+    int rc;
+
+    NebulaLog::log("MKP", Log::INFO,"Loading Marketplace Manager driver.");
+
+    if ( mad_conf.size() > 0 )
+    {
+        vattr = static_cast<const VectorAttribute *>(mad_conf[0]);
+    }
+
+    if ( vattr == 0 )
+    {
+        NebulaLog::log("MKP", Log::INFO,"Failed to load Marketplace Manager driver.");
+        return -1;
+    }
+
+    VectorAttribute market_conf("MARKET_MAD", vattr->value());
+
+    market_conf.replace("NAME", market_driver_name);
+
+    marketm_mad= new MarketManagerDriver(0, market_conf.value(), false);
+
+    rc = add(marketm_mad);
+
+    if ( rc == 0 )
+    {
+        oss.str("");
+        oss << "\tMarketplace Manager loaded";
+
+        NebulaLog::log("MKP", Log::INFO, oss);
+    }
+
+    return rc;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlaceManager::start()
+{
+    int            rc;
+    pthread_attr_t pattr;
+
+    rc = MadManager::start();
+
+    if ( rc != 0 )
+    {
+        return -1;
+    }
+
+    NebulaLog::log("ImM",Log::INFO,"Starting Marketplace Manager...");
+
+    pthread_attr_init (&pattr);
+    pthread_attr_setdetachstate (&pattr, PTHREAD_CREATE_JOINABLE);
+
+    rc = pthread_create(&marketm_thread, &pattr, marketplace_action_loop,
+            (void *) this);
+
+    return rc;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManager::do_action(const string &action, void * arg)
+{
+    if (action == ACTION_TIMER)
+    {
+        timer_action();
+    }
+    else if (action == ACTION_FINALIZE)
+    {
+        NebulaLog::log("MKP", Log::INFO, "Stopping Marketplace Manager...");
+        MadManager::stop();
+    }
+    else
+    {
+        std::ostringstream oss;
+        oss << "Unknown action name: " << action;
+
+        NebulaLog::log("MKP", Log::ERROR, oss);
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManager::init_managers()
+{
+    Nebula& nd = Nebula::instance();
+
+    mppool = nd.get_mppool();
+    appool = nd.get_appool();
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+string * MarketPlaceManager::format_message(
+    const string& app_data,
+    const string& market_data,
+    const string& extra_data)
+{
+    ostringstream oss;
+
+    oss << "<MARKET_DRIVER_ACTION_DATA>"
+        << app_data
+        << market_data
+        << extra_data
+        << "</MARKET_DRIVER_ACTION_DATA>";
+
+    return one_util::base64_encode(oss.str());
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManager::timer_action()
+{
+    static int mark = 0;
+    static int tics = monitor_period;
+
+    mark += timer_period;
+    tics += timer_period;
+
+    if ( mark >= 600 )
+    {
+        NebulaLog::log("MKP",Log::INFO,"--Mark--");
+        mark = 0;
+    }
+
+    if ( tics < monitor_period )
+    {
+        return;
+    }
+
+    tics = 0;
+
+    int rc;
+
+    std::vector<int> markets;
+    std::vector<int>::iterator it;
+
+    rc = mppool->list(markets);
+
+    if ( rc != 0 )
+    {
+        return;
+    }
+
+    for(it = markets.begin() ; it != markets.end(); it++)
+    {
+        monitor_market(*it);
+    }
+
+    return;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManager::monitor_market(int mp_id)
+{
+    std::string  mp_data;
+    std::string  mp_name;
+    std::string* drv_msg;
+
+    std::ostringstream oss;
+
+    const MarketPlaceManagerDriver* mpmd = get();
+
+    if ( mpmd == 0 )
+    {
+        oss << "Error getting MarketPlaceManagerDriver";
+
+        NebulaLog::log("MKP", Log::ERROR, oss);
+        return;
+    }
+
+    MarketPlace * mp = mppool->get(mp_id, true);
+
+    if ( ds == 0 )
+    {
+        return;
+    }
+
+    mp->to_xml(mp_data);
+
+    mp_name = mp->get_name();
+
+    mp->unlock();
+
+    drv_msg = MarketPlaceManager::format_message("", mp_data, "");
+
+    oss << "Monitoring marketplace " << mp_name  << " (" << mp_id << ")";
+
+    NebulaLog::log("MKP", Log::DEBUG, oss);
+
+    mpmd->monitor(mp_id, *drv_msg);
+
+    delete drv_msg;
+}

From 632fb755c42cdcbcf5fd738d21383fbf10f0d993 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 14 Dec 2015 16:47:33 +0100
Subject: [PATCH 022/197] feature #4217: first version of Market Manager

---
 ...rketPlaceManger.h => MarketPlaceManager.h} |  16 +-
 include/MarketPlaceManagerDriver.h            |  88 +++++
 include/Nebula.h                              |  10 +-
 src/market/MarketPlaceManager.cc              |  12 +-
 src/market/MarketPlaceManagerDriver.cc        | 311 ++++++++++++++++++
 src/market/SConstruct                         |   4 +-
 6 files changed, 429 insertions(+), 12 deletions(-)
 rename include/{MarketPlaceManger.h => MarketPlaceManager.h} (95%)
 create mode 100644 include/MarketPlaceManagerDriver.h
 create mode 100644 src/market/MarketPlaceManagerDriver.cc

diff --git a/include/MarketPlaceManger.h b/include/MarketPlaceManager.h
similarity index 95%
rename from include/MarketPlaceManger.h
rename to include/MarketPlaceManager.h
index d2421b6ff9..4d90c6aac7 100644
--- a/include/MarketPlaceManger.h
+++ b/include/MarketPlaceManager.h
@@ -23,8 +23,8 @@
 
 extern "C" void * marketplace_action_loop(void *arg);
 
-class MarketPlace;
-class MarketPlaceApp;
+class MarketPlacePool;
+class MarketPlaceAppPool;
 
 class MarketPlaceManager : public MadManager, public ActionListener
 {
@@ -45,6 +45,12 @@ public:
 
     ~MarketPlaceManager(){};
 
+    /**
+     * Initializes internal pointers to other managers. Must be called when
+     * all the other managers exist in Nebula::instance
+     */
+    void init_managers();
+
     /**
      *  This functions starts the associated listener thread, and creates a
      *  new thread for the MarketPlace Manager. This thread will wait in
@@ -67,7 +73,7 @@ public:
      */
     pthread_t get_thread_id() const
     {
-        return marektm_thread;
+        return marketm_thread;
     };
 
     /**
@@ -88,7 +94,7 @@ public:
      *
      *    @return 0 on success
      */
-    int import_app(int appid, const std::string& market_data, std::string& error);
+    int import_app(int appid, const std::string& market_data, std::string& err);
 
     /**
      *  Exports the app to this cloud. If an APPTEMPLATE64 is provided associated
@@ -99,7 +105,7 @@ public:
      *
      *    @return 0 on success
      */
-    int export_app(int appid, const std::string& market_data, std::string& error);
+    int export_app(int appid, const std::string& market_data, std::string& err);
 
     /**
      *  Deletes an app from the marketplace.
diff --git a/include/MarketPlaceManagerDriver.h b/include/MarketPlaceManagerDriver.h
new file mode 100644
index 0000000000..0a88321114
--- /dev/null
+++ b/include/MarketPlaceManagerDriver.h
@@ -0,0 +1,88 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef MARKETPLACE_MANAGER_DRIVER_H_
+#define MARKETPLACE_MANAGER_DRIVER_H_
+
+#include <map>
+#include <string>
+#include <sstream>
+
+#include "Mad.h"
+
+/**
+ *  ImageManagerDriver represents the basic abstraction for Image Repository
+ *  drivers. It implements the protocol and recover functions from the Mad
+ *  interface.
+ */
+class MarketPlaceManagerDriver : public Mad
+{
+public:
+    MarketPlaceManagerDriver(int   userid,
+       const std::map<string,string>& attrs,
+       bool  sudo):
+            Mad(userid,attrs,sudo){};
+
+    virtual ~MarketPlaceManagerDriver(){};
+
+    /**
+     *  Implements the Image Manager driver protocol.
+     *    @param message the string read from the driver
+     */
+    void protocol(const std::string& message) const;
+
+    /**
+     *  TODO: What do we need here? Check on-going xfr?
+     */
+    void recover();
+
+private:
+    friend class MarketPlaceManager;
+
+    /**
+     *  Sends a stat  request to the MAD.
+     *    @param oid the id of the stat request
+     *    @param drv_msg xml data for the mad operation.
+     */
+    void importapp(int oid, const std::string& drv_msg) const;
+
+    /**
+     *  Sends a make filesystem request to the MAD.
+     *    @param oid the image id.
+     *    @param drv_msg xml data for the mad operation.
+     */
+    void exportapp(int oid, const std::string& drv_msg) const;
+
+    /**
+     *  Sends a delete request to the MAD: "DELETE IMAGE_ID PATH"
+     *    @param oid the image id.
+     *    @param drv_msg xml data for the mad operation.
+     */
+    void deleteapp(int oid, const std::string& drv_msg) const;
+
+    /**
+     *  Sends a monitor request to the MAD: "MONITOR DS_ID DS_XML"
+     *    @param oid the datastore id.
+     *    @param drv_msg xml data for the mad operation.
+     */
+    void monitor(int oid, const std::string& drv_msg) const;
+};
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+#endif /*MARKETPLACE_MANAGER_DRIVER_H_*/
+
diff --git a/include/Nebula.h b/include/Nebula.h
index 7ca5724ada..42f36674ce 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -48,6 +48,7 @@
 #include "AuthManager.h"
 #include "AclManager.h"
 #include "ImageManager.h"
+#include "MarketPlaceManager.h"
 
 #include "DefaultQuotas.h"
 
@@ -203,6 +204,11 @@ public:
         return aclm;
     };
 
+    MarketPlaceManager * get_marketm()
+    {
+        return marketm;
+    };
+
     // --------------------------------------------------------------
     // Environment & Configuration
     // --------------------------------------------------------------
@@ -678,7 +684,7 @@ private:
         dspool(0), clpool(0), docpool(0), zonepool(0),
         secgrouppool(0), vdcpool(0), vrouterpool(0), marketpool(0), apppool(0),
         lcm(0), vmm(0), im(0), tm(0), dm(0), rm(0), hm(0), authm(0),
-        aclm(0), imagem(0)
+        aclm(0), imagem(0), marketm(0)
     {
         const char * nl = getenv("ONE_LOCATION");
 
@@ -739,6 +745,7 @@ private:
         delete authm;
         delete aclm;
         delete imagem;
+        delete marketm;
         delete nebula_configuration;
         delete db;
         delete system_db;
@@ -826,6 +833,7 @@ private:
     AuthManager *           authm;
     AclManager *            aclm;
     ImageManager *          imagem;
+    MarketPlaceManager *    marketm;
 
     // ---------------------------------------------------------------
     // Implementation functions
diff --git a/src/market/MarketPlaceManager.cc b/src/market/MarketPlaceManager.cc
index 65b4a52fa6..696f0e37e7 100644
--- a/src/market/MarketPlaceManager.cc
+++ b/src/market/MarketPlaceManager.cc
@@ -15,9 +15,11 @@
 /* -------------------------------------------------------------------------- */
 
 #include "MarketPlaceManager.h"
-#include "NebulaLog.h"
 #include "MarketPlacePool.h"
 #include "MarketPlaceAppPool.h"
+#include "MarketPlaceManagerDriver.h"
+
+#include "NebulaLog.h"
 #include "Nebula.h"
 
 const char * MarketPlaceManager::market_driver_name = "market_exe";
@@ -74,7 +76,7 @@ int MarketPlaceManager::load_mads(int uid)
 
     market_conf.replace("NAME", market_driver_name);
 
-    marketm_mad= new MarketManagerDriver(0, market_conf.value(), false);
+    marketm_mad= new MarketPlaceManagerDriver(0, market_conf.value(), false);
 
     rc = add(marketm_mad);
 
@@ -145,8 +147,8 @@ void MarketPlaceManager::init_managers()
 {
     Nebula& nd = Nebula::instance();
 
-    mppool = nd.get_mppool();
-    appool = nd.get_appool();
+    mppool  = nd.get_marketpool();
+    apppool = nd.get_apppool();
 }
 
 /* -------------------------------------------------------------------------- */
@@ -235,7 +237,7 @@ void MarketPlaceManager::monitor_market(int mp_id)
 
     MarketPlace * mp = mppool->get(mp_id, true);
 
-    if ( ds == 0 )
+    if ( mp == 0 )
     {
         return;
     }
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
new file mode 100644
index 0000000000..b793c755e9
--- /dev/null
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -0,0 +1,311 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "MarketPlaceManagerDriver.h"
+#include "Nebula.h"
+#include <sstream>
+
+/* ************************************************************************** */
+/* Driver ASCII Protocol Implementation                                       */
+/* ************************************************************************** */
+
+void MarketPlaceManagerDriver::importapp(int oid, const std::string& msg) const
+{
+    std::ostringstream os;
+
+    os << "IMPORT " << oid << " " << msg << endl;
+
+    write(os);
+}
+
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManagerDriver::exportapp(int oid, const std::string& msg) const
+{
+    std::ostringstream os;
+
+    os << "EXPORT " << oid << " " << msg << endl;
+
+    write(os);
+}
+
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManagerDriver::deleteapp(int oid, const std::string& msg) const
+{
+    std::ostringstream os;
+
+    os << "DELETE " << oid << " " << msg << endl;
+
+    write(os);
+}
+
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManagerDriver::monitor(int oid, const std::string& msg) const
+{
+    std::ostringstream os;
+
+    os << "MONITOR " << oid << " " << msg << endl;
+
+    write(os);
+}
+
+/* ************************************************************************** */
+/* MAD Interface                                                              */
+/* ************************************************************************** */
+/*
+static int delete_action(istringstream& is,
+                     ImagePool*     ipool,
+                     int            id,
+                     const string&  result)
+{
+    int rc;
+    int ds_id = -1;
+
+    string  tmp_error;
+    string  source;
+    string  info;
+    Image * image;
+
+    ostringstream oss;
+
+    image = ipool->get(id, true);
+
+    if ( image == 0 )
+    {
+        return ds_id;
+    }
+
+    ds_id  = image->get_ds_id();
+    source = image->get_source();
+
+    rc = ipool->drop(image, tmp_error);
+
+    image->unlock();
+
+    if ( result == "FAILURE" )
+    {
+       goto error;
+    }
+    else if ( rc < 0 )
+    {
+        goto error_drop;
+    }
+
+    NebulaLog::log("ImM", Log::INFO, "Image successfully removed.");
+
+    return ds_id;
+
+error_drop:
+    oss << "Error removing image from DB: " << tmp_error
+        << ". Remove image source " << source << " to completely delete image.";
+
+    NebulaLog::log("ImM", Log::ERROR, oss);
+    return ds_id;
+
+error:
+    oss << "Error removing image from datastore. Manually remove image source "
+        << source << " to completely delete the image";
+
+    getline(is,info);
+
+    if (!info.empty() && (info[0] != '-'))
+    {
+        oss << ": " << info;
+    }
+
+    NebulaLog::log("ImM", Log::ERROR, oss);
+
+    return ds_id;
+}
+*/
+/* -------------------------------------------------------------------------- */
+/*
+static void monitor_action(istringstream& is,
+                           DatastorePool* dspool,
+                           int            id,
+                           const string&  result)
+{
+    string  dsinfo64;
+    string *dsinfo = 0;
+
+    ostringstream oss;
+
+    getline (is, dsinfo64);
+
+    if (is.fail())
+    {
+        oss << "Error monitoring datastore " << id << ". Bad monitor data: "
+            << dsinfo64;
+
+        NebulaLog::log("ImM", Log::ERROR, oss);
+        return;
+    }
+
+    dsinfo = one_util::base64_decode(dsinfo64);
+
+    if (dsinfo == 0)
+    {
+        oss << "Error monitoring datastore " << id << ". Bad monitor data: "
+            << dsinfo64;
+
+        NebulaLog::log("ImM", Log::ERROR, oss);
+        return;
+    }
+
+    if (result != "SUCCESS")
+    {
+        oss << "Error monitoring datastore " << id << ": " << *dsinfo;
+        NebulaLog::log("ImM", Log::ERROR, oss);
+
+        delete dsinfo;
+        return;
+    }
+
+    Template monitor_data;
+
+    char*  error_msg;
+    int    rc = monitor_data.parse(*dsinfo, &error_msg);
+
+    if ( rc != 0 )
+    {
+        oss << "Error parsing datastore information: " << error_msg
+            << ". Monitoring information: " << endl << *dsinfo;
+
+        NebulaLog::log("ImM", Log::ERROR, oss);
+
+        delete dsinfo;
+        free(error_msg);
+
+        return;
+    }
+
+    delete dsinfo;
+
+    float  total, free, used;
+    string ds_name;
+
+    monitor_data.get("TOTAL_MB", total);
+    monitor_data.get("FREE_MB", free);
+    monitor_data.get("USED_MB", used);
+
+    Datastore * ds = dspool->get(id, true);
+
+    if (ds == 0 )
+    {
+        return;
+    }
+
+    ds_name = ds->get_name();
+
+    ds->update_monitor(total, free, used);
+
+    dspool->update(ds);
+
+    ds->unlock();
+
+    oss << "Datastore " << ds_name << " (" << id << ") successfully monitored.";
+
+    NebulaLog::log("ImM", Log::DEBUG, oss);
+
+    return;
+}
+*/
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManagerDriver::protocol(const string& message) const
+{
+    std::istringstream is(message);
+    std::ostringstream oss;
+
+    std::string action;
+    std::string result;
+    std::string source;
+    std::string info;
+
+    int id;
+
+    oss << "Message received: " << message;
+    NebulaLog::log("MKP", Log::DDEBUG, oss);
+
+    // --------------------- Parse the driver message --------------------------
+
+    if ( is.good() )
+        is >> action >> ws;
+    else
+        return;
+
+    if ( is.good() )
+        is >> result >> ws;
+    else
+        return;
+
+    if ( is.good() )
+    {
+        is >> id >> ws;
+
+        if ( is.fail() )
+        {
+            if ( action == "LOG" )
+            {
+                is.clear();
+                getline(is,info);
+
+                NebulaLog::log("MKP",log_type(result[0]), info.c_str());
+            }
+
+            return;
+        }
+    }
+    else
+        return;
+
+    if (action == "EXPORT")
+    {
+        return;
+    }
+    else if (action == "IMPORT")
+    {
+        return;
+    }
+    else if (action == "DELETE")
+    {
+        return;
+    }
+    else if (action == "MONITOR")
+    {
+        return;
+    }
+    else if (action == "LOG")
+    {
+        getline(is,info);
+        NebulaLog::log("MKP", log_type(result[0]), info.c_str());
+    }
+
+    return;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void MarketPlaceManagerDriver::recover()
+{
+    NebulaLog::log("MKP",Log::INFO,"Recovering MarketPlace drivers");
+}
+
diff --git a/src/market/SConstruct b/src/market/SConstruct
index 5f5ebd67da..e6c39bc402 100644
--- a/src/market/SConstruct
+++ b/src/market/SConstruct
@@ -25,7 +25,9 @@ source_files=[
     'MarketPlace.cc',
     'MarketPlacePool.cc',
     'MarketPlaceApp.cc',
-    'MarketPlaceAppPool.cc'
+    'MarketPlaceAppPool.cc',
+    'MarketPlaceManager.cc',
+    'MarketPlaceManagerDriver.cc'
 ]
 
 # Build library

From 31cfdce5b20d543e140d9136486c235c74fb1d2e Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Tue, 15 Dec 2015 00:49:36 +0100
Subject: [PATCH 023/197] feature #4217: Actions for MarketPlace Manager

---
 include/MarketPlaceApp.h                | 23 ++++++++
 include/MarketPlaceAppPool.h            |  2 +
 src/market/MarketPlaceAppPool.cc        | 24 +++++++-
 src/market/MarketPlaceManagerActions.cc | 66 ++++++++++++++++++++++
 src/market/MarketPlaceManagerDriver.cc  | 74 +++++++++++++++++++++++++
 src/market/SConstruct                   |  3 +-
 src/rm/RequestManagerAllocate.cc        |  5 +-
 7 files changed, 194 insertions(+), 3 deletions(-)
 create mode 100644 src/market/MarketPlaceManagerActions.cc

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index d66fb19fdc..47113800ce 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -139,6 +139,29 @@ public:
         return type;
     };
 
+    //--------------------------------------------------------------------------
+    // Set Marketplace app attributes
+    //--------------------------------------------------------------------------
+    void set_state(MarketPlaceAppState _state)
+    {
+        state = _state;
+    };
+
+    void set_source(const std::string& _source)
+    {
+        source = _source;
+    };
+
+    void set_checksum(const std::string& _checksum)
+    {
+        checksum = _checksum;
+    };
+
+    void set_size(long long _size_mb)
+    {
+        size_mb = _size_mb;
+    };
+
 private:
 
     friend class MarketPlaceAppPool;
diff --git a/include/MarketPlaceAppPool.h b/include/MarketPlaceAppPool.h
index 6a2a0e6640..b23c364ece 100644
--- a/include/MarketPlaceAppPool.h
+++ b/include/MarketPlaceAppPool.h
@@ -42,6 +42,7 @@ public:
      *    @param apptemplate MarketPlaceApp definition template
      *    @param mp_id of the MarketPlace to store de App
      *    @param mp_name of the MarketPlace
+     *    @param mp_data XML representation of the target MarketPlace
      *    @param oid the id assigned to the MarketPlace
      *    @param error_str Returns the error reason, if any
      *
@@ -56,6 +57,7 @@ public:
             MarketPlaceAppTemplate * apptemplate,
             int                mp_id,
             const std::string& mp_name,
+            const std::string& mp_data,
             int *              oid,
             std::string&       error_str);
 
diff --git a/src/market/MarketPlaceAppPool.cc b/src/market/MarketPlaceAppPool.cc
index 12fee4a354..318a4abd80 100644
--- a/src/market/MarketPlaceAppPool.cc
+++ b/src/market/MarketPlaceAppPool.cc
@@ -29,12 +29,16 @@ int MarketPlaceAppPool:: allocate(
             MarketPlaceAppTemplate * apptemplate,
             int                mp_id,
             const std::string& mp_name,
+            const std::string& mp_data,
             int *              oid,
             std::string&       error_str)
 {
     MarketPlaceApp * mp;
     MarketPlaceApp * mp_aux = 0;
 
+    Nebula&                   nd = Nebula::instance();
+    MarketPlaceManager * marketm = nd.get_marketm();
+
     std::string name;
 
     std::ostringstream oss;
@@ -49,7 +53,6 @@ int MarketPlaceAppPool:: allocate(
     // -------------------------------------------------------------------------
     // Check name & duplicates
     // -------------------------------------------------------------------------
-
     mp->get_template_attribute("NAME", name);
 
     if ( !PoolObjectSQL::name_is_valid(name, error_str) )
@@ -66,6 +69,25 @@ int MarketPlaceAppPool:: allocate(
 
     *oid = PoolSQL::allocate(mp, error_str);
 
+    if ( *oid != -1 )
+    {
+        if (marketm->import_app(*oid, mp_data, error_str) == -1)
+        {
+            MarketPlaceApp * app = get(*oid, true);
+
+            if ( app != 0 )
+            {
+                string aux_str;
+
+                drop(app, aux_str);
+
+                app->unlock();
+            }
+
+            *oid = -1;
+        }
+    }
+
     return *oid;
 
 error_duplicated:
diff --git a/src/market/MarketPlaceManagerActions.cc b/src/market/MarketPlaceManagerActions.cc
new file mode 100644
index 0000000000..8fe7e19c28
--- /dev/null
+++ b/src/market/MarketPlaceManagerActions.cc
@@ -0,0 +1,66 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "MarketPlaceManager.h"
+#include "MarketPlacePool.h"
+#include "MarketPlaceAppPool.h"
+#include "MarketPlaceManagerDriver.h"
+
+#include "NebulaLog.h"
+#include "Nebula.h"
+
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlaceManager::import_app(
+        int                appid,
+        const std::string& market_data,
+        std::string&       err)
+{
+    std::string      app_data;
+    MarketPlaceApp * app = apppool->get(appid, true);
+
+    if ( app == 0 )
+    {
+        err = "Marketplace app no longer exists";
+        return -1;
+    }
+
+    app->to_xml(app_data);
+
+    app->unlock();
+
+    std::string * msg = format_message(app_data, market_data, "");
+
+    const MarketPlaceManagerDriver* mpmd = get();
+
+    if ( mpmd == 0 )
+    {
+        err = "Error getting MarketPlaceManagerDriver";
+        return -1;
+    }
+
+    mpmd->importapp(appid, *msg);
+
+    delete msg;
+
+    return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index b793c755e9..783e16e6ef 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -226,6 +226,80 @@ static void monitor_action(istringstream& is,
 }
 */
 
+static int import_action(
+        std::istringstream&  is,
+        MarketPlaceAppPool * apppool,
+        int                  id,
+        const std::string&   result)
+{
+    std::string   error;
+    std::string   info64;
+    std::string * info;
+
+    getline(is, info64);
+
+    if (is.fail())
+    {
+        //goto error_parse;
+    }
+
+    info = one_util::base64_decode(info64);
+
+    if ( info == 0 )
+    {
+        //goto error_decode64;
+    }
+
+    MarketPlaceAppTemplate tmpl;
+
+    if ( tmpl.parse_str_or_xml(*info, error) != 0 )
+    {
+        delete info;
+        //goto error_parse;
+    }
+
+    delete info;
+
+    std::string source;
+    std::string checksum;
+    long long   size_mb;
+
+    tmpl.get("SOURCE", source);
+    tmpl.get("CHECKSUM", checksum);
+    bool rc = tmpl.get("SIZE", size_mb);
+
+    if ( source.empty() || checksum.empty() || rc == false )
+    {
+        //goto error_attributes;
+    }
+
+    MarketPlaceApp * app = apppool->get(id, true);
+
+    if (app == 0)
+    {
+        //goto error_app;
+    }
+
+    app->set_source(source);
+    app->set_checksum(checksum);
+    app->set_size(size_mb);
+
+    app->set_state(MarketPlaceApp::READY);
+
+    apppool->update(app);
+
+    app->unlock();
+
+    NebulaLog::log("MKP", Log::INFO, "Marketplace app successfully imported");
+
+    return 0;
+
+//error_parse:
+//error_decode64:
+//error_parse:
+//error_attributes:
+}
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/src/market/SConstruct b/src/market/SConstruct
index e6c39bc402..2690a2a4ea 100644
--- a/src/market/SConstruct
+++ b/src/market/SConstruct
@@ -27,7 +27,8 @@ source_files=[
     'MarketPlaceApp.cc',
     'MarketPlaceAppPool.cc',
     'MarketPlaceManager.cc',
-    'MarketPlaceManagerDriver.cc'
+    'MarketPlaceManagerDriver.cc',
+    'MarketPlaceManagerActions.cc'
 ]
 
 # Build library
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 93c3929f0a..ed74c08c25 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -834,11 +834,14 @@ int MarketPlaceAppAllocate::pool_allocate(
     }
 
     std::string mp_name = mp->get_name();
+    std::string mp_data;
+
+    mp->to_xml(mp_data);
 
     mp->unlock();
 
     int rc = appool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-        ttmpl, mp_id, mp_name, &id, error_str);
+        ttmpl, mp_id, mp_name, mp_data, &id, error_str);
 
 	if (rc < 0)
 	{

From 695e05266de367d5323dee7fc23df679d788b9f4 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Tue, 15 Dec 2015 12:18:43 +0100
Subject: [PATCH 024/197] feature #4217: Import action for market driver (core)

---
 include/MarketPlaceManagerDriver.h     |  20 +++-
 src/market/MarketPlaceManager.cc       |   3 +-
 src/market/MarketPlaceManagerDriver.cc | 137 +++++++++++++++++++++----
 3 files changed, 133 insertions(+), 27 deletions(-)

diff --git a/include/MarketPlaceManagerDriver.h b/include/MarketPlaceManagerDriver.h
index 0a88321114..592b7d2b4a 100644
--- a/include/MarketPlaceManagerDriver.h
+++ b/include/MarketPlaceManagerDriver.h
@@ -23,6 +23,9 @@
 
 #include "Mad.h"
 
+class MarketPlacePool;
+class MarketPlaceAppPool;
+
 /**
  *  ImageManagerDriver represents the basic abstraction for Image Repository
  *  drivers. It implements the protocol and recover functions from the Mad
@@ -31,10 +34,12 @@
 class MarketPlaceManagerDriver : public Mad
 {
 public:
-    MarketPlaceManagerDriver(int   userid,
-       const std::map<string,string>& attrs,
-       bool  sudo):
-            Mad(userid,attrs,sudo){};
+    MarketPlaceManagerDriver(int userid,
+        const std::map<string,string>& attrs,
+        bool sudo,
+        MarketPlacePool    * _marketpool,
+        MarketPlaceAppPool * _apppool
+       ):Mad(userid,attrs,sudo), marketpool(_marketpool), apppool(_apppool){};
 
     virtual ~MarketPlaceManagerDriver(){};
 
@@ -52,6 +57,13 @@ public:
 private:
     friend class MarketPlaceManager;
 
+    /**
+     *  Reference to Marketplace related pools
+     */
+    MarketPlacePool    * marketpool;
+
+    MarketPlaceAppPool * apppool;
+
     /**
      *  Sends a stat  request to the MAD.
      *    @param oid the id of the stat request
diff --git a/src/market/MarketPlaceManager.cc b/src/market/MarketPlaceManager.cc
index 696f0e37e7..e31ad9c855 100644
--- a/src/market/MarketPlaceManager.cc
+++ b/src/market/MarketPlaceManager.cc
@@ -76,7 +76,8 @@ int MarketPlaceManager::load_mads(int uid)
 
     market_conf.replace("NAME", market_driver_name);
 
-    marketm_mad= new MarketPlaceManagerDriver(0, market_conf.value(), false);
+    marketm_mad= new MarketPlaceManagerDriver(0, market_conf.value(), false,
+            mppool, apppool);
 
     rc = add(marketm_mad);
 
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index 783e16e6ef..a747d5225b 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -226,58 +226,132 @@ static void monitor_action(istringstream& is,
 }
 */
 
+/* -------------------------------------------------------------------------- */
+/* Helper functions for failure and error conditions                          */
+/* -------------------------------------------------------------------------- */
+
+static void set_failure_response(
+        std::istringstream * is,
+        PoolObjectSQL *     obj,
+        const std::string&  msg)
+{
+    std::ostringstream oss;
+    std::string        info;
+
+    oss << msg;
+
+    getline(*is, info);
+
+    if (!info.empty() && (info[0] != '-'))
+    {
+        oss << ": " << info;
+    }
+
+    if (obj != 0)
+    {
+        obj->set_template_error_message(oss.str());
+    }
+
+    NebulaLog::log("MKP", Log::ERROR, oss);
+}
+
+static void app_failure_action(
+        std::istringstream * is,
+        MarketPlaceAppPool * apppool,
+        int                  id,
+        const std::string&   msg)
+{
+    MarketPlaceApp * app = apppool->get(id, true);
+
+    if (app == 0)
+    {
+        return;
+    }
+
+    if ( is == 0)
+    {
+        app->set_template_error_message(msg);
+
+        NebulaLog::log("MKP", Log::ERROR, msg);
+    }
+    else
+    {
+        set_failure_response(is, app, msg);
+    }
+
+    app->set_state(MarketPlaceApp::ERROR);
+
+    apppool->update(app);
+
+    app->unlock();
+}
+
+/* -------------------------------------------------------------------------- */
+
 static int import_action(
         std::istringstream&  is,
         MarketPlaceAppPool * apppool,
         int                  id,
         const std::string&   result)
 {
+    bool rc;
+    int  rci;
+
     std::string   error;
     std::string   info64;
     std::string * info;
 
+    MarketPlaceApp *       app;
+    MarketPlaceAppTemplate tmpl;
+
+    std::string source;
+    std::string checksum;
+    long long   size_mb;
+
+    if ( result == "FAILURE" )
+    {
+        app_failure_action(&is, apppool, id,
+            "Error importing app into marketplace");
+        return -1;
+    }
+
     getline(is, info64);
 
     if (is.fail())
     {
-        //goto error_parse;
+        goto error_parse;
     }
 
     info = one_util::base64_decode(info64);
 
     if ( info == 0 )
     {
-        //goto error_decode64;
+        goto error_decode64;
     }
 
-    MarketPlaceAppTemplate tmpl;
-
-    if ( tmpl.parse_str_or_xml(*info, error) != 0 )
-    {
-        delete info;
-        //goto error_parse;
-    }
+    rci = tmpl.parse_str_or_xml(*info, error);
 
     delete info;
 
-    std::string source;
-    std::string checksum;
-    long long   size_mb;
+    if ( rci != 0 )
+    {
+        goto error_parse_template;
+    }
 
     tmpl.get("SOURCE", source);
     tmpl.get("CHECKSUM", checksum);
-    bool rc = tmpl.get("SIZE", size_mb);
+    rc = tmpl.get("SIZE", size_mb);
 
     if ( source.empty() || checksum.empty() || rc == false )
     {
-        //goto error_attributes;
+        goto error_attributes;
     }
 
-    MarketPlaceApp * app = apppool->get(id, true);
+    app = apppool->get(id, true);
 
     if (app == 0)
     {
-        //goto error_app;
+        goto error_app;
     }
 
     app->set_source(source);
@@ -294,10 +368,30 @@ static int import_action(
 
     return 0;
 
-//error_parse:
-//error_decode64:
-//error_parse:
-//error_attributes:
+error_parse:
+    app_failure_action(0, apppool, id,
+        "Error importing app into marketplace. Wrong message from driver.");
+    return -1;
+
+error_decode64:
+    app_failure_action(0, apppool, id,
+        "Error importing app into marketplace. Bad base64 encoding.");
+    return -1;
+
+error_parse_template:
+    app_failure_action(0, apppool, id,
+        "Error importing app into marketplace. Parse error: " + error);
+    return -1;
+
+error_attributes:
+    app_failure_action(0, apppool, id,
+        "Error importing app into marketplace. Missing app atributes.");
+    return -1;
+
+error_app:
+    NebulaLog::log("MKP", Log::ERROR, "Marketplace app successfully imported "
+        "but it no longer exists. You may need to manually remove: " + source);
+    return -1;
 }
 
 /* -------------------------------------------------------------------------- */
@@ -310,7 +404,6 @@ void MarketPlaceManagerDriver::protocol(const string& message) const
 
     std::string action;
     std::string result;
-    std::string source;
     std::string info;
 
     int id;
@@ -352,7 +445,7 @@ void MarketPlaceManagerDriver::protocol(const string& message) const
 
     if (action == "EXPORT")
     {
-        return;
+        import_action(is, apppool, id, result);
     }
     else if (action == "IMPORT")
     {

From 4c68cd7c9ede80bc3dabe353730c9f31e3c64237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 16 Dec 2015 12:32:19 +0100
Subject: [PATCH 025/197] Feature #4215: VRs have NICs defined

VRs can request vnet leases. If a vm template has a
VROUTER_ID, the NICs from that VR are merged into
the template. If the VR NIC has a floating IP, it
is added as VROUTER_IP.
---
 include/VirtualMachine.h                      |  11 +-
 include/VirtualNetwork.h                      |  67 +++---
 include/VirtualNetworkPool.h                  |  17 +-
 include/VirtualRouter.h                       |  35 +++-
 src/cli/one_helper/onetemplate_helper.rb      |   8 +
 src/cli/one_helper/onevnet_helper.rb          |   2 +
 src/cli/onetemplate                           |   7 +-
 src/dm/DispatchManagerActions.cc              |  31 ++-
 src/rm/RequestManagerVMTemplate.cc            |  75 ++++---
 .../app/tabs/vnets-tab/panels/leases.js       |   3 +
 src/vm/VirtualMachine.cc                      |  30 ++-
 src/vm/VirtualMachinePool.cc                  |   4 +-
 src/vnm/AddressRange.cc                       |   8 +
 src/vnm/VirtualNetwork.cc                     |  55 ++++-
 src/vnm/VirtualNetworkPool.cc                 |  53 ++++-
 src/vrouter/VirtualRouter.cc                  | 193 +++++++++++++++++-
 16 files changed, 501 insertions(+), 98 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 66246f4fb0..edde6df239 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1262,12 +1262,11 @@ public:
      *
      * @param nic NIC to be released
      * @param vmid Virtual Machine oid
-     * @param vrid Virtual Router id if the VM is a VR, or -1
      *
      * @return 0 on success, -1 otherwise
      */
     static int release_network_leases(
-            VectorAttribute const * nic, int vmid, int vrid);
+            VectorAttribute const * nic, int vmid);
 
     /**
      *  Releases all disk images taken by this Virtual Machine
@@ -1329,6 +1328,12 @@ public:
      */
     int get_vrouter_id();
 
+    /**
+     * Returns true if this VM is a Virtual Router
+     * @return true if this VM is a Virtual Router
+     */
+    bool is_vrouter();
+
     // ------------------------------------------------------------------------
     // Context related functions
     // ------------------------------------------------------------------------
@@ -1544,7 +1549,6 @@ public:
      *
      * @param vm_id Id of the VM where this nic will be attached
      * @param vm_sgs the securty group ids already present in the VM
-     * @param vm_vrid Virtual Router id if the VM is a VR, or -1
      * @param new_nic New NIC vector attribute, obtained from get_attach_nic_info
      * @param rules Security Group rules will be added at the end of this
      * vector. If not used, the VectorAttributes must be freed by the calling
@@ -1557,7 +1561,6 @@ public:
     static int set_up_attach_nic(
                             int                      vm_id,
                             set<int>&                vm_sgs,
-                            int                      vm_vrid,
                             VectorAttribute *        new_nic,
                             vector<VectorAttribute*> &rules,
                             int                      max_nic_id,
diff --git a/include/VirtualNetwork.h b/include/VirtualNetwork.h
index 2febc3f722..1a431576fb 100644
--- a/include/VirtualNetwork.h
+++ b/include/VirtualNetwork.h
@@ -157,75 +157,79 @@ public:
 
     /**
      *    Gets a new address lease for a specific VM
-     *    @param vid VM identifier
+     *    @param ot the type of the object requesting the address
+     *    @param oid the id of the object requesting the address
      *    @param nic the VM NIC attribute to be filled with the lease info.
      *    @param inherit attributes from the address range to include in the NIC
      *    @return 0 if success
      */
-    int allocate_addr(int vid, VectorAttribute * nic,
-        const vector<string>& inherit)
+    int allocate_addr(PoolObjectSQL::ObjectType ot, int oid,
+            VectorAttribute * nic, const vector<string>& inherit)
     {
-        return ar_pool.allocate_addr(PoolObjectSQL::VM, vid, nic, inherit);
+        return ar_pool.allocate_addr(ot, oid, nic, inherit);
     }
 
     /**
      *    Gets a new address lease for a specific VM by MAC
-     *    @param vid VM identifier
+     *    @param ot the type of the object requesting the address
+     *    @param oid the id of the object requesting the address
      *    @param mac the MAC address requested
      *    @param nic the VM NIC attribute to be filled with the lease info.
      *    @param inherit attributes from the address range to include in the NIC
      *    @return 0 if success
      */
-    int allocate_by_mac(int vid, const string& mac, VectorAttribute * nic,
-        const vector<string>& inherit)
+    int allocate_by_mac(PoolObjectSQL::ObjectType ot, int oid, const string& mac,
+            VectorAttribute * nic, const vector<string>& inherit)
     {
-        return ar_pool.allocate_by_mac(mac, PoolObjectSQL::VM, vid, nic, inherit);
+        return ar_pool.allocate_by_mac(mac, ot, oid, nic, inherit);
     }
 
     /**
      *    Gets a new address lease for a specific VM by IP
-     *    @param vid VM identifier
+     *    @param ot the type of the object requesting the address
+     *    @param oid the id of the object requesting the address
      *    @param ip the IP address requested
      *    @param nic the VM NIC attribute to be filled with the lease info.
      *    @param inherit attributes from the address range to include in the NIC
      *    @return 0 if success
      */
-    int allocate_by_ip(int vid, const string& ip, VectorAttribute * nic,
-        const vector<string>& inherit)
+    int allocate_by_ip(PoolObjectSQL::ObjectType ot, int oid, const string& ip,
+            VectorAttribute * nic, const vector<string>& inherit)
     {
-        return ar_pool.allocate_by_ip(ip, PoolObjectSQL::VM, vid, nic, inherit);
+        return ar_pool.allocate_by_ip(ip, ot, oid, nic, inherit);
     }
 
     /**
      *  Release previously given address lease
      *    @param arid of the address range where the address was leased from
-     *    @param vid the ID of the VM
-     *    @param vrid Virtual Router id if the VM is a VR, or -1
+     *    @param ot the type of the object requesting the address
+     *    @param oid the id of the object requesting the address
      *    @param mac MAC address identifying the lease
      */
-    void free_addr(unsigned int arid, int vid, int vrid, const string& mac)
+    void free_addr(unsigned int arid, PoolObjectSQL::ObjectType ot, int oid,
+                    const string& mac)
     {
-        ar_pool.free_addr(arid, PoolObjectSQL::VM, vid, mac);
+        ar_pool.free_addr(arid, ot, oid, mac);
 
-        if (vrid != -1)
+        if (ot == PoolObjectSQL::VROUTER)
         {
-            vrouters.del_collection_id(vrid);
+            vrouters.del_collection_id(oid);
         }
     }
 
     /**
      *  Release previously given address lease
-     *    @param vid the ID of the VM
-     *    @param vrid Virtual Router id if the VM is a VR, or -1
+     *    @param ot the type of the object requesting the address
+     *    @param oid the id of the object requesting the address
      *    @param mac MAC address identifying the lease
      */
-    void free_addr(int vid, int vrid, const string& mac)
+    void free_addr(PoolObjectSQL::ObjectType ot, int oid, const string& mac)
     {
-        ar_pool.free_addr(PoolObjectSQL::VM, vid, mac);
+        ar_pool.free_addr(ot, oid, mac);
 
-        if (vrid != -1)
+        if (ot == PoolObjectSQL::VROUTER)
         {
-            vrouters.del_collection_id(vrid);
+            vrouters.del_collection_id(oid);
         }
     }
 
@@ -259,7 +263,6 @@ public:
      *  * BRIDGE: for this virtual network
      *  @param nic attribute for the VM template
      *  @param vid of the VM getting the lease
-     *  @param vrid Virtual Router id if the VM is a VR, or -1
      *  @param inherit_attrs Attributes to be inherited from the vnet template
      *      into the nic
      *  @return 0 on success
@@ -267,6 +270,20 @@ public:
     int nic_attribute(
             VectorAttribute *       nic,
             int                     vid,
+            const vector<string>&   inherit_attrs);
+
+    /**
+     * Modifies the given nic attribute adding the following attributes:
+     *  * IP:  leased from network
+     *  * MAC: leased from network
+     *  @param nic attribute for the VRouter template
+     *  @param vrid of the VRouter getting the lease
+     *  @param inherit_attrs Attributes to be inherited from the vnet template
+     *      into the nic
+     *  @return 0 on success
+     */
+    int vrouter_nic_attribute(
+            VectorAttribute *       nic,
             int                     vrid,
             const vector<string>&   inherit_attrs);
 
diff --git a/include/VirtualNetworkPool.h b/include/VirtualNetworkPool.h
index cfc3298c9c..b211e143ac 100644
--- a/include/VirtualNetworkPool.h
+++ b/include/VirtualNetworkPool.h
@@ -107,7 +107,6 @@ public:
      *    @param nic_id the id for this NIC
      *    @param uid of the VM owner
      *    @param vid of the VM requesting the lease
-     *    @param vrid Virtual Router id if the VM is a VR, or -1
      *    @param error_str string describing the error
      *    @return 0 on success,
      *            -1 error,
@@ -118,6 +117,22 @@ public:
             int                 nic_id,
             int                 uid,
             int                 vid,
+            string&             error_str);
+
+    /**
+     *  Generates a NIC attribute for VRouters using the VirtualNetwork
+     *  metadata
+     *    @param nic the nic attribute to be generated
+     *    @param uid of the VM owner
+     *    @param vrid of the VRouter requesting the lease
+     *    @param error_str string describing the error
+     *    @return 0 on success,
+     *            -1 error,
+     *            -2 not using the pool
+     */
+    int vrouter_nic_attribute(
+            VectorAttribute *   nic,
+            int                 uid,
             int                 vrid,
             string&             error_str);
 
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index d9b613bdd9..e4e938d1e4 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -65,6 +65,8 @@ public:
                 *(static_cast<Template *>(obj_template)));
     };
 
+    Template * get_nics() const;
+
 private:
     // -------------------------------------------------------------------------
     // Friends
@@ -111,8 +113,6 @@ private:
      */
     int from_xml(const string &xml_str);
 
-protected:
-
     // *************************************************************************
     // Constructor
     // *************************************************************************
@@ -144,6 +144,13 @@ protected:
      */
     int insert(SqlDB *db, string& error_str);
 
+    /**
+     *  Drops object from the database
+     *    @param db pointer to the db
+     *    @return 0 on success
+     */
+    virtual int drop(SqlDB *db);
+
     /**
      *  Writes/updates the VirtualRouter data fields in the database.
      *    @param db pointer to the db
@@ -154,6 +161,30 @@ protected:
         string err;
         return insert_replace(db, true, err);
     };
+
+    // -------------------------------------------------------------------------
+    // NIC Management
+    // -------------------------------------------------------------------------
+
+    /**
+     *  Get all network leases for this Virtual Router
+     *  @return 0 onsuccess
+     */
+    int get_network_leases(string& estr);
+
+    /**
+     *  Releases all network leases taken by this Virtual Router
+     */
+    void release_network_leases();
+
+    /**
+     * Releases the network lease taken by this NIC
+     *
+     * @param nic NIC to be released
+     *
+     * @return 0 on success, -1 otherwise
+     */
+    int release_network_leases(VectorAttribute const * nic);
 };
 
 #endif /*VIRTUAL_ROUTER_H_*/
diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb
index 80e3672aa2..0d36625ea5 100644
--- a/src/cli/one_helper/onetemplate_helper.rb
+++ b/src/cli/one_helper/onetemplate_helper.rb
@@ -51,6 +51,14 @@ EOT
                         "information, such as the SIZE for each DISK"
     }
 
+    VROUTER={
+        :name => "vrouter",
+        :large => "--vrouter vrid",
+        :format => Integer,
+        :description => "Creates a VM associated to the given Virtual Router. "+
+                        "The NIC elements defined in the Virtual Router will be used"
+    }
+
     def self.rname
         "VMTEMPLATE"
     end
diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb
index c92a160d87..8510c2d5ec 100644
--- a/src/cli/one_helper/onevnet_helper.rb
+++ b/src/cli/one_helper/onevnet_helper.rb
@@ -308,6 +308,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                     "V:#{d['VM']}"
                 elsif d['VNET']
                     "N:#{d['VNET']}"
+                elsif d['VROUTER']
+                    "R:#{d['VROUTER']}"
                 end
             end
 
diff --git a/src/cli/onetemplate b/src/cli/onetemplate
index a505a6da3f..b75348ee30 100755
--- a/src/cli/onetemplate
+++ b/src/cli/onetemplate
@@ -55,7 +55,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         OneTemplateHelper::VM_NAME,
         OneTemplateHelper::MULTIPLE,
         OneTemplateHelper::USERDATA,
-        OneVMHelper::HOLD
+        OneVMHelper::HOLD,
+        OneTemplateHelper::VROUTER,
     ]
 
     ########################################################################
@@ -232,6 +233,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
                 extra_template << "\n" << user_inputs
 
+                if !options[:vrouter].nil?
+                    extra_template << "\n" << "VROUTER_ID = \"#{options[:vrouter]}\""
+                end
+
                 res = t.instantiate(name, on_hold, extra_template)
 
                 if !OpenNebula.is_error?(res)
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index 5160854b3c..320a7cd33a 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -1442,7 +1442,6 @@ int DispatchManager::attach_nic(
     int max_nic_id;
     int uid;
     int oid;
-    int vrid;
     int rc;
 
     set<int> vm_sgs;
@@ -1477,6 +1476,19 @@ int DispatchManager::attach_nic(
         return -1;
     }
 
+    if (vm->is_vrouter())
+    {
+        oss << "Could not add a new NIC to VM " << vid
+            << ", it is associated to the Virtual Router "
+            << vm->get_vrouter_id() << ".";
+        error_str = oss.str();
+
+        NebulaLog::log("DiM", Log::ERROR, error_str);
+
+        vm->unlock();
+        return -1;
+    }
+
     nic = vm->get_attach_nic_info(tmpl, max_nic_id, error_str);
 
     if ( nic == 0 )
@@ -1499,7 +1511,6 @@ int DispatchManager::attach_nic(
 
     uid  = vm->get_uid();
     oid  = vm->get_oid();
-    vrid = vm->get_vrouter_id();
 
     vmpool->update(vm);
 
@@ -1507,7 +1518,6 @@ int DispatchManager::attach_nic(
 
     rc = VirtualMachine::set_up_attach_nic(oid,
                                     vm_sgs,
-                                    vrid,
                                     nic,
                                     sg_rules,
                                     max_nic_id,
@@ -1521,7 +1531,7 @@ int DispatchManager::attach_nic(
 
         if ( rc == 0 )
         {
-            VirtualMachine::release_network_leases(nic, vid, vrid);
+            VirtualMachine::release_network_leases(nic, vid);
 
             vector<VectorAttribute*>::iterator it;
             for(it = sg_rules.begin(); it != sg_rules.end(); it++)
@@ -1647,6 +1657,19 @@ int DispatchManager::detach_nic(
         return -1;
     }
 
+    if (vm->is_vrouter())
+    {
+        oss << "Could not detach NIC from VM " << vid
+            << ", it is associated to the Virtual Router "
+            << vm->get_vrouter_id() << ".";
+        error_str = oss.str();
+
+        NebulaLog::log("DiM", Log::ERROR, error_str);
+
+        vm->unlock();
+        return -1;
+    }
+
     if ( vm->set_attach_nic(nic_id) == -1 )
     {
         oss << "Could not detach NIC with NIC_ID " << nic_id
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index b3d0afefc7..16df955ffc 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -35,11 +35,14 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
     ostringstream sid;
 
     PoolObjectAuth perms;
+    PoolObjectAuth vr_perms;
 
     Nebula& nd = Nebula::instance();
 
     VirtualMachinePool* vmpool  = nd.get_vmpool();
     VMTemplatePool *    tpool   = static_cast<VMTemplatePool *>(pool);
+    VirtualRouterPool*  vrpool  = nd.get_vrouterpool();
+    VirtualRouter *     vr;
 
     VirtualMachineTemplate * tmpl;
     VirtualMachineTemplate * extended_tmpl = 0;
@@ -48,6 +51,8 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     string error_str;
     string aname;
+    bool   has_vrouter_id;
+    int    vrid;
 
     string tmpl_name;
 
@@ -136,28 +141,39 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
         tmpl->set(new SingleAttribute("NAME",name));
     }
 
-    //--------------------------------------------------------------------------
-    // Temporary code to create Virtual Routers from regular VM Templates
-
-    bool    is_vrouter;
-    bool    has_vrouter_id;
-    int     vrid;
-    string  vr_error_str;
-
-    VirtualRouterPool* vrpool = Nebula::instance().get_vrouterpool();
-
-    tmpl->get("VROUTER", is_vrouter);
+    /* ---------------------------------------------------------------------- */
+    /* If it is a Virtual Router, get the NICs                                */
+    /* ---------------------------------------------------------------------- */
 
     has_vrouter_id = tmpl->get("VROUTER_ID", vrid);
 
-    if (is_vrouter && !has_vrouter_id)
+    if ( has_vrouter_id )
     {
-        Template * vr_tmpl = new Template;
+        vr = vrpool->get(vrid, true);
 
-        vrpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-            vr_tmpl, &vrid, vr_error_str);
+        if (vr == 0)
+        {
+            failure_response(NO_EXISTS,
+                    get_error(object_name(PoolObjectSQL::VROUTER),vrid),
+                    att);
 
-        tmpl->replace("VROUTER_ID", vrid);
+            delete tmpl;
+            return;
+        }
+
+        vr->get_permissions(vr_perms);
+
+        tmpl->erase("NIC");
+        rc = tmpl->merge(vr->get_nics(), error_str);
+
+        vr->unlock();
+
+        if ( rc != 0 )
+        {
+            failure_response(INTERNAL, error_str, att);
+            delete tmpl;
+            return;
+        }
     }
 
     //--------------------------------------------------------------------------
@@ -180,6 +196,11 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
         VirtualMachine::set_auth_request(att.uid, ar, tmpl);
 
+        if (has_vrouter_id)
+        {
+            ar.add_auth(AuthRequest::MANAGE, vr_perms); // MANAGE VROUTER
+        }
+
         if (UserPool::authorize(ar) == -1)
         {
             failure_response(AUTHORIZATION,
@@ -223,23 +244,19 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     delete extended_tmpl;
 
-    //--------------------------------------------------------------------------
-    // Temporary code to create Virtual Routers from regular VM Templates
-    // Final code would need rollback to delete the new VR on error
-
-    VirtualRouter *  vr;
-
-    vr = vrpool->get(vrid, true);
-
-    if (vr != 0)
+    if ( has_vrouter_id )
     {
-        vr->add_vmid(vid);
+        vr = vrpool->get(vrid, true);
 
-        vrpool->update(vr);
+        if (vr != 0)
+        {
+            vr->add_vmid(vid);
 
-        vr->unlock();
+            vrpool->update(vr);
+
+            vr->unlock();
+        }
     }
-    //--------------------------------------------------------------------------
 
     success_response(vid, att);
 }
diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js b/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js
index 8eeed2e794..6591251c3b 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js
@@ -91,6 +91,9 @@ define(function(require) {
         } else if (lease.VNET != undefined) { //used by a VNET
           col0HTML = '<span type="text" class="radius label "></span>';
           col1HTML = Locale.tr("NET:") + lease.VNET;
+        } else if (lease.VROUTER != undefined) { //used by a VR
+          col0HTML = '<span type="text" class="radius label "></span>';
+          col1HTML = Locale.tr("VR:") + lease.VROUTER;
         } else {
           col0HTML = '<span type="text" class="radius label "></span>';
           col1HTML = '--';
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index e04e66cd16..872a1db391 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -842,13 +842,6 @@ int VirtualMachine::parse_vrouter(string& error_str)
 {
     string st;
 
-    user_obj_template->get("VROUTER", st);
-
-    if (!st.empty())
-    {
-        obj_template->replace("VROUTER", st);
-    }
-
     user_obj_template->get("VROUTER_ID", st);
 
     if (!st.empty())
@@ -856,7 +849,6 @@ int VirtualMachine::parse_vrouter(string& error_str)
         obj_template->replace("VROUTER_ID", st);
     }
 
-    user_obj_template->erase("VROUTER");
     user_obj_template->erase("VROUTER_ID");
 
     return 0;
@@ -2589,7 +2581,6 @@ VectorAttribute * VirtualMachine::get_attach_nic_info(
 int VirtualMachine::set_up_attach_nic(
                         int                      vm_id,
                         set<int>&                vm_sgs,
-                        int                      vm_vrid,
                         VectorAttribute *        new_nic,
                         vector<VectorAttribute*> &rules,
                         int                      max_nic_id,
@@ -2601,8 +2592,7 @@ int VirtualMachine::set_up_attach_nic(
 
     set<int> nic_sgs;
 
-    int rc = vnpool->nic_attribute(new_nic, max_nic_id+1, uid, vm_id,
-                                    vm_vrid, error_str);
+    int rc = vnpool->nic_attribute(new_nic, max_nic_id+1, uid, vm_id, error_str);
 
     if ( rc == -1 ) //-2 is not using a pre-defined network
     {
@@ -3002,7 +2992,7 @@ int VirtualMachine::get_network_leases(string& estr)
 
         merge_nic_defaults(nic);
 
-        rc = vnpool->nic_attribute(nic, i, uid, oid, get_vrouter_id(), estr);
+        rc = vnpool->nic_attribute(nic, i, uid, oid, estr);
 
         if (rc == -1)
         {
@@ -3068,7 +3058,7 @@ void VirtualMachine::release_network_leases()
         VectorAttribute const *  nic =
             dynamic_cast<VectorAttribute const * >(nics[i]);
 
-        release_network_leases(nic, oid, get_vrouter_id());
+        release_network_leases(nic, oid);
     }
 }
 
@@ -3076,7 +3066,7 @@ void VirtualMachine::release_network_leases()
 /* -------------------------------------------------------------------------- */
 
 int VirtualMachine::release_network_leases(
-        VectorAttribute const * nic, int vmid, int vrid)
+        VectorAttribute const * nic, int vmid)
 {
     VirtualNetworkPool* vnpool = Nebula::instance().get_vnpool();
     VirtualNetwork*     vn;
@@ -3114,11 +3104,11 @@ int VirtualMachine::release_network_leases(
 
     if (nic->vector_value("AR_ID", ar_id) == 0)
     {
-        vn->free_addr(ar_id, vmid, vrid, mac);
+        vn->free_addr(ar_id, PoolObjectSQL::VM, vmid, mac);
     }
     else
     {
-        vn->free_addr(vmid, vrid, mac);
+        vn->free_addr(PoolObjectSQL::VM, vmid, mac);
     }
 
     vnpool->update(vn);
@@ -3263,6 +3253,14 @@ int VirtualMachine::get_vrouter_id()
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+bool VirtualMachine::is_vrouter()
+{
+    return get_vrouter_id() != -1;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int VirtualMachine::generate_context(string &files, int &disk_id,
         string& token_password)
 {
diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc
index bba8042927..6c386fc91b 100644
--- a/src/vm/VirtualMachinePool.cc
+++ b/src/vm/VirtualMachinePool.cc
@@ -1119,7 +1119,6 @@ void VirtualMachinePool::delete_attach_nic(int vid)
     int uid;
     int gid;
     int oid;
-    int vrid;
 
     vm = get(vid,true);
 
@@ -1132,7 +1131,6 @@ void VirtualMachinePool::delete_attach_nic(int vid)
     uid  = vm->get_uid();
     gid  = vm->get_gid();
     oid  = vm->get_oid();
-    vrid = vm->get_vrouter_id();
 
     update(vm);
 
@@ -1146,6 +1144,6 @@ void VirtualMachinePool::delete_attach_nic(int vid)
 
         Quotas::quota_del(Quotas::NETWORK, uid, gid, &tmpl);
 
-        VirtualMachine::release_network_leases(nic, oid, vrid);
+        VirtualMachine::release_network_leases(nic, oid);
     }
 }
diff --git a/src/vnm/AddressRange.cc b/src/vnm/AddressRange.cc
index 53c18631d7..e6b6cdf023 100644
--- a/src/vnm/AddressRange.cc
+++ b/src/vnm/AddressRange.cc
@@ -508,6 +508,14 @@ void AddressRange::to_xml(ostringstream &oss, const vector<int>& vms,
                     is_in = true;
                 }
             }
+            else if (it->second & PoolObjectSQL::VROUTER)
+            {
+                int oid = it->second & 0x00000000FFFFFFFFLL;
+
+                // TODO: all_vrouters?
+                lease.replace("VROUTER", oid);
+                is_in = true;
+            }
 
             if (!is_in)
             {
diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc
index 7068f4d9d2..ff12ebf75b 100644
--- a/src/vnm/VirtualNetwork.cc
+++ b/src/vnm/VirtualNetwork.cc
@@ -569,7 +569,6 @@ int VirtualNetwork::from_xml(const string &xml_str)
 int VirtualNetwork::nic_attribute(
         VectorAttribute *       nic,
         int                     vid,
-        int                     vrid,
         const vector<string>&   inherit_attrs)
 {
     string inherit_val;
@@ -630,15 +629,15 @@ int VirtualNetwork::nic_attribute(
 
     if (!ip.empty())
     {
-        rc = allocate_by_ip(vid, ip, nic, inherit_attrs);
+        rc = allocate_by_ip(PoolObjectSQL::VM, vid, ip, nic, inherit_attrs);
     }
     else if (!mac.empty())
     {
-        rc = allocate_by_mac(vid, mac, nic, inherit_attrs);
+        rc = allocate_by_mac(PoolObjectSQL::VM, vid, mac, nic, inherit_attrs);
     }
     else
     {
-        rc = allocate_addr(vid, nic, inherit_attrs);
+        rc = allocate_addr(PoolObjectSQL::VM, vid, nic, inherit_attrs);
     }
 
     //--------------------------------------------------------------------------
@@ -659,7 +658,53 @@ int VirtualNetwork::nic_attribute(
     nic->replace("SECURITY_GROUPS",
         one_util::join(nic_sgs.begin(), nic_sgs.end(), ','));
 
-    if (rc == 0 && vrid != -1)
+    return rc;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualNetwork::vrouter_nic_attribute(
+        VectorAttribute *       nic,
+        int                     vrid,
+        const vector<string>&   inherit_attrs)
+{
+    int     rc = 0;
+    bool    floating;
+    vector<string>::const_iterator it;
+
+    //--------------------------------------------------------------------------
+    //  Set default values from the Virtual Network
+    //--------------------------------------------------------------------------
+
+    nic->replace("NETWORK", name);
+    nic->replace("NETWORK_ID", oid);
+
+    //--------------------------------------------------------------------------
+    //  Get the lease from the Virtual Network
+    //--------------------------------------------------------------------------
+    nic->vector_value("FLOATING_IP", floating);
+
+    if (floating)
+    {
+        string ip  = nic->vector_value("IP");
+        string mac = nic->vector_value("MAC");
+
+        if (!ip.empty())
+        {
+            rc = allocate_by_ip(PoolObjectSQL::VROUTER, vrid, ip, nic, inherit_attrs);
+        }
+        else if (!mac.empty())
+        {
+            rc = allocate_by_mac(PoolObjectSQL::VROUTER, vrid, mac, nic, inherit_attrs);
+        }
+        else
+        {
+            rc = allocate_addr(PoolObjectSQL::VROUTER, vrid, nic, inherit_attrs);
+        }
+    }
+
+    if (rc == 0)
     {
         vrouters.add_collection_id(vrid);
     }
diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc
index 1b702d2c78..cfbae08750 100644
--- a/src/vnm/VirtualNetworkPool.cc
+++ b/src/vnm/VirtualNetworkPool.cc
@@ -243,7 +243,6 @@ int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
                                       int     nic_id,
                                       int     uid,
                                       int     vid,
-                                      int     vrid,
                                       string& error)
 {
     string           network;
@@ -269,7 +268,7 @@ int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
         return -1;
     }
 
-    int rc = vnet->nic_attribute(nic, vid, vrid, inherit_attrs);
+    int rc = vnet->nic_attribute(nic, vid, inherit_attrs);
 
     if ( rc == 0 )
     {
@@ -292,6 +291,56 @@ int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+int VirtualNetworkPool::vrouter_nic_attribute(
+                        VectorAttribute *   nic,
+                        int                 uid,
+                        int                 vrid,
+                        string&             error_str)
+{
+    string           network;
+    VirtualNetwork * vnet = 0;
+
+    if (!(network = nic->vector_value("NETWORK")).empty())
+    {
+        vnet = get_nic_by_name (nic, network, uid, error_str);
+    }
+    else if (!(network = nic->vector_value("NETWORK_ID")).empty())
+    {
+        vnet = get_nic_by_id(network, error_str);
+    }
+    else //Not using a pre-defined network
+    {
+        return -2;
+    }
+
+    if (vnet == 0)
+    {
+        return -1;
+    }
+
+    int rc = vnet->vrouter_nic_attribute(nic, vrid, inherit_attrs);
+
+    if ( rc == 0 )
+    {
+        update(vnet);
+    }
+    else
+    {
+        ostringstream oss;
+        oss << "Cannot get IP/MAC lease from virtual network " << vnet->get_oid() << ".";
+
+        error_str = oss.str();
+    }
+
+    vnet->unlock();
+
+
+    return rc;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 void VirtualNetworkPool::authorize_nic(VectorAttribute * nic,
                                        int uid,
                                        AuthRequest * ar)
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index a94584a0c1..5cb10d5bc0 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -15,6 +15,8 @@
 /* ------------------------------------------------------------------------ */
 
 #include "VirtualRouter.h"
+#include "VirtualNetworkPool.h"
+#include "Nebula.h"
 
 /* ************************************************************************ */
 /* VirtualRouter :: Constructor/Destructor                                  */
@@ -78,15 +80,20 @@ int VirtualRouter::insert(SqlDB *db, string& error_str)
 
     erase_template_attribute("NAME", name);
 
-    if ( name.empty() == true )
+    if ( !PoolObjectSQL::name_is_valid(name, error_str) )
     {
-        oss << "vrouter-" << oid;
-        name = oss.str();
+        goto error_name;
     }
-    else if ( name.length() > 128 )
+
+    // ------------------------------------------------------------------------
+    // Get network leases
+    // ------------------------------------------------------------------------
+
+    rc = get_network_leases(error_str);
+
+    if ( rc != 0 )
     {
-        error_str = "NAME is too long; max length is 128 chars.";
-        return -1;
+        goto error_leases_rollback;
     }
 
     // ------------------------------------------------------------------------
@@ -96,6 +103,63 @@ int VirtualRouter::insert(SqlDB *db, string& error_str)
     rc = insert_replace(db, false, error_str);
 
     return rc;
+
+error_leases_rollback:
+    release_network_leases();
+    goto error_common;
+
+error_name:
+error_common:
+    //NebulaLog::log("ONE",Log::ERROR, error_str);
+
+    return -1;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualRouter::drop(SqlDB * db)
+{
+    int rc;
+
+    rc = PoolObjectSQL::drop(db);
+
+    if ( rc == 0 )
+    {
+        release_network_leases();
+    }
+
+    return rc;
+}
+
+/* ------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------ */
+
+int VirtualRouter::get_network_leases(string& estr)
+{
+    int                   num_nics, rc;
+    vector<Attribute  * > nics;
+    VirtualNetworkPool *  vnpool;
+    VectorAttribute *     nic;
+
+    Nebula& nd = Nebula::instance();
+    vnpool     = nd.get_vnpool();
+
+    num_nics = obj_template->get("NIC",nics);
+
+    for(int i=0; i<num_nics; i++)
+    {
+        nic = static_cast<VectorAttribute * >(nics[i]);
+
+        rc = vnpool->vrouter_nic_attribute(nic, uid, oid, estr);
+
+        if (rc == -1)
+        {
+            return -1;
+        }
+    }
+
+    return 0;
 }
 
 /* ------------------------------------------------------------------------ */
@@ -264,3 +328,120 @@ int VirtualRouter::from_xml(const string& xml)
 
     return 0;
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void VirtualRouter::release_network_leases()
+{
+    string                        vnid;
+    string                        ip;
+    int                           num_nics;
+    vector<Attribute const  * >   nics;
+
+    num_nics = get_template_attribute("NIC",nics);
+
+    for(int i=0; i<num_nics; i++)
+    {
+        VectorAttribute const *  nic =
+            dynamic_cast<VectorAttribute const * >(nics[i]);
+
+        release_network_leases(nic);
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualRouter::release_network_leases(VectorAttribute const * nic)
+{
+    VirtualNetworkPool* vnpool = Nebula::instance().get_vnpool();
+    VirtualNetwork*     vn;
+
+    int     vnid;
+    int     ar_id;
+    string  mac;
+    string  error_msg;
+
+    if ( nic == 0 )
+    {
+        return -1;
+    }
+
+    if (nic->vector_value("NETWORK_ID", vnid) != 0)
+    {
+        return -1;
+    }
+
+    mac = nic->vector_value("MAC");
+
+    vn = vnpool->get(vnid, true);
+
+    if ( vn == 0 )
+    {
+        return -1;
+    }
+
+    if (nic->vector_value("AR_ID", ar_id) == 0)
+    {
+        vn->free_addr(ar_id, PoolObjectSQL::VROUTER, oid, mac);
+    }
+    else
+    {
+        vn->free_addr(PoolObjectSQL::VROUTER, oid, mac);
+    }
+
+    vnpool->update(vn);
+
+    vn->unlock();
+
+    return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+Template * VirtualRouter::get_nics() const
+{
+    Template * tmpl = new Template();
+
+    int                   num_nics;
+    bool                  floating;
+    string                ip;
+    vector<Attribute  * > nics;
+    VectorAttribute *     nic;
+
+    num_nics = obj_template->get("NIC",nics);
+
+    for(int i=0; i<num_nics; i++)
+    {
+        nic = static_cast<VectorAttribute * >(nics[i]);
+
+        if (nic == 0)
+        {
+            continue;
+        }
+
+        nic = nic->clone();
+
+        floating = false;
+        nic->vector_value("FLOATING_IP", floating);
+
+        if (floating)
+        {
+            // TODO: this is IPv4 only
+            nic->remove("MAC");
+            if (nic->vector_value("IP", ip) == 0)
+            {
+                nic->remove("IP");
+                nic->replace("VROUTER_IP", ip);
+            }
+
+            // TODO: remove all other attrs, such as AR, BRIDGE, etc?
+        }
+
+        tmpl->set(nic);
+    }
+
+    return tmpl;
+}

From 787c09663a03326f712b6e41a49646832a17a4c1 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Wed, 16 Dec 2015 23:58:41 +0100
Subject: [PATCH 026/197] feature #4217: Import action for market driver. First
 version on driver engine

---
 src/market/MarketPlaceManagerDriver.cc |   4 +-
 src/market_mad/one_market              |  38 ++++
 src/market_mad/one_market.rb           | 283 +++++++++++++++++++++++++
 3 files changed, 323 insertions(+), 2 deletions(-)
 create mode 100755 src/market_mad/one_market
 create mode 100755 src/market_mad/one_market.rb

diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index a747d5225b..43fa87da0c 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -443,11 +443,11 @@ void MarketPlaceManagerDriver::protocol(const string& message) const
     else
         return;
 
-    if (action == "EXPORT")
+    if (action == "IMPORT")
     {
         import_action(is, apppool, id, result);
     }
-    else if (action == "IMPORT")
+    else if (action == "EXPORT")
     {
         return;
     }
diff --git a/src/market_mad/one_market b/src/market_mad/one_market
new file mode 100755
index 0000000000..43f334f60f
--- /dev/null
+++ b/src/market_mad/one_market
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+#Setup driver variables
+DRIVER_NAME=`basename $0 | cut -d. -f1`
+
+if [ -z "${ONE_LOCATION}" ]; then
+    MADCOMMON=/usr/lib/one/mads/madcommon.sh
+    VAR_LOCATION=/var/lib/one
+else
+    MADCOMMON=$ONE_LOCATION/lib/mads/madcommon.sh
+    VAR_LOCATION=$ONE_LOCATION/var
+fi
+
+. $MADCOMMON
+
+# Go to var directory ONE_LOCATION/var or /var/lib/one
+cd $VAR_LOCATION
+
+LOG_FILE=$DRIVER_NAME
+
+# Execute the actual MAD
+execute_mad $*
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
new file mode 100755
index 0000000000..e764b3768a
--- /dev/null
+++ b/src/market_mad/one_market.rb
@@ -0,0 +1,283 @@
+#!/usr/bin/env ruby
+
+# ----------------------------------------------------------------------------
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems
+# 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Set up the environment for the driver
+# ----------------------------------------------------------------------------
+
+ONE_LOCATION = ENV["ONE_LOCATION"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
+    VAR_LOCATION      = "/var/lib/one"
+else
+    RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
+    VAR_LOCATION      = ONE_LOCATION + "/var"
+end
+
+$: << RUBY_LIB_LOCATION
+
+require "OpenNebulaDriver"
+require 'getoptlong'
+require 'base64'
+require 'rexml/document'
+require 'opennebula'
+
+# This class provides basic messaging and logging functionality to implement
+# Marketplace Drivers. A marketplace driver specialize the OpenNebula behavior
+# to interface with different object or file stores.
+class MarketPlaceDriver < OpenNebulaDriver
+
+    # Market Driver Protocol constants
+    ACTION = {
+        :import  => "IMPORT",
+        :export  => "EXPORT",
+        :delete  => "DELETE",
+        :log     => "LOG",
+        :monitor => "MONITOR"
+    }
+
+    # XPATHs for driver messages
+    MARKETPLACE_XPATH    = '/MARKET_DRIVER_ACTION_DATA/MARKETPLACE'
+    MARKETPLACEAPP_XPATH = '/MARKET_DRIVER_ACTION_DATA/MARKETPLACEAPP'
+
+    # Register default actions for the protocol
+    def initialize(market_type, options={})
+        @options={
+            :concurrency => 10,
+            :threaded => true,
+            :retries => 0,
+            :local_actions => {
+                ACTION[:import]  => nil,
+                ACTION[:export]  => nil,
+                ACTION[:delete]  => nil,
+                ACTION[:log]     => nil,
+                ACTION[:monitor] => nil
+            }
+        }.merge!(options)
+
+        super("market/", @options)
+
+        if market_type == nil
+            @types = Dir["#{@local_scripts_path}/*/"].map do |d|
+                d.split('/')[-1]
+            end
+        elsif market_type.class == String
+            @types = [marke_type]
+        else
+            @types = market_type
+        end
+
+        @local_ds_scripts_path = File.join(@local_scripts_base_path, 'datastore/')
+
+        @one = OpenNebula::Client.new()
+
+        register_action(ACTION[:import].to_sym, method("import"))
+        register_action(ACTION[:export].to_sym, method("export"))
+        register_action(ACTION[:delete].to_sym, method("delete"))
+        register_action(ACTION[:monitor].to_sym,method("monitor"))
+    end
+
+    ############################################################################
+    # Image Manager Protocol Actions (generic implementation)
+    ############################################################################
+
+    def import(id, drv_message)
+        market, app = decode(drv_message)
+
+        type   = app['TYPE'] if !app.nil?
+        origin = app['ORIGIN'] if !app.nil?
+
+        if market.nil? || app.nil? || type.nil? || origin.nil?
+            failure(:import, id,"Wrong driver message format")
+            return
+        end
+
+        #-----------------------------------------------------------------------
+        #  Export origin to a path
+        #-----------------------------------------------------------------------
+        case OpenNebula::MarketPlaceApp::MARKETPLACEAPP_TYPES[type.to_i]
+          when "IMAGE" then
+            if ( origin =~ /\d+$/ )
+                # Get the associated datastore ID
+                image = OpenNebula::Image.new_with_id(origin, @one)
+                rc    = image.info
+
+                if OpenNebula.is_error?(rc)
+                    failure(:import, id, "Cannot find information for image #{origin}")
+                    return
+                end
+
+                ds_id = image['DATASTORE_ID']
+
+                if ds_id.nil?
+                    failure(:import, id, "Cannot find datastore for image #{origin}")
+                    return
+                end
+
+                ds = OpenNebula::Datastore.new_with_id(ds_id, @one)
+                rc = ds.info
+
+                if OpenNebula.is_error?(rc)
+                    failure(:import, id, "Cannot find information for datastore #{ds_id}")
+                    return
+                end
+
+                mad = ds['DS_MAD']
+
+                if mad.nil?
+                    failure(:import, id, "Cannot find datastore driver")
+                    return
+                end
+
+                #Execute export action from Datastore
+                ds_msg   = "<DS_DRIVER_ACTION_DATA>"\
+                           "#{image.to_xml}"\
+                           "#{ds.to_xml}"\
+                           "</DS_DRIVER_ACTION_DATA>"
+                ds_msg64 = Base64::encode64(ds_msg)
+
+                result, info = do_action(id, nil, datastore, :export,
+                    "#{ds_msg64} #{id}")
+
+                if ( result == RESULT[:failure] )
+                    failure(:import, id, "Error exporting image to file: #{info}")
+                    return
+                end
+
+                source = info
+            elsif ( source =~ /\d+$|\/.+|https?:\/\// )
+                source = origin
+            else
+                failure(:import, id, "Marketplace app origin not a valid ID, path or http URL")
+                return
+            end
+          else # Only IMAGE type is supported
+                failure(:import, id, "Marketplace app type #{apptype} not supported")
+                return
+        end
+
+        mp_msg = "<MARKETPLACE_DRIVER_ACTION_DATA>"\
+                 "#{market.to_s}"\
+                 "#{app.to_s}"\
+                 "<IMPORT_SOURCE>#{source}</IMPORT_SOURCE>"\
+                 "</MARKETPLACE_DRIVER_ACTION_DATA>"
+        mp_msg64 = Base64::encode64(mp_msg)
+
+        result, info = do_action(id, market, nil, :import, "#{mp_msg64} #{id}")
+
+        send_message(ACTION[:import], result, id, info)
+    end
+
+    def export(id, drv_message)
+        send_message(ACTION[:export], RESULT[:failure], id, "Not implemented")
+    end
+
+    def delete(id, drv_message)
+        send_message(ACTION[:export], RESULT[:failure], id, "Not implemented")
+    end
+
+    def monitor(id, drv_message)
+        send_message(ACTION[:export], RESULT[:failure], id, "Not implemented")
+    end
+
+    private
+
+    # Check if the selected marketplace driver is enabled in the configuration
+    def is_available?(market, id, action)
+        if @types.include?(market)
+            return true
+        else
+            send_message(ACTION[action], RESULT[:failure], id,
+                "Marketplace driver '#{market}' not available")
+            return false
+        end
+    end
+
+    #Execute marketplace or datastore actions for
+    #  @param id of the app
+    #  @param market driver to use
+    #  @param datastore driver to use
+    #  @param action to invoke from the driver
+    #  @param arguments for the action
+    #  @return result and info of the action
+    def do_action(id, market, datastore, action, arguments)
+
+        if !datastore.empty?
+            path = File.join(@local_ds_scripts_path, datastore)
+        else
+            return if not is_available?(market, id, action)
+            path = File.join(@local_scripts_path, market)
+        end
+
+        cmd  = File.join(path, ACTION[action].downcase)
+        cmd << " " << arguments
+
+        rc = LocalCommand.run(cmd, log_method(id))
+
+        result, info = get_info_from_execution(rc)
+
+        return result, info
+    end
+
+    # Decodes the core message and returns the app and market information as
+    # xml documents
+    def decode(drv_message)
+        message = Base64.decode64(drv_message)
+        xml_doc = REXML::Document.new(message)
+
+        market = xml_doc.root.elements[MARKETPLACE_XPATH]
+        app    = xml_doc.root.elements[MARKETPLACEAPP_XPATH]
+
+        return market, app
+    end
+
+    def failure(asym, id, message)
+        send_message(ACTION[asym], RESULT[:failure], id, message)
+    end
+end
+
+################################################################################
+################################################################################
+# DatastoreDriver Main program
+################################################################################
+################################################################################
+
+opts = GetoptLong.new(
+    [ '--threads',         '-t', GetoptLong::OPTIONAL_ARGUMENT ],
+    [ '--market-types',    '-m', GetoptLong::OPTIONAL_ARGUMENT ]
+)
+
+mp_type = nil
+threads = 15
+
+begin
+    opts.each do |opt, arg|
+        case opt
+            when '--threads'
+                threads = arg.to_i
+            when '--market-types'
+                mp_type = arg.split(',').map {|a| a.strip }
+        end
+    end
+rescue Exception => e
+    exit(-1)
+end
+
+mp_driver = MarketPlaceDriver.new(mp_type, :concurrency => threads)
+mp_driver.start_driver
+

From 125e485e04d18bb864f5b34b1f120dfcad4458a2 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 17 Dec 2015 12:39:27 +0100
Subject: [PATCH 027/197] feature #4217: First version of import/datastore
 plugins. Star marketplace manager and load driver

---
 install.sh                             | 49 +++++++-------
 share/etc/oned.conf                    | 18 +++++
 src/datastore_mad/remotes/dummy/export | 19 ++++++
 src/datastore_mad/remotes/fs/export    | 71 ++++++++++++++++++++
 src/datastore_mad/remotes/libfs.sh     | 15 +++--
 src/market_mad/one_market.rb           | 20 +++---
 src/market_mad/remotes/http/delete     |  0
 src/market_mad/remotes/http/export     |  0
 src/market_mad/remotes/http/import     | 92 ++++++++++++++++++++++++++
 src/market_mad/remotes/http/monitor    |  0
 src/nebula/Nebula.cc                   | 27 ++++++++
 11 files changed, 273 insertions(+), 38 deletions(-)
 create mode 100755 src/datastore_mad/remotes/dummy/export
 create mode 100755 src/datastore_mad/remotes/fs/export
 create mode 100644 src/market_mad/remotes/http/delete
 create mode 100644 src/market_mad/remotes/http/export
 create mode 100755 src/market_mad/remotes/http/import
 create mode 100644 src/market_mad/remotes/http/monitor

diff --git a/install.sh b/install.sh
index d5e6141842..70098c0aa0 100755
--- a/install.sh
+++ b/install.sh
@@ -294,6 +294,8 @@ VAR_DIRS="$VAR_LOCATION/remotes \
           $VAR_LOCATION/remotes/datastore/lvm \
           $VAR_LOCATION/remotes/datastore/ceph \
           $VAR_LOCATION/remotes/datastore/dev \
+          $VAR_LOCATION/remotes/market \
+          $VAR_LOCATION/remotes/market/http \
           $VAR_LOCATION/remotes/auth \
           $VAR_LOCATION/remotes/auth/plain \
           $VAR_LOCATION/remotes/auth/ssh \
@@ -327,10 +329,6 @@ LIB_ECO_CLIENT_DIRS="$LIB_LOCATION/ruby \
                  $LIB_LOCATION/ruby/cloud/ \
                  $LIB_LOCATION/ruby/cloud/econe"
 
-LIB_MARKET_CLIENT_DIRS="$LIB_LOCATION/ruby \
-                 $LIB_LOCATION/ruby/opennebula \
-                 $LIB_LOCATION/ruby/cloud/marketplace"
-
 LIB_OCA_CLIENT_DIRS="$LIB_LOCATION/ruby \
                  $LIB_LOCATION/ruby/opennebula"
 
@@ -340,7 +338,7 @@ LIB_CLI_CLIENT_DIRS="$LIB_LOCATION/ruby/cli \
 CONF_CLI_DIRS="$ETC_LOCATION/cli"
 
 if [ "$CLIENT" = "yes" ]; then
-    MAKE_DIRS="$MAKE_DIRS $LIB_ECO_CLIENT_DIRS $LIB_MARKET_CLIENT_DIRS \
+    MAKE_DIRS="$MAKE_DIRS $LIB_ECO_CLIENT_DIRS \
                $LIB_OCA_CLIENT_DIRS $LIB_CLI_CLIENT_DIRS $CONF_CLI_DIRS \
                $ETC_LOCATION"
 elif [ "$ONEGATE" = "yes" ]; then
@@ -427,6 +425,7 @@ INSTALL_FILES=(
     DATASTORE_DRIVER_LVM_SCRIPTS:$VAR_LOCATION/remotes/datastore/lvm
     DATASTORE_DRIVER_CEPH_SCRIPTS:$VAR_LOCATION/remotes/datastore/ceph
     DATASTORE_DRIVER_DEV_SCRIPTS:$VAR_LOCATION/remotes/datastore/dev
+    MARKETPLACE_DRIVER_HTTP_SCRIPTS:$VAR_LOCATION/remotes/market/http
     NETWORK_FILES:$VAR_LOCATION/remotes/vnm
     NETWORK_8021Q_FILES:$VAR_LOCATION/remotes/vnm/802.1Q
     NETWORK_VXLAN_FILES:$VAR_LOCATION/remotes/vnm/vxlan
@@ -445,8 +444,6 @@ INSTALL_FILES=(
     ECO_LIB_FILES:$LIB_LOCATION/ruby/cloud/econe
     ECO_LIB_VIEW_FILES:$LIB_LOCATION/ruby/cloud/econe/views
     ECO_BIN_FILES:$BIN_LOCATION
-    MARKET_LIB_FILES:$LIB_LOCATION/ruby/cloud/marketplace
-    MARKET_BIN_FILES:$BIN_LOCATION
     MAN_FILES:$MAN_LOCATION
     DOCS_FILES:$DOCS_LOCATION
     CLI_LIB_FILES:$LIB_LOCATION/ruby/cli
@@ -463,8 +460,6 @@ INSTALL_CLIENT_FILES=(
     ECO_LIB_CLIENT_FILES:$LIB_LOCATION/ruby/cloud/econe
     ECO_BIN_CLIENT_FILES:$BIN_LOCATION
     COMMON_CLOUD_CLIENT_LIB_FILES:$LIB_LOCATION/ruby/cloud
-    MARKET_LIB_CLIENT_FILES:$LIB_LOCATION/ruby/cloud/marketplace
-    MARKET_BIN_CLIENT_FILES:$BIN_LOCATION
     CLI_BIN_FILES:$BIN_LOCATION
     CLI_LIB_FILES:$LIB_LOCATION/ruby/cli
     ONE_CLI_LIB_FILES:$LIB_LOCATION/ruby/cli/one_helper
@@ -663,7 +658,9 @@ MADS_LIB_FILES="src/mad/sh/madcommon.sh \
               src/authm_mad/one_auth_mad.rb \
               src/authm_mad/one_auth_mad \
               src/datastore_mad/one_datastore.rb \
-              src/datastore_mad/one_datastore"
+              src/datastore_mad/one_datastore \
+              src/market_mad/one_market.rb \
+              src/market_mad/one_market"
 
 #-------------------------------------------------------------------------------
 # VMM SH Driver KVM scripts, to be installed under $REMOTES_LOCATION/vmm/kvm
@@ -1149,7 +1146,8 @@ DATASTORE_DRIVER_DUMMY_SCRIPTS="src/datastore_mad/remotes/dummy/cp \
                          src/datastore_mad/remotes/dummy/snap_delete \
                          src/datastore_mad/remotes/dummy/snap_revert \
                          src/datastore_mad/remotes/dummy/snap_flatten \
-                         src/datastore_mad/remotes/dummy/rm"
+                         src/datastore_mad/remotes/dummy/rm \
+                         src/datastore_mad/remotes/dummy/export"
 
 DATASTORE_DRIVER_FS_SCRIPTS="src/datastore_mad/remotes/fs/cp \
                          src/datastore_mad/remotes/fs/mkfs \
@@ -1159,7 +1157,8 @@ DATASTORE_DRIVER_FS_SCRIPTS="src/datastore_mad/remotes/fs/cp \
                          src/datastore_mad/remotes/fs/snap_delete \
                          src/datastore_mad/remotes/fs/snap_revert \
                          src/datastore_mad/remotes/fs/snap_flatten \
-                         src/datastore_mad/remotes/fs/rm"
+                         src/datastore_mad/remotes/fs/rm \
+                         src/datastore_mad/remotes/fs/export"
 
 DATASTORE_DRIVER_VMFS_SCRIPTS="src/datastore_mad/remotes/vmfs/cp \
                          src/datastore_mad/remotes/vmfs/mkfs \
@@ -1205,6 +1204,19 @@ DATASTORE_DRIVER_DEV_SCRIPTS="src/datastore_mad/remotes/dev/cp \
                          src/datastore_mad/remotes/dev/snap_flatten \
                          src/datastore_mad/remotes/dev/clone"
 
+#-------------------------------------------------------------------------------
+# Marketplace drivers, to be installed under $REMOTES_LOCATION/market
+#   - HTTP based marketplace, $REMOTES_LOCATION/market/http
+#   - S3-obeject based Image Repository, $REMOTES_LOCATION/datastore/fs
+#   - VMFS based Image Repository, $REMOTES_LOCATION/datastore/vmfs
+#   - LVM based Image Repository, $REMOTES_LOCATION/datastore/lvm
+#-------------------------------------------------------------------------------
+
+MARKETPLACE_DRIVER_HTTP_SCRIPTS="src/market_mad/remotes/http/import \
+            src/market_mad/remotes/http/export \
+            src/market_mad/remotes/http/delete \
+            src/market_mad/remotes/http/monitor"
+
 #-------------------------------------------------------------------------------
 # Migration scripts for onedb command, to be installed under $LIB_LOCATION
 #-------------------------------------------------------------------------------
@@ -1500,19 +1512,6 @@ ECO_ETC_FILES="src/cloud/ec2/etc/econe.conf"
 
 ECO_ETC_TEMPLATE_FILES="src/cloud/ec2/etc/templates/m1.small.erb"
 
-#-------------------------------------------------------------------------------
-# Marketplace Client
-#-------------------------------------------------------------------------------
-
-#MARKET_LIB_FILES="src/cloud/marketplace/lib/marketplace_client.rb"
-
-#MARKET_LIB_CLIENT_FILES="src/cloud/marketplace/lib/marketplace_client.rb"
-
-#MARKET_BIN_FILES="src/cloud/marketplace/bin/onemarket"
-
-#MARKET_BIN_CLIENT_FILES="src/cloud/marketplace/bin/onemarket"
-
-
 #-----------------------------------------------------------------------------
 # CLI files
 #-----------------------------------------------------------------------------
diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index eb239fa2c9..475ce57dca 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -650,6 +650,24 @@ DATASTORE_MAD = [
     arguments  = "-t 15 -d dummy,fs,vmfs,lvm,ceph,dev -s shared,ssh,ceph"
 ]
 
+#*******************************************************************************
+# Marketplace Driver Configuration
+#*******************************************************************************
+# Drivers to manage different marketplaces, specialized for the storage backend
+#   executable: path of the transfer driver executable, can be an
+#               absolute path or relative to $ONE_LOCATION/lib/mads (or
+#               /usr/lib/one/mads/ if OpenNebula was installed in /)
+#
+#   arguments : for the driver executable
+#       -t number of threads, i.e. number of repo operations at the same time
+#       -m marketplace mads separated by commas
+#*******************************************************************************
+
+MARKET_MAD = [
+    executable = "one_market",
+    arguments  = "-t 15 -m http,s3"
+]
+
 #*******************************************************************************
 # Hook Manager Configuration
 #*******************************************************************************
diff --git a/src/datastore_mad/remotes/dummy/export b/src/datastore_mad/remotes/dummy/export
new file mode 100755
index 0000000000..d701831e7a
--- /dev/null
+++ b/src/datastore_mad/remotes/dummy/export
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+echo "dummy_path"
diff --git a/src/datastore_mad/remotes/fs/export b/src/datastore_mad/remotes/fs/export
new file mode 100755
index 0000000000..8b206261db
--- /dev/null
+++ b/src/datastore_mad/remotes/fs/export
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+###############################################################################
+# This script is used to export an image to qcow2 file
+###############################################################################
+
+# ------------ Set up the environment to source common tools ------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    LIB_LOCATION=/usr/lib/one
+else
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+
+DRIVER_PATH=$(dirname $0)
+source ${DRIVER_PATH}/../libfs.sh
+
+# -------- Get rm and datastore arguments from OpenNebula core ------------
+
+DRV_ACTION=$1
+ID=$2
+
+XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
+
+unset i XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+    XPATH_ELEMENTS[i++]="$element"
+done < <($XPATH     /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/EXPORT_DIR \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH)
+unset i
+
+SRC="${XPATH_ELEMENTS[i++]}"
+BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
+EXPORT_DIR="${XPATH_ELEMENTS[i++]}"
+BASE_PATH="${XPATH_ELEMENTS[i++]}"
+
+EXPORT_DIR="${EXPORT_DIR-$BASE_PATH}"
+
+# -------------------- Convert image to qcow2 format ---------------------------
+# TODO:
+#   Export directories needs to be defined, probably in oned.conf
+#   BRIDGE_LIST needs to be handled
+#-------------------------------------------------------------------------------
+
+log "Removing $SRC from the image repository"
+
+exec_and_log "$QEMU_IMG convert -O qcow2 $SRC $SRC.export." \
+	"Error converting image to qcow2 format"
+
+echo "$SRC.export"
diff --git a/src/datastore_mad/remotes/libfs.sh b/src/datastore_mad/remotes/libfs.sh
index 24fb95dbca..3041ce77dc 100644
--- a/src/datastore_mad/remotes/libfs.sh
+++ b/src/datastore_mad/remotes/libfs.sh
@@ -53,7 +53,7 @@ function set_up_datastore {
 }
 
 #-------------------------------------------------------------------------------
-# Generates an unique image hash. Requires BASE_PATH to be set
+# Generates an unique image hash. Requires ID to be set
 #   @return hash for the image (empty if error)
 #-------------------------------------------------------------------------------
 function generate_image_hash {
@@ -64,11 +64,10 @@ function generate_image_hash {
 $CANONICAL_STR
 EOF
 )
-    IMAGE_HASH=$(echo $CANONICAL_MD5 | cut -d ' ' -f1)
-    IMAGE_HASH=$(basename "$IMAGE_HASH")
+    IMAGE_HASH="$(echo $CANONICAL_MD5 | cut -d ' ' -f1)"
 
-    if [ -z "$IMAGE_HASH" -o -z "$BASE_PATH" ]; then
-        log_error "Error generating the path in generate_image_path."
+    if [ -z "$IMAGE_HASH" ]; then
+        log_error "Error generating the path in generate_image_hash."
         exit 1
     fi
 
@@ -81,6 +80,12 @@ EOF
 #-------------------------------------------------------------------------------
 function generate_image_path {
     IMAGE_HASH=`generate_image_hash`
+
+    if [ -z "$BASE_PATH" ]; then
+        log_error "Error generating the path in generate_image_path."
+        exit 1
+    fi
+
     echo "${BASE_PATH}/${IMAGE_HASH}"
 }
 
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index e764b3768a..195f9a1ab1 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -101,8 +101,9 @@ class MarketPlaceDriver < OpenNebulaDriver
 
         type   = app['TYPE'] if !app.nil?
         origin = app['ORIGIN'] if !app.nil?
+        mp_mad = market['MARKET_MAD'] if !app.nil?
 
-        if market.nil? || app.nil? || type.nil? || origin.nil?
+        if market.nil? || app.nil? || type.nil? || origin.nil? || mp_mad.nil?
             failure(:import, id,"Wrong driver message format")
             return
         end
@@ -133,7 +134,7 @@ class MarketPlaceDriver < OpenNebulaDriver
                 rc = ds.info
 
                 if OpenNebula.is_error?(rc)
-                    failure(:import, id, "Cannot find information for datastore #{ds_id}")
+                    failure(:import, id, "Datastore #{ds_id} not found: #{rc}")
                     return
                 end
 
@@ -152,7 +153,7 @@ class MarketPlaceDriver < OpenNebulaDriver
                 ds_msg64 = Base64::encode64(ds_msg)
 
                 result, info = do_action(id, nil, datastore, :export,
-                    "#{ds_msg64} #{id}")
+                    "#{ds_msg64} #{id}", false)
 
                 if ( result == RESULT[:failure] )
                     failure(:import, id, "Error exporting image to file: #{info}")
@@ -160,14 +161,14 @@ class MarketPlaceDriver < OpenNebulaDriver
                 end
 
                 source = info
-            elsif ( source =~ /\d+$|\/.+|https?:\/\// )
+            elsif ( source =~ /\/.+|https?:\/\// )
                 source = origin
             else
-                failure(:import, id, "Marketplace app origin not a valid ID, path or http URL")
+                failure(:import, id, "Origin is not a valid ID, path or URL")
                 return
             end
           else # Only IMAGE type is supported
-                failure(:import, id, "Marketplace app type #{apptype} not supported")
+                failure(:import, id, "Type #{apptype} not supported")
                 return
         end
 
@@ -178,7 +179,8 @@ class MarketPlaceDriver < OpenNebulaDriver
                  "</MARKETPLACE_DRIVER_ACTION_DATA>"
         mp_msg64 = Base64::encode64(mp_msg)
 
-        result, info = do_action(id, market, nil, :import, "#{mp_msg64} #{id}")
+        result, info = do_action(id, mp_mad, nil, :import, "#{mp_msg64} #{id}",
+                            true)
 
         send_message(ACTION[:import], result, id, info)
     end
@@ -215,7 +217,7 @@ class MarketPlaceDriver < OpenNebulaDriver
     #  @param action to invoke from the driver
     #  @param arguments for the action
     #  @return result and info of the action
-    def do_action(id, market, datastore, action, arguments)
+    def do_action(id, market, datastore, action, arguments, encode)
 
         if !datastore.empty?
             path = File.join(@local_ds_scripts_path, datastore)
@@ -231,6 +233,8 @@ class MarketPlaceDriver < OpenNebulaDriver
 
         result, info = get_info_from_execution(rc)
 
+        result = Base64::encode64(result) if encode
+
         return result, info
     end
 
diff --git a/src/market_mad/remotes/http/delete b/src/market_mad/remotes/http/delete
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/market_mad/remotes/http/export b/src/market_mad/remotes/http/export
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/market_mad/remotes/http/import b/src/market_mad/remotes/http/import
new file mode 100755
index 0000000000..c5cdde7a8d
--- /dev/null
+++ b/src/market_mad/remotes/http/import
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+# -------------------------------------------------------------------------- #
+
+###############################################################################
+# This script is used to import a file into the marketplace. The source file
+# is an opaque representation of an OpenNebula object, like a image file or a
+# tar.gz with several vm template or flow disk images
+###############################################################################
+
+# -------- Set up the environment to source common tools & conf ------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    LIB_LOCATION=/usr/lib/one
+else
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+
+DRIVER_PATH=$(dirname $0)
+source ${DRIVER_PATH}/../../datastore/libfs.sh
+
+XPATH_PATH="${DRIVER_PATH}/../../datastore/xpath.rb"
+
+# -------- Get arguments from OpenNebula core ------------
+
+DRV_ACTION=$1
+ID=$2
+
+XPATH="$XPATH_PATH/xpath.rb -b $DRV_ACTION"
+
+unset i XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+    XPATH_ELEMENTS[i++]="$element"
+done < <($XPATH     /MARKETPLACE_DRIVER_ACTION_DATA/IMPORT_SOURCE \
+                    /MARKETPLACE_DRIVER_ACTION_DATA/MARKETPLACE/BASE_URL \
+                    /MARKETPLACE_DRIVER_ACTION_DATA/MARKETPLACE/PUBLIC_DIR)
+unset i
+
+IMPORT_SOURCE="${XPATH_ELEMENTS[i++]}"
+BASE_URL="${XPATH_ELEMENTS[i++]}"
+PUBLIC_DIR="${XPATH_ELEMENTS[i++]}"
+
+# -------- Copy source to public folder an generarte App data ------------
+
+APPNAME=`generate_image_hash`
+DST_PATH="${PUBLIC_DIR}/${APP_NAME}"
+SOURCE="${BASE_URL}/${APP_NAME}"
+
+if [ ! -f ${IMPORT_SOURCE} ]; then
+    log_error "File ${IMPORT_SOURCE} does not exits"
+    exit -1
+fi
+
+CHECKSUM=$(${MD5SUM} ${IMPORT_SOURCE} | cut -f1 -d' ')
+
+SIZE=$(fs_size ${IMPORT_SOURCE})
+
+if [ "$SIZE" = "0" ]; then
+    log_error "Cannot determine size for ${IMPORT_SOURCE}"
+    exit -1
+fi
+
+exec_and_log "$CP ${IMPORT_SOURCE} ${DST_PATH}" \
+    "Error copying ${IMPORT_SOURCE} to ${DST_PATH}. ${IMPORT_SOURCE} not removed"
+
+exec_and_log "$RM ${IMPORT_SOURCE}" "Error removing ${IMPORT_SOURCE}"
+
+RESPONSE=$(cat << EOF
+SOURCE="$SOURCE"
+CHECKSUM="$CHECKSUM"
+SIZE="$SIZE"
+EOF
+)
+
+echo "$RESPONSE"
diff --git a/src/market_mad/remotes/http/monitor b/src/market_mad/remotes/http/monitor
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 5d3474578c..9a81b82c1a 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -821,6 +821,27 @@ void Nebula::start(bool bootstrap_only)
        throw runtime_error("Could not start the Image Manager");
     }
 
+    // ---- Marketplace Manager ----
+    try
+    {
+        vector<const Attribute *> mmads ;
+
+        nebula_configuration->get("MARKET_MAD", mmads);
+
+        marketm = new MarketPlaceManager(timer_period, monitor_period, mmads);
+    }
+    catch (bad_alloc&)
+    {
+        throw;
+    }
+
+    rc = marketm->start();
+
+    if ( rc != 0 )
+    {
+       throw runtime_error("Could not start the Marketplace Manager");
+    }
+
     // -----------------------------------------------------------
     // Load mads
     // -----------------------------------------------------------
@@ -854,6 +875,11 @@ void Nebula::start(bool bootstrap_only)
         goto error_mad;
     }
 
+    if (marketm->load_mads(0) != 0)
+    {
+        goto error_mad;
+    }
+
     if ( authm != 0 )
     {
         if (authm->load_mads(0) != 0)
@@ -946,6 +972,7 @@ void Nebula::start(bool bootstrap_only)
     rm->finalize();
     hm->finalize();
     imagem->finalize();
+    marketm->finalize();
     aclm->finalize();
 
     //sleep to wait drivers???

From 56180ff21d182f1f872f42bbe4e7ecfd834b434a Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 17 Dec 2015 17:21:57 +0100
Subject: [PATCH 028/197] feature #4217: Fix bugs

---
 src/datastore_mad/remotes/fs/export    |  2 +-
 src/mad/sh/scripts_common.sh           |  1 +
 src/market_mad/one_market.rb           | 49 +++++++++++++-------------
 src/market_mad/remotes/http/import     | 12 +++----
 src/oca/ruby/opennebula/xml_element.rb |  5 +++
 5 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/datastore_mad/remotes/fs/export b/src/datastore_mad/remotes/fs/export
index 8b206261db..709921ba9d 100755
--- a/src/datastore_mad/remotes/fs/export
+++ b/src/datastore_mad/remotes/fs/export
@@ -65,7 +65,7 @@ EXPORT_DIR="${EXPORT_DIR-$BASE_PATH}"
 
 log "Removing $SRC from the image repository"
 
-exec_and_log "$QEMU_IMG convert -O qcow2 $SRC $SRC.export." \
+exec_and_log "$QEMU_IMG convert -O qcow2 $SRC $SRC.export" \
 	"Error converting image to qcow2 format"
 
 echo "$SRC.export"
diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index 023fe63a1d..12eaecaa7c 100644
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -42,6 +42,7 @@ RADOS=${RADOS:-rados}
 RBD=${RBD:-rbd}
 READLINK=${READLINK:-readlink}
 RM=${RM:-rm}
+CP=${CP:-cp}
 SCP=${SCP:-scp}
 SED=${SED:-sed}
 SSH=${SSH:-ssh}
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index 195f9a1ab1..90dea56ae7 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -97,13 +97,18 @@ class MarketPlaceDriver < OpenNebulaDriver
     ############################################################################
 
     def import(id, drv_message)
-        market, app = decode(drv_message)
+        xml = decode(drv_message)
 
-        type   = app['TYPE'] if !app.nil?
-        origin = app['ORIGIN'] if !app.nil?
-        mp_mad = market['MARKET_MAD'] if !app.nil?
+        if xml.nil?
+            failure(:import, id, "Cannot decode driver message")
+            return
+        end
 
-        if market.nil? || app.nil? || type.nil? || origin.nil? || mp_mad.nil?
+        type   = xml['MARKETPLACEAPP/TYPE']
+        origin = xml['MARKETPLACEAPP/ORIGIN']
+        mp_mad = xml['MARKETPLACE/MARKET_MAD']
+
+        if type.nil? || origin.nil? || mp_mad.nil?
             failure(:import, id,"Wrong driver message format")
             return
         end
@@ -119,7 +124,8 @@ class MarketPlaceDriver < OpenNebulaDriver
                 rc    = image.info
 
                 if OpenNebula.is_error?(rc)
-                    failure(:import, id, "Cannot find information for image #{origin}")
+                    failure(:import, id, "Cannot find information for image "\
+                            "#{origin}: #{rc.to_str()}")
                     return
                 end
 
@@ -138,9 +144,9 @@ class MarketPlaceDriver < OpenNebulaDriver
                     return
                 end
 
-                mad = ds['DS_MAD']
+                ds_mad = ds['DS_MAD']
 
-                if mad.nil?
+                if ds_mad.nil?
                     failure(:import, id, "Cannot find datastore driver")
                     return
                 end
@@ -150,9 +156,9 @@ class MarketPlaceDriver < OpenNebulaDriver
                            "#{image.to_xml}"\
                            "#{ds.to_xml}"\
                            "</DS_DRIVER_ACTION_DATA>"
-                ds_msg64 = Base64::encode64(ds_msg)
+                ds_msg64 = Base64::strict_encode64(ds_msg)
 
-                result, info = do_action(id, nil, datastore, :export,
+                result, info = do_action(id, nil, ds_mad, :export,
                     "#{ds_msg64} #{id}", false)
 
                 if ( result == RESULT[:failure] )
@@ -172,12 +178,9 @@ class MarketPlaceDriver < OpenNebulaDriver
                 return
         end
 
-        mp_msg = "<MARKETPLACE_DRIVER_ACTION_DATA>"\
-                 "#{market.to_s}"\
-                 "#{app.to_s}"\
-                 "<IMPORT_SOURCE>#{source}</IMPORT_SOURCE>"\
-                 "</MARKETPLACE_DRIVER_ACTION_DATA>"
-        mp_msg64 = Base64::encode64(mp_msg)
+        xml.add_element('/MARKET_DRIVER_ACTION_DATA',
+            'IMPORT_SOURCE' => "#{source}")
+        mp_msg64 = Base64::strict_encode64(xml.to_xml)
 
         result, info = do_action(id, mp_mad, nil, :import, "#{mp_msg64} #{id}",
                             true)
@@ -219,7 +222,7 @@ class MarketPlaceDriver < OpenNebulaDriver
     #  @return result and info of the action
     def do_action(id, market, datastore, action, arguments, encode)
 
-        if !datastore.empty?
+        if !datastore.nil?
             path = File.join(@local_ds_scripts_path, datastore)
         else
             return if not is_available?(market, id, action)
@@ -233,7 +236,7 @@ class MarketPlaceDriver < OpenNebulaDriver
 
         result, info = get_info_from_execution(rc)
 
-        result = Base64::encode64(result) if encode
+        info = Base64::strict_encode64(info) if encode
 
         return result, info
     end
@@ -241,13 +244,11 @@ class MarketPlaceDriver < OpenNebulaDriver
     # Decodes the core message and returns the app and market information as
     # xml documents
     def decode(drv_message)
-        message = Base64.decode64(drv_message)
-        xml_doc = REXML::Document.new(message)
+        msg = Base64.decode64(drv_message)
+        doc = OpenNebula::XMLElement.new
+        doc.initialize_xml(msg, 'MARKET_DRIVER_ACTION_DATA')
 
-        market = xml_doc.root.elements[MARKETPLACE_XPATH]
-        app    = xml_doc.root.elements[MARKETPLACEAPP_XPATH]
-
-        return market, app
+        return doc
     end
 
     def failure(asym, id, message)
diff --git a/src/market_mad/remotes/http/import b/src/market_mad/remotes/http/import
index c5cdde7a8d..df86561180 100755
--- a/src/market_mad/remotes/http/import
+++ b/src/market_mad/remotes/http/import
@@ -35,7 +35,7 @@ fi
 DRIVER_PATH=$(dirname $0)
 source ${DRIVER_PATH}/../../datastore/libfs.sh
 
-XPATH_PATH="${DRIVER_PATH}/../../datastore/xpath.rb"
+XPATH_PATH="${DRIVER_PATH}/../../datastore"
 
 # -------- Get arguments from OpenNebula core ------------
 
@@ -48,9 +48,9 @@ unset i XPATH_ELEMENTS
 
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
-done < <($XPATH     /MARKETPLACE_DRIVER_ACTION_DATA/IMPORT_SOURCE \
-                    /MARKETPLACE_DRIVER_ACTION_DATA/MARKETPLACE/BASE_URL \
-                    /MARKETPLACE_DRIVER_ACTION_DATA/MARKETPLACE/PUBLIC_DIR)
+done < <($XPATH     /MARKET_DRIVER_ACTION_DATA/IMPORT_SOURCE \
+                    /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/BASE_URL \
+                    /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/PUBLIC_DIR)
 unset i
 
 IMPORT_SOURCE="${XPATH_ELEMENTS[i++]}"
@@ -60,8 +60,8 @@ PUBLIC_DIR="${XPATH_ELEMENTS[i++]}"
 # -------- Copy source to public folder an generarte App data ------------
 
 APPNAME=`generate_image_hash`
-DST_PATH="${PUBLIC_DIR}/${APP_NAME}"
-SOURCE="${BASE_URL}/${APP_NAME}"
+DST_PATH="${PUBLIC_DIR}/${APPNAME}"
+SOURCE="${BASE_URL}/${APPNAME}"
 
 if [ ! -f ${IMPORT_SOURCE} ]; then
     log_error "File ${IMPORT_SOURCE} does not exits"
diff --git a/src/oca/ruby/opennebula/xml_element.rb b/src/oca/ruby/opennebula/xml_element.rb
index 356ca34049..9297619dea 100644
--- a/src/oca/ruby/opennebula/xml_element.rb
+++ b/src/oca/ruby/opennebula/xml_element.rb
@@ -65,6 +65,11 @@ module OpenNebula
             return doc
         end
 
+        # Checks if the internal XML representation is valid
+        def nil?
+            return @xml.nil?
+        end
+
         # Extract a text element from the XML description of the PoolElement.
         #
         # @param [String] key Xpath expression

From f9910aa1035c156b315fec009c8e18cb3553cf99 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 18 Dec 2015 12:07:21 +0100
Subject: [PATCH 029/197] feature #4217: Fix bug when initializating pool
 references

---
 include/MarketPlaceManager.h     | 25 +++++++------------------
 src/market/MarketPlaceManager.cc | 29 ++++++++++++++++++-----------
 src/nebula/Nebula.cc             |  2 --
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/include/MarketPlaceManager.h b/include/MarketPlaceManager.h
index 4d90c6aac7..f80682dfa7 100644
--- a/include/MarketPlaceManager.h
+++ b/include/MarketPlaceManager.h
@@ -30,27 +30,16 @@ class MarketPlaceManager : public MadManager, public ActionListener
 {
 public:
 
-    MarketPlaceManager(
-            time_t _timer_period,
-            time_t _monitor_period,
-            std::vector<const Attribute*>& _mads):
-        MadManager(_mads),
-        timer_period(_timer_period),
-        monitor_period(_monitor_period),
-        mppool(0),
-        apppool(0)
-    {
-        am.addListener(this);
-    };
+    /**
+     *  Inititalizes the Marketplace manager:
+     *    @param t, timer_period to wake up the manger to perform actions
+     *    @param m, monitor_period to monitor marketplaces
+     *    @param mad, list of drivers for the manager
+     */
+    MarketPlaceManager( time_t t, time_t m, std::vector<const Attribute*>& mad);
 
     ~MarketPlaceManager(){};
 
-    /**
-     * Initializes internal pointers to other managers. Must be called when
-     * all the other managers exist in Nebula::instance
-     */
-    void init_managers();
-
     /**
      *  This functions starts the associated listener thread, and creates a
      *  new thread for the MarketPlace Manager. This thread will wait in
diff --git a/src/market/MarketPlaceManager.cc b/src/market/MarketPlaceManager.cc
index e31ad9c855..55625be7a0 100644
--- a/src/market/MarketPlaceManager.cc
+++ b/src/market/MarketPlaceManager.cc
@@ -46,6 +46,24 @@ extern "C" void * marketplace_action_loop(void *arg)
 
     return 0;
 }
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+MarketPlaceManager::MarketPlaceManager(
+            time_t _timer_period,
+            time_t _monitor_period,
+            std::vector<const Attribute*>& _mads):
+        MadManager(_mads),
+        timer_period(_timer_period),
+        monitor_period(_monitor_period)
+{
+    Nebula& nd = Nebula::instance();
+
+    mppool  = nd.get_marketpool();
+    apppool = nd.get_apppool();
+
+    am.addListener(this);
+};
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -144,17 +162,6 @@ void MarketPlaceManager::do_action(const string &action, void * arg)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void MarketPlaceManager::init_managers()
-{
-    Nebula& nd = Nebula::instance();
-
-    mppool  = nd.get_marketpool();
-    apppool = nd.get_apppool();
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
 string * MarketPlaceManager::format_message(
     const string& app_data,
     const string& market_data,
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 9a81b82c1a..1a0fd1fdbd 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -936,8 +936,6 @@ void Nebula::start(bool bootstrap_only)
 
     lcm->init_managers();
 
-    marketm->init_managers();
-
     // ---- Start the Request Manager ----
 
     rc = rm->start();

From e4cd7b45e687515a38d40d05c209cbba2a1a19f1 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 18 Dec 2015 12:53:53 +0100
Subject: [PATCH 030/197] feature #4217. Better output for CLI commands

---
 src/cli/etc/onemarket.yaml                |  6 ++---
 src/cli/etc/onemarketapp.yaml             | 33 +++++++++++------------
 src/cli/one_helper/onemarket_helper.rb    |  6 ++---
 src/cli/one_helper/onemarketapp_helper.rb | 25 +++++++++--------
 4 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/cli/etc/onemarket.yaml b/src/cli/etc/onemarket.yaml
index 7d6bfca2a6..2d593e1d71 100644
--- a/src/cli/etc/onemarket.yaml
+++ b/src/cli/etc/onemarket.yaml
@@ -5,7 +5,7 @@
 
 :NAME:
   :desc: Name of the Marketplace
-  :size: 13
+  :size: 30
   :left: true
 
 :SIZE:
@@ -14,7 +14,7 @@
 
 :AVAIL:
   :desc: MarketPlace free size (%)
-  :size: 5
+  :size: 10
   :left: true
 
 :APPS:
@@ -28,8 +28,8 @@
 
 :default:
 - :ID
-- :NAME
 - :SIZE
 - :AVAIL
 - :APPS
 - :MAD
+- :NAME
diff --git a/src/cli/etc/onemarketapp.yaml b/src/cli/etc/onemarketapp.yaml
index 4c40749109..e1958cfa18 100644
--- a/src/cli/etc/onemarketapp.yaml
+++ b/src/cli/etc/onemarketapp.yaml
@@ -5,49 +5,46 @@
 
 :NAME:
   :desc: Name of the marketplace app
-  :size: 13
-  :left: true
-
-:PUBLISHER:
-  :desc: Publisher of the marketplace app
   :size: 15
   :left: true
 
 :VERSION:
   :desc: Version of the marketplace app
-  :size: 10
-  :left: true
+  :size: 7
 
 :SIZE:
   :desc: Marketplace app size (M)
-  :size: 8
+  :size: 5
 
 :STAT:
   :desc: State of the app
   :size: 4
-  :left: true
-
-:DATE:
-  :desc: Publishing date for the marketplace app
-  :size: 15
 
 :TYPE:
   :desc: Marketplace app type
   :size: 4
-  :left: true
+
+:DATE:
+  :desc: Publishing date for the marketplace app
+  :size: 8
 
 :MARKET:
-  :desc: Name of the marketplace 
-  :size: 10
+  :desc: ID of the marketplace
+  :size: 6
+
+:PUBLISHER:
+  :desc: Publisher of the marketplace app
+  :size: 25
   :left: true
 
+
 :default:
 - :ID
 - :NAME
-- :PUBLISHER
 - :VERSION
 - :SIZE
 - :STAT
-- :DATE
 - :TYPE
+- :DATE
 - :MARKET
+- :PUBLISHER
diff --git a/src/cli/one_helper/onemarket_helper.rb b/src/cli/one_helper/onemarket_helper.rb
index 7f584cfb3d..872467b294 100644
--- a/src/cli/one_helper/onemarket_helper.rb
+++ b/src/cli/one_helper/onemarket_helper.rb
@@ -44,7 +44,7 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
                 d["ID"]
             end
 
-            column :NAME, "Name of the Marketplace", :left, :size=>13 do |d|
+            column :NAME, "Name of the Marketplace", :left, :size=>30 do |d|
                 d["NAME"]
             end
 
@@ -52,7 +52,7 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.unit_to_str(d['TOTAL_MB'].to_i, {}, 'M')
             end
 
-            column :AVAIL, "Marketplace free size", :left, :size =>5 do |d|
+            column :AVAIL, "Marketplace free size", :left, :size =>10 do |d|
                 if d['TOTAL_MB'].to_i == 0
                     "-"
                 else
@@ -77,7 +77,7 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
                 d["MARKET_MAD"]
             end
 
-            default :ID, :NAME, :SIZE, :AVAIL, :APPS, :TYPE, :MAD
+            default :ID, :SIZE, :AVAIL, :APPS, :TYPE, :MAD, :NAME
         end
 
         table
diff --git a/src/cli/one_helper/onemarketapp_helper.rb b/src/cli/one_helper/onemarketapp_helper.rb
index 0973acd55b..2f0cf197ab 100644
--- a/src/cli/one_helper/onemarketapp_helper.rb
+++ b/src/cli/one_helper/onemarketapp_helper.rb
@@ -39,41 +39,40 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
                 d["ID"]
             end
 
-            column :NAME, "Name of the marketplace app", :left, :size=>13 do |d|
+            column :NAME, "Name of the marketplace app", :left, :size=>15 do |d|
                 d["NAME"]
             end
 
-            column :PUBLISHER, "Publisher of the App", :left, :size=>15 do |d|
+            column :PUBLISHER, "Publisher of the App", :left, :size=>25 do |d|
                 d["PUBLISHER"]
             end
 
-            column :VERSION, "Version of the app", :left, :size=>10 do |d|
+            column :VERSION, "Version of the app", :size=>7 do |d|
                 d["VERSION"]
             end
 
-            column :SIZE, "App size", :size =>8 do |d|
+            column :SIZE, "App size", :size =>5 do |d|
                 OpenNebulaHelper.unit_to_str(d['SIZE'].to_i, {}, 'M')
             end
 
-            column :STAT, "State of the app", :left, :size=>4 do |d|
+            column :STAT, "State of the app", :size=>4 do |d|
                 OneMarketPlaceAppHelper.state_to_str(d["STATE"])
             end
 
-            column :DATE, "Publishing date of the app",
-                    :size=>15 do |d|
-                OpenNebulaHelper.time_to_str(d["DATE"])
+            column :DATE, "Publishing date of the app", :size=>8 do |d|
+                Time.at(d['DATE'].to_i).strftime("%D")
             end
 
-            column :TYPE, "Marketplace app type", :left, :size=>4 do |d|
+            column :TYPE, "Marketplace app type", :size=>4 do |d|
                 type = MarketPlaceApp::MARKETPLACEAPP_TYPES[d["TYPE"].to_i]
                 MarketPlaceApp::SHORT_MARKETPLACEAPP_TYPES[type]
             end
 
-            column :MARKET, "Name of the marketplace", :left, :size=>10 do |d|
-                d["MARKETPLACE"]
+            column :MARKET, "ID of the marketplace", :size=>6 do |d|
+                d["MARKETPLACE_ID"]
             end
 
-            default :ID,:NAME,:PUBLISHER,:VERSION,:SIZE,:STAT,:DATE,:TYPE,:MARKET
+            default :ID,:NAME,:VERSION,:SIZE,:STAT,:TYPE,:DATE,:MARKET,:PUBLISHER
         end
 
         table
@@ -126,7 +125,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
         puts str % ["SOURCE", app['SOURCE']]
         puts str % ["CHECKSUM", app['CHECKSUM']]
         puts str % ["PUBLISHER", app['PUBLISHER']]
-        puts str % ["PUB. DATE", OpenNebulaHelper.time_to_str(app["DATE"])]
+        puts str % ["PUB. DATE", Time.at(app['DATE'].to_i).strftime("%c") ]
         puts str % ["VERSION", app['VERSION']]
         puts str % ["DESCRIPTION", app['DESCRIPTION']]
         puts str % ["SIZE", OpenNebulaHelper.unit_to_str(app['SIZE'].to_i,{},'M')]

From 59267f1f86da7ae6782b659fa560772d2222283d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 18 Dec 2015 14:55:12 +0100
Subject: [PATCH 031/197] Feature #4215: Select a VM Template from the VR
 create wizard

---
 .../public/app/tabs/vnets-topology-tab.js     |  21 +++
 .../tabs/vrouters-tab/form-panels/create.js   | 146 +++++++++++++-----
 .../form-panels/create/wizard.hbs             |  83 ++++++++--
 src/sunstone/public/app/utils/nics-section.js |  33 ++--
 4 files changed, 218 insertions(+), 65 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js
index 1668a276ae..a5864d395c 100644
--- a/src/sunstone/public/app/tabs/vnets-topology-tab.js
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js
@@ -167,6 +167,8 @@ define(function(require) {
         }
       }
 
+      // TODO: VR edges with floating IPs
+
       $.each(vrs, function(j,vr){
         var nodeId = "vr"+vr;
 
@@ -226,6 +228,25 @@ define(function(require) {
               label = lease.IP;
             }
 
+            edges.push({from: vnetNodeId, to: nodeId, label: label});
+          } else if (lease.VROUTER != undefined){
+            var nodeId = "vr"+lease.VROUTER;
+
+            if (!nodeIndex[nodeId]){
+              nodeIndex[nodeId] = true;
+              nodes.push({
+                id: nodeId,
+                label: "VR "+vr,
+                group: "vr"});
+            }
+
+            var label = undefined;
+
+            // TODO: IPv6 IPs
+            if (lease.IP != undefined){
+              label = lease.IP;
+            }
+
             edges.push({from: vnetNodeId, to: nodeId, label: label});
           }
 
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index 6aad3f9514..22acdeaae9 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -25,7 +25,13 @@ define(function(require) {
   var Locale = require('utils/locale');
   var Tips = require('utils/tips');
   var TemplateUtils = require('utils/template-utils');
+  var UserInputs = require('utils/user-inputs');
   var WizardFields = require('utils/wizard-fields');
+  var NicsSection = require('utils/nics-section');
+  var TemplatesTable = require('tabs/templates-tab/datatable');
+  var OpenNebulaVirtualRouter = require('opennebula/virtualrouter');
+  var OpenNebulaTemplate = require('opennebula/template');
+  var Notifier = require('utils/notifier');
 
   /*
     TEMPLATES
@@ -53,14 +59,11 @@ define(function(require) {
         'title': Locale.tr("Create Virtual Router"),
         'buttonText': Locale.tr("Create"),
         'resetButton': true
-      },
-      'update': {
-        'title': Locale.tr("Update Virtual Router"),
-        'buttonText': Locale.tr("Update"),
-        'resetButton': false
       }
     };
 
+    this.templatesTable = new TemplatesTable('vr_create', {'select': true});
+
     BaseFormPanel.call(this);
   }
 
@@ -72,7 +75,6 @@ define(function(require) {
   FormPanel.prototype.submitWizard = _submitWizard;
   FormPanel.prototype.submitAdvanced = _submitAdvanced;
   FormPanel.prototype.onShow = _onShow;
-  FormPanel.prototype.fill = _fill;
   FormPanel.prototype.setup = _setup;
 
   return FormPanel;
@@ -83,7 +85,8 @@ define(function(require) {
 
   function _htmlWizard() {
     return TemplateWizardHTML({
-      'formPanelId': this.formPanelId
+      'formPanelId': this.formPanelId,
+      'templatesTableHTML': this.templatesTable.dataTableHTML
     });
   }
 
@@ -94,35 +97,115 @@ define(function(require) {
   function _setup(context) {
     var that = this;
 
+    NicsSection.insert({}, $(".nicsContext", context));
+
+    this.templatesTable.initialize();
+
+    this.templatesTable.idInput().attr("required", "");
+
+    this.templatesTable.idInput().on("change", function(){
+      var templateId = $(this).val();
+
+      var inputs_div = $(".template_user_inputs", context);
+      inputs_div.empty();
+
+      OpenNebulaTemplate.show({
+        data : {
+          id: templateId
+        },
+        timeout: true,
+        success: function (request, template_json) {
+          UserInputs.vmTemplateInsert(
+              inputs_div,
+              template_json,
+              {text_header: '<i class="fa fa-gears fa-lg"></i>&emsp;'+Locale.tr("Custom Attributes")});
+        },
+        error: Notifier.onError
+      });
+    });
+
+    $(".vr_attributes #name", context).on("input", function(){
+      $('#vm_name', context).val("vr-"+$(this).val()+"-%i");
+    });
+
     Tips.setup();
 
     return false;
   }
 
   function _submitWizard(context) {
+    var virtual_router_json = WizardFields.retrieve($(".vr_attributes", context));
 
-    var name = $('#virtual_router_name', context).val();
-    var description = $('#virtual_router_description', context).val();
+    var nics = NicsSection.retrieve($(".nicsContext", context));
+    if (nics.length > 0) {
+      // TODO: Instead of a global checkbox, each vnet should have
+      // its own checkbox to choose floating IP or not
+      $.each(nics, function(){
+        this["FLOATING_IP"] = virtual_router_json["FLOATING_IP"];
+      });
 
-    var virtual_router_json = {
-      "NAME" : name,
-      "DESCRIPTION": description
-    };
+      virtual_router_json.NIC = nics;
+    }
+
+    var tmplId = this.templatesTable.retrieveResourceTableSelect();
 
     if (this.action == "create") {
       virtual_router_json = {
         "virtual_router" : virtual_router_json
       };
 
-      Sunstone.runAction("VirtualRouter.create",virtual_router_json);
-      return false;
-    } else if (this.action == "update") {
-      delete virtual_router_json["NAME"];
+      var vm_name = $('#vm_name', context).val();
+      var n_times = parseInt($('#vm_n_times', context).val());
 
-      Sunstone.runAction(
-        "VirtualRouter.update",
-        this.resourceId,
-        TemplateUtils.templateToString(virtual_router_json));
+      if (isNaN(n_times)){
+        n_times = 1;
+      }
+
+      var hold = $('#hold', context).prop("checked");
+
+      OpenNebulaVirtualRouter.create({
+        data : virtual_router_json,
+        timeout: true,
+        success: function (request, response) {
+
+          // TODO: close form panel only on instantiate success
+          Sunstone.resetFormPanel(TAB_ID, FORM_PANEL_ID);
+          Sunstone.hideFormPanel(TAB_ID);
+
+          var extra_msg = "";
+          if (n_times > 1) {
+            extra_msg = n_times + " times";
+          }
+
+          Notifier.notifySubmit("Template.instantiate", tmplId, extra_msg);
+
+          var extra_info = {
+            'hold': hold
+          };
+
+          var tmpl = WizardFields.retrieve($(".template_user_inputs", context));
+          tmpl["VROUTER_ID"] = response.VROUTER.ID;
+
+          extra_info['template'] = tmpl;
+
+          for (var i = 0; i < n_times; i++) {
+            extra_info['vm_name'] = vm_name.replace(/%i/gi, i);
+
+            OpenNebulaTemplate.instantiate({
+              data:{
+                id: tmplId,
+                extra_param: extra_info
+              },
+              timeout: true,
+              error: Notifier.onError
+            });
+          }
+        },
+        error: function(request, response) {
+          Sunstone.hideFormPanelLoading(TAB_ID);
+          Notifier.onError(request, response);
+        },
+      });
 
       return false;
     }
@@ -134,29 +217,10 @@ define(function(require) {
       var virtual_router_json = {virtual_router: {virtual_router_raw: template}};
       Sunstone.runAction("VirtualRouter.create",virtual_router_json);
       return false;
-    } else if (this.action == "update") {
-      var template_raw = $('textarea#template', context).val();
-      Sunstone.runAction("VirtualRouter.update", this.resourceId, template_raw);
-      return false;
     }
   }
 
   function _onShow(context) {
-  }
-
-  function _fill(context, element) {
-    var that = this;
-
-    this.resourceId = element.ID;
-
-    // Populates the Avanced mode Tab
-    $('#template', context).val(TemplateUtils.templateToString(element.TEMPLATE).replace(/^[\r\n]+$/g, ""));
-
-    $('#virtual_router_name',context).val(
-      TemplateUtils.escapeDoubleQuotes(TemplateUtils.htmlDecode( element.NAME ))).
-      prop("disabled", true);
-
-    $('#virtual_router_description', context).val(
-      TemplateUtils.escapeDoubleQuotes(TemplateUtils.htmlDecode( element.TEMPLATE.DESCRIPTION )) );
+    this.templatesTable.refreshResourceTableSelect();
   }
 });
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
index f712b800ba..bb2afc7ae7 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
@@ -16,18 +16,81 @@
 
 <div id="create_virtual_router_form_wrapper">
   <form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
-    <div class="row">
-      <div class="medium-4 columns">
-        <label for="virtual_router_name">{{tr "Virtual Router Name"}}:</label>
-        <input required type="text" name="virtual_router_name" id="virtual_router_name"/>
+    <div class="vr_attributes">
+      <div class="row">
+        <div class="medium-6 columns">
+          <label for="name" >
+            {{tr "Name"}}:
+          </label>
+          <input type="text" wizard_field="NAME" required name="name" id="name"/>
+        </div>
       </div>
-      <div class="medium-8 columns">
-        <label for="virtual_router_description">{{tr "Description"}}
-          <span class="tip">{{tr "Description for the Virtual Router"}}</span>
-        </label>
-        <textarea type="text" id="virtual_router_description" name="virtual_router_description" style="height: 70px;"/>
+      <div class="row">
+        <div class="medium-6 columns">
+          <label for="DESCRIPTION" >
+            {{tr "Description"}}
+            <span class="tip">{{tr "Description of the Virtual Router"}}</span>
+          </label>
+          <textarea type="text" wizard_field="DESCRIPTION" id="DESCRIPTION" name="DESCRIPTION"/>
+        </div>
+      </div>
+      <div class="row">
+        <div class="medium-6 columns">
+          <label for="floating_ip">
+            <input type="checkbox" wizard_field="FLOATING_IP" value="YES" name="floating_ip" id="floating_ip" />
+            {{tr "Floating IPs"}}
+            <span class="tip">
+              {{tr "If checked, each Virtual Machine will have a floating IP added to its network interface."}}
+            </span>
+          </label>
+        </div>
       </div>
     </div>
-    <hr/>
+    <div class="row">
+      <div class="large-12 columns nicsContext">
+        <div class="provision_network_selector">
+        </div>
+        <br>
+      </div>
+    </div>
+    <br/>
+    <div class="row">
+      {{{templatesTableHTML}}}
+    </div>
+    {{!TODO: duplicated html from templates-tab/form-panels/instantiate/html.hbs}}
+    <div class="row nameContainer">
+      <div class="medium-4 columns">
+        <label for="vm_name">
+          {{tr "VM Name"}}
+          <span class="tip">
+            {{tr "Defaults to template name when emtpy. You can use the wildcard %i. When creating several VMs, %i will be replaced with a different number starting from 0 in each of them"}}.
+          </span>
+        </label>
+        <input type="text" name="vm_name" id="vm_name" />
+      </div> 
+      <div class="medium-4 columns">
+        <label for="vm_n_times">
+          {{tr "Number of instances"}}
+          <span class="tip">
+            {{tr "Number of Virtual Machines that will be created using this template"}}.
+          </span>
+        </label>
+        <input type="text" name="vm_n_times" id="vm_n_times" value="1">
+      </div>
+      <div class="medium-4 columns">
+        <input type="checkbox" name="hold" id="hold"/>
+        <label for="hold">
+          {{tr "Hold"}}
+          <span class="tip">
+            {{tr "Sets the new VM to hold state, instead of pending. The scheduler will not deploy VMs in this state. It can be released later, or deployed manually."}}
+          </span>
+        </label>
+      </div>
+    </div>
+    <div class="row">
+      <div class="large-12 columns large-centered template_user_inputs">
+      </div>
+      <br>
+    </div>
   </form>
 </div>
diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js
index 3ad108ea0d..5d44f804af 100644
--- a/src/sunstone/public/app/utils/nics-section.js
+++ b/src/sunstone/public/app/utils/nics-section.js
@@ -30,22 +30,27 @@ define(function(require) {
   }
 
   function _insert(template_json, context) {
-    if (template_json.VMTEMPLATE.TEMPLATE.SUNSTONE_NETWORK_SELECT != "NO") {
-      var template_nic = template_json.VMTEMPLATE.TEMPLATE.NIC
-      var nics = []
-      if ($.isArray(template_nic))
-          nics = template_nic
-      else if (!$.isEmptyObject(template_nic))
-          nics = [template_nic]
-        
+    try {
+      if (template_json.VMTEMPLATE.TEMPLATE.SUNSTONE_NETWORK_SELECT != "NO") {
+        var template_nic = template_json.VMTEMPLATE.TEMPLATE.NIC
+        var nics = []
+        if ($.isArray(template_nic))
+            nics = template_nic
+        else if (!$.isEmptyObject(template_nic))
+            nics = [template_nic]
+
+        _generate_provision_network_accordion(
+          $(".provision_network_selector", context));
+
+        $.each(nics, function(index, nic) {
+          _generate_provision_network_table(
+            $(".provision_nic_accordion", context),
+            nic);
+        })
+      }
+    } catch(err) {
       _generate_provision_network_accordion(
         $(".provision_network_selector", context));
-
-      $.each(nics, function(index, nic) {
-        _generate_provision_network_table(
-          $(".provision_nic_accordion", context),
-          nic);
-      })
     }
   }
 

From 603c726a189e7edaf73f4b2d9a3baf171d51ef10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 18 Dec 2015 16:46:23 +0100
Subject: [PATCH 032/197] Feature #4215: Remove the VR update button

---
 src/sunstone/etc/sunstone-views/admin.yaml           | 1 -
 src/sunstone/etc/sunstone-views/admin_vcenter.yaml   | 1 -
 src/sunstone/etc/sunstone-views/user.yaml            | 1 -
 src/sunstone/public/app/tabs/vrouters-tab/buttons.js | 5 -----
 4 files changed, 8 deletions(-)

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 06e9fa6c2d..25022e6d1b 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -447,7 +447,6 @@ tabs:
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
-            VirtualRouter.update_dialog: true
             VirtualRouter.rename: true
             VirtualRouter.chown: true
             VirtualRouter.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 488a67b080..74a2d5c534 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -441,7 +441,6 @@ tabs:
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
-            VirtualRouter.update_dialog: true
             VirtualRouter.rename: true
             VirtualRouter.chown: true
             VirtualRouter.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 6ba2462f11..54f41c0271 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -442,7 +442,6 @@ tabs:
         actions:
             VirtualRouter.refresh: true
             VirtualRouter.create_dialog: true
-            VirtualRouter.update_dialog: true
             VirtualRouter.rename: true
             VirtualRouter.chown: true
             VirtualRouter.chgrp: true
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
index 49ddc6c4bd..305e5190bc 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
@@ -27,11 +27,6 @@ define(function(require) {
       type: "create_dialog",
       layout: "create"
     },
-    "VirtualRouter.update_dialog" : {
-      type: "action",
-      layout: "main",
-      text: Locale.tr("Update")
-    },
     "VirtualRouter.chown" : {
       type: "confirm_with_select",
       text: Locale.tr("Change owner"),

From e3ffbd2409f820a5cbdca7a7f39a82c5003fe37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 18 Dec 2015 16:47:46 +0100
Subject: [PATCH 033/197] Feature #4215: Show VR nics in a nice table

---
 src/cli/one_helper/onevrouter_helper.rb       | 74 +++++++++++++++++++
 .../tabs/vrouters-tab/form-panels/create.js   |  6 ++
 .../app/tabs/vrouters-tab/panels/info.js      | 19 ++++-
 .../tabs/vrouters-tab/panels/info/html.hbs    | 24 ++++++
 4 files changed, 120 insertions(+), 3 deletions(-)

diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb
index 098b3e80ed..bcdd09f9df 100644
--- a/src/cli/one_helper/onevrouter_helper.rb
+++ b/src/cli/one_helper/onevrouter_helper.rb
@@ -108,6 +108,80 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
 
             puts str % [e,  mask]
         }
+
+        if obj.has_elements?("/VROUTER/TEMPLATE/NIC")
+            puts
+            CLIHelper.print_header(str_h1 % "VIRTUAL ROUTER NICS",false)
+
+            nic_default = {"NETWORK" => "-",
+                           "IP" => "-"}
+
+            shown_ips = []
+
+            array_id = 0
+            vm_nics = [obj.to_hash['VROUTER']['TEMPLATE']['NIC']].flatten.compact
+            vm_nics.each {|nic|
+
+                next if nic.has_key?("CLI_DONE")
+
+                if nic.has_key?("IP6_LINK")
+                    shown_ips << nic["IP6_LINK"]
+
+                    ip6_link = {"IP"           => nic.delete("IP6_LINK"),
+                                "CLI_DONE"     => true,
+                                "DOUBLE_ENTRY" => true}
+                    vm_nics.insert(array_id+1,ip6_link)
+
+                    array_id += 1
+                end
+
+                if nic.has_key?("IP6_ULA")
+                    shown_ips << nic["IP6_ULA"]
+
+                    ip6_link = {"IP"           => nic.delete("IP6_ULA"),
+                                "CLI_DONE"     => true,
+                                "DOUBLE_ENTRY" => true}
+                    vm_nics.insert(array_id+1,ip6_link)
+
+                    array_id += 1
+                end
+
+                if nic.has_key?("IP6_GLOBAL")
+                    shown_ips << nic["IP6_GLOBAL"]
+
+                    ip6_link = {"IP"           => nic.delete("IP6_GLOBAL"),
+                                "CLI_DONE"     => true,
+                                "DOUBLE_ENTRY" => true}
+                    vm_nics.insert(array_id+1,ip6_link)
+
+                    array_id += 1
+                end
+
+                shown_ips << nic["IP"] if nic.has_key?("IP")
+
+                nic.merge!(nic_default) {|k,v1,v2| v1}
+                array_id += 1
+            }
+
+            CLIHelper::ShowTable.new(nil, self) do
+                column :NETWORK, "", :left, :size=>20 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["NETWORK"]
+                    end
+                end
+
+                column :IP, "",:left, :donottruncate, :size=>15 do |d|
+                    d["IP"]
+                end
+            end.show(vm_nics,{})
+        end
+
+        while obj.has_elements?("/VROUTER/TEMPLATE/NIC")
+            obj.delete_element("/VROUTER/TEMPLATE/NIC")
+        end
+
         puts
 
         CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index 22acdeaae9..b227966253 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -31,6 +31,7 @@ define(function(require) {
   var TemplatesTable = require('tabs/templates-tab/datatable');
   var OpenNebulaVirtualRouter = require('opennebula/virtualrouter');
   var OpenNebulaTemplate = require('opennebula/template');
+  var OpenNebulaAction = require('opennebula/action');
   var Notifier = require('utils/notifier');
 
   /*
@@ -147,6 +148,8 @@ define(function(require) {
       virtual_router_json.NIC = nics;
     }
 
+    delete virtual_router_json["FLOATING_IP"];
+
     var tmplId = this.templatesTable.retrieveResourceTableSelect();
 
     if (this.action == "create") {
@@ -197,6 +200,9 @@ define(function(require) {
                 extra_param: extra_info
               },
               timeout: true,
+              success: function(request, response){
+                OpenNebulaAction.clear_cache("VM");
+              },
               error: Notifier.onError
             });
           }
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
index 05a7baa90e..0edac9cf0e 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
@@ -70,9 +70,17 @@ define(function(require) {
 
     var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
 
+    var nics = [];
+
+    if ($.isArray(this.element.TEMPLATE.NIC)){
+      nics = this.element.TEMPLATE.NIC;
+    } else if (!$.isEmptyObject(this.element.TEMPLATE.NIC)){
+      nics = [this.element.TEMPLATE.NIC];
+    }
+
     // TODO: simplify interface?
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);
-    //delete strippedTemplate[""];
+    delete strippedTemplate["NIC"];
 
     var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE,
                                               Locale.tr("Attributes"));
@@ -82,6 +90,7 @@ define(function(require) {
       'element': this.element,
       'renameTrHTML': renameTrHTML,
       'permissionsTableHTML': permissionsTableHTML,
+      'nics': nics,
       'templateTableHTML': templateTableHTML
     });
   }
@@ -101,9 +110,13 @@ define(function(require) {
 
     // TODO: simplify interface?
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);
-    //delete strippedTemplate[""];
+    delete strippedTemplate["NIC"];
 
-    var hiddenValues = {RULE: this.element.TEMPLATE.RULE};
+    var hiddenValues = {};
+
+    if (this.element.TEMPLATE.NIC != undefined){
+        hiddenValues.NIC = this.element.TEMPLATE.NIC;
+    }
 
     TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, hiddenValues);
     //===
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
index 04f34b052e..22374b9c0a 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -35,6 +35,30 @@
     {{{permissionsTableHTML}}}
   </div>
 </div>
+<div class="row">
+  <div class="large-9 columns">
+    <table class="dataTable">
+      <thead>
+        <tr>
+          <th>{{tr "Network"}}</th>
+          <th>{{tr "Floating IP"}}</th>
+          <th>{{tr "Floating IPv6 ULA"}}</th>
+          <th>{{tr "Floating IPv6 Global"}}</th>
+        </tr>
+      </thead>
+      <tbody>
+        {{#each nics}}
+        <tr>
+          <td>{{NETWORK}}</td>
+          <td>{{valOrDefault IP "--"}}</td>
+          <td>{{valOrDefault IP6_ULA "--"}}</td>
+          <td>{{valOrDefault IP6_GLOBAL "--"}}</td>
+        </tr>
+        {{/each}}
+      </tbody>
+    </table>
+  </div>
+</div>
 <div class="row">
   <div class="large-9 columns">
     {{{templateTableHTML}}}

From 831372003d3701fb3cf82168fe114d60c710b1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 18 Dec 2015 17:10:48 +0100
Subject: [PATCH 034/197] Feature #4215: Support IPv6 in VR management

---
 .../public/app/tabs/vnets-topology-tab.js     | 16 +++++++++---
 src/vrouter/VirtualRouter.cc                  | 25 +++++++++++++------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js
index a5864d395c..a6cb8de539 100644
--- a/src/sunstone/public/app/tabs/vnets-topology-tab.js
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js
@@ -167,8 +167,6 @@ define(function(require) {
         }
       }
 
-      // TODO: VR edges with floating IPs
-
       $.each(vrs, function(j,vr){
         var nodeId = "vr"+vr;
 
@@ -223,9 +221,14 @@ define(function(require) {
 
             var label = undefined;
 
-            // TODO: IPv6 IPs
             if (lease.IP != undefined){
               label = lease.IP;
+            } else if (lease.IP6_GLOBAL != undefined){
+              label = lease.IP6_GLOBAL;
+            } else if (lease.IP6_ULA != undefined){
+              label = lease.IP6_ULA;
+            } else if (lease.IP6_LINK != undefined){
+              label = lease.IP6_LINK;
             }
 
             edges.push({from: vnetNodeId, to: nodeId, label: label});
@@ -242,9 +245,14 @@ define(function(require) {
 
             var label = undefined;
 
-            // TODO: IPv6 IPs
             if (lease.IP != undefined){
               label = lease.IP;
+            } else if (lease.IP6_GLOBAL != undefined){
+              label = lease.IP6_GLOBAL;
+            } else if (lease.IP6_ULA != undefined){
+              label = lease.IP6_ULA;
+            } else if (lease.IP6_LINK != undefined){
+              label = lease.IP6_LINK;
             }
 
             edges.push({from: vnetNodeId, to: nodeId, label: label});
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index 5cb10d5bc0..4707604222 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -401,13 +401,25 @@ int VirtualRouter::release_network_leases(VectorAttribute const * nic)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+void vrouter_prefix(VectorAttribute* nic, const string& attr)
+{
+    string val;
+
+    if (nic->vector_value(attr.c_str(), val) == 0)
+    {
+        nic->remove(attr);
+        nic->replace("VROUTER_"+attr, val);
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
 Template * VirtualRouter::get_nics() const
 {
     Template * tmpl = new Template();
 
     int                   num_nics;
     bool                  floating;
-    string                ip;
     vector<Attribute  * > nics;
     VectorAttribute *     nic;
 
@@ -429,13 +441,12 @@ Template * VirtualRouter::get_nics() const
 
         if (floating)
         {
-            // TODO: this is IPv4 only
             nic->remove("MAC");
-            if (nic->vector_value("IP", ip) == 0)
-            {
-                nic->remove("IP");
-                nic->replace("VROUTER_IP", ip);
-            }
+
+            vrouter_prefix(nic, "IP");
+            vrouter_prefix(nic, "IP6_LINK");
+            vrouter_prefix(nic, "IP6_ULA");
+            vrouter_prefix(nic, "IP6_GLOBAL");
 
             // TODO: remove all other attrs, such as AR, BRIDGE, etc?
         }

From ade6513a0deab6d3b527866cc9b2f28496cacf8d Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 19 Dec 2015 22:35:09 +0100
Subject: [PATCH 035/197] feature #4217: Move some logic to core, set clone
 state for images being imported into a marketplace

---
 include/ImageManager.h                        |  17 +-
 include/MarketPlaceApp.h                      |  11 +-
 include/MarketPlaceManager.h                  |  29 ++-
 install.sh                                    |   4 +-
 src/cli/one_helper/onemarketapp_helper.rb     |   2 +
 src/cloud/marketplace/bin/onemarket           | 183 ------------------
 .../marketplace/lib/marketplace_client.rb     |  90 ---------
 src/datastore_mad/remotes/downloader.sh       |  10 +
 src/datastore_mad/remotes/fs/export           |  48 +++--
 src/datastore_mad/remotes/libfs.sh            |   8 +
 src/image/ImageManagerActions.cc              |  92 ++++-----
 src/market/MarketPlaceApp.cc                  |  16 +-
 src/market/MarketPlaceManager.cc              |  15 +-
 src/market/MarketPlaceManagerActions.cc       |  74 ++++++-
 src/market_mad/one_market.rb                  | 110 +++++------
 src/market_mad/remotes/http/import            |  50 +++--
 src/nebula/Nebula.cc                          |   2 +
 17 files changed, 318 insertions(+), 443 deletions(-)
 delete mode 100755 src/cloud/marketplace/bin/onemarket
 delete mode 100644 src/cloud/marketplace/lib/marketplace_client.rb

diff --git a/include/ImageManager.h b/include/ImageManager.h
index 4f2e5020a5..e0acf44ddd 100644
--- a/include/ImageManager.h
+++ b/include/ImageManager.h
@@ -115,8 +115,8 @@ public:
 
     /**
      *  Closes any cloning operation on the image, updating the state if needed
-     *    @param iid image id of the image to be released
-     *    @param clone_img_id image id of the image that was being cloned
+     *    @param iid image id of the image to that was being cloned
+     *    @param clone_img_id the cloned image (id > 0) or market app (id =< 0)
      */
     void release_cloning_image(int iid, int clone_img_id);
 
@@ -147,8 +147,16 @@ public:
      *
      * @return 0 if the image can be cloned, -1 otherwise
      */
-    int can_clone_image(int             cloning_id,
-                        ostringstream&  oss_error);
+    int can_clone_image(int cloning_id, ostringstream&  oss_error);
+
+    /**
+     * Sets the state to CLONE for the given image
+     *   @param new_id for the target image (new_id>0) or market app (new_id =<0)
+     *   @param clonning_id the ID of the image to be cloned
+     *   @param error if any
+     *   @return 0 if siccess
+     */
+    int set_clone_state(int new_id, int cloning_id, std::string& error);
 
     /**
      *  Clone an existing image to the repository
@@ -162,7 +170,6 @@ public:
                     int cloning_id,
                     const string& ds_data,
                     string& error);
-
     /**
      *  Deletes an image from the repository and the DB. The Datastore image list
      *  is also updated
diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index 47113800ce..154e05ab0c 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -139,6 +139,15 @@ public:
         return type;
     };
 
+    /**
+     * Returns the ID of the object originating this app
+     *    @return the image, vmtemplate or flow id
+     */
+    int get_origin_id() const
+    {
+        return origin_id;
+    };
+
     //--------------------------------------------------------------------------
     // Set Marketplace app attributes
     //--------------------------------------------------------------------------
@@ -232,7 +241,7 @@ private:
     /**
      *  Origin of this App
      */
-    std::string origin;
+    int origin_id;
 
     // *************************************************************************
     // Constructor
diff --git a/include/MarketPlaceManager.h b/include/MarketPlaceManager.h
index f80682dfa7..ecef74b2e5 100644
--- a/include/MarketPlaceManager.h
+++ b/include/MarketPlaceManager.h
@@ -25,6 +25,10 @@ extern "C" void * marketplace_action_loop(void *arg);
 
 class MarketPlacePool;
 class MarketPlaceAppPool;
+class ImagePool;
+class DatastorePool;
+
+class ImageManager;
 
 class MarketPlaceManager : public MadManager, public ActionListener
 {
@@ -36,10 +40,16 @@ public:
      *    @param m, monitor_period to monitor marketplaces
      *    @param mad, list of drivers for the manager
      */
-    MarketPlaceManager( time_t t, time_t m, std::vector<const Attribute*>& mad);
+    MarketPlaceManager(time_t t, time_t m, std::vector<const Attribute*>& mad);
 
     ~MarketPlaceManager(){};
 
+    /**
+     * Initializes internal pointers to other managers. Must be called when
+     * all the other managers exist in Nebula::instance
+     */
+    void init_managers();
+
     /**
      *  This functions starts the associated listener thread, and creates a
      *  new thread for the MarketPlace Manager. This thread will wait in
@@ -75,7 +85,7 @@ public:
 
     /**
      *  Imports a new app into the marketplace. The marketplace app needs to
-     *  include the ORIGIN attribute so the driver can locate the app. An
+     *  include the ORIGIN_ID attribute so the driver can locate the app. An
      *  optional template maybe provided to export the app to a cloud.
      *    @param appid of the app
      *    @param market_data of the associated marketplace in XML format
@@ -142,6 +152,21 @@ private:
      */
     MarketPlaceAppPool * apppool;
 
+	/**
+     *  Pointer to the image pool
+     */
+	ImagePool *          ipool;
+
+	/**
+     * Pointer to the image pool
+     */
+	DatastorePool *      dspool;
+
+	/**
+	 *  Pointer to the Image Manger
+     */
+	ImageManager *       imagem;
+
     /**
      *  Action engine for the Manager
      */
diff --git a/install.sh b/install.sh
index 70098c0aa0..ef7856069e 100755
--- a/install.sh
+++ b/install.sh
@@ -1207,9 +1207,7 @@ DATASTORE_DRIVER_DEV_SCRIPTS="src/datastore_mad/remotes/dev/cp \
 #-------------------------------------------------------------------------------
 # Marketplace drivers, to be installed under $REMOTES_LOCATION/market
 #   - HTTP based marketplace, $REMOTES_LOCATION/market/http
-#   - S3-obeject based Image Repository, $REMOTES_LOCATION/datastore/fs
-#   - VMFS based Image Repository, $REMOTES_LOCATION/datastore/vmfs
-#   - LVM based Image Repository, $REMOTES_LOCATION/datastore/lvm
+#   - S3-obeject based marketplace, $REMOTES_LOCATION/market/s3
 #-------------------------------------------------------------------------------
 
 MARKETPLACE_DRIVER_HTTP_SCRIPTS="src/market_mad/remotes/http/import \
diff --git a/src/cli/one_helper/onemarketapp_helper.rb b/src/cli/one_helper/onemarketapp_helper.rb
index 2f0cf197ab..5833c4695c 100644
--- a/src/cli/one_helper/onemarketapp_helper.rb
+++ b/src/cli/one_helper/onemarketapp_helper.rb
@@ -129,6 +129,8 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
         puts str % ["VERSION", app['VERSION']]
         puts str % ["DESCRIPTION", app['DESCRIPTION']]
         puts str % ["SIZE", OpenNebulaHelper.unit_to_str(app['SIZE'].to_i,{},'M')]
+        puts str % ["ORIGIN_ID", app['ORIGIN_ID']]
+        puts str % ["FORMAT", app['FORMAT']]
 
         puts
 
diff --git a/src/cloud/marketplace/bin/onemarket b/src/cloud/marketplace/bin/onemarket
deleted file mode 100755
index 9d940c7adb..0000000000
--- a/src/cloud/marketplace/bin/onemarket
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env ruby
-
-# ---------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                  #
-#                                                                              #
-# 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"]
-
-if !ONE_LOCATION
-    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
-else
-    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
-    TEMPLATES_LOCATION=ONE_LOCATION+"/etc/occi_templates"
-    CONF_LOCATION=ONE_LOCATION+"/etc"
-end
-
-$: << RUBY_LIB_LOCATION
-$: << RUBY_LIB_LOCATION+"/cloud"
-
-require 'marketplace/marketplace_client'
-
-require 'cli/command_parser'
-require 'cli/cli_helper'
-
-require 'rubygems'
-require 'json'
-
-USER_AGENT = "CLI"
-
-#
-# Options
-#
-
-DEFAULT_OPTIONS = [
-    ENDPOINT = {
-        :name => "server",
-        :short => "-s url",
-        :large => "--server url",
-        :format => String,
-        :description => "Marketplace endpoint"
-    },
-    USERNAME={
-        :name => "username",
-        :short => "-u name",
-        :large => "--username name",
-        :format => String,
-        :description => "User name"
-    },
-    PASSWORD={
-        :name => "password",
-        :short => "-p pass",
-        :large => "--password pass",
-        :format => String,
-        :description => "User password"
-    }
-]
-
-JSON_FORMAT={
-    :name => "json",
-    :short => "-j",
-    :large => "--json",
-    :description => "Show in JSON format"
-}
-
-#
-# Table
-#
-
-TABLE = CLIHelper::ShowTable.new(nil, self) do
-    column :ID, "Appliance", :size=>25 do |d|
-        d["_id"]["$oid"]
-    end
-
-    column :NAME, "Name", :size=>50 do |d|
-        d["name"]
-    end
-
-    column :PUBLISHER, "Publisher", :size=>15 do |d|
-        d["publisher"]
-    end
-
-    default :ID, :NAME, :PUBLISHER
-end
-
-#
-# Commands
-#
-
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onemarket` <command> [<args>] [<options>]"
-
-    set :option, DEFAULT_OPTIONS
-
-    #
-    # List
-    #
-
-    list_desc = <<-EOT.unindent
-        List the available appliances in the Marketplace
-    EOT
-
-    command :list, list_desc, :options => JSON_FORMAT do
-        client = Market::ApplianceClient.new(
-                    options[:username],
-                    options[:password],
-                    options[:server],
-                    USER_AGENT)
-
-        response = client.list
-
-        if CloudClient::is_error?(response)
-            [response.code.to_i, response.to_s]
-        else
-            if options[:json]
-                [0,response.body]
-            else
-                array_list = JSON.parse(response.body)
-                TABLE.show(array_list['appliances'])
-                0
-            end
-        end
-    end
-
-    #
-    # Create
-    #
-
-    create_desc = <<-EOT.unindent
-        Create a new appliance in the Marketplace
-    EOT
-
-    command :create, create_desc, :file do
-        client = Market::ApplianceClient.new(
-                    options[:username],
-                    options[:password],
-                    options[:server],
-                    USER_AGENT)
-
-        response = client.create(File.read(args[0]))
-
-        if CloudClient::is_error?(response)
-            [response.code.to_i, response.to_s]
-        else
-            [0, response.body]
-        end
-    end
-
-    #
-    # Show
-    #
-
-    show_desc = <<-EOT.unindent
-        Show detailed information of a given appliance
-    EOT
-
-    command :show, show_desc, :id, :options => JSON_FORMAT do
-        client = Market::ApplianceClient.new(
-                    options[:username],
-                    options[:password],
-                    options[:server],
-                    USER_AGENT)
-
-        response = client.show(args[0])
-
-        if CloudClient::is_error?(response)
-            [response.code.to_i, response.to_s]
-        else
-            [0,response.body]
-        end
-    end
-end
diff --git a/src/cloud/marketplace/lib/marketplace_client.rb b/src/cloud/marketplace/lib/marketplace_client.rb
deleted file mode 100644
index 32724e64fa..0000000000
--- a/src/cloud/marketplace/lib/marketplace_client.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# ---------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                  #
-#                                                                              #
-# 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 'uri'
-require 'cloud/CloudClient'
-
-require 'ostruct'
-
-module Market
-    class Client
-        def initialize(username, password, url, user_agent="Ruby")
-            @username = username
-            @password = password
-
-            url ||= 'http://marketplace.opennebula.systems/'
-            @uri = URI.parse(url)
-
-            @user_agent = "OpenNebula #{CloudClient::VERSION} (#{user_agent})"
-
-            @host = nil
-            @port = nil
-
-            if ENV['http_proxy']
-                uri_proxy  = URI.parse(ENV['http_proxy'])
-                @host = uri_proxy.host
-                @port = uri_proxy.port
-            end
-        end
-
-        def get(path)
-            req = Net::HTTP::Proxy(@host, @port)::Get.new(@uri.path + path)
-            do_request(req)
-        end
-
-        def post(path, body)
-            req = Net::HTTP::Proxy(@host, @port)::Post.new(@uri.path + path)
-            req.body = body
-
-            do_request(req)
-        end
-
-        private
-
-        def do_request(req)
-            if @username && @password
-                req.basic_auth @username, @password
-            end
-
-            req['User-Agent'] = @user_agent
-
-            res = CloudClient::http_start(@uri, @timeout) do |http|
-                http.request(req)
-            end
-
-            res
-        end
-    end
-
-
-    class ApplianceClient < Client
-        def initialize(user, password, url, agent)
-            super(user, password, url, agent)
-        end
-
-        def list
-            get("/appliance")
-        end
-
-        def create(body)
-            post("/appliance", body)
-        end
-
-        def show(id)
-            get("/appliance/#{id}")
-        end
-    end
-end
diff --git a/src/datastore_mad/remotes/downloader.sh b/src/datastore_mad/remotes/downloader.sh
index 79bad38ec5..b887322698 100755
--- a/src/datastore_mad/remotes/downloader.sh
+++ b/src/datastore_mad/remotes/downloader.sh
@@ -176,6 +176,16 @@ http://*|https://*)
 
     command="curl $curl_args"
     ;;
+ssh://*)
+    # pseudo-url for ssh transfers ssh://user@host:path
+    # -l to limit the bw
+    ssh_src=$(echo $FROM | grep -Po '(?<=ssh://).+')
+    ssh_arg=(${ssh_src//:/ })
+
+    rmt_cmd="'cat ${ssh_arg[1]}'"
+
+    command="ssh ${ssh_arg[0]} $rmt_cmd"
+    ;;
 *)
     if [ ! -r $FROM ]; then
         echo "Cannot read from $FROM" >&2
diff --git a/src/datastore_mad/remotes/fs/export b/src/datastore_mad/remotes/fs/export
index 709921ba9d..bbfdab2c32 100755
--- a/src/datastore_mad/remotes/fs/export
+++ b/src/datastore_mad/remotes/fs/export
@@ -45,27 +45,45 @@ unset i XPATH_ELEMENTS
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <($XPATH     /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/EXPORT_DIR \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH)
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST)
 unset i
 
 SRC="${XPATH_ELEMENTS[i++]}"
 BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
-EXPORT_DIR="${XPATH_ELEMENTS[i++]}"
-BASE_PATH="${XPATH_ELEMENTS[i++]}"
 
-EXPORT_DIR="${EXPORT_DIR-$BASE_PATH}"
-
-# -------------------- Convert image to qcow2 format ---------------------------
-# TODO:
-#   Export directories needs to be defined, probably in oned.conf
-#   BRIDGE_LIST needs to be handled
+#-------------------------------------------------------------------------------
+# Output image source and format
 #-------------------------------------------------------------------------------
 
-log "Removing $SRC from the image repository"
+INFO_SCRIPT=$(cat <<EOF
 
-exec_and_log "$QEMU_IMG convert -O qcow2 $SRC $SRC.export" \
-	"Error converting image to qcow2 format"
+CHECKSUM=\$(${MD5SUM} ${SRC} | cut -f1 -d' ')
+SIZE=\$(${DU} -LBM ${SRC} | cut -f1)
+FORMAT=\$(${QEMU_IMG} info ${SRC} 2>/dev/null | grep -Po '(?<=file format: )\w+')
+
+echo "<CHECKSUM>\$CHECKSUM</CHECKSUM>"
+echo "<SIZE>\$SIZE</SIZE>"
+echo "<FORMAT>\$FORMAT</FORMAT>"
+
+EOF
+)
+
+if [ -n "$BRIDGE_LIST" ]; then
+    HOST=`get_destination_host $ID`
+    INFO=$(ssh_monitor_and_log "$HOST" "$INFO_SCRIPT" "Image info script" 2>&1)
+    SRC="ssh://$HOST:$SRC"
+else
+    INFO=$(monitor_and_log "$INFO_SCRIPT" "Image info script" 2>&1)
+fi
+
+INFO_STATUS=$?
+
+if [ "$INFO_STATUS" != "0" ]; then
+    echo "$INFO"
+    exit $INFO_STATUS
+fi
+
+echo "<IMPORT_INFO><IMPORT_SOURCE>$SRC</IMPORT_SOURCE> \
+      $INFO \
+      <DISPOSE>NO</DISPOSE></IMPORT_INFO>"
 
-echo "$SRC.export"
diff --git a/src/datastore_mad/remotes/libfs.sh b/src/datastore_mad/remotes/libfs.sh
index 3041ce77dc..f130dd81ea 100644
--- a/src/datastore_mad/remotes/libfs.sh
+++ b/src/datastore_mad/remotes/libfs.sh
@@ -52,6 +52,14 @@ function set_up_datastore {
     export SAFE_DIRS
 }
 
+#-------------------------------------------------------------------------------
+# Get file format using qemu-img
+#   @return string representation of the format, empty if error
+#-------------------------------------------------------------------------------
+function image_format {
+    echo "$($QEMU_IMG info $1 2>/dev/null | grep -Po '(?<=file format: )\w+')"
+}
+
 #-------------------------------------------------------------------------------
 # Generates an unique image hash. Requires ID to be set
 #   @return hash for the image (empty if error)
diff --git a/src/image/ImageManagerActions.cc b/src/image/ImageManagerActions.cc
index 66ab6e4a8a..c451de5fcd 100644
--- a/src/image/ImageManagerActions.cc
+++ b/src/image/ImageManagerActions.cc
@@ -287,12 +287,8 @@ void ImageManager::release_cloning_image(int iid, int clone_img_id)
         case Image::ERROR:
         case Image::USED_PERS:
         case Image::LOCKED:
-            ostringstream oss;
-
-            oss << "Releasing image in wrong state: "
-                << Image::state_to_str(img->get_state());
-
-            NebulaLog::log("ImM", Log::ERROR, oss.str());
+            NebulaLog::log("ImM", Log::ERROR, "Release cloning image"
+                " in wrong state");
             break;
     }
 
@@ -564,8 +560,7 @@ int ImageManager::delete_image(int iid, string& error_str)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int ImageManager::can_clone_image(  int             cloning_id,
-                                    ostringstream&  oss_error)
+int ImageManager::can_clone_image(int cloning_id, ostringstream&  oss_error)
 {
     Image *       img;
 
@@ -607,29 +602,10 @@ int ImageManager::can_clone_image(  int             cloning_id,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int ImageManager::clone_image(int   new_id,
-                              int   cloning_id,
-                              const string& ds_data,
-                              string& error)
+int ImageManager::set_clone_state(int new_id, int cloning_id, std::string& error)
 {
-    const ImageManagerDriver* imd = get();
-
-    ostringstream oss;
-    Image *       img;
-
-    string  path;
-    string  img_tmpl;
-    string* drv_msg;
-
-    if ( imd == 0 )
-    {
-        error = "Could not get datastore driver";
-
-        NebulaLog::log("ImM", Log::ERROR, error);
-        return -1;
-    }
-
-    img = ipool->get(cloning_id, true);
+    int     rc  = 0;
+    Image * img = ipool->get(cloning_id, true);
 
     if (img == 0)
     {
@@ -652,18 +628,13 @@ int ImageManager::clone_image(int   new_id,
             }
 
             ipool->update(img);
-
-            img->unlock();
-        break;
+            break;
 
         case Image::USED:
         case Image::CLONE:
             img->inc_cloning(new_id);
-
             ipool->update(img);
-
-            img->unlock();
-        break;
+            break;
 
         case Image::USED_PERS:
         case Image::INIT:
@@ -671,19 +642,52 @@ int ImageManager::clone_image(int   new_id,
         case Image::ERROR:
         case Image::DELETE:
         case Image::LOCKED:
-            oss << "Cannot clone image in state: "
-                << Image::state_to_str(img->get_state());
+            error = "Cannot clone image in current state";
+            rc    = -1;
+            break;
+    }
 
-            error = oss.str();
-            img->unlock();
-            return -1;
-        break;
+    img->unlock();
+
+    return rc;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int ImageManager::clone_image(int   new_id,
+                              int   cloning_id,
+                              const string& ds_data,
+                              string& error)
+{
+    const ImageManagerDriver* imd = get();
+
+    ostringstream oss;
+    Image *       img;
+
+    string  path;
+    string  img_tmpl;
+    string* drv_msg;
+
+    if ( imd == 0 )
+    {
+        error = "Could not get datastore driver";
+
+        NebulaLog::log("ImM", Log::ERROR, error);
+        return -1;
+    }
+
+    if ( set_clone_state(new_id, cloning_id, error) == -1 )
+    {
+        return -1;
     }
 
     img = ipool->get(new_id,true);
 
-    if (img == 0) //TODO: Rollback cloning counter
+    if (img == 0)
     {
+        release_cloning_image(cloning_id, new_id);
+
         error = "Target image deleted during cloning operation";
         return -1;
     }
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index eddaacee40..54453ac24b 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -99,18 +99,18 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
     type = IMAGE;
 
     //Known attributes
-    //ORIGIN
+    //ORIGIN_ID
     //DESCRIPTION
     //APPTEMPLATE64
     //PUBLISHER
     //VERSION
-    erase_template_attribute("ORIGIN", origin);
-
-    if (origin.empty())
+    if (!get_template_attribute("ORIGIN_ID", origin_id))
     {
         goto error_origin;
     }
 
+    remove_template_attribute("ORIGIN_ID");
+
     get_template_attribute("DESCRIPTION", description);
 
     get_template_attribute("APPTEMPLATE64", apptemplate64);
@@ -136,7 +136,7 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
     return insert_replace(db, false, error_str);
 
 error_origin:
-    error_str = "Missing ORIGIN for the MARKETPLACEAPP";
+    error_str = "Missing ORIGIN_ID for the MARKETPLACEAPP";
     NebulaLog::log("MKP", Log::ERROR, error_str);
     return -1;
 }
@@ -241,7 +241,7 @@ std::string& MarketPlaceApp::to_xml(std::string& xml) const
 			"<GNAME>"          << gname         << "</GNAME>" <<
 			"<DATE>"           << date          << "</DATE>" <<
 			"<NAME>"           << name          << "</NAME>" <<
-            "<ORIGIN>"         << origin        << "</ORIGIN>" <<
+            "<ORIGIN_ID>"      << origin_id     << "</ORIGIN_ID>" <<
             "<SOURCE>"         << source        << "</SOURCE>" <<
             "<CHECKSUM>"       << checksum      << "</CHECKSUM>" <<
             "<SIZE>"           << size_mb       << "</SIZE>" <<
@@ -283,8 +283,8 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
     rc += xpath(gname,        "/MARKETPLACEAPP/GNAME", "not_found");
     rc += xpath(name,         "/MARKETPLACEAPP/NAME", "not_found");
     rc += xpath(date,         "/MARKETPLACEAPP/DATE", -1);
-    rc += xpath(source,       "/MARKETPLACEAPP/SOURCE","not_found");
-    rc += xpath(origin,       "/MARKETPLACEAPP/ORIGIN","not_found");
+    rc += xpath(source,       "/MARKETPLACEAPP/SOURCE", "not_found");
+    rc += xpath(origin_id,    "/MARKETPLACEAPP/ORIGIN_ID", -1);
     rc += xpath(istate,       "/MARKETPLACEAPP/STATE", -1);
     rc += xpath(itype,        "/MARKETPLACEAPP/TYPE",  -1);
     rc += xpath(description,  "/MARKETPLACEAPP/DESCRIPTION", "not_found");
diff --git a/src/market/MarketPlaceManager.cc b/src/market/MarketPlaceManager.cc
index 55625be7a0..67f9b5faa6 100644
--- a/src/market/MarketPlaceManager.cc
+++ b/src/market/MarketPlaceManager.cc
@@ -55,12 +55,15 @@ MarketPlaceManager::MarketPlaceManager(
             std::vector<const Attribute*>& _mads):
         MadManager(_mads),
         timer_period(_timer_period),
-        monitor_period(_monitor_period)
+        monitor_period(_monitor_period),
+        imagem(0)
 {
     Nebula& nd = Nebula::instance();
 
     mppool  = nd.get_marketpool();
     apppool = nd.get_apppool();
+    dspool  = nd.get_dspool();
+    ipool   = nd.get_ipool();
 
     am.addListener(this);
 };
@@ -113,6 +116,16 @@ int MarketPlaceManager::load_mads(int uid)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+void MarketPlaceManager::init_managers()
+{
+    Nebula& nd = Nebula::instance();
+
+    imagem = nd.get_imagem();
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int MarketPlaceManager::start()
 {
     int            rc;
diff --git a/src/market/MarketPlaceManagerActions.cc b/src/market/MarketPlaceManagerActions.cc
index 8fe7e19c28..d18ae1627b 100644
--- a/src/market/MarketPlaceManagerActions.cc
+++ b/src/market/MarketPlaceManagerActions.cc
@@ -19,6 +19,10 @@
 #include "MarketPlaceAppPool.h"
 #include "MarketPlaceManagerDriver.h"
 
+#include "Image.h"
+#include "Datastore.h"
+#include "ImageManager.h"
+
 #include "NebulaLog.h"
 #include "Nebula.h"
 
@@ -31,7 +35,22 @@ int MarketPlaceManager::import_app(
         const std::string& market_data,
         std::string&       err)
 {
-    std::string      app_data;
+    std::string app_data, image_data, ds_data;
+	std::string * msg;
+
+	Image * image;
+	Datastore * ds;
+
+	int ds_id;
+
+    const MarketPlaceManagerDriver* mpmd = get();
+
+    if ( mpmd == 0 )
+    {
+        err = "Error getting MarketPlaceManagerDriver";
+        return -1;
+    }
+
     MarketPlaceApp * app = apppool->get(appid, true);
 
     if ( app == 0 )
@@ -42,18 +61,57 @@ int MarketPlaceManager::import_app(
 
     app->to_xml(app_data);
 
+    MarketPlaceApp::MarketPlaceAppType type = app->get_type();
+
+	int app_id    = app->get_oid();
+    int origin_id = app->get_origin_id();
+
     app->unlock();
 
-    std::string * msg = format_message(app_data, market_data, "");
-
-    const MarketPlaceManagerDriver* mpmd = get();
-
-    if ( mpmd == 0 )
+    switch (type)
     {
-        err = "Error getting MarketPlaceManagerDriver";
-        return -1;
+        case MarketPlaceApp::IMAGE:
+            image = ipool->get(origin_id, true);
+
+			if ( image == 0 )
+			{
+				err = "Image does not exist.";
+				return -1;
+			}
+
+            image->to_xml(image_data);
+
+            ds_id = image->get_ds_id();
+
+            image->unlock();
+
+            ds = dspool->get(ds_id, true);
+
+			if ( ds == 0 )
+			{
+				err = "Image datastore no longer exists.";
+				return -1;
+			}
+
+            ds->to_xml(ds_data);
+
+            ds->unlock();
+
+			if (imagem->set_clone_state(-app_id, origin_id, err) != 0)
+			{
+				return -1;
+			}
+			break;
+
+        case MarketPlaceApp::VMTEMPLATE:
+        case MarketPlaceApp::FLOW:
+        case MarketPlaceApp::UNKNOWN:
+            err = "Marketplace app type not supported.";
+            return -1;
     }
 
+    msg = format_message(app_data, market_data, image_data + ds_data);
+
     mpmd->importapp(appid, *msg);
 
     delete msg;
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index 90dea56ae7..4b757308db 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -93,9 +93,12 @@ class MarketPlaceDriver < OpenNebulaDriver
     end
 
     ############################################################################
-    # Image Manager Protocol Actions (generic implementation)
+    # Import a marketplace app into the marketplace. This is a two step process:
+    #   1- The associated datastore_mad/export script is invoked to generate
+    #      a file representation of the app.
+    #   2- The resulting file path is used to import it into the marketplace
+    #      invoking marketplace_mad/import.
     ############################################################################
-
     def import(id, drv_message)
         xml = decode(drv_message)
 
@@ -105,81 +108,60 @@ class MarketPlaceDriver < OpenNebulaDriver
         end
 
         type   = xml['MARKETPLACEAPP/TYPE']
-        origin = xml['MARKETPLACEAPP/ORIGIN']
+        origin = xml['MARKETPLACEAPP/ORIGIN_ID']
         mp_mad = xml['MARKETPLACE/MARKET_MAD']
 
         if type.nil? || origin.nil? || mp_mad.nil?
-            failure(:import, id,"Wrong driver message format")
+            failure(:import, id, "Wrong driver message format")
             return
         end
 
-        #-----------------------------------------------------------------------
-        #  Export origin to a path
-        #-----------------------------------------------------------------------
         case OpenNebula::MarketPlaceApp::MARKETPLACEAPP_TYPES[type.to_i]
-          when "IMAGE" then
-            if ( origin =~ /\d+$/ )
-                # Get the associated datastore ID
-                image = OpenNebula::Image.new_with_id(origin, @one)
-                rc    = image.info
+        #-----------------------------------------------------------------------
+        # Export marketplace origin to a file path, IMAGE
+        #-----------------------------------------------------------------------
+        when "IMAGE" then
+            # ------------ Execute export action from Datastore ----------------
+            ds_mad = xml['DATASTORE/DS_MAD']
 
-                if OpenNebula.is_error?(rc)
-                    failure(:import, id, "Cannot find information for image "\
-                            "#{origin}: #{rc.to_str()}")
-                    return
-                end
-
-                ds_id = image['DATASTORE_ID']
-
-                if ds_id.nil?
-                    failure(:import, id, "Cannot find datastore for image #{origin}")
-                    return
-                end
-
-                ds = OpenNebula::Datastore.new_with_id(ds_id, @one)
-                rc = ds.info
-
-                if OpenNebula.is_error?(rc)
-                    failure(:import, id, "Datastore #{ds_id} not found: #{rc}")
-                    return
-                end
-
-                ds_mad = ds['DS_MAD']
-
-                if ds_mad.nil?
-                    failure(:import, id, "Cannot find datastore driver")
-                    return
-                end
-
-                #Execute export action from Datastore
-                ds_msg   = "<DS_DRIVER_ACTION_DATA>"\
-                           "#{image.to_xml}"\
-                           "#{ds.to_xml}"\
-                           "</DS_DRIVER_ACTION_DATA>"
-                ds_msg64 = Base64::strict_encode64(ds_msg)
-
-                result, info = do_action(id, nil, ds_mad, :export,
-                    "#{ds_msg64} #{id}", false)
-
-                if ( result == RESULT[:failure] )
-                    failure(:import, id, "Error exporting image to file: #{info}")
-                    return
-                end
-
-                source = info
-            elsif ( source =~ /\/.+|https?:\/\// )
-                source = origin
-            else
-                failure(:import, id, "Origin is not a valid ID, path or URL")
+            if ds_mad.nil?
+                failure(:import, id, "Wrong driver message format")
                 return
             end
-          else # Only IMAGE type is supported
-                failure(:import, id, "Type #{apptype} not supported")
+
+            ds_msg = "<DS_DRIVER_ACTION_DATA>"\
+                     "#{xml.element_xml('IMAGE')}"\
+                     "#{xml.element_xml('DATASTORE')}"\
+                     "</DS_DRIVER_ACTION_DATA>"
+
+            ds_msg64 = Base64::strict_encode64(ds_msg)
+
+            result, info = do_action(id, nil, ds_mad, :export,
+                "#{ds_msg64} #{id}", false)
+
+            if ( result == RESULT[:failure] )
+                failure(:import, id, "Error exporting image to file: #{info}")
                 return
+            end
+
+            info_doc = OpenNebula::XMLElement.new
+            info_doc.initialize_xml(info, 'IMPORT_INFO')
+        #-----------------------------------------------------------------------
+        # Only IMAGE type is supported
+        #-----------------------------------------------------------------------
+        else
+            failure(:import, id, "Type #{apptype} not supported")
+            return
         end
 
+        # --------------- Import image app into the marketplace ----------------
         xml.add_element('/MARKET_DRIVER_ACTION_DATA',
-            'IMPORT_SOURCE' => "#{source}")
+                        'IMPORT_SOURCE' => "#{info_doc['IMPORT_SOURCE']}",
+                        'CHECKSUM'      => "#{info_doc['CHECKSUM']}",
+                        'SIZE'          => "#{info_doc['SIZE']}",
+                        'FORMAT'        => "#{info_doc['FORMAT']}",
+                        'DISPOSE'       => "#{info_doc['DISPOSE']}")
+
         mp_msg64 = Base64::strict_encode64(xml.to_xml)
 
         result, info = do_action(id, mp_mad, nil, :import, "#{mp_msg64} #{id}",
@@ -236,7 +218,7 @@ class MarketPlaceDriver < OpenNebulaDriver
 
         result, info = get_info_from_execution(rc)
 
-        info = Base64::strict_encode64(info) if encode
+        info = Base64::strict_encode64(info) if encode && result != RESULT[:failure]
 
         return result, info
     end
diff --git a/src/market_mad/remotes/http/import b/src/market_mad/remotes/http/import
index df86561180..c479687970 100755
--- a/src/market_mad/remotes/http/import
+++ b/src/market_mad/remotes/http/import
@@ -35,26 +35,36 @@ fi
 DRIVER_PATH=$(dirname $0)
 source ${DRIVER_PATH}/../../datastore/libfs.sh
 
-XPATH_PATH="${DRIVER_PATH}/../../datastore"
+UTILS_PATH="${DRIVER_PATH}/../../datastore"
 
 # -------- Get arguments from OpenNebula core ------------
 
 DRV_ACTION=$1
 ID=$2
 
-XPATH="$XPATH_PATH/xpath.rb -b $DRV_ACTION"
+XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"
 
 unset i XPATH_ELEMENTS
 
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <($XPATH     /MARKET_DRIVER_ACTION_DATA/IMPORT_SOURCE \
+                    /MARKET_DRIVER_ACTION_DATA/FORMAT \
+                    /MARKET_DRIVER_ACTION_DATA/DISPOSE \
+                    /MARKET_DRIVER_ACTION_DATA/SIZE \
+                    /MARKET_DRIVER_ACTION_DATA/CHECKSUM \
                     /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/BASE_URL \
+                    /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/BRIDGE_LIST \
                     /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/PUBLIC_DIR)
 unset i
 
 IMPORT_SOURCE="${XPATH_ELEMENTS[i++]}"
+FORMAT="${XPATH_ELEMENTS[i++]}"
+DISPOSE="${XPATH_ELEMENTS[i++]}"
+SIZE="${XPATH_ELEMENTS[i++]}"
+CHECKSUM="${XPATH_ELEMENTS[i++]}"
 BASE_URL="${XPATH_ELEMENTS[i++]}"
+BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
 PUBLIC_DIR="${XPATH_ELEMENTS[i++]}"
 
 # -------- Copy source to public folder an generarte App data ------------
@@ -63,29 +73,31 @@ APPNAME=`generate_image_hash`
 DST_PATH="${PUBLIC_DIR}/${APPNAME}"
 SOURCE="${BASE_URL}/${APPNAME}"
 
-if [ ! -f ${IMPORT_SOURCE} ]; then
-    log_error "File ${IMPORT_SOURCE} does not exits"
-    exit -1
+if [ -n "$BRIDGE_LIST" ]; then
+    DST_HOST=`get_destination_host $ID`
+    CP_CMD="$UTILS_PATH/downloader.sh ${IMPORT_SOURCE} -"
+
+    exec_and_log "eval $CP_CMD | $SSH ${DST_HOST} $DD of=${DST_PATH} bs=64k" \
+                 "Error dumping ${IMPORT_SOURCE} to ${DST_HOST}:${DST_PATH}"
+
+    #if [ "${DISPOSE}" = "YES" ]; then
+    #TODO This should call a ds operation
+    #fi
+else
+    CP_CMD="$UTILS_PATH/downloader.sh ${IMPORT_SOURCE} ${DST_PATH}"
+    exec_and_log "$CP_CMD" "Error copying ${IMPORT_SOURCE} to ${DST_PATH}"
+
+    if [ "${DISPOSE}" = "YES" ]; then
+    #TODO This should call a ds operation
+        exec_and_log "$RM ${IMPORT_SOURCE}" "Error removing ${IMPORT_SOURCE}"
+    fi
 fi
 
-CHECKSUM=$(${MD5SUM} ${IMPORT_SOURCE} | cut -f1 -d' ')
-
-SIZE=$(fs_size ${IMPORT_SOURCE})
-
-if [ "$SIZE" = "0" ]; then
-    log_error "Cannot determine size for ${IMPORT_SOURCE}"
-    exit -1
-fi
-
-exec_and_log "$CP ${IMPORT_SOURCE} ${DST_PATH}" \
-    "Error copying ${IMPORT_SOURCE} to ${DST_PATH}. ${IMPORT_SOURCE} not removed"
-
-exec_and_log "$RM ${IMPORT_SOURCE}" "Error removing ${IMPORT_SOURCE}"
-
 RESPONSE=$(cat << EOF
 SOURCE="$SOURCE"
 CHECKSUM="$CHECKSUM"
 SIZE="$SIZE"
+FORMAT="$FORMAT"
 EOF
 )
 
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 1a0fd1fdbd..9a81b82c1a 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -936,6 +936,8 @@ void Nebula::start(bool bootstrap_only)
 
     lcm->init_managers();
 
+    marketm->init_managers();
+
     // ---- Start the Request Manager ----
 
     rc = rm->start();

From 21eb1b0803ec5f40bbf986cddc3e661d4038525b Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 21 Dec 2015 13:23:22 +0100
Subject: [PATCH 036/197] feature #4127: Delete for marketplace apps, fix bug

---
 include/MarketPlaceApp.h                |  20 ++++
 include/MarketPlaceManager.h            |  13 ++-
 include/MarketPlaceManagerDriver.h      |   9 +-
 include/RequestManagerDelete.h          |   5 +-
 src/datastore_mad/remotes/fs/export     |   4 +-
 src/market/MarketPlaceApp.cc            |   3 +
 src/market/MarketPlaceManager.cc        |   2 +-
 src/market/MarketPlaceManagerActions.cc | 105 ++++++++++++++++++
 src/market/MarketPlaceManagerDriver.cc  | 142 ++++++++++++------------
 src/market_mad/one_market.rb            |  28 ++++-
 src/market_mad/remotes/http/delete      |  81 ++++++++++++++
 src/oca/ruby/opennebula/xml_element.rb  |   2 +-
 src/rm/RequestManagerDelete.cc          |  38 +++++++
 13 files changed, 367 insertions(+), 85 deletions(-)
 mode change 100644 => 100755 src/market_mad/remotes/http/delete

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index 154e05ab0c..4e89c49cee 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -148,6 +148,16 @@ public:
         return origin_id;
     };
 
+    const string& get_source()
+    {
+        return source;
+    }
+
+    MarketPlaceAppState get_state()
+    {
+        return state;
+    }
+
     //--------------------------------------------------------------------------
     // Set Marketplace app attributes
     //--------------------------------------------------------------------------
@@ -171,6 +181,11 @@ public:
         size_mb = _size_mb;
     };
 
+    void set_format(const std::string&  _format)
+    {
+        format = _format;
+    };
+
 private:
 
     friend class MarketPlaceAppPool;
@@ -213,6 +228,11 @@ private:
      */
     std::string version;
 
+    /**
+     *  format of the disk images
+     */
+    std::string format;
+
     /**
      * App template to import it
      */
diff --git a/include/MarketPlaceManager.h b/include/MarketPlaceManager.h
index ecef74b2e5..d2c64c4b55 100644
--- a/include/MarketPlaceManager.h
+++ b/include/MarketPlaceManager.h
@@ -108,12 +108,13 @@ public:
 
     /**
      *  Deletes an app from the marketplace.
-     *    @param iid id of image
-     *    @param error_str Error reason, if any
+     *    @param appid of the app
+     *    @param market_data of the associated marketplace in XML format
+     *    @param error descrition
      *
      *    @return 0 on success
      */
-    int delete_app(int iid, std::string& error_str);
+    int delete_app(int appid, const std::string& market_data, std::string& err);
 
      /**
       *  Trigger a monitor action for the marketplace .
@@ -121,6 +122,12 @@ public:
       */
      void monitor_market(int ds_id);
 
+     /**
+      *  Relsease resources locked by this app during the import phase
+      *    @param appid of the app
+      */
+    void release_app_resources(int appid);
+
 private:
     /**
      *  Generic name for the marketplace driver
diff --git a/include/MarketPlaceManagerDriver.h b/include/MarketPlaceManagerDriver.h
index 592b7d2b4a..79c493ec17 100644
--- a/include/MarketPlaceManagerDriver.h
+++ b/include/MarketPlaceManagerDriver.h
@@ -25,6 +25,7 @@
 
 class MarketPlacePool;
 class MarketPlaceAppPool;
+class MarketPlaceManager;
 
 /**
  *  ImageManagerDriver represents the basic abstraction for Image Repository
@@ -38,8 +39,10 @@ public:
         const std::map<string,string>& attrs,
         bool sudo,
         MarketPlacePool    * _marketpool,
-        MarketPlaceAppPool * _apppool
-       ):Mad(userid,attrs,sudo), marketpool(_marketpool), apppool(_apppool){};
+        MarketPlaceAppPool * _apppool,
+        MarketPlaceManager * _marketm
+       ):Mad(userid,attrs,sudo), marketpool(_marketpool), apppool(_apppool),
+         marketm(_marketm){};
 
     virtual ~MarketPlaceManagerDriver(){};
 
@@ -64,6 +67,8 @@ private:
 
     MarketPlaceAppPool * apppool;
 
+    MarketPlaceManager * marketm;
+
     /**
      *  Sends a stat  request to the MAD.
      *    @param oid the id of the stat request
diff --git a/include/RequestManagerDelete.h b/include/RequestManagerDelete.h
index ea560d553e..38f7617c18 100644
--- a/include/RequestManagerDelete.h
+++ b/include/RequestManagerDelete.h
@@ -137,9 +137,6 @@ public:
 
     ~ImageDelete(){};
 
-
-    /* -------------------------------------------------------------------- */
-
     int drop(int oid, PoolObjectSQL * object, string& error_msg);
 };
 
@@ -406,6 +403,8 @@ public:
     };
 
     ~MarketPlaceAppDelete(){};
+
+    int drop(int oid, PoolObjectSQL * object, string& error_msg);
 };
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/src/datastore_mad/remotes/fs/export b/src/datastore_mad/remotes/fs/export
index bbfdab2c32..2f52cbd9ae 100755
--- a/src/datastore_mad/remotes/fs/export
+++ b/src/datastore_mad/remotes/fs/export
@@ -58,12 +58,12 @@ BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
 INFO_SCRIPT=$(cat <<EOF
 
 CHECKSUM=\$(${MD5SUM} ${SRC} | cut -f1 -d' ')
-SIZE=\$(${DU} -LBM ${SRC} | cut -f1)
+SIZE=\$(${DU} -Lm ${SRC} | cut -f1)
 FORMAT=\$(${QEMU_IMG} info ${SRC} 2>/dev/null | grep -Po '(?<=file format: )\w+')
 
 echo "<CHECKSUM>\$CHECKSUM</CHECKSUM>"
 echo "<SIZE>\$SIZE</SIZE>"
-echo "<FORMAT>\$FORMAT</FORMAT>"
+echo "<FORMAT>\${FORMAT-"unknown"}</FORMAT>"
 
 EOF
 )
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 54453ac24b..46240ee66f 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -93,6 +93,7 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
     remove_template_attribute("SOURCE");
     remove_template_attribute("SIZE");
     remove_template_attribute("CHECKSUM");
+    remove_template_attribute("FORMAT");
 
     date = time(NULL);
 
@@ -248,6 +249,7 @@ std::string& MarketPlaceApp::to_xml(std::string& xml) const
             "<DESCRIPTION>"    << description   << "</DESCRIPTION>" <<
             "<PUBLISHER>"      << publisher     << "</PUBLISHER>" <<
             "<VERSION>"        << version       << "</VERSION>" <<
+            "<FORMAT>"         << format        << "</FORMAT>" <<
             "<APPTEMPLATE64>"  << apptemplate64 << "</APPTEMPLATE64>" <<
             "<MARKETPLACE_ID>" << market_id     << "</MARKETPLACE_ID>" <<
             "<MARKETPLACE>"    << market_name   << "</MARKETPLACE>" <<
@@ -292,6 +294,7 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
     rc += xpath(version,      "/MARKETPLACEAPP/VERSION", "not_found");
     rc += xpath(checksum,     "/MARKETPLACEAPP/CHECKSUM", "not_found");
     rc += xpath(publisher,    "/MARKETPLACEAPP/PUBLISHER", "not_found");
+    rc += xpath(format,       "/MARKETPLACEAPP/FORMAT", "not_found");
     rc += xpath(apptemplate64,"/MARKETPLACEAPP/APPTEMPLATE64", "not_found");
     rc += xpath(market_name,  "/MARKETPLACEAPP/MARKETPLACE", "not_found");
     rc += xpath(market_id,    "/MARKETPLACEAPP/MARKETPLACE_ID", -1);
diff --git a/src/market/MarketPlaceManager.cc b/src/market/MarketPlaceManager.cc
index 67f9b5faa6..0558b4e421 100644
--- a/src/market/MarketPlaceManager.cc
+++ b/src/market/MarketPlaceManager.cc
@@ -98,7 +98,7 @@ int MarketPlaceManager::load_mads(int uid)
     market_conf.replace("NAME", market_driver_name);
 
     marketm_mad= new MarketPlaceManagerDriver(0, market_conf.value(), false,
-            mppool, apppool);
+            mppool, apppool, this);
 
     rc = add(marketm_mad);
 
diff --git a/src/market/MarketPlaceManagerActions.cc b/src/market/MarketPlaceManagerActions.cc
index d18ae1627b..1e8bad1936 100644
--- a/src/market/MarketPlaceManagerActions.cc
+++ b/src/market/MarketPlaceManagerActions.cc
@@ -122,3 +122,108 @@ int MarketPlaceManager::import_app(
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+void MarketPlaceManager::release_app_resources(int appid)
+{
+    MarketPlaceApp * app = apppool->get(appid, true);
+
+    if (app == 0)
+    {
+        return;
+    }
+
+    MarketPlaceApp::MarketPlaceAppType type = app->get_type();
+
+    int iid = app->get_origin_id();
+
+    app->unlock();
+
+    switch (type)
+    {
+        case MarketPlaceApp::IMAGE:
+            imagem->release_cloning_image(iid, -appid);
+            return;
+
+        case MarketPlaceApp::VMTEMPLATE:
+        case MarketPlaceApp::FLOW:
+        case MarketPlaceApp::UNKNOWN:
+            return;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int MarketPlaceManager::delete_app(int appid, const std::string& market_data,
+        std::string& error_str)
+{
+    MarketPlaceApp * app;
+    MarketPlace *    mp;
+
+    std::string app_data;
+    std::string * msg;
+
+    const MarketPlaceManagerDriver* mpmd = get();
+
+    if ( mpmd == 0 )
+    {
+        error_str = "Error getting MarketPlaceManagerDriver";
+        return -1;
+    }
+
+    app = apppool->get(appid, true);
+
+    if (app == 0)
+    {
+        error_str = "Marketplace app no longer exists";
+        return -1;
+    }
+
+    app->to_xml(app_data);
+
+    MarketPlaceApp::MarketPlaceAppType type   = app->get_type();
+    MarketPlaceApp::MarketPlaceAppState state = app->get_state();
+
+    int market_id = app->get_market_id();
+
+    app->unlock();
+
+    switch (type)
+    {
+        case MarketPlaceApp::IMAGE:
+            switch (state)
+            {
+                case MarketPlaceApp::LOCKED:
+                    release_app_resources(appid);
+                    break;
+                case MarketPlaceApp::INIT:
+                case MarketPlaceApp::READY :
+                case MarketPlaceApp::ERROR:
+                    break;
+            }
+            break;
+
+        case MarketPlaceApp::VMTEMPLATE:
+        case MarketPlaceApp::FLOW:
+        case MarketPlaceApp::UNKNOWN:
+            return -1;
+    }
+
+    mp = mppool->get(market_id, true);
+
+    if ( mp != 0 )
+    {
+        mp->del_marketapp(appid);
+
+        mppool->update(mp);
+
+        mp->unlock();
+    }
+
+    msg = format_message(app_data, market_data, "");
+
+    mpmd->deleteapp(appid, *msg);
+
+    delete msg;
+
+    return 0;
+}
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index 43fa87da0c..21db88f666 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -68,70 +68,6 @@ void MarketPlaceManagerDriver::monitor(int oid, const std::string& msg) const
 /* MAD Interface                                                              */
 /* ************************************************************************** */
 /*
-static int delete_action(istringstream& is,
-                     ImagePool*     ipool,
-                     int            id,
-                     const string&  result)
-{
-    int rc;
-    int ds_id = -1;
-
-    string  tmp_error;
-    string  source;
-    string  info;
-    Image * image;
-
-    ostringstream oss;
-
-    image = ipool->get(id, true);
-
-    if ( image == 0 )
-    {
-        return ds_id;
-    }
-
-    ds_id  = image->get_ds_id();
-    source = image->get_source();
-
-    rc = ipool->drop(image, tmp_error);
-
-    image->unlock();
-
-    if ( result == "FAILURE" )
-    {
-       goto error;
-    }
-    else if ( rc < 0 )
-    {
-        goto error_drop;
-    }
-
-    NebulaLog::log("ImM", Log::INFO, "Image successfully removed.");
-
-    return ds_id;
-
-error_drop:
-    oss << "Error removing image from DB: " << tmp_error
-        << ". Remove image source " << source << " to completely delete image.";
-
-    NebulaLog::log("ImM", Log::ERROR, oss);
-    return ds_id;
-
-error:
-    oss << "Error removing image from datastore. Manually remove image source "
-        << source << " to completely delete the image";
-
-    getline(is,info);
-
-    if (!info.empty() && (info[0] != '-'))
-    {
-        oss << ": " << info;
-    }
-
-    NebulaLog::log("ImM", Log::ERROR, oss);
-
-    return ds_id;
-}
 */
 /* -------------------------------------------------------------------------- */
 /*
@@ -286,11 +222,13 @@ static void app_failure_action(
     app->unlock();
 }
 
+/* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
 static int import_action(
         std::istringstream&  is,
         MarketPlaceAppPool * apppool,
+        MarketPlaceManager * marketm,
         int                  id,
         const std::string&   result)
 {
@@ -306,12 +244,14 @@ static int import_action(
 
     std::string source;
     std::string checksum;
+    std::string format;
     long long   size_mb;
 
+    marketm->release_app_resources(id);
+
     if ( result == "FAILURE" )
     {
-        app_failure_action(&is, apppool, id,
-            "Error importing app into marketplace");
+        app_failure_action(&is, apppool, id, "Error importing app into marketplace");
         return -1;
     }
 
@@ -340,9 +280,10 @@ static int import_action(
 
     tmpl.get("SOURCE", source);
     tmpl.get("CHECKSUM", checksum);
+    tmpl.get("FORMAT", format);
     rc = tmpl.get("SIZE", size_mb);
 
-    if ( source.empty() || checksum.empty() || rc == false )
+    if ( source.empty() || checksum.empty() || format.empty() || rc == false )
     {
         goto error_attributes;
     }
@@ -357,6 +298,7 @@ static int import_action(
     app->set_source(source);
     app->set_checksum(checksum);
     app->set_size(size_mb);
+    app->set_format(format);
 
     app->set_state(MarketPlaceApp::READY);
 
@@ -397,6 +339,68 @@ error_app:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+static int delete_action(
+        std::istringstream&  is,
+        MarketPlaceAppPool * apppool,
+        MarketPlaceManager * marketm,
+        int                  id,
+        const std::string&   result)
+{
+    int rc;
+
+    std::string source;
+    std::string error;
+
+    std::ostringstream eoss("Error removing app from marketplace");
+
+    MarketPlaceApp * app = apppool->get(id, true);
+
+    if ( app == 0 )
+    {
+        return -1;
+    }
+
+    source = app->get_source();
+
+    rc = apppool->drop(app, error);
+
+    app->unlock();
+
+    if ( result == "FAILURE" )
+    {
+        std::string info;
+
+        getline(is, info);
+
+        if (!info.empty() && (info[0] != '-'))
+        {
+            eoss << ": " << info;
+        }
+
+        eoss << ".";
+    }
+
+    if ( rc < 0 )
+    {
+        eoss << " Error removing app from DB: " << error
+             << ". Remove app manually, source is: " << source;
+    }
+
+    if ( rc < 0 || result == "FAILURE" )
+    {
+        NebulaLog::log("MKP", Log::ERROR, eoss.str());
+    }
+    else
+    {
+        NebulaLog::log("MKP",Log::INFO,"Marketplace app successfully removed.");
+    }
+
+    return rc;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 void MarketPlaceManagerDriver::protocol(const string& message) const
 {
     std::istringstream is(message);
@@ -445,7 +449,7 @@ void MarketPlaceManagerDriver::protocol(const string& message) const
 
     if (action == "IMPORT")
     {
-        import_action(is, apppool, id, result);
+        import_action(is, apppool, marketm, id, result);
     }
     else if (action == "EXPORT")
     {
@@ -453,7 +457,7 @@ void MarketPlaceManagerDriver::protocol(const string& message) const
     }
     else if (action == "DELETE")
     {
-        return;
+        delete_action(is, apppool, marketm, id, result);
     }
     else if (action == "MONITOR")
     {
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index 4b757308db..3497f38388 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -164,18 +164,36 @@ class MarketPlaceDriver < OpenNebulaDriver
 
         mp_msg64 = Base64::strict_encode64(xml.to_xml)
 
-        result, info = do_action(id, mp_mad, nil, :import, "#{mp_msg64} #{id}",
-                            true)
+        rc, info = do_action(id, mp_mad, nil, :import, "#{mp_msg64} #{id}",true)
 
-        send_message(ACTION[:import], result, id, info)
+        send_message(ACTION[:import], rc, id, info)
     end
 
     def export(id, drv_message)
         send_message(ACTION[:export], RESULT[:failure], id, "Not implemented")
     end
 
+    ############################################################################
+    # Deletes an app from the marketplace by freeing the underlying resources
+    ############################################################################
     def delete(id, drv_message)
-        send_message(ACTION[:export], RESULT[:failure], id, "Not implemented")
+        xml = decode(drv_message)
+
+        if xml.nil?
+            failure(:import, id, "Cannot decode driver message")
+            return
+        end
+
+        mp_mad = xml['MARKETPLACE/MARKET_MAD']
+
+        if mp_mad.nil?
+            failure(:import, id, "Wrong driver message format")
+            return
+        end
+
+        rc, info = do_action(id,mp_mad,nil,:delete,"#{drv_message} #{id}",false)
+
+        send_message(ACTION[:delete], rc, id, info)
     end
 
     def monitor(id, drv_message)
@@ -230,6 +248,8 @@ class MarketPlaceDriver < OpenNebulaDriver
         doc = OpenNebula::XMLElement.new
         doc.initialize_xml(msg, 'MARKET_DRIVER_ACTION_DATA')
 
+        doc = nil if doc.xml_nil?
+
         return doc
     end
 
diff --git a/src/market_mad/remotes/http/delete b/src/market_mad/remotes/http/delete
old mode 100644
new mode 100755
index e69de29bb2..c651bab702
--- a/src/market_mad/remotes/http/delete
+++ b/src/market_mad/remotes/http/delete
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+# -------------------------------------------------------------------------- #
+
+###############################################################################
+# This script is used to import a file into the marketplace. The source file
+# is an opaque representation of an OpenNebula object, like a image file or a
+# tar.gz with several vm template or flow disk images
+###############################################################################
+
+# -------- Set up the environment to source common tools & conf ------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    LIB_LOCATION=/usr/lib/one
+else
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+
+DRIVER_PATH=$(dirname $0)
+source ${DRIVER_PATH}/../../datastore/libfs.sh
+
+UTILS_PATH="${DRIVER_PATH}/../../datastore"
+
+# -------- Get arguments from OpenNebula core ------------
+
+DRV_ACTION=$1
+ID=$2
+
+XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"
+
+unset i XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+    XPATH_ELEMENTS[i++]="$element"
+done < <($XPATH     /MARKET_DRIVER_ACTION_DATA/MARKETPLACEAPP/SOURCE \
+                    /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/BASE_URL \
+                    /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/BRIDGE_LIST \
+                    /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/PUBLIC_DIR)
+unset i
+
+SOURCE="${XPATH_ELEMENTS[i++]}"
+BASE_URL="${XPATH_ELEMENTS[i++]}"
+BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
+PUBLIC_DIR="${XPATH_ELEMENTS[i++]}"
+
+# ----------------- Delete the app source from public folder -------------------
+APPNAME=${SOURCE##${BASE_URL}}
+DST_PATH="${PUBLIC_DIR}/${APPNAME}"
+
+if [ -n "$BRIDGE_LIST" ]; then
+    DST_HOST=`get_destination_host $ID`
+
+    ssh_exec_and_log "${DST_HOST}" "[ -f ${DST_PATH} ] && rm -rf ${DST_PATH}" \
+        "Error deleting ${DST_PATH} in ${DST_HOST}"
+else
+    if [ -f ${DST_PATH} ]
+    then
+        log "Removing ${DST_PATH} from the marketplace"
+
+        exec_and_log "rm -rf ${DST_PATH}" "Error deleting ${DST_PATH}"
+    else
+        log_error "Bad formed or unavailable app source: ${DST_PATH}"
+        exit 1
+    fi
+fi
diff --git a/src/oca/ruby/opennebula/xml_element.rb b/src/oca/ruby/opennebula/xml_element.rb
index 9297619dea..156b92b6e2 100644
--- a/src/oca/ruby/opennebula/xml_element.rb
+++ b/src/oca/ruby/opennebula/xml_element.rb
@@ -66,7 +66,7 @@ module OpenNebula
         end
 
         # Checks if the internal XML representation is valid
-        def nil?
+        def xml_nil?
             return @xml.nil?
         end
 
diff --git a/src/rm/RequestManagerDelete.cc b/src/rm/RequestManagerDelete.cc
index e8dcec6223..d3cfb4da67 100644
--- a/src/rm/RequestManagerDelete.cc
+++ b/src/rm/RequestManagerDelete.cc
@@ -363,3 +363,41 @@ int SecurityGroupDelete::drop(int oid, PoolObjectSQL * object, string& error_msg
 
     return RequestManagerDelete::drop(oid, object, error_msg);
 }
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+int MarketPlaceAppDelete::drop(int oid, PoolObjectSQL * object, string& emsg)
+{
+    Nebula& nd = Nebula::instance();
+
+    MarketPlaceManager * marketm = nd.get_marketm();
+    MarketPlacePool * marketpool = nd.get_marketpool();
+
+    MarketPlaceApp * app = static_cast<MarketPlaceApp *>(object);
+
+    int mp_id = app->get_market_id();
+
+    app->unlock();
+
+    MarketPlace * mp = marketpool->get(mp_id, true);
+
+    if ( mp == 0 )
+    {
+        emsg = "Cannot find associated MARKETPLACE";
+        return -1;
+    }
+
+    std::string mp_name = mp->get_name();
+    std::string mp_data;
+
+    mp->to_xml(mp_data);
+
+    mp->unlock();
+
+    return marketm->delete_app(oid, mp_data, emsg);
+}
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+

From 1d464eec2f0e82b86b47527316f55ee0cec2844c Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 21 Dec 2015 17:08:42 +0100
Subject: [PATCH 037/197] feature #4217: Update App name CHECKSUM to MD5

---
 include/MarketPlaceApp.h                  | 6 +++---
 src/cli/one_helper/onemarketapp_helper.rb | 2 +-
 src/datastore_mad/remotes/fs/export       | 2 +-
 src/market/MarketPlaceApp.cc              | 8 ++++----
 src/market/MarketPlaceManagerDriver.cc    | 4 ++--
 src/market_mad/one_market.rb              | 2 +-
 src/market_mad/remotes/http/import        | 6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index 4e89c49cee..f8c3dc892d 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -171,9 +171,9 @@ public:
         source = _source;
     };
 
-    void set_checksum(const std::string& _checksum)
+    void set_md5(const std::string& _md5)
     {
-        checksum = _checksum;
+        md5 = _md5;
     };
 
     void set_size(long long _size_mb)
@@ -206,7 +206,7 @@ private:
     /**
      *  Source URL for the marketplace app
      */
-    std::string checksum;
+    std::string md5;
 
     /**
      *  Size of this app
diff --git a/src/cli/one_helper/onemarketapp_helper.rb b/src/cli/one_helper/onemarketapp_helper.rb
index 5833c4695c..c32ef5078b 100644
--- a/src/cli/one_helper/onemarketapp_helper.rb
+++ b/src/cli/one_helper/onemarketapp_helper.rb
@@ -123,7 +123,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
         CLIHelper.print_header(str_h1 % "DETAILS", false)
 
         puts str % ["SOURCE", app['SOURCE']]
-        puts str % ["CHECKSUM", app['CHECKSUM']]
+        puts str % ["MD5", app['MD5']]
         puts str % ["PUBLISHER", app['PUBLISHER']]
         puts str % ["PUB. DATE", Time.at(app['DATE'].to_i).strftime("%c") ]
         puts str % ["VERSION", app['VERSION']]
diff --git a/src/datastore_mad/remotes/fs/export b/src/datastore_mad/remotes/fs/export
index 2f52cbd9ae..4660f33311 100755
--- a/src/datastore_mad/remotes/fs/export
+++ b/src/datastore_mad/remotes/fs/export
@@ -61,7 +61,7 @@ CHECKSUM=\$(${MD5SUM} ${SRC} | cut -f1 -d' ')
 SIZE=\$(${DU} -Lm ${SRC} | cut -f1)
 FORMAT=\$(${QEMU_IMG} info ${SRC} 2>/dev/null | grep -Po '(?<=file format: )\w+')
 
-echo "<CHECKSUM>\$CHECKSUM</CHECKSUM>"
+echo "<MD5>\$CHECKSUM</MD5>"
 echo "<SIZE>\$SIZE</SIZE>"
 echo "<FORMAT>\${FORMAT-"unknown"}</FORMAT>"
 
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 46240ee66f..1a404164a7 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -46,7 +46,7 @@ MarketPlaceApp::MarketPlaceApp(
     MarketPlaceAppTemplate * app_template):
         PoolObjectSQL(-1, MARKETPLACEAPP, "", uid, gid, uname, gname, table),
         source(""),
-        checksum(""),
+        md5(""),
         size_mb(0),
         description(""),
         publisher(""),
@@ -92,7 +92,7 @@ int MarketPlaceApp::insert(SqlDB *db, string& error_str)
     //Atrributes updated after export
     remove_template_attribute("SOURCE");
     remove_template_attribute("SIZE");
-    remove_template_attribute("CHECKSUM");
+    remove_template_attribute("MD5");
     remove_template_attribute("FORMAT");
 
     date = time(NULL);
@@ -244,7 +244,7 @@ std::string& MarketPlaceApp::to_xml(std::string& xml) const
 			"<NAME>"           << name          << "</NAME>" <<
             "<ORIGIN_ID>"      << origin_id     << "</ORIGIN_ID>" <<
             "<SOURCE>"         << source        << "</SOURCE>" <<
-            "<CHECKSUM>"       << checksum      << "</CHECKSUM>" <<
+            "<MD5>"            << md5           << "</MD5>" <<
             "<SIZE>"           << size_mb       << "</SIZE>" <<
             "<DESCRIPTION>"    << description   << "</DESCRIPTION>" <<
             "<PUBLISHER>"      << publisher     << "</PUBLISHER>" <<
@@ -292,7 +292,7 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
     rc += xpath(description,  "/MARKETPLACEAPP/DESCRIPTION", "not_found");
     rc += xpath(size_mb,      "/MARKETPLACEAPP/SIZE", -1);
     rc += xpath(version,      "/MARKETPLACEAPP/VERSION", "not_found");
-    rc += xpath(checksum,     "/MARKETPLACEAPP/CHECKSUM", "not_found");
+    rc += xpath(md5,          "/MARKETPLACEAPP/MD5", "not_found");
     rc += xpath(publisher,    "/MARKETPLACEAPP/PUBLISHER", "not_found");
     rc += xpath(format,       "/MARKETPLACEAPP/FORMAT", "not_found");
     rc += xpath(apptemplate64,"/MARKETPLACEAPP/APPTEMPLATE64", "not_found");
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index 21db88f666..83fad70214 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -279,7 +279,7 @@ static int import_action(
     }
 
     tmpl.get("SOURCE", source);
-    tmpl.get("CHECKSUM", checksum);
+    tmpl.get("MD5", checksum);
     tmpl.get("FORMAT", format);
     rc = tmpl.get("SIZE", size_mb);
 
@@ -296,7 +296,7 @@ static int import_action(
     }
 
     app->set_source(source);
-    app->set_checksum(checksum);
+    app->set_md5(checksum);
     app->set_size(size_mb);
     app->set_format(format);
 
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index 3497f38388..80363676a8 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -157,7 +157,7 @@ class MarketPlaceDriver < OpenNebulaDriver
         # --------------- Import image app into the marketplace ----------------
         xml.add_element('/MARKET_DRIVER_ACTION_DATA',
                         'IMPORT_SOURCE' => "#{info_doc['IMPORT_SOURCE']}",
-                        'CHECKSUM'      => "#{info_doc['CHECKSUM']}",
+                        'MD5'           => "#{info_doc['MD5']}",
                         'SIZE'          => "#{info_doc['SIZE']}",
                         'FORMAT'        => "#{info_doc['FORMAT']}",
                         'DISPOSE'       => "#{info_doc['DISPOSE']}")
diff --git a/src/market_mad/remotes/http/import b/src/market_mad/remotes/http/import
index c479687970..6fe892b772 100755
--- a/src/market_mad/remotes/http/import
+++ b/src/market_mad/remotes/http/import
@@ -52,7 +52,7 @@ done < <($XPATH     /MARKET_DRIVER_ACTION_DATA/IMPORT_SOURCE \
                     /MARKET_DRIVER_ACTION_DATA/FORMAT \
                     /MARKET_DRIVER_ACTION_DATA/DISPOSE \
                     /MARKET_DRIVER_ACTION_DATA/SIZE \
-                    /MARKET_DRIVER_ACTION_DATA/CHECKSUM \
+                    /MARKET_DRIVER_ACTION_DATA/MD5 \
                     /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/BASE_URL \
                     /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/BRIDGE_LIST \
                     /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/PUBLIC_DIR)
@@ -62,7 +62,7 @@ IMPORT_SOURCE="${XPATH_ELEMENTS[i++]}"
 FORMAT="${XPATH_ELEMENTS[i++]}"
 DISPOSE="${XPATH_ELEMENTS[i++]}"
 SIZE="${XPATH_ELEMENTS[i++]}"
-CHECKSUM="${XPATH_ELEMENTS[i++]}"
+MD5="${XPATH_ELEMENTS[i++]}"
 BASE_URL="${XPATH_ELEMENTS[i++]}"
 BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
 PUBLIC_DIR="${XPATH_ELEMENTS[i++]}"
@@ -95,7 +95,7 @@ fi
 
 RESPONSE=$(cat << EOF
 SOURCE="$SOURCE"
-CHECKSUM="$CHECKSUM"
+MD5="$MD5"
 SIZE="$SIZE"
 FORMAT="$FORMAT"
 EOF

From eeb7c01ac0dbd191a77061cbcc1940c78a032902 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Wed, 23 Dec 2015 00:26:54 +0100
Subject: [PATCH 038/197] feature #4217: Export action for images.

---
 include/MarketPlaceApp.h                  | 19 +++--
 include/MarketPlaceManagerDriver.h        | 19 ++---
 include/RequestManagerMarketPlaceApp.h    | 66 +++++++++++++++++
 src/cli/onemarketapp                      | 63 ++++++++++++++---
 src/market/MarketPlaceApp.cc              | 28 ++++++++
 src/market/MarketPlaceManagerActions.cc   |  1 +
 src/market/MarketPlaceManagerDriver.cc    | 15 ----
 src/market_mad/one_market.rb              | 11 +--
 src/oca/ruby/opennebula/marketplaceapp.rb | 86 +++++++++++++++++++++--
 src/rm/RequestManager.cc                  |  6 ++
 src/rm/RequestManagerMarketPlaceApp.cc    | 60 ++++++++++++++++
 src/rm/SConstruct                         |  1 +
 12 files changed, 322 insertions(+), 53 deletions(-)
 create mode 100644 include/RequestManagerMarketPlaceApp.h
 create mode 100644 src/rm/RequestManagerMarketPlaceApp.cc

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index f8c3dc892d..351dac2e81 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -37,6 +37,7 @@ public:
         READY     = 1, /** < Ready to use */
         LOCKED    = 2, /** < Operation in process */
         ERROR     = 3, /** < Error state the operation failed*/
+        DISABLED  = 4
     };
 
     /**
@@ -48,10 +49,11 @@ public:
     {
         switch(state)
         {
-            case INIT:   return "INIT";   break;
-            case READY:  return "READY";  break;
-            case LOCKED: return "LOCKED"; break;
-            case ERROR:  return "ERROR";  break;
+            case INIT:     return "INIT";   break;
+            case READY:    return "READY";  break;
+            case LOCKED:   return "LOCKED"; break;
+            case ERROR:    return "ERROR";  break;
+            case DISABLED: return "DISABLED";  break;
             default:     return "";
         }
     };
@@ -106,6 +108,15 @@ public:
      */
     int from_xml(const std::string &xml_str);
 
+    /**
+     * Enable or disable the app. A disabled app cannot be exported
+     * @param enable true to enable
+     * @param error_str Returns the error reason, if any
+     *
+     * @return 0 on success
+     */
+    int enable(bool enable, string& error_str);
+
     /**
      * Returns the marketplace ID
      */
diff --git a/include/MarketPlaceManagerDriver.h b/include/MarketPlaceManagerDriver.h
index 79c493ec17..6c1108da16 100644
--- a/include/MarketPlaceManagerDriver.h
+++ b/include/MarketPlaceManagerDriver.h
@@ -70,29 +70,22 @@ private:
     MarketPlaceManager * marketm;
 
     /**
-     *  Sends a stat  request to the MAD.
-     *    @param oid the id of the stat request
+     *  Imports a new object into the marketplace
+     *    @param oid of the app
      *    @param drv_msg xml data for the mad operation.
      */
     void importapp(int oid, const std::string& drv_msg) const;
 
     /**
-     *  Sends a make filesystem request to the MAD.
-     *    @param oid the image id.
-     *    @param drv_msg xml data for the mad operation.
-     */
-    void exportapp(int oid, const std::string& drv_msg) const;
-
-    /**
-     *  Sends a delete request to the MAD: "DELETE IMAGE_ID PATH"
-     *    @param oid the image id.
+     *  Deletes an app from the marketplace
+     *    @param oid of the app
      *    @param drv_msg xml data for the mad operation.
      */
     void deleteapp(int oid, const std::string& drv_msg) const;
 
     /**
-     *  Sends a monitor request to the MAD: "MONITOR DS_ID DS_XML"
-     *    @param oid the datastore id.
+     *  Monitors the marketplace
+     *    @param oid of the operation
      *    @param drv_msg xml data for the mad operation.
      */
     void monitor(int oid, const std::string& drv_msg) const;
diff --git a/include/RequestManagerMarketPlaceApp.h b/include/RequestManagerMarketPlaceApp.h
new file mode 100644
index 0000000000..d0b8cb4015
--- /dev/null
+++ b/include/RequestManagerMarketPlaceApp.h
@@ -0,0 +1,66 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef REQUEST_MANAGER_MARKETPLACEAPP_H
+#define REQUEST_MANAGER_MARKETPLACEAPP_H
+
+#include "Request.h"
+#include "Nebula.h"
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class RequestManagerMarketPlaceApp: public Request
+{
+protected:
+    RequestManagerMarketPlaceApp(const std::string& method_name,
+		const std::string& help, const std::string& params) :
+		Request(method_name, params, help)
+    {
+        Nebula& nd = Nebula::instance();
+        pool       = nd.get_apppool();
+
+        auth_object = PoolObjectSQL::MARKETPLACEAPP;
+        auth_op     = AuthRequest::MANAGE;
+    };
+
+    ~RequestManagerMarketPlaceApp(){};
+
+    /* --------------------------------------------------------------------- */
+
+    virtual void request_execute(xmlrpc_c::paramList const& _paramList,
+		RequestAttributes& att) = 0;
+};
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class MarketPlaceAppEnable : public RequestManagerMarketPlaceApp
+{
+public:
+    MarketPlaceAppEnable(): RequestManagerMarketPlaceApp("MarketPlaceAppEnable",
+		"Enables or disables a marketplace app", "A:sib"){};
+
+    ~MarketPlaceAppEnable(){};
+
+    void request_execute(xmlrpc_c::paramList const& _paramList,
+		RequestAttributes& att);
+};
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+#endif
diff --git a/src/cli/onemarketapp b/src/cli/onemarketapp
index c624f8f9fe..d803e3417e 100755
--- a/src/cli/onemarketapp
+++ b/src/cli/onemarketapp
@@ -30,6 +30,7 @@ $: << RUBY_LIB_LOCATION+"/cli"
 require 'command_parser'
 require 'one_helper/onemarketapp_helper'
 require 'one_helper/onemarket_helper'
+require 'one_helper/onedatastore_helper'
 
 CommandParser::CmdParser.new(ARGV) do
     usage "`onemarket` <command> [<args>] [<options>]"
@@ -52,6 +53,7 @@ CommandParser::CmdParser.new(ARGV) do
     list_options << OpenNebulaHelper::DESCRIBE
 
     CREATE_OPTIONS = [OneMarketPlaceHelper::MARKETPLACE]
+    EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE]
 
     ########################################################################
     # Formatters for arguments
@@ -103,12 +105,32 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    export_desc = <<-EOT.unindent
+        Exports the marketplace app to the OpenNebula cloud
+    EOT
+
+    command :export, export_desc, :appid, :name, :options=>EXPORT_OPTIONS  do
+        helper.perform_action(args[0], options, "exported") do |obj|
+
+            rc = obj.export(:dsid=>options[:datastore], :name=>args[1])
+
+            next rc if OpenNebula.is_error?(rc)
+
+            rc.each { |key, value|
+                puts "#{key.to_s.upcase}"
+                value.each{ |id|
+                    puts "    ID: #{id}"
+                }
+            }
+        end
+    end
+
     delete_desc = <<-EOT.unindent
         Deletes the given marketplace app
     EOT
 
     command :delete, delete_desc, [:range, :appid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |app|
+        helper.perform_actions(args[0], options, "deleted") do |app|
             app.delete
         end
     end
@@ -119,7 +141,8 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :appid, [:file, nil],
-    :options=>OpenNebulaHelper::APPEND do
+        :options=>OpenNebulaHelper::APPEND do
+
         helper.perform_action(args[0],options,"modified") do |obj|
             if options[:append]
                 str = OpenNebulaHelper.append_template(args[0], obj, args[1])
@@ -136,7 +159,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chgrp, chgrp_desc,[:range, :appid_list], :groupid do
-        helper.perform_actions(args[0],options,"Group changed") do |app|
+        helper.perform_actions(args[0], options, "Group changed") do |app|
             app.chown(-1, args[1].to_i)
         end
     end
@@ -146,10 +169,10 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chown, chown_desc, [:range, :appid_list], :userid,
-            [:groupid,nil] do
+            [:groupid, nil] do
         gid = args[2].nil? ? -1 : args[2].to_i
-        helper.perform_actions(args[0],options,
-                "Owner/Group changed") do |app|
+
+        helper.perform_actions(args[0], options, "Owner/Group changed") do |app|
             app.chown(args[1].to_i, gid)
         end
     end
@@ -159,8 +182,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chmod, chmod_desc, [:range, :appid_list], :octet do
-        helper.perform_actions(args[0],options,
-                "Permissions changed") do |app|
+        helper.perform_actions(args[0], options, "Permissions changed") do |app|
             app.chmod_octet(args[1])
         end
     end
@@ -170,7 +192,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :appid, :name do
-        helper.perform_action(args[0],options,"renamed") do |o|
+        helper.perform_action(args[0], options, "renamed") do |o|
             o.rename(args[1])
         end
     end
@@ -188,6 +210,27 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :appid, :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+        helper.show_resource(args[0], options)
+    end
+
+    enable_desc = <<-EOT.unindent
+        Enables the marketplace app
+    EOT
+
+    command :enable, enable_desc, [:range, :appid_list] do
+        helper.perform_actions(args[0], options, "enabled") do |obj|
+            obj.enable
+        end
+    end
+
+    disable_desc = <<-EOT.unindent
+        Disables the marketplace app. A disabled marketplace app cannot be
+        exported to a cloud
+    EOT
+
+    command :disable, disable_desc, [:range, :appid_list] do
+        helper.perform_actions(args[0], options, "disabled") do |obj|
+            obj.disable
+        end
     end
 end
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 1a404164a7..5276751995 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -374,3 +374,31 @@ MarketPlaceApp::MarketPlaceAppType MarketPlaceApp::str_to_type(string& str_type)
     return UNKNOWN;
 }
 
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+int MarketPlaceApp::enable(bool enable, string& error_str)
+{
+    switch(state)
+    {
+        case INIT:
+        case LOCKED:
+        case ERROR:
+            break;
+
+        case READY:
+        case DISABLED:
+            if (enable)
+            {
+                state = READY;
+            }
+            else
+            {
+                state = DISABLED;
+            }
+            break;
+    }
+
+    return 0;
+}
+
diff --git a/src/market/MarketPlaceManagerActions.cc b/src/market/MarketPlaceManagerActions.cc
index 1e8bad1936..be9093b570 100644
--- a/src/market/MarketPlaceManagerActions.cc
+++ b/src/market/MarketPlaceManagerActions.cc
@@ -198,6 +198,7 @@ int MarketPlaceManager::delete_app(int appid, const std::string& market_data,
                 case MarketPlaceApp::INIT:
                 case MarketPlaceApp::READY :
                 case MarketPlaceApp::ERROR:
+                case MarketPlaceApp::DISABLED:
                     break;
             }
             break;
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index 83fad70214..1bdd557e61 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -33,17 +33,6 @@ void MarketPlaceManagerDriver::importapp(int oid, const std::string& msg) const
 
 /* -------------------------------------------------------------------------- */
 
-void MarketPlaceManagerDriver::exportapp(int oid, const std::string& msg) const
-{
-    std::ostringstream os;
-
-    os << "EXPORT " << oid << " " << msg << endl;
-
-    write(os);
-}
-
-/* -------------------------------------------------------------------------- */
-
 void MarketPlaceManagerDriver::deleteapp(int oid, const std::string& msg) const
 {
     std::ostringstream os;
@@ -451,10 +440,6 @@ void MarketPlaceManagerDriver::protocol(const string& message) const
     {
         import_action(is, apppool, marketm, id, result);
     }
-    else if (action == "EXPORT")
-    {
-        return;
-    }
     else if (action == "DELETE")
     {
         delete_action(is, apppool, marketm, id, result);
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index 80363676a8..ad49089359 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -148,6 +148,8 @@ class MarketPlaceDriver < OpenNebulaDriver
             info_doc.initialize_xml(info, 'IMPORT_INFO')
         #-----------------------------------------------------------------------
         # Only IMAGE type is supported
+        # when "VMTEMPLATE"
+        # when "FLOW"
         #-----------------------------------------------------------------------
         else
             failure(:import, id, "Type #{apptype} not supported")
@@ -169,12 +171,8 @@ class MarketPlaceDriver < OpenNebulaDriver
         send_message(ACTION[:import], rc, id, info)
     end
 
-    def export(id, drv_message)
-        send_message(ACTION[:export], RESULT[:failure], id, "Not implemented")
-    end
-
     ############################################################################
-    # Deletes an app from the marketplace by freeing the underlying resources
+    # Deletes an app from the marketplace
     ############################################################################
     def delete(id, drv_message)
         xml = decode(drv_message)
@@ -196,6 +194,9 @@ class MarketPlaceDriver < OpenNebulaDriver
         send_message(ACTION[:delete], rc, id, info)
     end
 
+    ############################################################################
+    # Monitor the marketplace. It gathers information about usage and app status
+    ############################################################################
     def monitor(id, drv_message)
         send_message(ACTION[:export], RESULT[:failure], id, "Not implemented")
     end
diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb
index 94c44c068c..a0e6b6c1fd 100644
--- a/src/oca/ruby/opennebula/marketplaceapp.rb
+++ b/src/oca/ruby/opennebula/marketplaceapp.rb
@@ -29,16 +29,18 @@ module OpenNebula
             :update     => "marketapp.update",
             :chown      => "marketapp.chown",
             :chmod      => "marketapp.chmod",
-            :rename     => "marketapp.rename"
+            :rename     => "marketapp.rename",
+            :enable     => "marketapp.enable"
         }
 
-        MARKETPLACEAPP_STATES=%w{INIT READY LOCKED ERROR}
+        MARKETPLACEAPP_STATES=%w{INIT READY LOCKED ERROR DISABLED}
 
         SHORT_MARKETPLACEAPP_STATES={
-            "INIT"      => "init",
+            "INIT"      => "ini",
             "READY"     => "rdy",
-            "LOCKED"    => "lock",
+            "LOCKED"    => "lck",
             "ERROR"     => "err",
+            "DISABLED"  => "dis"
         }
 
         MARKETPLACEAPP_TYPES=%w{UNKNOWN IMAGE VMTEMPLATE FLOW}
@@ -137,8 +139,8 @@ module OpenNebula
         #   otherwise
         def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
                 other_m, other_a)
-            super(MARKETPLACEAPP_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
-                group_m, group_a, other_u, other_m, other_a)
+            super(MARKETPLACEAPP_METHODS[:chmod], owner_u, owner_m, owner_a,
+                group_u, group_m, group_a, other_u, other_m, other_a)
         end
 
         # Renames this marketplace app
@@ -151,6 +153,78 @@ module OpenNebula
             return call(MARKETPLACEAPP_METHODS[:rename], @pe_id, name)
         end
 
+        # Exports this app to a suitable OpenNebula object
+        # @param appid [Integer] id of the marketplace app
+        # @param options [Hash] to control the export behavior
+        #   dsid [Integer] datastore to save images
+        #   name [String] of the new object
+        #
+        # @return [Hash, OpenNebula::Error] with the ID and type of the created
+        # objects
+        #   { :vm => [ vm ids ],
+        #     :vmtemplate => [vmtemplates ids],
+        #     :image => [ vm ids] }
+        def export(options={})
+            return Error.new("Missing datastore id") if options[:dsid].nil?
+            return Error.new("Missing name to export app") if options[:name].nil?
+
+            one = Client.new()
+
+            rc  = info
+            return rc if OpenNebula.is_error?(rc)
+            return Error.new("App is not in READY state") if state_str!="READY"
+
+            case type_str
+            when "IMAGE"
+                if !self['APPTEMPLATE64'].nil?
+                    tmpl=Base64::decode64(self['APPTEMPLATE64'])
+                else
+                    tmpl=""
+                end
+
+                name = options[:name] || "marketapp-#{self.id}"
+
+                tmpl << "\n"
+                tmpl << "NAME=\"" << name << "\"\n"
+                tmpl << "PATH="   << self['SOURCE'] << "\n"
+                tmpl << "FORMAT=" << self['FORMAT'] << "\n"
+                tmpl << "MD5="    << self['MD5'] << "\n"
+                tmpl << "FROM_APP=\""      << self['ID'] << "\"\n"
+                tmpl << "FROM_APP_NAME=\"" << self['NAME'] << "\"\n"
+
+                image = Image.new(Image.build_xml, one)
+                rc    = image.allocate(tmpl, options[:dsid])
+
+                return rc if OpenNebula.is_error?(rc)
+
+                if !self['TEMPLATE/VMTEMPLATE64'].nil?
+                    tmpl=Base64::decode64(self['TEMPLATE/VMTEMPLATE64'])
+
+                    tmpl << "\nNAME=#{name}\n"
+                    tmpl << "DISK=[ IMAGE_ID = #{image.id} ]\n"
+
+                    vmtpl = Template.new(Template.build_xml, one)
+                    rc    = vmtpl.allocate(tmpl)
+
+                    return rc if OpenNebula.is_error?(rc)
+                end
+
+                return { :image => [image.id], :vmtemplate => [vmtpl.id] }
+            else
+                return Error.new("App type #{app.type_str} not supported")
+            end
+        end
+
+        # Enables this app
+        def enable
+            return call(MARKETPLACEAPP_METHODS[:enable], @pe_id, true)
+        end
+
+        # Enables this app
+        def disable
+            return call(MARKETPLACEAPP_METHODS[:enable], @pe_id, false)
+        end
+
         # ---------------------------------------------------------------------
         # Helpers to get information
         # ---------------------------------------------------------------------
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index 14417a70e6..34d13d603d 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -40,6 +40,7 @@
 #include "RequestManagerGroup.h"
 #include "RequestManagerVdc.h"
 #include "RequestManagerDatastore.h"
+#include "RequestManagerMarketPlaceApp.h"
 
 #include "RequestManagerSystem.h"
 #include "RequestManagerProxy.h"
@@ -956,6 +957,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::method * marketapp_delete_pt;
     xmlrpc_c::method * marketapp_chmod_pt;
     xmlrpc_c::method * marketapp_chown_pt;
+    xmlrpc_c::method * marketapp_enable_pt;
 
     if (nebula.is_federation_slave())
     {
@@ -964,6 +966,7 @@ void RequestManager::register_xml_methods()
         marketapp_delete_pt   = new RequestManagerProxy("one.marketapp.delete");
         marketapp_chmod_pt    = new RequestManagerProxy("one.marketapp.chmod");
         marketapp_chown_pt    = new RequestManagerProxy("one.marketapp.chown");
+        marketapp_enable_pt   = new RequestManagerProxy("one.marketapp.enable");
     }
     else
     {
@@ -972,6 +975,7 @@ void RequestManager::register_xml_methods()
         marketapp_delete_pt   = new MarketPlaceAppDelete();
         marketapp_chmod_pt    = new MarketPlaceAppChmod();
         marketapp_chown_pt    = new MarketPlaceAppChown();
+        marketapp_enable_pt   = new MarketPlaceAppEnable();
     }
 
     xmlrpc_c::methodPtr marketapp_allocate(marketapp_allocate_pt);
@@ -979,6 +983,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr marketapp_delete(marketapp_delete_pt);
     xmlrpc_c::methodPtr marketapp_chmod(marketapp_chmod_pt);
     xmlrpc_c::methodPtr marketapp_chown(marketapp_chown_pt);
+    xmlrpc_c::methodPtr marketapp_enable(marketapp_enable_pt);
 
     xmlrpc_c::methodPtr marketapp_info(new MarketPlaceAppInfo());
     xmlrpc_c::methodPtr marketapp_rename(new MarketPlaceAppRename());
@@ -989,6 +994,7 @@ void RequestManager::register_xml_methods()
     RequestManagerRegistry.addMethod("one.marketapp.delete", marketapp_delete);
     RequestManagerRegistry.addMethod("one.marketapp.chmod", marketapp_chmod);
     RequestManagerRegistry.addMethod("one.marketapp.chown", marketapp_chown);
+    RequestManagerRegistry.addMethod("one.marketapp.enable", marketapp_enable);
 
     RequestManagerRegistry.addMethod("one.marketapp.info", marketapp_info);
     RequestManagerRegistry.addMethod("one.marketapp.rename", marketapp_rename);
diff --git a/src/rm/RequestManagerMarketPlaceApp.cc b/src/rm/RequestManagerMarketPlaceApp.cc
new file mode 100644
index 0000000000..e9532103ab
--- /dev/null
+++ b/src/rm/RequestManagerMarketPlaceApp.cc
@@ -0,0 +1,60 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "RequestManagerMarketPlaceApp.h"
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+void MarketPlaceAppEnable::request_execute(xmlrpc_c::paramList const& paramList,
+	RequestAttributes& att)
+{
+    int  id          = xmlrpc_c::value_int(paramList.getInt(1));
+    bool enable_flag = xmlrpc_c::value_boolean(paramList.getBoolean(2));
+    int  rc;
+
+    MarketPlaceApp * app;
+	std::string  err_msg;
+
+    if ( basic_authorization(id, att) == false )
+    {
+        return;
+    }
+
+    app = static_cast<MarketPlaceApp *>(pool->get(id, true));
+
+    if ( app == 0 )
+    {
+        failure_response(NO_EXISTS,get_error(object_name(auth_object),id),att);
+        return;
+    }
+
+    rc = app->enable(enable_flag, err_msg);
+
+    if ( rc != 0  )
+    {
+        failure_response(INTERNAL, request_error(err_msg,""), att);
+
+        app->unlock();
+        return;
+    }
+
+    pool->update(app);
+
+    app->unlock();
+
+    success_response(id, att);
+}
diff --git a/src/rm/SConstruct b/src/rm/SConstruct
index 09e3d43eea..cdb68f7ae4 100644
--- a/src/rm/SConstruct
+++ b/src/rm/SConstruct
@@ -47,6 +47,7 @@ source_files=[
     'RequestManagerVdc.cc',
     'RequestManagerDatastore.cc',
     'RequestManagerLock.cc',
+    'RequestManagerMarketPlaceApp.cc'
 ]
 
 # Build library

From 3bb13e106a30fe64595ec1304e77f53b4e88d991 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Wed, 23 Dec 2015 23:50:22 +0100
Subject: [PATCH 039/197] feature #4217: Implements monitor action for
 marketplace. Sample monitor driver for http marketplace

---
 include/MarketPlace.h                  | 11 +---
 install.sh                             |  1 -
 src/market/MarketPlace.cc              | 16 ++++-
 src/market/MarketPlaceManagerDriver.cc | 87 +++++++++++--------------
 src/market_mad/one_market.rb           | 23 +++++--
 src/market_mad/remotes/http/export     |  0
 src/market_mad/remotes/http/monitor    | 90 ++++++++++++++++++++++++++
 7 files changed, 162 insertions(+), 66 deletions(-)
 delete mode 100644 src/market_mad/remotes/http/export
 mode change 100644 => 100755 src/market_mad/remotes/http/monitor

diff --git a/include/MarketPlace.h b/include/MarketPlace.h
index 833fee370f..29b8aba7e8 100644
--- a/include/MarketPlace.h
+++ b/include/MarketPlace.h
@@ -82,16 +82,9 @@ public:
 
     /**
      *  Set monitor information for the MarketPlace
-     *    @param total_mb
-     *    @param free_mb
-     *    @param used_mb
+     *    @param data template with monitor information
      */
-    void update_monitor(long long total, long long free, long long used)
-    {
-        total_mb = total;
-        free_mb  = free;
-        used_mb  = used;
-    }
+    void update_monitor(const Template& data);
 
 private:
 
diff --git a/install.sh b/install.sh
index ef7856069e..35532359a4 100755
--- a/install.sh
+++ b/install.sh
@@ -1211,7 +1211,6 @@ DATASTORE_DRIVER_DEV_SCRIPTS="src/datastore_mad/remotes/dev/cp \
 #-------------------------------------------------------------------------------
 
 MARKETPLACE_DRIVER_HTTP_SCRIPTS="src/market_mad/remotes/http/import \
-            src/market_mad/remotes/http/export \
             src/market_mad/remotes/http/delete \
             src/market_mad/remotes/http/monitor"
 
diff --git a/src/market/MarketPlace.cc b/src/market/MarketPlace.cc
index e53916edd3..be24de452d 100644
--- a/src/market/MarketPlace.cc
+++ b/src/market/MarketPlace.cc
@@ -281,10 +281,10 @@ int MarketPlace::from_xml(const std::string &xml_str)
     return 0;
 }
 
-/* --------------------------------------------------------------------------- */
-/* --------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
 
-int MarketPlace::post_update_template(string& error)
+int MarketPlace::post_update_template(std::string& error)
 {
 	std::string new_market_mad;
 
@@ -300,3 +300,13 @@ int MarketPlace::post_update_template(string& error)
 	return 0;
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void MarketPlace::update_monitor(const Template& data)
+{
+    data.get("TOTAL_MB", total_mb);
+    data.get("FREE_MB",  free_mb);
+    data.get("USED_MB",  used_mb);
+}
+
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index 1bdd557e61..aaf1a3b079 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -56,100 +56,91 @@ void MarketPlaceManagerDriver::monitor(int oid, const std::string& msg) const
 /* ************************************************************************** */
 /* MAD Interface                                                              */
 /* ************************************************************************** */
-/*
-*/
-/* -------------------------------------------------------------------------- */
-/*
-static void monitor_action(istringstream& is,
-                           DatastorePool* dspool,
-                           int            id,
-                           const string&  result)
+
+static void monitor_action(
+        std::istringstream&  is,
+        MarketPlacePool *    marketpool,
+        MarketPlaceManager * marketm,
+        int                  id,
+        const std::string&   result)
 {
-    string  dsinfo64;
-    string *dsinfo = 0;
+    std::string  info64;
+    std::string* info = 0;
 
-    ostringstream oss;
+    std::ostringstream oss;
 
-    getline (is, dsinfo64);
+    getline (is, info64);
 
     if (is.fail())
     {
-        oss << "Error monitoring datastore " << id << ". Bad monitor data: "
-            << dsinfo64;
+        oss << "Error monitoring marketplace " << id << ". Bad monitor data: "
+            << info64;
 
-        NebulaLog::log("ImM", Log::ERROR, oss);
+        NebulaLog::log("MKP", Log::ERROR, oss);
         return;
     }
 
-    dsinfo = one_util::base64_decode(dsinfo64);
+    info = one_util::base64_decode(info64);
 
-    if (dsinfo == 0)
+    if (info == 0)
     {
-        oss << "Error monitoring datastore " << id << ". Bad monitor data: "
-            << dsinfo64;
+        oss << "Error monitoring marketplace " << id << ". Bad monitor data: "
+            << info64;
 
-        NebulaLog::log("ImM", Log::ERROR, oss);
+        NebulaLog::log("MKP", Log::ERROR, oss);
         return;
     }
 
     if (result != "SUCCESS")
     {
-        oss << "Error monitoring datastore " << id << ": " << *dsinfo;
-        NebulaLog::log("ImM", Log::ERROR, oss);
+        oss << "Error monitoring datastore " << id << ": " << *info;
+        NebulaLog::log("MKP", Log::ERROR, oss);
 
-        delete dsinfo;
+        delete info;
         return;
     }
 
     Template monitor_data;
 
-    char*  error_msg;
-    int    rc = monitor_data.parse(*dsinfo, &error_msg);
+    char * error_msg;
+    int    rc = monitor_data.parse(*info, &error_msg);
+
+    delete info;
 
     if ( rc != 0 )
     {
-        oss << "Error parsing datastore information: " << error_msg
-            << ". Monitoring information: " << endl << *dsinfo;
+        oss << "Error parsing marketplace information: " << error_msg
+            << ". Monitoring information: " << endl << *info;
 
-        NebulaLog::log("ImM", Log::ERROR, oss);
+        NebulaLog::log("MKP", Log::ERROR, oss);
 
-        delete dsinfo;
         free(error_msg);
-
         return;
     }
 
-    delete dsinfo;
+    std::string   name;
+    MarketPlace * market = marketpool->get(id, true);
 
-    float  total, free, used;
-    string ds_name;
-
-    monitor_data.get("TOTAL_MB", total);
-    monitor_data.get("FREE_MB", free);
-    monitor_data.get("USED_MB", used);
-
-    Datastore * ds = dspool->get(id, true);
-
-    if (ds == 0 )
+    if (market == 0 )
     {
         return;
     }
 
-    ds_name = ds->get_name();
+    name = market->get_name();
 
-    ds->update_monitor(total, free, used);
+    market->update_monitor(monitor_data);
 
-    dspool->update(ds);
+    marketpool->update(market);
 
-    ds->unlock();
+    market->unlock();
 
-    oss << "Datastore " << ds_name << " (" << id << ") successfully monitored.";
+
+    oss << "Marketplace " << name << " (" << id << ") successfully monitored.";
 
     NebulaLog::log("ImM", Log::DEBUG, oss);
 
     return;
 }
-*/
 
 /* -------------------------------------------------------------------------- */
 /* Helper functions for failure and error conditions                          */
@@ -446,7 +437,7 @@ void MarketPlaceManagerDriver::protocol(const string& message) const
     }
     else if (action == "MONITOR")
     {
-        return;
+        monitor_action(is, marketpool, marketm, id, result);
     }
     else if (action == "LOG")
     {
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index ad49089359..25dcb4856b 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -45,7 +45,6 @@ class MarketPlaceDriver < OpenNebulaDriver
     # Market Driver Protocol constants
     ACTION = {
         :import  => "IMPORT",
-        :export  => "EXPORT",
         :delete  => "DELETE",
         :log     => "LOG",
         :monitor => "MONITOR"
@@ -63,7 +62,6 @@ class MarketPlaceDriver < OpenNebulaDriver
             :retries => 0,
             :local_actions => {
                 ACTION[:import]  => nil,
-                ACTION[:export]  => nil,
                 ACTION[:delete]  => nil,
                 ACTION[:log]     => nil,
                 ACTION[:monitor] => nil
@@ -87,7 +85,6 @@ class MarketPlaceDriver < OpenNebulaDriver
         @one = OpenNebula::Client.new()
 
         register_action(ACTION[:import].to_sym, method("import"))
-        register_action(ACTION[:export].to_sym, method("export"))
         register_action(ACTION[:delete].to_sym, method("delete"))
         register_action(ACTION[:monitor].to_sym,method("monitor"))
     end
@@ -185,7 +182,7 @@ class MarketPlaceDriver < OpenNebulaDriver
         mp_mad = xml['MARKETPLACE/MARKET_MAD']
 
         if mp_mad.nil?
-            failure(:import, id, "Wrong driver message format")
+            failure(:delete, id, "Wrong driver message format")
             return
         end
 
@@ -198,7 +195,23 @@ class MarketPlaceDriver < OpenNebulaDriver
     # Monitor the marketplace. It gathers information about usage and app status
     ############################################################################
     def monitor(id, drv_message)
-        send_message(ACTION[:export], RESULT[:failure], id, "Not implemented")
+        xml = decode(drv_message)
+
+        if xml.nil?
+            failure(:monitor, id, "Cannot decode driver message")
+            return
+        end
+
+        mp_mad = xml['MARKETPLACE/MARKET_MAD']
+
+        if mp_mad.nil?
+            failure(:monitor, id, "Wrong driver message format")
+            return
+        end
+
+        rc, info = do_action(id,mp_mad,nil,:monitor,"#{drv_message} #{id}",true)
+
+        send_message(ACTION[:monitor], rc, id, info)
     end
 
     private
diff --git a/src/market_mad/remotes/http/export b/src/market_mad/remotes/http/export
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/market_mad/remotes/http/monitor b/src/market_mad/remotes/http/monitor
old mode 100644
new mode 100755
index e69de29bb2..b4e8883bc2
--- a/src/market_mad/remotes/http/monitor
+++ b/src/market_mad/remotes/http/monitor
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+###############################################################################
+# This script is used to monitor the free and used space of a marketplace
+###############################################################################
+
+# -------- Set up the environment to source common tools & conf ------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    LIB_LOCATION=/usr/lib/one
+else
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+
+DRIVER_PATH=$(dirname $0)
+source ${DRIVER_PATH}/../../datastore/libfs.sh
+
+UTILS_PATH="${DRIVER_PATH}/../../datastore"
+
+# -------- Get arguments from OpenNebula core ------------
+
+DRV_ACTION=$1
+ID=$2
+
+XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"
+
+unset i XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+    XPATH_ELEMENTS[i++]="$element"
+done < <($XPATH     /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/BRIDGE_LIST \
+                    /MARKET_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/PUBLIC_DIR)
+unset i
+
+BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
+PUBLIC_DIR="${XPATH_ELEMENTS[i++]}"
+
+# ------------ Compute datastore usage -------------
+
+MONITOR_SCRIPT=$(cat <<EOF
+USED_MB=\$(df -B1M -P ${PUBLIC_DIR} 2>/dev/null | tail -n 1 | awk '{print \$3}')
+TOTAL_MB=\$(df -B1M -P ${PUBLIC_DIR} 2>/dev/null | tail -n 1 | awk '{print \$2}')
+FREE_MB=\$(df -B1M -P ${PUBLIC_DIR} 2>/dev/null | tail -n 1 | awk '{print \$4}')
+
+if [ -z "\$USED_MB" -o -z "\$TOTAL_MB" -o -z "\$FREE_MB" ]; then
+    msg="Empty value found"
+    echo "\$msg: USED_MB=\$USED_MB, TOTAL_MB=\$TOTAL_MB, FREE_MB=\$FREE_MB"
+    exit 1
+fi
+
+echo "USED_MB=\$USED_MB"
+echo "FREE_MB=\$FREE_MB"
+echo "TOTAL_MB=\$TOTAL_MB"
+EOF
+)
+
+if [ -n "$BRIDGE_LIST" ]; then
+    HOST=`get_destination_host`
+    MONITOR_DATA=$(ssh_monitor_and_log "$HOST" "$MONITOR_SCRIPT" "Remote monitor script" 2>&1)
+else
+    MONITOR_DATA=$(monitor_and_log "$MONITOR_SCRIPT" "Monitor script" 2>&1)
+fi
+
+MONITOR_STATUS=$?
+
+if [ "$MONITOR_STATUS" = "0" ]; then
+    echo "$MONITOR_DATA" | tr ' ' '\n'
+    exit 0
+else
+    echo "$MONITOR_DATA"
+    exit $MONITOR_STATUS
+fi

From 10b8699fdc18729952cadbbea1712c07f87bd79d Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 24 Dec 2015 18:49:21 +0100
Subject: [PATCH 040/197] feature #4217: First version of OpenNebula
 marketplace

---
 install.sh                         |   7 ++
 src/market_mad/remotes/one/delete  |  29 +++++++
 src/market_mad/remotes/one/import  |  29 +++++++
 src/market_mad/remotes/one/monitor | 130 +++++++++++++++++++++++++++++
 4 files changed, 195 insertions(+)
 create mode 100755 src/market_mad/remotes/one/delete
 create mode 100755 src/market_mad/remotes/one/import
 create mode 100755 src/market_mad/remotes/one/monitor

diff --git a/install.sh b/install.sh
index 35532359a4..6ab032e3b2 100755
--- a/install.sh
+++ b/install.sh
@@ -296,6 +296,7 @@ VAR_DIRS="$VAR_LOCATION/remotes \
           $VAR_LOCATION/remotes/datastore/dev \
           $VAR_LOCATION/remotes/market \
           $VAR_LOCATION/remotes/market/http \
+          $VAR_LOCATION/remotes/market/one \
           $VAR_LOCATION/remotes/auth \
           $VAR_LOCATION/remotes/auth/plain \
           $VAR_LOCATION/remotes/auth/ssh \
@@ -426,6 +427,7 @@ INSTALL_FILES=(
     DATASTORE_DRIVER_CEPH_SCRIPTS:$VAR_LOCATION/remotes/datastore/ceph
     DATASTORE_DRIVER_DEV_SCRIPTS:$VAR_LOCATION/remotes/datastore/dev
     MARKETPLACE_DRIVER_HTTP_SCRIPTS:$VAR_LOCATION/remotes/market/http
+    MARKETPLACE_DRIVER_ONE_SCRIPTS:$VAR_LOCATION/remotes/market/one
     NETWORK_FILES:$VAR_LOCATION/remotes/vnm
     NETWORK_8021Q_FILES:$VAR_LOCATION/remotes/vnm/802.1Q
     NETWORK_VXLAN_FILES:$VAR_LOCATION/remotes/vnm/vxlan
@@ -1207,6 +1209,7 @@ DATASTORE_DRIVER_DEV_SCRIPTS="src/datastore_mad/remotes/dev/cp \
 #-------------------------------------------------------------------------------
 # Marketplace drivers, to be installed under $REMOTES_LOCATION/market
 #   - HTTP based marketplace, $REMOTES_LOCATION/market/http
+#   - OpenNebula public marketplace, $REMOTES_LOCATION/market/one
 #   - S3-obeject based marketplace, $REMOTES_LOCATION/market/s3
 #-------------------------------------------------------------------------------
 
@@ -1214,6 +1217,10 @@ MARKETPLACE_DRIVER_HTTP_SCRIPTS="src/market_mad/remotes/http/import \
             src/market_mad/remotes/http/delete \
             src/market_mad/remotes/http/monitor"
 
+MARKETPLACE_DRIVER_ONE_SCRIPTS="src/market_mad/remotes/one/import \
+            src/market_mad/remotes/one/delete \
+            src/market_mad/remotes/one/monitor"
+
 #-------------------------------------------------------------------------------
 # Migration scripts for onedb command, to be installed under $LIB_LOCATION
 #-------------------------------------------------------------------------------
diff --git a/src/market_mad/remotes/one/delete b/src/market_mad/remotes/one/delete
new file mode 100755
index 0000000000..4c8d775233
--- /dev/null
+++ b/src/market_mad/remotes/one/delete
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+# -------------------------------------------------------------------------- #
+
+if [ -z "${ONE_LOCATION}" ]; then
+    LIB_LOCATION=/usr/lib/one
+else
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+
+error_message "Cannot delete app from OpenNebula marketplace"
+
+exit -1
diff --git a/src/market_mad/remotes/one/import b/src/market_mad/remotes/one/import
new file mode 100755
index 0000000000..e436d9a627
--- /dev/null
+++ b/src/market_mad/remotes/one/import
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+# -------------------------------------------------------------------------- #
+
+if [ -z "${ONE_LOCATION}" ]; then
+    LIB_LOCATION=/usr/lib/one
+else
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+
+error_message "Cannot import app into OpenNebula marketplace"
+
+exit -1
diff --git a/src/market_mad/remotes/one/monitor b/src/market_mad/remotes/one/monitor
new file mode 100755
index 0000000000..356828d29f
--- /dev/null
+++ b/src/market_mad/remotes/one/monitor
@@ -0,0 +1,130 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'net/http'
+require 'uri'
+require 'json'
+require 'base64'
+
+class OneMarket
+    ONE_MARKET_URL = 'http://marketplace.opennebula.systems/'
+    AGENT          = 'Market Driver'
+    VERSION        = '../../VERSION'
+
+    def initialize(url=ONE_MARKET_URL)
+        @url   = url
+        @agent = "OpenNebula #{File.read(VERSION)} (#{AGENT})"
+    end
+
+    def get(path)
+        uri = URI(@url + path)
+        req = Net::HTTP::Get.new(uri)
+
+        req['User-Agent'] = @agent
+
+        response = Net::HTTP.start(uri.hostname, uri.port) {|http|
+            http.request(req)
+        }
+
+        if response.is_a? Net::HTTPSuccess
+            return 0, response.body
+        else
+            return response.code.to_i, response.msg
+        end
+    end
+
+    def get_appliances()
+        rc, body = get('/appliance')
+
+        if rc != 0
+            return rc, body
+        end
+
+        applist = JSON.parse(body)
+        appstr  = ""
+
+        applist['appliances'].each { |app|
+            tmpl =  "NAME        =\"#{app["name"]}\"\n"
+            tmpl << "IMPORT_ID   =\"#{app["_id"]["$oid"]}\"\n"
+            tmpl << "TYPE        = IMAGE\n"
+            tmpl << "PUBLISHER   = #{app["publisher"]}\n"
+            tmpl << "FORMAT      = #{app["format"]}\n"
+            tmpl << "DESCRIPTION = \"#{app["short_description"]}\"\n"
+            tmpl << "VERSION     = #{app["version"]}\n"
+            tmpl << "TAGS        = \"#{app["tags"].join(', ')}\"\n"
+            tmpl << "DATE        = #{app["creation_time"]}\n"
+
+            if !app["files"].nil? && !app["files"][0].nil?
+                file = app["files"][0]
+
+                tmpl << "SIZE = #{app["files"][0]["size"]}\n"
+                tmpl << "MD5   = #{app["files"][0]["md5"]}\n"
+
+                tmpl64 = ""
+                tmpl64 << "DEV_PREFIX = #{file["dev_prefix"]}\n" if file["dev_prefix"]
+                tmpl64 << "DRIVER     = #{file["driver"]}\n" if file["driver"]
+                tmpl64 << "TYPE       = #{file["type"]}\n" if file["type"]
+
+                if !tmpl64.empty?
+                    tmpl << "APPTEMPLATE64 = \"#{Base64::strict_encode64(tmpl64)}\"\n"
+                end
+            end
+
+            if !app["opennebula_template"].nil?
+                vmtmpl64 = template_to_str(JSON.parse(app["opennebula_template"]))
+                tmpl << "VMTEMPLATE64 = \"#{Base64::strict_encode64(vmtmpl64)}\"\n"
+            end
+
+            tmpl << "APPTEMPLATE64 = \"#{Base64::strict_encode64(tmpl64)}\"\n"
+
+            appstr << "APP=\"#{Base64::strict_encode64(tmpl)}\"\n"
+        }
+
+        appstr
+    end
+
+    private
+
+    def template_to_str(thash)
+        thash.collect do |key, value|
+            next if value.nil? || value.empty?
+
+            str = case value.class.name
+            when "Hash"
+                attr = "#{key.to_s.upcase} = [ "
+
+                attr << value.collect do |k, v|
+                     next if v.nil? || v.empty?
+                     "#{k.to_s.upcase}  =\"#{v.to_s}\""
+                end.compact.join(",")
+
+                attr << "]\n"
+            when "String"
+                "#{key.to_s.upcase} = \"#{value.to_s}\""
+            end
+        end.compact.join("\n")
+    end
+end
+
+################################################################################
+# Main Program. Outpust the list of marketplace appliances
+################################################################################
+#TODO get marketplace URL from MARKETPLACE Templace for other markets
+one_market = OneMarket.new
+puts one_market.get_appliances()
+

From 49b9de94f54d312648214ee123bc647a2b6584fc Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 28 Dec 2015 01:08:33 +0100
Subject: [PATCH 041/197] feature #4217: Monitor external marketplaces. Import
 functionality for existing apps. Drivers for OpenNebula public marketplace

---
 include/MarketPlaceApp.h               | 11 ++++-
 include/MarketPlaceAppPool.h           | 11 +++++
 include/MarketPlacePool.h              |  1 +
 share/etc/oned.conf                    |  2 +-
 src/market/MarketPlaceApp.cc           | 64 ++++++++++++++++++++++++++
 src/market/MarketPlaceAppPool.cc       | 49 ++++++++++++++++++++
 src/market/MarketPlaceManagerDriver.cc | 41 +++++++++++++----
 src/market_mad/remotes/one/monitor     | 55 ++++++++++++++--------
 8 files changed, 203 insertions(+), 31 deletions(-)

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index 351dac2e81..cb7c49dd3d 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -108,6 +108,15 @@ public:
      */
     int from_xml(const std::string &xml_str);
 
+    /**
+     *  Rebuilds the object from base64 encoded template representation
+     *    @param str The template string, base64 encoded
+     *    @param error_str Returns the error reason, if any
+     *
+     *    @return 0 on success, -1 otherwise
+     */
+    int from_template64(const std::string &xml_str, std::string& error_str);
+
     /**
      * Enable or disable the app. A disabled app cannot be exported
      * @param enable true to enable
@@ -115,7 +124,7 @@ public:
      *
      * @return 0 on success
      */
-    int enable(bool enable, string& error_str);
+    int enable(bool enable, std::string& error_str);
 
     /**
      * Returns the marketplace ID
diff --git a/include/MarketPlaceAppPool.h b/include/MarketPlaceAppPool.h
index b23c364ece..89598e3a8f 100644
--- a/include/MarketPlaceAppPool.h
+++ b/include/MarketPlaceAppPool.h
@@ -60,6 +60,17 @@ public:
             const std::string& mp_data,
             int *              oid,
             std::string&       error_str);
+    /**
+     *  Imports an app into the marketplace, as reported by the monitor driver
+     *    @param template to generate app with the from_template64 function
+     *    @param mp_id of the MarketPlace to store de App
+     *    @param mp_name of the MarketPlace
+     *    @param error_str Returns the error reason, if any
+     *
+     *    @return 0 on success
+     */
+    int import(const std::string& t64, int mp_id, const std::string& mp_name,
+            std::string& error_str);
 
     /**
      *  Function to get a MarketPlaceApp from the pool
diff --git a/include/MarketPlacePool.h b/include/MarketPlacePool.h
index f796860664..c61ed67fb1 100644
--- a/include/MarketPlacePool.h
+++ b/include/MarketPlacePool.h
@@ -22,6 +22,7 @@
 #include "SqlDB.h"
 
 class SqlDB;
+class MarketPlaceApp;
 
 class MarketPlacePool : public PoolSQL
 {
diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index 475ce57dca..b92b3e7aa9 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -665,7 +665,7 @@ DATASTORE_MAD = [
 
 MARKET_MAD = [
     executable = "one_market",
-    arguments  = "-t 15 -m http,s3"
+    arguments  = "-t 15 -m http,s3,one"
 ]
 
 #*******************************************************************************
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 5276751995..a57420534e 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -81,6 +81,12 @@ MarketPlaceApp::~MarketPlaceApp()
 int MarketPlaceApp::insert(SqlDB *db, string& error_str)
 {
     std::ostringstream oss;
+    bool imported;
+
+    if (get_template_attribute("IMPORTED", imported) && imported)
+    {
+        return insert_replace(db, false, error_str);
+    }
 
     // -------------------------------------------------------------------------
     // Check default marketplace app attributes
@@ -402,3 +408,61 @@ int MarketPlaceApp::enable(bool enable, string& error_str)
     return 0;
 }
 
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
+int MarketPlaceApp::from_template64(const std::string &info64, std::string& err)
+{
+    std::string * info = one_util::base64_decode(info64);
+    std::string sdate;
+
+    if (info == 0)
+    {
+        err = "Error decoding driver message";
+        return -1;
+    }
+
+    char *   error_msg;
+
+    int rc = obj_template->parse(*info, &error_msg);
+
+    delete info;
+
+    if ( rc != 0 )
+    {
+        err = error_msg;
+
+        free(error_msg);
+        return -1;
+    }
+
+    state = READY;
+
+    type      = IMAGE;
+    origin_id = -1;
+    remove_template_attribute("TYPE");
+    remove_template_attribute("ORIGIN_ID");
+
+    erase_template_attribute("NAME", name);
+    erase_template_attribute("SOURCE", source);
+    erase_template_attribute("DESCRIPTION", description);
+    erase_template_attribute("SIZE", size_mb);
+    erase_template_attribute("VERSION", version);
+    erase_template_attribute("MD5", md5);
+    erase_template_attribute("PUBLISHER", publisher);
+    erase_template_attribute("FORMAT", format);
+    erase_template_attribute("APPTEMPLATE64", apptemplate64);
+
+    erase_template_attribute("DATE", sdate);
+    std::istringstream iss(sdate);
+    iss >> date;
+
+    if ( date == 0 )
+    {
+        date = time(NULL);
+    }
+
+   replace_template_attribute("IMPORTED", "YES");
+   return 0;
+}
+
diff --git a/src/market/MarketPlaceAppPool.cc b/src/market/MarketPlaceAppPool.cc
index 318a4abd80..0b27d6234b 100644
--- a/src/market/MarketPlaceAppPool.cc
+++ b/src/market/MarketPlaceAppPool.cc
@@ -50,6 +50,8 @@ int MarketPlaceAppPool:: allocate(
 
     mp->state = MarketPlaceApp::INIT;
 
+    mp->remove_template_attribute("IMPORTED");
+
     // -------------------------------------------------------------------------
     // Check name & duplicates
     // -------------------------------------------------------------------------
@@ -104,6 +106,53 @@ error_name:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+int MarketPlaceAppPool::import(const std::string& t64, int mp_id,
+        const std::string& mp_name, std::string& error_str)
+{
+    MarketPlaceApp * app = new MarketPlaceApp(UserPool::ONEADMIN_ID,
+        GroupPool::ONEADMIN_ID, UserPool::oneadmin_name,
+        GroupPool::ONEADMIN_NAME, 0133, 0);
+
+    int rc = app->from_template64(t64, error_str);
+
+    if ( rc != 0 )
+    {
+        delete app;
+        return -1;
+    }
+
+    app->market_id   = mp_id;
+    app->market_name = mp_name;
+
+    if ( !PoolObjectSQL::name_is_valid(app->name, error_str) )
+    {
+        std::ostringstream oss;
+
+        oss << "imported-" << app->get_origin_id();
+        app->name = oss.str();
+
+        if ( !PoolObjectSQL::name_is_valid(app->name, error_str) )
+        {
+            error_str = "Cannot generate a valida name for app";
+            return -1;
+        }
+    }
+
+    MarketPlaceApp * mp_aux = get(app->name, 0, false);
+
+    if( mp_aux != 0 )
+    {
+        //Marketplace app already imported
+        delete app;
+        return 0;
+    }
+
+    return PoolSQL::allocate(app, error_str);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int MarketPlaceAppPool::update(PoolObjectSQL * objsql)
 {
     if (Nebula::instance().is_federation_slave())
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index aaf1a3b079..675b58b7c0 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -60,6 +60,7 @@ void MarketPlaceManagerDriver::monitor(int oid, const std::string& msg) const
 static void monitor_action(
         std::istringstream&  is,
         MarketPlacePool *    marketpool,
+        MarketPlaceAppPool * apppool,
         MarketPlaceManager * marketm,
         int                  id,
         const std::string&   result)
@@ -80,6 +81,15 @@ static void monitor_action(
         return;
     }
 
+    if (result != "SUCCESS")
+    {
+        oss << "Error monitoring datastore " << id << ": " << info64;
+        NebulaLog::log("MKP", Log::ERROR, oss);
+
+        delete info;
+        return;
+    }
+
     info = one_util::base64_decode(info64);
 
     if (info == 0)
@@ -91,14 +101,6 @@ static void monitor_action(
         return;
     }
 
-    if (result != "SUCCESS")
-    {
-        oss << "Error monitoring datastore " << id << ": " << *info;
-        NebulaLog::log("MKP", Log::ERROR, oss);
-
-        delete info;
-        return;
-    }
 
     Template monitor_data;
 
@@ -134,10 +136,29 @@ static void monitor_action(
 
     market->unlock();
 
+    std::vector<Attribute *> apps;
+    std::string err;
+
+    int num = monitor_data.get("APP", apps);
+
+    for (int i=0; i< num ; i++)
+    {
+        SingleAttribute * sa = static_cast<SingleAttribute *>(apps[i]);
+
+        if ( sa == 0 )
+        {
+            continue;
+        }
+
+        if ( apppool->import(sa->value(), id, name, err) == -1 )
+        {
+            NebulaLog::log("MKP", Log::ERROR, "Error importing app: " + err);
+        }
+    }
 
     oss << "Marketplace " << name << " (" << id << ") successfully monitored.";
 
-    NebulaLog::log("ImM", Log::DEBUG, oss);
+    NebulaLog::log("MKP", Log::DEBUG, oss);
 
     return;
 }
@@ -437,7 +458,7 @@ void MarketPlaceManagerDriver::protocol(const string& message) const
     }
     else if (action == "MONITOR")
     {
-        monitor_action(is, marketpool, marketm, id, result);
+        monitor_action(is, marketpool, apppool, marketm, id, result);
     }
     else if (action == "LOG")
     {
diff --git a/src/market_mad/remotes/one/monitor b/src/market_mad/remotes/one/monitor
index 356828d29f..9755865d26 100755
--- a/src/market_mad/remotes/one/monitor
+++ b/src/market_mad/remotes/one/monitor
@@ -24,7 +24,7 @@ require 'base64'
 class OneMarket
     ONE_MARKET_URL = 'http://marketplace.opennebula.systems/'
     AGENT          = 'Market Driver'
-    VERSION        = '../../VERSION'
+    VERSION        = File.dirname(__FILE__) + '/../../VERSION'
 
     def initialize(url=ONE_MARKET_URL)
         @url   = url
@@ -59,39 +59,49 @@ class OneMarket
         appstr  = ""
 
         applist['appliances'].each { |app|
-            tmpl =  "NAME        =\"#{app["name"]}\"\n"
-            tmpl << "IMPORT_ID   =\"#{app["_id"]["$oid"]}\"\n"
-            tmpl << "TYPE        = IMAGE\n"
-            tmpl << "PUBLISHER   = #{app["publisher"]}\n"
-            tmpl << "FORMAT      = #{app["format"]}\n"
-            tmpl << "DESCRIPTION = \"#{app["short_description"]}\"\n"
-            tmpl << "VERSION     = #{app["version"]}\n"
-            tmpl << "TAGS        = \"#{app["tags"].join(', ')}\"\n"
-            tmpl << "DATE        = #{app["creation_time"]}\n"
+            id     = app["_id"]["$oid"]
+            source = "#{@url}/appliance/#{id}/download/0"
+
+            tmpl = ""
+
+            print_var(tmpl, "NAME",        app["name"])
+            print_var(tmpl, "SOURCE",      source)
+            print_var(tmpl, "IMPORT_ID",   id)
+            print_var(tmpl, "ORIGIN_ID",   "-1")
+            print_var(tmpl, "TYPE",        "IMAGE")
+            print_var(tmpl, "PUBLISHER",   app["publisher"])
+            print_var(tmpl, "FORMAT",      app["format"])
+            print_var(tmpl, "DESCRIPTION", app["short_description"])
+            print_var(tmpl, "VERSION",     app["version"])
+            print_var(tmpl, "TAGS",        app["tags"].join(', '))
+            print_var(tmpl, "DATE",        app["creation_time"])
 
             if !app["files"].nil? && !app["files"][0].nil?
                 file = app["files"][0]
+                size = 0
 
-                tmpl << "SIZE = #{app["files"][0]["size"]}\n"
-                tmpl << "MD5   = #{app["files"][0]["md5"]}\n"
+                if (file["size"].to_i != 0)
+                    size = file["size"].to_i / (2**20)
+                end
+
+                print_var(tmpl, "SIZE", size)
+                print_var(tmpl, "MD5",  file["md5"])
 
                 tmpl64 = ""
-                tmpl64 << "DEV_PREFIX = #{file["dev_prefix"]}\n" if file["dev_prefix"]
-                tmpl64 << "DRIVER     = #{file["driver"]}\n" if file["driver"]
-                tmpl64 << "TYPE       = #{file["type"]}\n" if file["type"]
+                print_var(tmpl64, "DEV_PREFIX", file["dev_prefix"])
+                print_var(tmpl64, "DRIVER",     file["driver"])
+                print_var(tmpl64, "TYPE",       file["type"])
 
                 if !tmpl64.empty?
-                    tmpl << "APPTEMPLATE64 = \"#{Base64::strict_encode64(tmpl64)}\"\n"
+                    print_var(tmpl64, "APPTEMPLATE64", Base64::strict_encode64(tmpl64))
                 end
             end
 
             if !app["opennebula_template"].nil?
                 vmtmpl64 = template_to_str(JSON.parse(app["opennebula_template"]))
-                tmpl << "VMTEMPLATE64 = \"#{Base64::strict_encode64(vmtmpl64)}\"\n"
+                print_var(tmpl, "VMTEMPLATE64", Base64::strict_encode64(vmtmpl64))
             end
 
-            tmpl << "APPTEMPLATE64 = \"#{Base64::strict_encode64(tmpl64)}\"\n"
-
             appstr << "APP=\"#{Base64::strict_encode64(tmpl)}\"\n"
         }
 
@@ -100,6 +110,13 @@ class OneMarket
 
     private
 
+    def print_var(str, name, val)
+        return if val.nil?
+        return if val.class == String && val.empty?
+
+        str << "#{name}=\"#{val}\"\n"
+    end
+
     def template_to_str(thash)
         thash.collect do |key, value|
             next if value.nil? || value.empty?

From 66c135e34604fb58e7381b9c5153935f2c659f2d Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 28 Dec 2015 17:43:05 +0100
Subject: [PATCH 042/197] feature #4217: Fixes minor bugs

---
 src/market_mad/one_market.rb              | 3 ++-
 src/oca/ruby/opennebula/marketplaceapp.rb | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index 25dcb4856b..fdcbf3536d 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -47,7 +47,8 @@ class MarketPlaceDriver < OpenNebulaDriver
         :import  => "IMPORT",
         :delete  => "DELETE",
         :log     => "LOG",
-        :monitor => "MONITOR"
+        :monitor => "MONITOR",
+        :export  => "EXPORT"  #For Datastore export action
     }
 
     # XPATHs for driver messages
diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb
index a0e6b6c1fd..0e9359c1f9 100644
--- a/src/oca/ruby/opennebula/marketplaceapp.rb
+++ b/src/oca/ruby/opennebula/marketplaceapp.rb
@@ -197,6 +197,9 @@ module OpenNebula
 
                 return rc if OpenNebula.is_error?(rc)
 
+                image_id = image.id
+                vmtpl_id = -1
+
                 if !self['TEMPLATE/VMTEMPLATE64'].nil?
                     tmpl=Base64::decode64(self['TEMPLATE/VMTEMPLATE64'])
 
@@ -207,9 +210,11 @@ module OpenNebula
                     rc    = vmtpl.allocate(tmpl)
 
                     return rc if OpenNebula.is_error?(rc)
+
+                    vmtpl_id = vmtpl.id
                 end
 
-                return { :image => [image.id], :vmtemplate => [vmtpl.id] }
+                return { :image => [image_id], :vmtemplate => [vmtpl_id] }
             else
                 return Error.new("App type #{app.type_str} not supported")
             end

From 034943e6b1ecbe2610b4a69ee0d0d28cd011c523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 7 Jan 2016 16:58:54 +0100
Subject: [PATCH 043/197] Feature #4215: Filter VR leases in onevnet show

---
 include/AddressRange.h       |  4 +++-
 include/AddressRangePool.h   |  4 +++-
 include/VirtualNetwork.h     |  7 +++++--
 include/VirtualRouterPool.h  | 11 +++++++++++
 src/rm/RequestManagerInfo.cc | 18 +++++++++++++++++-
 src/vnm/AddressRange.cc      | 11 +++++++----
 src/vnm/AddressRangePool.cc  |  5 +++--
 src/vnm/VirtualNetwork.cc    | 11 ++++++-----
 8 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/include/AddressRange.h b/include/AddressRange.h
index c26b629827..7446febe9a 100644
--- a/include/AddressRange.h
+++ b/include/AddressRange.h
@@ -121,9 +121,11 @@ public:
      *      A vector containing just -1 means all VMs.
      *    @param vnet_ids list of VNET the user can access reservation info from.
      *      A vector containing just -1 means all VNETs.
+     *    @param vrs list of VRouter the user can access VNET usage info from.
+     *      A vector containing just -1 means all VRouters.
      */
     void to_xml(ostringstream &oss, const vector<int>& vms,
-        const vector<int>& vnets) const;
+        const vector<int>& vnets, const vector<int>& vrs) const;
 
     // *************************************************************************
     // Address allocation functions
diff --git a/include/AddressRangePool.h b/include/AddressRangePool.h
index 91d66f656a..7c2dc7ff5d 100644
--- a/include/AddressRangePool.h
+++ b/include/AddressRangePool.h
@@ -341,10 +341,12 @@ public:
      *      A vector containing just -1 means all VMs.
      *    @param vnet_ids list of VNET the user can access reservation info from.
      *      A vector containing just -1 means all VNETs.
+     *    @param vrs list of VRouter the user can access VNET usage info from.
+     *      A vector containing just -1 means all VRouters.
      *    @return the string with the XML
      */
     string& to_xml(string& sstream, bool extended, const vector<int>& vms,
-        const vector<int>& vnets) const;
+        const vector<int>& vnets, const vector<int>& vrs) const;
 
 private:
     /**
diff --git a/include/VirtualNetwork.h b/include/VirtualNetwork.h
index 1a431576fb..d4ba3ce8c2 100644
--- a/include/VirtualNetwork.h
+++ b/include/VirtualNetwork.h
@@ -409,10 +409,12 @@ public:
      *  A vector containing just -1 means all VMs.
      *  @param vnet_ids list of VNET the user can access reservation info from.
      *  A vector containing just -1 means all VNETs.
+     *  @param vrs list of VRouter the user can access reservation info from.
+     *  A vector containing just -1 means all VRouters.
      *  @return a reference to the generated string
      */
     string& to_xml_extended(string& xml, const vector<int>& vms,
-        const vector<int>& vnets) const;
+        const vector<int>& vnets, const vector<int>& vrs) const;
 
     /**
      *  Gets a string based attribute (single) from an address range. If the
@@ -527,7 +529,8 @@ private:
      *  @return a reference to the generated string
      */
     string& to_xml_extended(string& xml, bool extended,
-        const vector<int>& vm_ids, const vector<int>& vnet_oids) const;
+        const vector<int>& vm_ids, const vector<int>& vnet_oids,
+        const vector<int>& vr_ids) const;
 
     /**
      *  Rebuilds the object from an xml formatted string
diff --git a/include/VirtualRouterPool.h b/include/VirtualRouterPool.h
index b43075b9d3..495f5ae091 100644
--- a/include/VirtualRouterPool.h
+++ b/include/VirtualRouterPool.h
@@ -124,6 +124,17 @@ public:
         return VirtualRouter::bootstrap(_db);
     };
 
+    /**
+     *  Gets the IDs of objects matching the given SQL where string.
+     *    @param oids a vector that contains the IDs
+     *    @param where SQL clause
+     *    @return 0 on success
+     */
+    int search(vector<int>& oids, const string& where)
+    {
+        return PoolSQL::search(oids, VirtualRouter::table, where);
+    };
+
 private:
     /**
      *  Factory method to produce objects
diff --git a/src/rm/RequestManagerInfo.cc b/src/rm/RequestManagerInfo.cc
index 063a4b4ca6..443e1fee3a 100644
--- a/src/rm/RequestManagerInfo.cc
+++ b/src/rm/RequestManagerInfo.cc
@@ -166,12 +166,15 @@ void VirtualNetworkInfo::to_xml(RequestAttributes& att, PoolObjectSQL * object,
 {
     vector<int> vms;
     vector<int> vnets;
+    vector<int> vrs;
 
     string where_vnets;
     string where_vms;
+    string where_vrs;
 
     bool all_reservations;
     bool all_vms;
+    bool all_vrs;
 
     PoolObjectAuth perms;
 
@@ -185,6 +188,7 @@ void VirtualNetworkInfo::to_xml(RequestAttributes& att, PoolObjectSQL * object,
     {
         all_reservations = true;
         all_vms = true;
+        all_vrs = true;
     }
     else
     {
@@ -193,6 +197,9 @@ void VirtualNetworkInfo::to_xml(RequestAttributes& att, PoolObjectSQL * object,
 
         all_vms = RequestManagerPoolInfoFilter::use_filter(att,
                 PoolObjectSQL::VM, false, false, false, "", where_vms);
+
+        all_vrs = RequestManagerPoolInfoFilter::use_filter(att,
+                PoolObjectSQL::VROUTER, false, false, false, "", where_vrs);
     }
 
     if ( all_reservations == true )
@@ -213,5 +220,14 @@ void VirtualNetworkInfo::to_xml(RequestAttributes& att, PoolObjectSQL * object,
         Nebula::instance().get_vmpool()->search(vms, where_vms);
     }
 
-    static_cast<VirtualNetwork*>(object)->to_xml_extended(str, vms, vnets);
+    if ( all_vrs == true )
+    {
+        vrs.push_back(-1);
+    }
+    else
+    {
+        Nebula::instance().get_vrouterpool()->search(vrs, where_vrs);
+    }
+
+    static_cast<VirtualNetwork*>(object)->to_xml_extended(str, vms, vnets, vrs);
 };
diff --git a/src/vnm/AddressRange.cc b/src/vnm/AddressRange.cc
index e6b6cdf023..a6a5528d96 100644
--- a/src/vnm/AddressRange.cc
+++ b/src/vnm/AddressRange.cc
@@ -400,7 +400,7 @@ int AddressRange::from_vattr_db(VectorAttribute *vattr)
 /* -------------------------------------------------------------------------- */
 
 void AddressRange::to_xml(ostringstream &oss, const vector<int>& vms,
-        const vector<int>& vns) const
+        const vector<int>& vns, const vector<int>& vrs) const
 {
     const map<string,string>&          ar_attrs = attr->value();
     map<string,string>::const_iterator it;
@@ -411,6 +411,7 @@ void AddressRange::to_xml(ostringstream &oss, const vector<int>& vms,
 
     bool all_vms = (vms.size() == 1 && vms[0] == -1);
     bool all_vns = (vns.size() == 1 && vns[0] == -1);
+    bool all_vrs = (vrs.size() == 1 && vrs[0] == -1);
 
     oss << "<AR>";
 
@@ -512,9 +513,11 @@ void AddressRange::to_xml(ostringstream &oss, const vector<int>& vms,
             {
                 int oid = it->second & 0x00000000FFFFFFFFLL;
 
-                // TODO: all_vrouters?
-                lease.replace("VROUTER", oid);
-                is_in = true;
+                if (all_vrs || (find(vrs.begin(),vrs.end(),oid) != vrs.end()))
+                {
+                    lease.replace("VROUTER", oid);
+                    is_in = true;
+                }
             }
 
             if (!is_in)
diff --git a/src/vnm/AddressRangePool.cc b/src/vnm/AddressRangePool.cc
index 03324b788f..5965cd2e6b 100644
--- a/src/vnm/AddressRangePool.cc
+++ b/src/vnm/AddressRangePool.cc
@@ -229,7 +229,8 @@ int AddressRangePool::rm_ar(unsigned int ar_id, string& error_msg)
 /* -------------------------------------------------------------------------- */
 
 string& AddressRangePool::to_xml(string& sstream, bool extended,
-    const vector<int>& vms, const vector<int>& vnets) const
+    const vector<int>& vms, const vector<int>& vnets,
+    const vector<int>& vrs) const
 {
     if (extended)
     {
@@ -240,7 +241,7 @@ string& AddressRangePool::to_xml(string& sstream, bool extended,
 
         for (it=ar_pool.begin(); it!=ar_pool.end(); it++)
         {
-            it->second->to_xml(oss, vms, vnets);
+            it->second->to_xml(oss, vms, vnets, vrs);
         }
 
         oss << "</AR_POOL>";
diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc
index ff12ebf75b..4a3881b132 100644
--- a/src/vnm/VirtualNetwork.cc
+++ b/src/vnm/VirtualNetwork.cc
@@ -399,23 +399,24 @@ string& VirtualNetwork::to_xml(string& xml) const
 {
     const vector<int> empty;
 
-    return to_xml_extended(xml,false, empty, empty);
+    return to_xml_extended(xml,false, empty, empty, empty);
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
 string& VirtualNetwork::to_xml_extended(string& xml, const vector<int>& vms,
-        const vector<int>& vnets) const
+        const vector<int>& vnets, const vector<int>& vrs) const
 {
-    return to_xml_extended(xml,true, vms, vnets);
+    return to_xml_extended(xml,true, vms, vnets, vrs);
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
 string& VirtualNetwork::to_xml_extended(string& xml, bool extended,
-    const vector<int>& vms, const vector<int>& vnets) const
+    const vector<int>& vms, const vector<int>& vnets,
+    const vector<int>& vrs) const
 {
     ostringstream   os;
 
@@ -470,7 +471,7 @@ string& VirtualNetwork::to_xml_extended(string& xml, bool extended,
 
     os  << obj_template->to_xml(template_xml);
 
-    os  << ar_pool.to_xml(leases_xml, extended, vms, vnets);
+    os  << ar_pool.to_xml(leases_xml, extended, vms, vnets, vrs);
 
     os << "</VNET>";
 

From cb8d84849ef9916ecd11f2a29f246d31cbe5e804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 7 Jan 2016 18:16:18 +0100
Subject: [PATCH 044/197] Feature #4215: Show VM floating IPs in onevm and
 sunstone

---
 src/cli/one_helper/onevm_helper.rb            | 59 ++++++++-----------
 src/sunstone/public/app/opennebula/vm.js      | 25 ++++----
 .../public/app/tabs/vms-tab/panels/network.js | 26 ++++++--
 3 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index 6e4de11eb5..ce53659a2d 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -170,16 +170,11 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
 
         vm_nics.each do |nic|
-            if nic.has_key?("IP")
-                ips.push(nic["IP"])
-            end
-
-            if nic.has_key?("IP6_GLOBAL")
-                ips.push(nic["IP6_GLOBAL"])
-            end
-
-            if nic.has_key?("IP6_ULA")
-                ips.push(nic["IP6_ULA"])
+            ["IP", "IP6_GLOBAL", "IP6_ULA",
+             "VROUTER_IP", "VROUTER_IP6_GLOBAL", "VROUTER_IP6_ULA"].each do |attr|
+                if nic.has_key?(attr)
+                    ips.push(nic[attr])
+                end
             end
         end
 
@@ -735,37 +730,31 @@ in the frontend machine.
 
                 next if nic.has_key?("CLI_DONE")
 
-                if nic.has_key?("IP6_LINK")
-                    shown_ips << nic["IP6_LINK"]
+                ["IP6_LINK", "IP6_ULA", "IP6_GLOBAL"].each do |attr|
+                    if nic.has_key?(attr)
+                        shown_ips << nic[attr]
 
-                    ip6_link = {"IP"           => nic.delete("IP6_LINK"),
-                                "CLI_DONE"     => true,
-                                "DOUBLE_ENTRY" => true}
-                    vm_nics.insert(array_id+1,ip6_link)
+                        ipstr = {"IP"           => nic.delete(attr),
+                                 "CLI_DONE"     => true,
+                                 "DOUBLE_ENTRY" => true}
+                        vm_nics.insert(array_id+1,ipstr)
 
-                    array_id += 1
+                        array_id += 1
+                    end
                 end
 
-                if nic.has_key?("IP6_ULA")
-                    shown_ips << nic["IP6_ULA"]
+                ["VROUTER_IP", "VROUTER_IP6_LINK",
+                 "VROUTER_IP6_ULA", "VROUTER_IP6_GLOBAL"].each do |attr|
+                    if nic.has_key?(attr)
+                        shown_ips << nic[attr]
 
-                    ip6_link = {"IP"           => nic.delete("IP6_ULA"),
-                                "CLI_DONE"     => true,
-                                "DOUBLE_ENTRY" => true}
-                    vm_nics.insert(array_id+1,ip6_link)
+                        ipstr = {"IP"           => nic.delete(attr) + " (VRouter)",
+                                 "CLI_DONE"     => true,
+                                 "DOUBLE_ENTRY" => true}
+                        vm_nics.insert(array_id+1,ipstr)
 
-                    array_id += 1
-                end
-
-                if nic.has_key?("IP6_GLOBAL")
-                    shown_ips << nic["IP6_GLOBAL"]
-
-                    ip6_link = {"IP"           => nic.delete("IP6_GLOBAL"),
-                                "CLI_DONE"     => true,
-                                "DOUBLE_ENTRY" => true}
-                    vm_nics.insert(array_id+1,ip6_link)
-
-                    array_id += 1
+                        array_id += 1
+                    end
                 end
 
                 shown_ips << nic["IP"] if nic.has_key?("IP")
diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js
index 57b8533022..6ffb656c97 100644
--- a/src/sunstone/public/app/opennebula/vm.js
+++ b/src/sunstone/public/app/opennebula/vm.js
@@ -261,6 +261,15 @@ define(function(require) {
     'SL_PRIMARYIPADDRESS'
   ];
 
+  var NIC_IP_ATTRS = [
+    "IP",
+    "IP6_GLOBAL",
+    "IP6_ULA",
+    "VROUTER_IP",
+    "VROUTER_IP6_GLOBAL",
+    "VROUTER_IP6_ULA"
+  ];
+
   var EXTERNAL_NETWORK_ATTRIBUTES = [
     'GUEST_IP',
     'GUEST_IP_ADDRESSES',
@@ -662,17 +671,11 @@ define(function(require) {
         }
 
         $.each(nic, function(index, value) {
-          if (value.IP) {
-            ips.push(value.IP);
-          }
-
-          if (value.IP6_GLOBAL) {
-            ips.push(value.IP6_GLOBAL);
-          }
-
-          if (value.IP6_ULA) {
-            ips.push(value.IP6_ULA);
-          }
+          $.each(NIC_IP_ATTRS, function(j, attr){
+            if (value[attr]) {
+              ips.push(value[attr]);
+            }
+          });
         });
       }
     }
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/network.js b/src/sunstone/public/app/tabs/vms-tab/panels/network.js
index f4c1dcc7a2..8f79b9751c 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/network.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/network.js
@@ -262,13 +262,27 @@ define(function(require) {
           });
         }
 
+        function ipTr(attr){
+          var v = "--";
+
+          if (nic[attr] != undefined){
+            v = nic[attr];
+
+            if (nic["VROUTER_"+attr] != undefined){
+              v += ("<br/>" + nic["VROUTER_"+attr] + Locale.tr(" (VRouter)"));
+            }
+          }
+
+          return v;
+        }
+
         nic_dt_data.push({
           NIC_ID : nic.NIC_ID,
           NETWORK : nic.NETWORK,
-          IP : (nic.IP ? nic.IP : "--"),
+          IP : ipTr("IP"),
           MAC : nic.MAC,
-          IP6_ULA : (nic.IP6_ULA ? nic.IP6_ULA : "--"),
-          IP6_GLOBAL : (nic.IP6_GLOBAL ? nic.IP6_GLOBAL : "--"),
+          IP6_ULA : ipTr("IP6_ULA"),
+          IP6_GLOBAL : ipTr("IP6_GLOBAL"),
           ACTIONS : actions,
           SECURITY_GROUP_RULES : secgroups
         });
@@ -287,10 +301,10 @@ define(function(require) {
         },
         {"data": "NIC_ID",     "defaultContent": ""},
         {"data": "NETWORK",    "defaultContent": ""},
-        {"data": "IP",         "defaultContent": ""},
+        {"data": "IP",         "defaultContent": "", "class": "nowrap"},
         {"data": "MAC",        "defaultContent": ""},
-        {"data": "IP6_ULA",    "defaultContent": ""},
-        {"data": "IP6_GLOBAL", "defaultContent": ""},
+        {"data": "IP6_ULA",    "defaultContent": "", "class": "nowrap"},
+        {"data": "IP6_GLOBAL", "defaultContent": "", "class": "nowrap"},
         {"data": "ACTIONS",    "defaultContent": "", "orderable": false},
         {"defaultContent": "", "orderable": false}
       ],

From 19a58bfbae252c9bb97c13ba17d88e6abd27f9c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 8 Jan 2016 11:38:29 +0100
Subject: [PATCH 045/197] Feature #4215: Add support for VROUTER_HOOKS

---
 include/VirtualRouterPool.h |  9 ++++++++-
 share/etc/oned.conf         |  1 +
 src/nebula/Nebula.cc        | 19 ++++++++++++-------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/include/VirtualRouterPool.h b/include/VirtualRouterPool.h
index 495f5ae091..8dd22e33d6 100644
--- a/include/VirtualRouterPool.h
+++ b/include/VirtualRouterPool.h
@@ -27,7 +27,14 @@ class VirtualRouterPool : public PoolSQL
 {
 public:
 
-    VirtualRouterPool(SqlDB * db) : PoolSQL(db, VirtualRouter::table, true, true){};
+    VirtualRouterPool(
+            SqlDB *                     db,
+            vector<const Attribute *>   hook_mads,
+            const string&               remotes_location)
+                : PoolSQL(db, VirtualRouter::table, true, true)
+    {
+        register_hooks(hook_mads, remotes_location);
+    };
 
     ~VirtualRouterPool(){};
 
diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index eb239fa2c9..da7f3621c9 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -728,6 +728,7 @@ DATASTORE_MAD = [
 #               - NO, The hook is executed in the OpenNebula server (default)
 #
 # Virtual Network (VNET_HOOK)
+# Virtual Router (VROUTER_HOOK)
 # User (USER_HOOK)
 # Group (GROUP_HOOK)
 # Image (IMAGE_HOOK)
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index db18d4d736..231c389931 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -473,6 +473,7 @@ void Nebula::start(bool bootstrap_only)
 
         vector<const Attribute *> vm_hooks;
         vector<const Attribute *> host_hooks;
+        vector<const Attribute *> vrouter_hooks;
         vector<const Attribute *> vnet_hooks;
         vector<const Attribute *> user_hooks;
         vector<const Attribute *> group_hooks;
@@ -492,14 +493,14 @@ void Nebula::start(bool bootstrap_only)
         docpool = new DocumentPool(db);
         zonepool= new ZonePool(db, is_federation_slave());
         vdcpool = new VdcPool(db, is_federation_slave());
-        vrouterpool = new VirtualRouterPool(db);
 
-        nebula_configuration->get("VM_HOOK", vm_hooks);
-        nebula_configuration->get("HOST_HOOK",  host_hooks);
-        nebula_configuration->get("VNET_HOOK",  vnet_hooks);
-        nebula_configuration->get("USER_HOOK",  user_hooks);
-        nebula_configuration->get("GROUP_HOOK", group_hooks);
-        nebula_configuration->get("IMAGE_HOOK", image_hooks);
+        nebula_configuration->get("VM_HOOK",        vm_hooks);
+        nebula_configuration->get("HOST_HOOK",      host_hooks);
+        nebula_configuration->get("VROUTER_HOOK",   vrouter_hooks);
+        nebula_configuration->get("VNET_HOOK",      vnet_hooks);
+        nebula_configuration->get("USER_HOOK",      user_hooks);
+        nebula_configuration->get("GROUP_HOOK",     group_hooks);
+        nebula_configuration->get("IMAGE_HOOK",     image_hooks);
 
         nebula_configuration->get("VM_RESTRICTED_ATTR", vm_restricted_attrs);
         nebula_configuration->get("IMAGE_RESTRICTED_ATTR", img_restricted_attrs);
@@ -565,6 +566,10 @@ void Nebula::start(bool bootstrap_only)
                               remotes_location,
                               host_expiration);
 
+        vrouterpool = new VirtualRouterPool(db,
+                                            vrouter_hooks,
+                                            remotes_location);
+
         nebula_configuration->get("MAC_PREFIX", mac_prefix);
         nebula_configuration->get("NETWORK_SIZE", size);
 

From 5523c818f07241a4c86a52049d1edec27deac728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 8 Jan 2016 15:53:22 +0100
Subject: [PATCH 046/197] Feature #4215: Select floating IP for each NIC in
 sunstone wizard

---
 src/sunstone/public/app/tabs/provision-tab.js |  5 +-
 .../tabs/vrouters-tab/form-panels/create.js   | 12 +--
 .../form-panels/create/wizard.hbs             | 11 ---
 src/sunstone/public/app/utils/nics-section.js | 97 +++++++++++++++----
 4 files changed, 83 insertions(+), 42 deletions(-)

diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js
index 71bf4b3151..df2faa79dc 100644
--- a/src/sunstone/public/app/tabs/provision-tab.js
+++ b/src/sunstone/public/app/tabs/provision-tab.js
@@ -1543,13 +1543,12 @@ define(function(require) {
 
               if (network_attrs.length > 0) {
                 NicsSection.generate_provision_network_accordion(
-                  $(".provision_network_selector", context), true);
+                  $(".provision_network_selector", context), {hide_add_button:true});
 
                 $.each(network_attrs, function(index, vnet_attr){
                   NicsSection.generate_provision_network_table(
                     $(".provision_nic_accordion", context),
-                    null,
-                    vnet_attr);
+                    {vnet_attr: vnet_attr});
                 });
               }
 
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index b227966253..02430addf8 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -98,7 +98,7 @@ define(function(require) {
   function _setup(context) {
     var that = this;
 
-    NicsSection.insert({}, $(".nicsContext", context));
+    NicsSection.insert({}, $(".nicsContext", context), {floatingIP: true});
 
     this.templatesTable.initialize();
 
@@ -129,7 +129,7 @@ define(function(require) {
       $('#vm_name', context).val("vr-"+$(this).val()+"-%i");
     });
 
-    Tips.setup();
+    Tips.setup(context);
 
     return false;
   }
@@ -139,17 +139,9 @@ define(function(require) {
 
     var nics = NicsSection.retrieve($(".nicsContext", context));
     if (nics.length > 0) {
-      // TODO: Instead of a global checkbox, each vnet should have
-      // its own checkbox to choose floating IP or not
-      $.each(nics, function(){
-        this["FLOATING_IP"] = virtual_router_json["FLOATING_IP"];
-      });
-
       virtual_router_json.NIC = nics;
     }
 
-    delete virtual_router_json["FLOATING_IP"];
-
     var tmplId = this.templatesTable.retrieveResourceTableSelect();
 
     if (this.action == "create") {
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
index bb2afc7ae7..264625279a 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
@@ -34,17 +34,6 @@
           <textarea type="text" wizard_field="DESCRIPTION" id="DESCRIPTION" name="DESCRIPTION"/>
         </div>
       </div>
-      <div class="row">
-        <div class="medium-6 columns">
-          <label for="floating_ip">
-            <input type="checkbox" wizard_field="FLOATING_IP" value="YES" name="floating_ip" id="floating_ip" />
-            {{tr "Floating IPs"}}
-            <span class="tip">
-              {{tr "If checked, each Virtual Machine will have a floating IP added to its network interface."}}
-            </span>
-          </label>
-        </div>
-      </div>
     </div>
     <div class="row">
       <div class="large-12 columns nicsContext">
diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js
index 5d44f804af..f8b63e6ff7 100644
--- a/src/sunstone/public/app/utils/nics-section.js
+++ b/src/sunstone/public/app/utils/nics-section.js
@@ -16,6 +16,7 @@
 
 define(function(require) {
   var Locale = require('utils/locale');
+  var Tips = require('utils/tips');
   var Notifier = require('utils/notifier');
   var OpenNebula = require('opennebula');
 
@@ -29,7 +30,20 @@ define(function(require) {
     'generate_provision_network_table': _generate_provision_network_table
   }
 
-  function _insert(template_json, context) {
+  /**
+   * Inserts the section into the context container
+   * @param  {Object} template_json VM Template
+   * @param  {object} context       JQuery selector
+   * @param  {object} options       Options
+   *                                - hide_add_button {bool}
+   *                                - floatingIPs {bool}: true to show the
+   *                                floating IP checkbox
+   */
+  function _insert(template_json, context, options) {
+    if (options == undefined){
+      options = {};
+    }
+
     try {
       if (template_json.VMTEMPLATE.TEMPLATE.SUNSTONE_NETWORK_SELECT != "NO") {
         var template_nic = template_json.VMTEMPLATE.TEMPLATE.NIC
@@ -40,17 +54,20 @@ define(function(require) {
             nics = [template_nic]
 
         _generate_provision_network_accordion(
-          $(".provision_network_selector", context));
+          $(".provision_network_selector", context), options);
 
         $.each(nics, function(index, nic) {
+          var opt = $.extend({}, options);
+          opt.nic = nic;
+
           _generate_provision_network_table(
             $(".provision_nic_accordion", context),
-            nic);
+            opt);
         })
       }
     } catch(err) {
       _generate_provision_network_accordion(
-        $(".provision_network_selector", context));
+        $(".provision_network_selector", context), options);
     }
   }
 
@@ -69,6 +86,10 @@ define(function(require) {
       }
 
       if (nic) {
+        if ($("input.floating_ip", $(this)).prop("checked")){
+          nic["FLOATING_IP"] = "YES";
+        }
+
         nics.push(nic);
       }
     });
@@ -76,14 +97,27 @@ define(function(require) {
     return nics
   }
 
-  function _generate_provision_network_table(context, nic, vnet_attr) {
+  /**
+   * @param  {object} context       JQuery selector
+   * @param  {object} options       Options
+   *                                - nic {object}
+   *                                - vnet_attr {object}
+   *                                - hide_add_button {bool}
+   *                                - floatingIPs {bool}: true to show the
+   *                                floating IP checkbox
+   */
+  function _generate_provision_network_table(context, options) {
     context.off();
     var nic_span;
 
-    if (nic) {
-      nic_span = '<span class="selected_network" template_nic=\'' + JSON.stringify(nic) + '\'>' +
+    if (options == undefined){
+      options = {};
+    }
+
+    if (options.nic) {
+      nic_span = '<span class="selected_network" template_nic=\'' + JSON.stringify(options.nic) + '\'>' +
           '<span style="color: #999; font-size: 14px">' + Locale.tr("INTERFACE") + "</span>&emsp;&emsp;" +
-          '<span style="color: #777;">' + (nic.NETWORK || nic.NETWORK_ID) + "</span>" +
+          '<span style="color: #777;">' + (options.nic.NETWORK || options.nic.NETWORK_ID) + "</span>" +
         '</span>' +
         '<span class="has-tip right provision_remove_nic" style="cursor: pointer;">' +
           '<i class="fa fa-times"/>' +
@@ -91,9 +125,9 @@ define(function(require) {
         '<span class="has-tip right" style="cursor: pointer; margin-right:10px">' +
           '<i class="fa fa-pencil"/>' +
         '</span>';
-    } else if (vnet_attr) {
-      nic_span = '<span style="color: #777; font-size: 16px">' + vnet_attr.description + "</span><br>" +
-        '<span class="selected_network only-not-active" attr_name=\'' + vnet_attr.name + '\' style="color: #777;">' +
+    } else if (options.vnet_attr) {
+      nic_span = '<span style="color: #777; font-size: 16px">' + options.vnet_attr.description + "</span><br>" +
+        '<span class="selected_network only-not-active" attr_name=\'' + options.vnet_attr.name + '\' style="color: #777;">' +
           '<span style="color: #999; font-size: 14px">' + Locale.tr("INTERFACE") + "</span>&emsp;&emsp;" +
           '<span class="button radius small">' + Locale.tr("Select a Network") + "</span>" +
         '</span>' +
@@ -212,13 +246,30 @@ define(function(require) {
     })
 
     dd_context.on("click", ".provision-pricing-table.more-than-one" , function() {
-      $(".selected_network", dd_context).html(
-          '<span style="color: #999; font-size: 14px">' + Locale.tr("INTERFACE") + "</span>&emsp;&emsp;" +
-          '<span style="color: #777;">' + $(this).attr("opennebula_name") + "</span>");
+      var html = 
+        '<span style="color: #999; font-size: 14px">' + Locale.tr("INTERFACE") + "</span>&emsp;&emsp;" +
+        '<span style="color: #777;">' + $(this).attr("opennebula_name") + "</span>";
 
+      if (options.floatingIP){
+        html +=
+          '<br/>' +
+          '<div class="noclick">' +
+            '<label style="color: #777; font-size: 16px">' +
+              '<input type="checkbox" class="floating_ip" />' +
+              Locale.tr("Floating IP") +
+              '<span class="tip">' +
+                Locale.tr("If checked, each Virtual Machine will have a floating IP added to its network interface.") +
+              '</span>' +
+            '</label>' +
+          '</div>';
+      }
+
+      $(".selected_network", dd_context).html(html);
       $(".selected_network", dd_context).attr("opennebula_id", $(this).attr("opennebula_id"))
       $(".selected_network", dd_context).removeAttr("template_nic")
 
+      Tips.setup($(".selected_network", dd_context));
+
       $('a', dd_context).first().trigger("click");
     })
 
@@ -227,14 +278,24 @@ define(function(require) {
       return false;
     });
 
-    if (!nic && !vnet_attr) {
+    dd_context.on("click", ".noclick" , function(event) {
+      event.stopPropagation();
+    });
+
+    if (!options.nic && !options.vnet_attr) {
       $('a', dd_context).trigger("click");
     }
 
     update_provision_networks_datatable(provision_networks_datatable);
   }
 
-  function _generate_provision_network_accordion(context, hide_add_button) {
+  /**
+   * @param  {object} context       JQuery selector
+   * @param  {object} options       Options
+   *                                - hide_add_button {bool}
+   *                                - floatingIP {bool}
+   */
+  function _generate_provision_network_accordion(context, options) {
     context.off();
     context.html(
       '<br>' +
@@ -254,7 +315,7 @@ define(function(require) {
           '<dl class="accordion provision_nic_accordion" data-accordion="provision_accordion_' + provision_nic_accordion_id + '">' +
           '</dl>' +
           '<br>' +
-          '<a class="button radius secondary provision_add_network_interface" style="width:inherit; padding: 1rem; color: #555; ' + (hide_add_button ? 'display:none;' : '') + '">' +
+          '<a class="button radius secondary provision_add_network_interface" style="width:inherit; padding: 1rem; color: #555; ' + (options.hide_add_button ? 'display:none;' : '') + '">' +
             Locale.tr("Add another Network Interface") +
           '</a>' +
         '</div>' +
@@ -264,7 +325,7 @@ define(function(require) {
     provision_nic_accordion_id += 1;
 
     $(".provision_add_network_interface", context).on("click", function() {
-      _generate_provision_network_table($(".accordion", context));
+      _generate_provision_network_table($(".accordion", context), options);
     })
 
     $(document).foundation();

From 166e0fd586e8f63900e61177a480c2e160cbb5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 8 Jan 2016 16:37:09 +0100
Subject: [PATCH 047/197] Feature #4215: Remove vrouter clone action

---
 src/cli/onevrouter                            |  19 ---
 src/oca/ruby/opennebula/virtual_router.rb     |  16 ---
 src/sunstone/etc/sunstone-views/admin.yaml    |   1 -
 .../etc/sunstone-views/admin_vcenter.yaml     |   1 -
 src/sunstone/etc/sunstone-views/user.yaml     |   1 -
 .../OpenNebulaJSON/VirtualRouterJSON.rb       |   5 -
 .../public/app/opennebula/virtualrouter.js    |   5 -
 src/sunstone/public/app/tabs/vrouters-tab.js  |   1 -
 .../public/app/tabs/vrouters-tab/actions.js   |  20 ----
 .../public/app/tabs/vrouters-tab/buttons.js   |   5 -
 .../app/tabs/vrouters-tab/dialogs/clone.js    | 113 ------------------
 .../vrouters-tab/dialogs/clone/dialogId.js    |  19 ---
 .../tabs/vrouters-tab/dialogs/clone/html.hbs  |  45 -------
 13 files changed, 251 deletions(-)
 delete mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone.js
 delete mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/dialogId.js
 delete mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/html.hbs

diff --git a/src/cli/onevrouter b/src/cli/onevrouter
index a8ea141932..cd3998a738 100755
--- a/src/cli/onevrouter
+++ b/src/cli/onevrouter
@@ -95,25 +95,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-# TODO: implement or remove
-=begin
-    clone_desc = <<-EOT.unindent
-        Creates a new Virtual Router from an existing one
-    EOT
-
-    command :clone, clone_desc, :vrouterid, :name do
-        helper.perform_action(args[0],options,"cloned") do |t|
-            res = t.clone(args[1])
-
-            if !OpenNebula.is_error?(res)
-                puts "ID: #{res}"
-            else
-                puts res.message
-            end
-        end
-    end
-=end
-
     delete_desc = <<-EOT.unindent
         Deletes the given Virtual Router
     EOT
diff --git a/src/oca/ruby/opennebula/virtual_router.rb b/src/oca/ruby/opennebula/virtual_router.rb
index fb6f11970d..dfa8646be3 100644
--- a/src/oca/ruby/opennebula/virtual_router.rb
+++ b/src/oca/ruby/opennebula/virtual_router.rb
@@ -30,8 +30,6 @@ module OpenNebula
             :delete      => "vrouter.delete",
             :chown       => "vrouter.chown",
             :chmod       => "vrouter.chmod",
-# TODO: remove or implement
-#            :clone       => "vrouter.clone",
             :rename      => "vrouter.rename"
         }
 
@@ -125,21 +123,7 @@ module OpenNebula
             super(VIRTUAL_ROUTER_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
                 group_m, group_a, other_u, other_m, other_a)
         end
-=begin
-        # Clones this VirtualRouter into a new one
-        #
-        # @param [String] name for the new VirtualRouter.
-        #
-        # @return [Integer, OpenNebula::Error] The new VirtualRouter ID in case
-        #   of success, Error otherwise
-        def clone(name)
-            return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(VIRTUAL_ROUTER_METHODS[:clone], @pe_id, name)
-
-            return rc
-        end
-=end
         # Renames this VirtualRouter
         #
         # @param name [String] New name for the VirtualRouter.
diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 25022e6d1b..b6f9ec4803 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -451,7 +451,6 @@ tabs:
             VirtualRouter.chown: true
             VirtualRouter.chgrp: true
             VirtualRouter.chmod: true
-            VirtualRouter.clone_dialog: true
             VirtualRouter.delete: true
     marketplace-tab:
         panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 74a2d5c534..11b33ba05e 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -445,7 +445,6 @@ tabs:
             VirtualRouter.chown: true
             VirtualRouter.chgrp: true
             VirtualRouter.chmod: true
-            VirtualRouter.clone_dialog: true
             VirtualRouter.delete: true
     marketplace-tab:
         panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 54f41c0271..fda3738a5e 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -446,7 +446,6 @@ tabs:
             VirtualRouter.chown: true
             VirtualRouter.chgrp: true
             VirtualRouter.chmod: true
-            VirtualRouter.clone_dialog: true
             VirtualRouter.delete: true
     marketplace-tab:
         panel_tabs:
diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
index 6b584e8b26..c850af9fbd 100644
--- a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
@@ -47,7 +47,6 @@ module OpenNebulaJSON
                  when "update"      then self.update(action_hash['params'])
                  when "chown"       then self.chown(action_hash['params'])
                  when "chmod"       then self.chmod_json(action_hash['params'])
-                 when "clone"       then self.clone(action_hash['params'])
                  when "rename"      then self.rename(action_hash['params'])
                  else
                      error_msg = "#{action_hash['perform']} action not " <<
@@ -80,10 +79,6 @@ module OpenNebulaJSON
             end
         end
 
-        def clone(params=Hash.new)
-            super(params['name'])
-        end
-
         def rename(params=Hash.new)
             super(params['name'])
         end
diff --git a/src/sunstone/public/app/opennebula/virtualrouter.js b/src/sunstone/public/app/opennebula/virtualrouter.js
index 487b72ed7e..b990486a53 100644
--- a/src/sunstone/public/app/opennebula/virtualrouter.js
+++ b/src/sunstone/public/app/opennebula/virtualrouter.js
@@ -48,11 +48,6 @@ define(function(require) {
       var action_obj = {"template_raw" : params.data.extra_param};
       OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj);
     },
-    "clone" : function(params) {
-      var name = params.data.extra_param ? params.data.extra_param : "";
-      var action_obj = {"name" : name};
-      OpenNebulaAction.simple_action(params, RESOURCE, "clone", action_obj);
-    },
     "rename" : function(params) {
       var action_obj = params.data.extra_param;
       OpenNebulaAction.simple_action(params, RESOURCE, "rename", action_obj);
diff --git a/src/sunstone/public/app/tabs/vrouters-tab.js b/src/sunstone/public/app/tabs/vrouters-tab.js
index aac508e532..6e83e0b4df 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab.js
@@ -24,7 +24,6 @@ define(function(require) {
   var DATATABLE_ID = "dataTableVirtualRouters";
 
   var _dialogs = [
-    require('./vrouters-tab/dialogs/clone')
   ];
 
   var _panels = [
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/actions.js b/src/sunstone/public/app/tabs/vrouters-tab/actions.js
index b239569381..5801b0ca1f 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/actions.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/actions.js
@@ -26,7 +26,6 @@ define(function(require) {
   var XML_ROOT = "VROUTER";
   var TAB_ID = require('./tabId');
   var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId');
-  var CLONE_DIALOG_ID = require('./dialogs/clone/dialogId');
 
   var _commonActions = new CommonActions(OpenNebulaResource, RESOURCE, TAB_ID, XML_ROOT);
 
@@ -45,25 +44,6 @@ define(function(require) {
     "VirtualRouter.update_template" : _commonActions.updateTemplate(),
     "VirtualRouter.update_dialog" : _commonActions.checkAndShowUpdate(),
     "VirtualRouter.show_to_update" : _commonActions.showUpdate(CREATE_DIALOG_ID),
-
-    "VirtualRouter.clone_dialog" : {
-      type: "custom",
-      call: function(){
-        Sunstone.getDialog(CLONE_DIALOG_ID).show();
-      }
-    },
-
-    "VirtualRouter.clone" : {
-      type: "single",
-      call: OpenNebulaResource.clone,
-      callback: function(request, response) {
-        Sunstone.getDialog(CLONE_DIALOG_ID).hide();
-        Sunstone.getDialog(CLONE_DIALOG_ID).reset();
-        Sunstone.runAction('VirtualRouter.refresh');
-      },
-      error: Notifier.onError,
-      notify: true
-    }
   };
 
   return _actions;
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
index 305e5190bc..d376ffd1f3 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js
@@ -41,11 +41,6 @@ define(function(require) {
       select: "Group",
       tip: Locale.tr("Select the new group")+":"
     },
-    "VirtualRouter.clone_dialog" : {
-      type: "action",
-      layout: "main",
-      text: Locale.tr("Clone")
-    },
     "VirtualRouter.delete" : {
       type: "confirm",
       layout: "del",
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone.js
deleted file mode 100644
index ab74201251..0000000000
--- a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require) {
-  /*
-    DEPENDENCIES
-   */
-
-  var BaseDialog = require('utils/dialogs/dialog');
-  var TemplateHTML = require('hbs!./clone/html');
-  var Sunstone = require('sunstone');
-  var Notifier = require('utils/notifier');
-  var Locale = require('utils/locale');
-  var OpenNebulaVirtualRouter = require('opennebula/virtualrouter');
-
-  /*
-    CONSTANTS
-   */
-
-  var DIALOG_ID = require('./clone/dialogId');
-  var TAB_ID = require('../tabId');
-
-  /*
-    CONSTRUCTOR
-   */
-
-  function Dialog() {
-    this.dialogId = DIALOG_ID;
-
-    BaseDialog.call(this);
-  }
-
-  Dialog.DIALOG_ID = DIALOG_ID;
-  Dialog.prototype = Object.create(BaseDialog.prototype);
-  Dialog.prototype.constructor = Dialog;
-  Dialog.prototype.html = _html;
-  Dialog.prototype.onShow = _onShow;
-  Dialog.prototype.setup = _setup;
-
-  return Dialog;
-
-  /*
-    FUNCTION DEFINITIONS
-   */
-
-  function _html() {
-    return TemplateHTML({
-      'dialogId': this.dialogId
-    });
-  }
-
-  function _setup(context) {
-    var that = this;
-
-    context.foundation('abide', 'reflow');
-    context.off('invalid.fndtn.abide', '#' + DIALOG_ID + 'Form');
-    context.off('valid.fndtn.abide', '#' + DIALOG_ID + 'Form');
-
-    context.on('invalid.fndtn.abide', '#' + DIALOG_ID + 'Form', function(e) {
-      Notifier.notifyError(Locale.tr("One or more required fields are missing or malformed."));
-    }).on('valid.fndtn.abide', '#' + DIALOG_ID + 'Form', function(e) {
-      var name = $('input', this).val();
-      var sel_elems = Sunstone.getDataTable(TAB_ID).elements();
-
-      if (sel_elems.length > 1){
-        for (var i=0; i< sel_elems.length; i++)
-          //use name as prefix if several items selected
-          Sunstone.runAction('VirtualRouter.clone',
-            sel_elems[i],
-            name + OpenNebulaVirtualRouter.getName(sel_elems[i]));
-      } else {
-        Sunstone.runAction('VirtualRouter.clone',sel_elems[0],name);
-      }
-
-      return false;
-    });
-
-    return false;
-  }
-
-  function _onShow(context) {
-    var sel_elems = Sunstone.getDataTable(TAB_ID).elements();
-
-    //show different text depending on how many elements are selected
-    if (sel_elems.length > 1) {
-      $('.clone_one', context).hide();
-      $('.clone_several', context).show();
-      $('input',context).val('Copy of ');
-    } else {
-      $('.clone_one', context).show();
-      $('.clone_several', context).hide();
-
-      $('input',context).val('Copy of ' + OpenNebulaVirtualRouter.getName(sel_elems[0]));
-    }
-
-    $("input[name='name']",context).focus();
-
-    return false;
-  }
-});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/dialogId.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/dialogId.js
deleted file mode 100644
index 611c0526b3..0000000000
--- a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/dialogId.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require){
-  return 'cloneVirtualRouterDialog';
-});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/html.hbs
deleted file mode 100644
index 3a6552a959..0000000000
--- a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/clone/html.hbs
+++ /dev/null
@@ -1,45 +0,0 @@
-{{! -------------------------------------------------------------------------- }}
-{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
-{{!                                                                            }}
-{{! 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.                                             }}
-{{! -------------------------------------------------------------------------- }}
-
-<div id="{{dialogId}}" class="reveal-modal" role="dialog" data-reveal >
-  <div class="row">
-    <h3 class="subheader">{{tr "Clone Virtual Router"}}</h3>
-  </div>
-  <form data-abide="ajax" id="{{dialogId}}Form">
-    <div class="row">
-      <div class="large-12 columns">
-        <div class="clone_one"></div>
-        <div class="clone_several">
-          {{tr "Several virtual routers are selected, please choose a prefix to name the new copies"}}
-          <br>
-        </div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="large-12 columns">
-        <label class="clone_one">{{tr "Name"}}</label>
-        <label class="clone_several">{{tr "Prefix"}}</label>
-        <input required type="text" name="name"></input>
-      </div>
-    </div>
-    <div class="form_buttons row">
-      <button type="submit" class="button radius right">
-        {{tr "Clone"}}
-      </button>
-    </div>
-    <a class="close-reveal-modal">&#215;</a>
-  </form>
-</div>

From d0c71ed74388ea3f88edefc9adc080caac238635 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Fri, 8 Jan 2016 17:23:06 +0100
Subject: [PATCH 048/197] bug-#4279: Add boolean for ebs_optimized ec2 vm
 parameter

---
 src/vmm_mad/remotes/ec2/ec2_driver.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb
index 5f5bb6e6f3..787ab41a2a 100755
--- a/src/vmm_mad/remotes/ec2/ec2_driver.rb
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb
@@ -133,7 +133,8 @@ class EC2Driver
                     :opt => 'placement/availability_zone'
                 },
                 "EBS_OPTIMIZED" => {
-                    :opt => 'ebs_optimized'
+                    :opt => 'ebs_optimized',
+                    :proc => lambda {|str| str.downcase.eql? "true"}
                 }
             }
         },

From a8d040362db1debb5a321d73ed8945058b4de8c9 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Fri, 8 Jan 2016 17:45:41 +0100
Subject: [PATCH 049/197] feature #3671: Move Sunstone user settings to a
 SUNSTONE vector inside the template

---
 .../tabs/settings-tab/panels/user-config.js   | 21 +++++---
 .../public/app/tabs/users-tab/panels/info.js  | 54 ++++++++++---------
 .../app/tabs/users-tab/panels/info/html.hbs   |  6 +--
 src/sunstone/sunstone-server.rb               | 39 ++++++++------
 4 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js b/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js
index 110771060a..e478163dd8 100644
--- a/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js
+++ b/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js
@@ -71,6 +71,7 @@ define(function(require) {
   }
 
   function _setup(context) {
+    var that = this;
     $(document).foundation('accordion', 'reflow');
     var ssh_key = this.element.TEMPLATE.SSH_PUBLIC_KEY;
     if (ssh_key && ssh_key.length) {
@@ -126,18 +127,26 @@ define(function(require) {
     });
 
     $("#provision_change_view_form").submit(function() {
-      var template_str = 'DEFAULT_VIEW = "'+$('#provision_user_views_select', this).val()+'"';
-
-      Sunstone.runAction("User.append_template_refresh", "-1", template_str);
+      var sunstone_template = {};
+      if (that.element.TEMPLATE.SUNSTONE) {
+        $.extend(sunstone_template, that.element.TEMPLATE.SUNSTONE);
+      }
 
+      sunstone_template.DEFAULT_VIEW = $('#provision_user_views_select', this).val();
+      var template_str = TemplateUtils.templateToString({'SUNSTONE': sunstone_template});
+      Sunstone.runAction("User.append_template_refresh", that.element.ID, template_str);
       return false;
     });
 
     $("#provision_change_language_form").submit(function() {
-      var template_str = 'LANG = "'+$('#provision_new_language', this).val()+'"';
-
-      Sunstone.runAction("User.append_template_refresh", "-1", template_str);
+      var sunstone_template = {};
+      if (that.element.TEMPLATE.SUNSTONE) {
+        $.extend(sunstone_template, that.element.TEMPLATE.SUNSTONE);
+      }
 
+      sunstone_template.LANG = $('#provision_new_language', this).val();
+      var template_str = TemplateUtils.templateToString({'SUNSTONE': sunstone_template});
+      Sunstone.runAction("User.append_template_refresh", that.element.ID, template_str);
       return false;
     });
 
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info.js b/src/sunstone/public/app/tabs/users-tab/panels/info.js
index c84b763be0..976c68c560 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/users-tab/panels/info.js
@@ -83,10 +83,7 @@ define(function(require) {
     // TODO: simplify interface?
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);
     delete strippedTemplate["SSH_PUBLIC_KEY"];
-    delete strippedTemplate["LANG"];
-    delete strippedTemplate["TABLE_ORDER"];
-    delete strippedTemplate["DEFAULT_VIEW"];
-    delete strippedTemplate["TABLE_DEFAULT_PAGE_LENGTH"];
+    delete strippedTemplate["SUNSTONE"];
 
     var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE,
                                               Locale.tr("Attributes"));
@@ -94,6 +91,7 @@ define(function(require) {
 
     return TemplateInfo({
       'element': this.element,
+      'sunstone_template': this.element.TEMPLATE.SUNSTONE||{},
       'groupTrHTML': groupTrHTML,
       'secondaryGroups': secondaryGroups,
       'templateTableHTML': templateTableHTML
@@ -107,24 +105,15 @@ define(function(require) {
     // TODO: simplify interface?
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);
     delete strippedTemplate["SSH_PUBLIC_KEY"];
-    delete strippedTemplate["LANG"];
-    delete strippedTemplate["TABLE_ORDER"];
-    delete strippedTemplate["DEFAULT_VIEW"];
-    delete strippedTemplate["TABLE_DEFAULT_PAGE_LENGTH"];
+    delete strippedTemplate["SUNSTONE"];
 
     var hiddenValues = {};
 
     if (this.element.TEMPLATE.SSH_PUBLIC_KEY != undefined) {
       hiddenValues.SSH_PUBLIC_KEY = this.element.TEMPLATE.SSH_PUBLIC_KEY;
     }
-    if (this.element.TEMPLATE.LANG != undefined) {
-      hiddenValues.LANG = this.element.TEMPLATE.LANG;
-    }
-    if (this.element.TEMPLATE.TABLE_ORDER != undefined) {
-      hiddenValues.TABLE_ORDER = this.element.TEMPLATE.TABLE_ORDER;
-    }
-    if (this.element.TEMPLATE.DEFAULT_VIEW != undefined) {
-      hiddenValues.DEFAULT_VIEW = this.element.TEMPLATE.DEFAULT_VIEW;
+    if (this.element.TEMPLATE.SUNSTONE != undefined) {
+      hiddenValues.SUNSTONE = this.element.TEMPLATE.SUNSTONE;
     }
 
     TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, hiddenValues);
@@ -182,15 +171,20 @@ define(function(require) {
          '<option value="desc">' + Locale.tr("descending") + '</option>' +
        '</select>');
 
-      if (that.element.TEMPLATE.TABLE_ORDER) {
-        $('#table_order_select', context).val(that.element.TEMPLATE.TABLE_ORDER);
+      if (that.element.TEMPLATE.SUNSTONE && that.element.TEMPLATE.SUNSTONE.TABLE_ORDER) {
+        $('#table_order_select', context).val(that.element.TEMPLATE.SUNSTONE.TABLE_ORDER);
       }
     });
 
     context.off("change", "#table_order_select")
     context.on("change", "#table_order_select", function() {
-      var template_str = 'TABLE_ORDER = "'+$(this).val()+'"';
+      var sunstone_template = {};
+      if (that.element.TEMPLATE.SUNSTONE) {
+        $.extend(sunstone_template, that.element.TEMPLATE.SUNSTONE);
+      }
 
+      sunstone_template.TABLE_ORDER = $(this).val();
+      var template_str = TemplateUtils.templateToString({'SUNSTONE': sunstone_template});
       Sunstone.runAction("User.append_template_refresh", that.element.ID, template_str);
     });
 
@@ -201,15 +195,20 @@ define(function(require) {
          Locale.language_options +
        '</select>');
 
-      if (that.element.TEMPLATE.LANG) {
-        $('#language_select', context).val(that.element.TEMPLATE.LANG);
+      if (that.element.TEMPLATE.SUNSTONE && that.element.TEMPLATE.SUNSTONE.LANG) {
+        $('#language_select', context).val(that.element.TEMPLATE.SUNSTONE.LANG);
       }
     });
 
     context.off("change", "#language_select")
     context.on("change", "#language_select", function() {
-      var template_str = 'LANG = "'+$(this).val()+'"';
+      var sunstone_template = {};
+      if (that.element.TEMPLATE.SUNSTONE) {
+        $.extend(sunstone_template, that.element.TEMPLATE.SUNSTONE);
+      }
 
+      sunstone_template.LANG = $(this).val();
+      var template_str = TemplateUtils.templateToString({'SUNSTONE': sunstone_template});
       Sunstone.runAction("User.append_template_refresh", that.element.ID, template_str);
     });
 
@@ -225,15 +224,20 @@ define(function(require) {
          options +
        '</select>');
 
-      if (that.element.TEMPLATE.DEFAULT_VIEW) {
-        $('#view_select', context).val(that.element.TEMPLATE.DEFAULT_VIEW);
+      if (that.element.TEMPLATE.SUNSTONE && that.element.TEMPLATE.SUNSTONE.DEFAULT_VIEW) {
+        $('#view_select', context).val(that.element.TEMPLATE.SUNSTONE.DEFAULT_VIEW);
       }
     });
 
     context.off("change", "#view_select")
     context.on("change", "#view_select", function() {
-      var template_str = 'DEFAULT_VIEW = "'+$(this).val()+'"';
+      var sunstone_template = {};
+      if (that.element.TEMPLATE.SUNSTONE) {
+        $.extend(sunstone_template, that.element.TEMPLATE.SUNSTONE);
+      }
 
+      sunstone_template.DEFAULT_VIEW = $(this).val();
+      var template_str = TemplateUtils.templateToString({'SUNSTONE': sunstone_template});
       Sunstone.runAction("User.append_template_refresh", that.element.ID, template_str);
     });
 
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
index 9f5e8b875a..e412911275 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
@@ -54,7 +54,7 @@
         </tr>
         <tr>
           <td class="key_td">{{tr "Table Order"}}</td>
-          <td class="value_td_table_order">{{valOrDefault element.TEMPLATE.TABLE_ORDER "-"}}</td>
+          <td class="value_td_table_order">{{valOrDefault sunstone_template.TABLE_ORDER "-"}}</td>
           <td>
             <div id="div_edit_table_order">
               <a id="div_edit_table_order_link" class="edit_e" href="#"> <i class="fa fa-pencil-square-o right"/></a>
@@ -63,7 +63,7 @@
         </tr>
         <tr>
           <td class="key_td">{{tr "Language"}}</td>
-          <td class="value_td_language">{{valOrDefault element.TEMPLATE.LANG "-"}}</td>
+          <td class="value_td_language">{{valOrDefault sunstone_template.LANG "-"}}</td>
           <td>
             <div id="div_edit_language">
               <a id="div_edit_language_link" class="edit_e" href="#"> <i class="fa fa-pencil-square-o right"/></a>
@@ -72,7 +72,7 @@
         </tr>
         <tr>
           <td class="key_td">{{tr "View"}}</td>
-          <td class="value_td_view">{{valOrDefault element.TEMPLATE.DEFAULT_VIEW "-"}}</td>
+          <td class="value_td_view">{{valOrDefault sunstone_template.DEFAULT_VIEW "-"}}</td>
           <td>
             <div id="div_edit_view">
               <a id="div_edit_view_link" class="edit_e" href="#"> <i class="fa fa-pencil-square-o right"/></a>
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index 1a950b7a50..ea3ebcb6c5 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -49,7 +49,12 @@ $: << SUNSTONE_ROOT_DIR+'/models'
 
 SESSION_EXPIRE_TIME = 60*60
 
-DISPLAY_NAME_XPATH = 'TEMPLATE/SUNSTONE_DISPLAY_NAME'
+DISPLAY_NAME_XPATH = 'TEMPLATE/SUNSTONE/DISPLAY_NAME'
+TABLE_ORDER_XPATH = 'TEMPLATE/SUNSTONE/TABLE_ORDER'
+DEFAULT_VIEW_XPATH = 'TEMPLATE/SUNSTONE/DEFAULT_VIEW'
+GROUP_ADMIN_DEFAULT_VIEW_XPATH = 'TEMPLATE/SUNSTONE/GROUP_ADMIN_DEFAULT_VIEW'
+TABLE_DEFAULT_PAGE_LENGTH_XPATH = 'TEMPLATE/SUNSTONE/TABLE_DEFAULT_PAGE_LENGTH'
+LANG_XPATH = 'TEMPLATE/SUNSTONE/LANG'
 
 ##############################################################################
 # Required libraries
@@ -225,14 +230,14 @@ helpers do
             # - WSS CONECTION
             # - TABLE ORDER
 
-            if user['TEMPLATE/LANG']
-                session[:lang] = user['TEMPLATE/LANG']
+            if user[LANG_XPATH]
+                session[:lang] = user[LANG_XPATH]
             else
                 session[:lang] = $conf[:lang]
             end
 
-            if user['TEMPLATE/TABLE_DEFAULT_PAGE_LENGTH']
-                session[:page_length] = user['TEMPLATE/TABLE_DEFAULT_PAGE_LENGTH']
+            if user[TABLE_DEFAULT_PAGE_LENGTH_XPATH]
+                session[:page_length] = user[TABLE_DEFAULT_PAGE_LENGTH_XPATH]
             else
                 session[:page_length] = DEFAULT_PAGE_LENGTH
             end
@@ -242,18 +247,18 @@ helpers do
             session[:vnc_wss] = (wss == true || wss == "yes" || wss == "only" ?
                              "yes" : "no")
 
-            if user['TEMPLATE/TABLE_ORDER']
-                session[:table_order] = user['TEMPLATE/TABLE_ORDER']
+            if user[TABLE_ORDER_XPATH]
+                session[:table_order] = user[TABLE_ORDER_XPATH]
             else
                 session[:table_order] = $conf[:table_order] || DEFAULT_TABLE_ORDER
             end
 
-            if user['TEMPLATE/DEFAULT_VIEW']
-                session[:default_view] = user['TEMPLATE/DEFAULT_VIEW']
-            elsif group.contains_admin(user.id) && group['TEMPLATE/GROUP_ADMIN_DEFAULT_VIEW']
-                session[:default_view] = group['TEMPLATE/GROUP_ADMIN_DEFAULT_VIEW']
-            elsif group['TEMPLATE/DEFAULT_VIEW']
-                session[:default_view] = group['TEMPLATE/DEFAULT_VIEW']
+            if user[DEFAULT_VIEW_XPATH]
+                session[:default_view] = user[DEFAULT_VIEW_XPATH]
+            elsif group.contains_admin(user.id) && group[GROUP_ADMIN_DEFAULT_VIEW_XPATH]
+                session[:default_view] = group[GROUP_ADMIN_DEFAULT_VIEW_XPATH]
+            elsif group[DEFAULT_VIEW_XPATH]
+                session[:default_view] = group[DEFAULT_VIEW_XPATH]
             else
                 session[:default_view] = $views_config.available_views(session[:user], session[:user_gname]).first
             end
@@ -458,11 +463,11 @@ post '/config' do
         error 500, ""
     end
 
-    session[:lang]         = user['TEMPLATE/LANG'] if user['TEMPLATE/LANG']
+    session[:lang]         = user[LANG_XPATH] if user[LANG_XPATH]
     session[:vnc_wss]      = user['TEMPLATE/VNC_WSS'] if user['TEMPLATE/VNC_WSS']
-    session[:default_view] = user['TEMPLATE/DEFAULT_VIEW'] if user['TEMPLATE/DEFAULT_VIEW']
-    session[:table_order]  = user['TEMPLATE/TABLE_ORDER'] if user['TEMPLATE/TABLE_ORDER']
-    session[:page_length]  = user['TEMPLATE/TABLE_DEFAULT_PAGE_LENGTH'] if user['TEMPLATE/TABLE_DEFAULT_PAGE_LENGTH']
+    session[:default_view] = user[DEFAULT_VIEW_XPATH] if user[DEFAULT_VIEW_XPATH]
+    session[:table_order]  = user[TABLE_ORDER_XPATH] if user[TABLE_ORDER_XPATH]
+    session[:page_length]  = user[TABLE_DEFAULT_PAGE_LENGTH_XPATH] if user[TABLE_DEFAULT_PAGE_LENGTH_XPATH]
     session[:display_name] = user[DISPLAY_NAME_XPATH] || user['NAME']
 
     [204, ""]

From 0d4a7457d29b3585974493e6fd1ac0ba617e2b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 8 Jan 2016 18:27:58 +0100
Subject: [PATCH 050/197] Feature #4215: topology styling, update vis library
 version

---
 .../public/app/tabs/vnets-topology-tab.js     | 60 +++++++++++++++----
 .../app/tabs/vnets-topology-tab/html.hbs      |  2 +-
 src/sunstone/public/bower.json                |  2 +-
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js
index a6cb8de539..35dbc62e36 100644
--- a/src/sunstone/public/app/tabs/vnets-topology-tab.js
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js
@@ -22,15 +22,10 @@ define(function(require) {
   var OpenNebula = require('opennebula');
   var VNetUtils = require('tabs/vnets-tab/utils/common');
 
-
   var Vis = require('vis');
 
   var TemplateDashboard = require('hbs!./vnets-topology-tab/html');
 
-  var VNETS_TAB_ID = require('tabs/vnets-tab/tabId');
-
-  var VNETS_CREATE_FORM_PANEL_ID = require('tabs/vnets-tab/form-panels/create/formPanelId');
-
   var _network;
   var _vnetList;
 
@@ -146,12 +141,17 @@ define(function(require) {
       if (vnet.PARENT_NETWORK_ID.length > 0){
         group = "reservation";
 
-        edges.push({from: "vnet"+vnet.PARENT_NETWORK_ID, to: vnetNodeId});
+        edges.push({
+          from: "vnet"+vnet.PARENT_NETWORK_ID,
+          to: vnetNodeId,
+          dashes: true,
+          color: "#0098c3"
+        });
       }
 
       nodes.push({
         id: vnetNodeId,
-        label: "VNet "+vnet.NAME,
+        label: "      VNet "+vnet.NAME + "      ", // Spaces for padding, no other reason
         group: group});
 
       // VRouter nodes
@@ -281,19 +281,57 @@ define(function(require) {
       groups: {
         vnet: {
           shape: 'box',
-          color: '#cfcfcf'
+          color: {
+            border: "#007a9c",
+            background: "#0098c3",
+            hover: "#007a9c",
+            highlight: "#007a9c"
+          },
+          font: {
+            color: "#fff"
+          }
         },
         reservation: {
           shape: 'box',
-          color: '#cfcfcf'
+          color: {
+            border: "#007a9c",
+            background: "#0098c3",
+            hover: "#007a9c",
+            highlight: "#007a9c"
+          },
+          font: {
+            color: "#fff"
+          }
         },
         vr: {
           shape: 'circle',
-          color: '#999'
+          color: {
+            border: "#43AC6A",
+            background: "#fff",
+            hover: {
+              border: "#43AC6A",
+              background: "#f7f7f7"
+            },
+            highlight: {
+              border: "#43AC6A",
+              background: "#f7f7f7"
+            }
+          }
         },
         vm: {
           shape: 'circle',
-          color: '#cfcfcf'
+          color: {
+            border: "#007a9c",
+            background: "#fff",
+            hover: {
+              border: "#007a9c",
+              background: "#f7f7f7"
+            },
+            highlight: {
+              border: "#007a9c",
+              background: "#f7f7f7"
+            }
+          }
         },
         vmCluster: {
           shape: 'circle',
diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs b/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs
index c708cb0625..459145a70f 100644
--- a/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs
@@ -14,4 +14,4 @@
 {{! limitations under the License.                                             }}
 {{! -------------------------------------------------------------------------- }}
 
-<div id="visgraph" style="width: 100%;height: 600px;"></div>
+<div id="visgraph" style="width: 100%; min-height: 400px; height: 75vh;"></div>
diff --git a/src/sunstone/public/bower.json b/src/sunstone/public/bower.json
index 2003bd2242..611c8d7081 100644
--- a/src/sunstone/public/bower.json
+++ b/src/sunstone/public/bower.json
@@ -23,7 +23,7 @@
     "almond": "0.3.1",
     "datatables": "1.10.7",
     "foundation": "5.5.2",
-    "vis": "4.10.0"
+    "vis": "4.12.0"
   },
   "version": "4.14",
   "authors": [

From b2398b24a7ba585664efb5bdd55ef9b8eb638cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 11 Jan 2016 11:32:36 +0100
Subject: [PATCH 051/197] Feature #4215: Show VRouter ID in VM CLI output &
 sunstone

---
 src/cli/one_helper/onevm_helper.rb                  |  2 ++
 src/sunstone/public/app/tabs/vms-tab/panels/info.js | 13 ++++++++++++-
 .../public/app/tabs/vms-tab/panels/info/html.hbs    | 11 +++++++++++
 .../public/app/tabs/vrouters-tab/panels/info.js     | 11 -----------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index ce53659a2d..f3d4052cb5 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -512,6 +512,8 @@ in the frontend machine.
             OpenNebulaHelper.time_to_str(vm['/VM/ETIME'])]
         value=vm['DEPLOY_ID']
         puts str % ["DEPLOY ID", value=="" ? "-" : value]
+        value=vm['TEMPLATE/VROUTER_ID']
+        puts str % ["VIRTUAL ROUTER ID", value] if value
 
         puts
 
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info.js b/src/sunstone/public/app/tabs/vms-tab/panels/info.js
index 9af32bd89a..f8d893b2bb 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/info.js
@@ -25,6 +25,8 @@ define(function(require) {
   var PermissionsTable = require('utils/panel/permissions-table');
   var TemplateTable = require('utils/panel/template-table');
   var OpenNebulaVM = require('opennebula/vm');
+  var Sunstone = require('sunstone');
+  var Config = require('sunstone-config');
 
   /*
     TEMPLATES
@@ -73,7 +75,7 @@ define(function(require) {
     var lcmStateStr = OpenNebulaVM.lcmStateStr(this.element.LCM_STATE);
     var hostname = OpenNebulaVM.hostnameStr(this.element);
 
-    var deployId = (typeof(this.element.DEPLOY_ID) == "object" ? "-" : this.element.DEPLOY_ID);
+    var deployId = (typeof(this.element.DEPLOY_ID) == "object" ? "--" : this.element.DEPLOY_ID);
     var resched = (parseInt(this.element.RESCHED) ? Locale.tr("yes") : Locale.tr("no"))
     var templateTableHTML = TemplateTable.html(this.element.USER_TEMPLATE, RESOURCE, Locale.tr("Attributes"));
 
@@ -110,6 +112,15 @@ define(function(require) {
     RenameTr.setup(TAB_ID, RESOURCE, this.element.ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
 
+    $("a.vrid", context).on("click", function(){
+      // TODO: this should be checked internally in showElement,
+      // but it won't work because of bug #4198
+
+      if (Config.isTabEnabled("vrouters-tab")){
+        Sunstone.showElement("vrouters-tab", "VirtualRouter.show", $(this).text());
+      }
+    });
+
     // Get rid of the unwanted (for show) SCHED_* keys
     var that = this;
     var strippedTemplate = {};
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs
index 35e02b0bb4..aaef4af219 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs
@@ -58,6 +58,17 @@
           <td class="value_td">{{resched}}</td>
           <td></td>
         </tr>
+        <tr>
+          <td class="key_td">{{tr "Virtual Router ID"}}</td>
+          <td class="value_td">
+            {{#if element.TEMPLATE.VROUTER_ID}}
+            <a class="vrid">{{element.TEMPLATE.VROUTER_ID}}</a>
+            {{else}}
+            --
+            {{/if}}
+          </td>
+          <td></td>
+        </tr>
       </tr>
     </tbody>
   </table>
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
index 0edac9cf0e..117b9a7b7d 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
@@ -24,8 +24,6 @@ define(function(require) {
   var PermissionsTable = require('utils/panel/permissions-table');
   var RenameTr = require('utils/panel/rename-tr');
   var OpenNebulaVirtualRouter = require('opennebula/virtualrouter');
-  var Sunstone = require('sunstone');
-  var Config = require('sunstone-config');
 
   /*
     TEMPLATES
@@ -96,15 +94,6 @@ define(function(require) {
   }
 
   function _setup(context) {
-    $("a.vmid", context).on("click", function(){
-      // TODO: this should be checked internally in showElement,
-      // but it won't work because of bug #4198
-
-      if (Config.isTabEnabled("vms-tab")){
-        Sunstone.showElement("vms-tab", "VM.show", $(this).text());
-      }
-    });
-
     RenameTr.setup(TAB_ID, RESOURCE, this.element.ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
 

From bf65d9a3ea578d623a39344e91a93598686f5cbf Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Mon, 11 Jan 2016 12:24:46 +0100
Subject: [PATCH 052/197] feature #4215: add onevrouter man page

---
 share/man/onevrouter.1 | 100 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 share/man/onevrouter.1

diff --git a/share/man/onevrouter.1 b/share/man/onevrouter.1
new file mode 100644
index 0000000000..a0e64f9351
--- /dev/null
+++ b/share/man/onevrouter.1
@@ -0,0 +1,100 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "ONEVROUTER" "1" "January 2016" "" "onevrouter(1) -- manages OpenNebula Virtual Routers"
+.
+.SH "NAME"
+\fBonevrouter\fR \- manages OpenNebula Virtual Routers
+.
+.SH "SYNOPSIS"
+\fBonevrouter\fR \fIcommand\fR [\fIargs\fR] [\fIoptions\fR]
+.
+.SH "OPTIONS"
+.
+.nf
+
+ \-a, \-\-append              Append new attributes to the current template
+ \-l, \-\-list x,y,z          Selects columns to display with list command
+ \-d, \-\-delay x             Sets the delay in seconds for top command
+ \-f, \-\-filter x,y,z        Filter data\. An array is specified with
+                           column=value pairs\.
+ \-\-csv                     Write table in csv format
+ \-x, \-\-xml                 Show the resource in xml format
+ \-n, \-\-numeric             Do not translate user and group IDs
+ \-\-describe                Describe list columns
+ \-v, \-\-verbose             Verbose mode
+ \-h, \-\-help                Show this message
+ \-V, \-\-version             Show version and copyright information
+ \-\-user name               User name used to connect to OpenNebula
+ \-\-password password       Password to authenticate with OpenNebula
+ \-\-endpoint endpoint       URL of OpenNebula xmlrpc frontend
+.
+.fi
+.
+.SH "COMMANDS"
+.
+.IP "\(bu" 4
+create \fIfile\fR Creates a new Virtual Router from the given description
+.
+.IP "\(bu" 4
+delete \fIrange|vrouterid_list\fR Deletes the given Virtual Router
+.
+.IP "\(bu" 4
+chgrp \fIrange|vrouterid_list\fR \fIgroupid\fR Changes the Virtual Router group
+.
+.IP "\(bu" 4
+chown \fIrange|vrouterid_list\fR \fIuserid\fR [\fIgroupid\fR] Changes the Virtual Router owner and group
+.
+.IP "\(bu" 4
+chmod \fIrange|vrouterid_list\fR \fIoctet\fR Changes the Virtual Router permissions
+.
+.IP "\(bu" 4
+update \fIvrouterid\fR [\fIfile\fR] Update the Virtual Router contents\. If a path is not provided the editor will be launched to modify the current content\. valid options: append
+.
+.IP "\(bu" 4
+rename \fIvrouterid\fR \fIname\fR Renames the Virtual Router
+.
+.IP "\(bu" 4
+list [\fIfilterflag\fR] Lists the Virtual Routers in the pool valid options: list, delay, filter, csv, xml, numeric, describe
+.
+.IP "\(bu" 4
+show \fIsecgroupid\fR Shows information for the given Virtual Router valid options: xml
+.
+.IP "\(bu" 4
+top [\fIfilterflag\fR] Lists Virtual Routers continuously valid options: list, delay, filter, csv, xml, numeric, describe
+.
+.IP "" 0
+.
+.SH "ARGUMENT FORMATS"
+.
+.IP "\(bu" 4
+file Path to a file
+.
+.IP "\(bu" 4
+range List of id\'s in the form 1,8\.\.15
+.
+.IP "\(bu" 4
+text String
+.
+.IP "\(bu" 4
+groupid OpenNebula GROUP name or id
+.
+.IP "\(bu" 4
+userid OpenNebula USER name or id
+.
+.IP "\(bu" 4
+vrouterid OpenNebula VROUTER name or id
+.
+.IP "\(bu" 4
+vrouterid_list Comma\-separated list of OpenNebula VROUTER names or ids
+.
+.IP "\(bu" 4
+filterflag a, all all the known VROUTERs m, mine the VROUTER belonging to the user in ONE_AUTH g, group \'mine\' plus the VROUTER belonging to the groups the user is member of uid VROUTER of the user identified by this uid user VROUTER of the user identified by the username
+.
+.IP "" 0
+.
+.SH "LICENSE"
+OpenNebula 4\.14\.1 Copyright 2002\-2015, OpenNebula Project, OpenNebula Systems
+.
+.P
+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

From 13e5d1f125d62a6f8819c7616454fb0ba86d4601 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 11 Jan 2016 16:35:02 +0100
Subject: [PATCH 053/197] feature #4238: Fix input selectors

---
 .../public/app/tabs/datastores-tab/form-panels/create.js    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index 97dac7da4f..38722371ac 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -340,9 +340,9 @@ define(function(require) {
     $('label[for="rbd_format"],input#rbd_format', dialog).parent().hide();
     $('label[for="staging_dir"],input#staging_dir', dialog).parent().hide();
     $('label[for="ceph_conf"],input#ceph_conf', dialog).parent().hide();
-    $('label[for="iscsi_host"],input#ceph_conf', dialog).parent().hide();
-    $('label[for="iscsi_user"],input#ceph_conf', dialog).parent().hide();
-    $('label[for="iscsi_usage"],input#ceph_conf', dialog).parent().hide();
+    $('label[for="iscsi_host"],input#iscsi_host', dialog).parent().hide();
+    $('label[for="iscsi_user"],input#iscsi_user', dialog).parent().hide();
+    $('label[for="iscsi_usage"],input#iscsi_usage', dialog).parent().hide();
     $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().hide();
     $('label[for="no_decompress"],input#no_decompress', dialog).parent().hide();
     $('select#ds_mad', dialog).removeAttr('disabled');

From 8f4f649dae5122ca91e9fff03d1555ea4e4e4344 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 11 Jan 2016 16:35:46 +0100
Subject: [PATCH 054/197] feature #4238: Use $ instead of jQuery

---
 src/sunstone/public/app/sunstone-config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js
index d7c6c1e9da..03da60bfd9 100644
--- a/src/sunstone/public/app/sunstone-config.js
+++ b/src/sunstone/public/app/sunstone-config.js
@@ -173,7 +173,7 @@ define(function(require) {
           }
 
           if (onedconf.DS_MAD_CONF != undefined){
-            jQuery.extend(true, _dsMadConf, onedconf.DS_MAD_CONF);
+            $.extend(true, _dsMadConf, onedconf.DS_MAD_CONF);
           }
         },
         error: function(request, error_json){

From 62d4faf68b4a30359802be162069350723bf6bb6 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 11 Jan 2016 16:50:53 +0100
Subject: [PATCH 055/197] feature #4238: Set required attrs not only for inputs

---
 .../app/tabs/datastores-tab/form-panels/create.js  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index 38722371ac..2bc63290fe 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -549,18 +549,12 @@ define(function(require) {
   }
 
   function _setRequiredFields(dialog, mad) {
-    $.each(Config.dsMadConf,function(i,e){
+    $.each(Config.dsMadConf, function(i, e){
         if (e["NAME"] == mad) {
           if (!$.isEmptyObject(e["REQUIRED_ATTRS"])) {
-            var required_attrs = e["REQUIRED_ATTRS"].split(",");
-
-            if (required_attrs != undefined){
-              $.each(required_attrs, function(i,e){
-                $('input#' + e.toLowerCase(), dialog).attr('required', true)
-                                                     .attr('required_active', '');
-              });
-            }
-
+            $.each(e["REQUIRED_ATTRS"].split(","), function(i, e){
+              $('#' + e.toLowerCase(), dialog).attr('required', true).attr('required_active', '');
+            });
           }
           return false;
         }

From cd99e2e60826a5f7ce3553794a3619ebbfd5abd1 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 11 Jan 2016 16:59:04 +0100
Subject: [PATCH 056/197] feature #4238: Set required fields for all ds_mad

---
 .../tabs/datastores-tab/form-panels/create.js | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index 2bc63290fe..b12800501a 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -110,10 +110,12 @@ define(function(require) {
       'input[name="ds_tab_custom_tm_mad"]', dialog).parent().hide();
 
     $('select#ds_mad', dialog).change(function() {
-      if ($(this).val() == "custom")
+      if ($(this).val() == "custom") {
           $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().show();
-      else
-          $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().hide();
+      } else {
+        _setRequiredFields(dialog, $(this).val());
+        $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().hide();
+      }
     });
 
     $('select#tm_mad', dialog).change(function() {
@@ -136,35 +138,27 @@ define(function(require) {
       {
         case 'fs':
           _selectFilesystem(dialog);
-          // _setRequiredFields(dialog, '');
           break;
         case 'vmware_vmfs':
           _selectVmwareVmfs(dialog);
-          _setRequiredFields(dialog, 'vmfs');
           break;
         case 'block_lvm':
           _selectBlockLvm(dialog);
-          _setRequiredFields(dialog, 'lvm');
           break;
         case 'fs_lvm':
           _selectFsLvm(dialog);
-          // _setRequiredFields(dialog, '');
           break;
         case 'ceph':
           _selectCeph(dialog);
-          _setRequiredFields(dialog, 'ceph');
           break;
         case 'gluster':
           _selectGluster(dialog);
-          // _setRequiredFields(dialog, '');
           break;
         case 'dev':
           _selectDevices(dialog);
-          _setRequiredFields(dialog, 'dev');
           break;
         case 'iscsi':
           _selectISCSI(dialog);
-          _setRequiredFields(dialog, 'iscsi');
           break;
         case 'custom':
           _selectCustom(dialog);
@@ -360,7 +354,7 @@ define(function(require) {
   }
 
   function _selectFilesystem(dialog) {
-    $('select#ds_mad', dialog).val('fs');
+    $('select#ds_mad', dialog).val('fs').change();
     $('select#tm_mad', dialog).val('shared');
     $('select#ds_mad', dialog).attr('disabled', 'disabled');
     $('select#tm_mad', dialog).children('option').each(function() {
@@ -389,7 +383,7 @@ define(function(require) {
   function _selectVmwareVmfs(dialog) {
     $('label[for="bridge_list"],input#bridge_list', dialog).parent().fadeIn();
     $('label[for="ds_tmp_dir"],input#ds_tmp_dir', dialog).parent().fadeIn();
-    $('select#ds_mad', dialog).val('vmfs');
+    $('select#ds_mad', dialog).val('vmfs').change();
     $('select#ds_mad', dialog).attr('disabled', 'disabled');
     $('select#tm_mad', dialog).val('vmfs');
     $('select#tm_mad', dialog).attr('disabled', 'disabled');
@@ -407,7 +401,7 @@ define(function(require) {
   function _selectCeph(dialog) {
     $('input#image_ds_type', dialog).click();
     $('input#file_ds_type', dialog).attr('disabled', 'disabled');
-    $('select#ds_mad', dialog).val('ceph');
+    $('select#ds_mad', dialog).val('ceph').change();
     $('select#ds_mad', dialog).attr('disabled', 'disabled');
     $('select#tm_mad', dialog).val('ceph');
     $('select#tm_mad', dialog).attr('disabled', 'disabled');
@@ -431,7 +425,7 @@ define(function(require) {
   }
 
   function _selectBlockLvm(dialog) {
-    $('select#ds_mad', dialog).val('lvm');
+    $('select#ds_mad', dialog).val('lvm').change();
     $('select#ds_mad', dialog).attr('disabled', 'disabled');
     $('select#tm_mad', dialog).val('lvm');
     $('select#tm_mad', dialog).attr('disabled', 'disabled');
@@ -451,7 +445,7 @@ define(function(require) {
   }
 
   function _selectFsLvm(dialog) {
-    $('select#ds_mad', dialog).val('fs');
+    $('select#ds_mad', dialog).val('fs').change();
     $('select#ds_mad', dialog).attr('disabled', 'disabled');
     $('select#tm_mad', dialog).val('fs_lvm');
     $('select#tm_mad', dialog).attr('disabled', 'disabled');
@@ -469,7 +463,7 @@ define(function(require) {
   }
 
   function _selectGluster(dialog) {
-    $('select#ds_mad', dialog).val('fs');
+    $('select#ds_mad', dialog).val('fs').change();
     $('select#ds_mad', dialog).attr('disabled', 'disabled');
     $('select#tm_mad', dialog).val('shared');
     $('select#tm_mad', dialog).children('option').each(function() {
@@ -496,7 +490,7 @@ define(function(require) {
   }
 
   function _selectDevices(dialog) {
-    $('select#ds_mad', dialog).val('dev');
+    $('select#ds_mad', dialog).val('dev').change();
     $('select#ds_mad', dialog).attr('disabled', 'disabled');
     $('select#tm_mad', dialog).val('dev');
     $('select#tm_mad', dialog).attr('disabled', 'disabled');
@@ -514,7 +508,7 @@ define(function(require) {
   }
 
   function _selectISCSI(dialog) {
-    $('select#ds_mad', dialog).val('iscsi');
+    $('select#ds_mad', dialog).val('iscsi').change();
     $('select#ds_mad', dialog).attr('disabled', 'disabled');
     $('select#tm_mad', dialog).val('iscsi');
     $('select#tm_mad', dialog).attr('disabled', 'disabled');
@@ -536,7 +530,7 @@ define(function(require) {
 
   function _selectCustom(dialog) {
     _hideAll(dialog);
-    $('select#ds_mad', dialog).val('fs');
+    $('select#ds_mad', dialog).val('fs').change();
     $('select#tm_mad', dialog).val('shared');
     $('input#safe_dirs', dialog).removeAttr('disabled');
     $('select#disk_type', dialog).removeAttr('disabled');

From 1897466bb67067e0f7768f43711cd7048c0407bc Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 11 Jan 2016 17:01:30 +0100
Subject: [PATCH 057/197] feature #4238: Remove required attrs before defining
 the new ones

---
 .../app/tabs/datastores-tab/form-panels/create.js      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index b12800501a..8cffdfee14 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -129,11 +129,6 @@ define(function(require) {
       _hideAll(dialog);
       var choice_str = $(this).val();
 
-      // Disable all required attributes except for those that come in the
-      // template.
-      $('input[required_active]', dialog).removeAttr('required')
-                                         .removeAttr('required_active');
-
       switch (choice_str)
       {
         case 'fs':
@@ -543,6 +538,11 @@ define(function(require) {
   }
 
   function _setRequiredFields(dialog, mad) {
+    // Disable all required attributes except for those that come in the
+    // template.
+    $('input[required_active]', dialog).removeAttr('required')
+                                       .removeAttr('required_active');
+                                       
     $.each(Config.dsMadConf, function(i, e){
         if (e["NAME"] == mad) {
           if (!$.isEmptyObject(e["REQUIRED_ATTRS"])) {

From 6b08f7a69f762bdd7e2dd6fe5ac6ab23fa7051e1 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 11 Jan 2016 17:02:15 +0100
Subject: [PATCH 058/197] feature #4238: Remove required attr not only from
 inputs

---
 .../public/app/tabs/datastores-tab/form-panels/create.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index 8cffdfee14..42663fa2f9 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -540,9 +540,9 @@ define(function(require) {
   function _setRequiredFields(dialog, mad) {
     // Disable all required attributes except for those that come in the
     // template.
-    $('input[required_active]', dialog).removeAttr('required')
+    $('[required_active]', dialog).removeAttr('required')
                                        .removeAttr('required_active');
-                                       
+
     $.each(Config.dsMadConf, function(i, e){
         if (e["NAME"] == mad) {
           if (!$.isEmptyObject(e["REQUIRED_ATTRS"])) {

From 30087b067fdf8679c8c2ab549efde975ab94739a Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 11 Jan 2016 18:07:08 +0100
Subject: [PATCH 059/197] feature #3671: Move Sunstone group settings to a
 SUNSTONE vector inside the template

---
 src/oca/ruby/opennebula/group.rb              | 23 ++++++++----
 src/sunstone/models/SunstoneViews.rb          |  6 +--
 .../app/tabs/groups-tab/form-panels/create.js | 37 ++++++++++---------
 .../public/app/tabs/groups-tab/panels/info.js | 29 +++++++--------
 4 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/src/oca/ruby/opennebula/group.rb b/src/oca/ruby/opennebula/group.rb
index e79ab5b4de..b4ee5e282e 100644
--- a/src/oca/ruby/opennebula/group.rb
+++ b/src/oca/ruby/opennebula/group.rb
@@ -139,31 +139,38 @@ module OpenNebula
                 return OpenNebula::Error.new(error_msg)
             end
 
-            str = ""
+            sunstone_attrs = []
 
             # Add Sunstone views for the group
             if group_hash[:views]
-                str += "SUNSTONE_VIEWS=\"#{group_hash[:views].join(",")}\"\n"
+                sunstone_attrs << "VIEWS=\"#{group_hash[:views].join(",")}\""
             end
 
             if group_hash[:default_view]
-                str += "DEFAULT_VIEW=\"#{group_hash[:default_view]}\"\n"
+                sunstone_attrs << "DEFAULT_VIEW=\"#{group_hash[:default_view]}\""
             end
 
             # And the admin views
             if group_hash[:admin_views]
-                str += "GROUP_ADMIN_VIEWS=\"#{group_hash[:admin_views].join(",")}\"\n"
+                sunstone_attrs << "GROUP_ADMIN_VIEWS=\"#{group_hash[:admin_views].join(",")}\""
             else
-                str += "GROUP_ADMIN_VIEWS=#{GROUP_ADMIN_SUNSTONE_VIEWS}\n"
+                sunstone_attrs << "GROUP_ADMIN_VIEWS=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
             end
 
             if group_hash[:default_admin_view]
-                str += "GROUP_ADMIN_DEFAULT_VIEW=\"#{group_hash[:default_admin_view]}\"\n"
+                sunstone_attrs << "GROUP_ADMIN_DEFAULT_VIEW=\"#{group_hash[:default_admin_view]}\""
             else
-                str += "GROUP_ADMIN_DEFAULT_VIEW=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
+                sunstone_attrs << "GROUP_ADMIN_DEFAULT_VIEW=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
             end
 
-            self.update(str, true)
+            if sunstone_attrs.length > 0
+                rc = self.update("SUNSTONE=[#{sunstone_attrs.join(',\n')}]", true)
+                if OpenNebula.is_error?(rc)
+                    self.delete
+                    error_msg =  "Error updating group template: #{rc.message}"
+                    return OpenNebula::Error.new(error_msg)
+                end
+            end
 
             return 0
         end
diff --git a/src/sunstone/models/SunstoneViews.rb b/src/sunstone/models/SunstoneViews.rb
index cba033b01c..2365922c2f 100644
--- a/src/sunstone/models/SunstoneViews.rb
+++ b/src/sunstone/models/SunstoneViews.rb
@@ -80,15 +80,15 @@ class SunstoneViews
                 return available.uniq
             end
 
-            if group["TEMPLATE/SUNSTONE_VIEWS"]
-                views_array = group["TEMPLATE/SUNSTONE_VIEWS"].split(",")
+            if group["TEMPLATE/SUNSTONE/VIEWS"]
+                views_array = group["TEMPLATE/SUNSTONE/VIEWS"].split(",")
                 available << views_array.each{|v| v.strip!}
             elsif @views_config['groups']
                 available << @views_config['groups'][group.name]
             end
 
             gadmins       = group.admin_ids
-            gadmins_views = group["TEMPLATE/GROUP_ADMIN_VIEWS"]
+            gadmins_views = group["TEMPLATE/SUNSTONE/GROUP_ADMIN_VIEWS"]
 
             if gadmins && gadmins.include?(user.id) && gadmins_views
                 views_array = gadmins_views.split(",")
diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
index 98d08bd39e..b04c3810ef 100644
--- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
@@ -255,30 +255,32 @@ define(function(require) {
     } else if (this.action == "update") {
       var template_json = this.element.TEMPLATE;
 
-      delete template_json["SUNSTONE_VIEWS"];
-      delete template_json["DEFAULT_VIEW"];
-      delete template_json["GROUP_ADMIN_VIEWS"];
-      delete template_json["GROUP_ADMIN_DEFAULT_VIEW"];
+      delete template_json['SUNSTONE'];
 
+      var sunstone_template = {};
       if (views.length != 0){
-        template_json["SUNSTONE_VIEWS"] = views.join(",");
+        sunstone_template["VIEWS"] = views.join(",");
       }
 
       if (default_view != undefined){
-        template_json["DEFAULT_VIEW"] = default_view;
+        sunstone_template["DEFAULT_VIEW"] = default_view;
       }
 
       if (admin_views.length != 0){
-        template_json["GROUP_ADMIN_VIEWS"] = admin_views.join(",");
+        sunstone_template["GROUP_ADMIN_VIEWS"] = admin_views.join(",");
       }
 
       if (default_admin_view != undefined){
-        template_json["GROUP_ADMIN_DEFAULT_VIEW"] = default_admin_view;
+        sunstone_template["GROUP_ADMIN_DEFAULT_VIEW"] = default_admin_view;
+      }
+
+      if (!$.isEmptyObject(sunstone_template)) {
+        template_json['SUNSTONE'] = sunstone_template;
       }
 
       var template_str = TemplateUtils.templateToString(template_json);
 
-      Sunstone.runAction("Group.update",this.resourceId, template_str);
+      Sunstone.runAction("Group.update", this.resourceId, template_str);
       return false;
     }
   }
@@ -305,8 +307,9 @@ define(function(require) {
 
     $('input[id^="group_view"]', context).removeAttr('checked');
 
-    if (element.TEMPLATE.SUNSTONE_VIEWS){
-      views_str = element.TEMPLATE.SUNSTONE_VIEWS;
+    var sunstone_template = element.TEMPLATE.SUNSTONE;
+    if (sunstone_template && sunstone_template.VIEWS){
+      views_str = sunstone_template.VIEWS;
 
       var views = views_str.split(",");
       $.each(views, function(){
@@ -317,16 +320,16 @@ define(function(require) {
 
     $('input[id^="group_default_view"]', context).removeAttr('checked');
 
-    if (element.TEMPLATE.DEFAULT_VIEW){
-      $('#user_view_default', context).val(element.TEMPLATE.DEFAULT_VIEW.trim()).change();
+    if (sunstone_template && sunstone_template.DEFAULT_VIEW){
+      $('#user_view_default', context).val(sunstone_template.DEFAULT_VIEW.trim()).change();
     } else {
       $('#user_view_default', context).val("").change();
     }
 
     $('input[id^="group_admin_view"]', context).removeAttr('checked');
 
-    if (element.TEMPLATE.GROUP_ADMIN_VIEWS){
-      views_str = element.TEMPLATE.GROUP_ADMIN_VIEWS;
+    if (sunstone_template && sunstone_template.GROUP_ADMIN_VIEWS){
+      views_str = sunstone_template.GROUP_ADMIN_VIEWS;
 
       var views = views_str.split(",");
       $.each(views, function(){
@@ -337,8 +340,8 @@ define(function(require) {
 
     $('input[id^="group_default_admin_view"]', context).removeAttr('checked');
 
-    if (element.TEMPLATE.GROUP_ADMIN_DEFAULT_VIEW){
-      $('#admin_view_default', context).val(element.TEMPLATE.GROUP_ADMIN_DEFAULT_VIEW.trim()).change();
+    if (sunstone_template && sunstone_template.GROUP_ADMIN_DEFAULT_VIEW){
+      $('#admin_view_default', context).val(sunstone_template.GROUP_ADMIN_DEFAULT_VIEW.trim()).change();
     } else {
       $('#admin_view_default', context).val("").change();
     }
diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/info.js b/src/sunstone/public/app/tabs/groups-tab/panels/info.js
index f0d7d4f732..891719158a 100644
--- a/src/sunstone/public/app/tabs/groups-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/groups-tab/panels/info.js
@@ -63,21 +63,23 @@ define(function(require) {
    */
 
   function _html() {
-    var adminViews = _processViews(
-      this.element.TEMPLATE.GROUP_ADMIN_VIEWS,
-      this.element.TEMPLATE.GROUP_ADMIN_DEFAULT_VIEW);
+    var adminViews = [];
+    var userViews = [];
 
-    var userViews = _processViews(
-      this.element.TEMPLATE.SUNSTONE_VIEWS,
-      this.element.TEMPLATE.DEFAULT_VIEW);
+    var sunstone_template = this.element.TEMPLATE.SUNSTONE;
+    if (sunstone_template) {
+      adminViews = _processViews(
+        sunstone_template.GROUP_ADMIN_VIEWS,
+        sunstone_template.GROUP_ADMIN_DEFAULT_VIEW);
+
+      userViews = _processViews(
+        sunstone_template.VIEWS,
+        sunstone_template.DEFAULT_VIEW);
+    }
 
     // TODO: simplify interface?
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);
-    delete strippedTemplate["GROUP_ADMIN_VIEWS"];
-    delete strippedTemplate["SUNSTONE_VIEWS"];
-    delete strippedTemplate["GROUP_ADMIN_DEFAULT_VIEW"];
-    delete strippedTemplate["DEFAULT_VIEW"];
-    delete strippedTemplate["TABLE_DEFAULT_PAGE_LENGTH"];
+    delete strippedTemplate["SUNSTONE"];
 
     var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE,
                                               Locale.tr("Attributes"));
@@ -99,10 +101,7 @@ define(function(require) {
     // Template update
     // TODO: simplify interface?
     var hiddenKeys = [
-      "GROUP_ADMIN_VIEWS",
-      "SUNSTONE_VIEWS",
-      "GROUP_ADMIN_DEFAULT_VIEW",
-      "DEFAULT_VIEW",
+      "SUNSTONE",
       "TABLE_DEFAULT_PAGE_LENGTH"];
 
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);

From 16f34db1a68d8e6a5ba48d277c6f885271ec3cee Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 11 Jan 2016 18:53:24 +0100
Subject: [PATCH 060/197] feature #3671: Move Sunstone vmtemplate settings to a
 SUNSTONE vector inside the template

---
 src/sunstone/public/app/tabs/provision-tab.js |  6 +++--
 .../form-panels/create/wizard-tabs/general.js | 24 ++++++++++++-------
 .../templates-tab/form-panels/instantiate.js  |  5 ++--
 src/sunstone/public/app/utils/nics-section.js |  3 ++-
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js
index 4848c46c73..4ed94e6421 100644
--- a/src/sunstone/public/app/tabs/provision-tab.js
+++ b/src/sunstone/public/app/tabs/provision-tab.js
@@ -380,7 +380,8 @@ define(function(require) {
           '<br>'+
         '</div>'+
       '</div>'+
-      (Config.provision.create_vm.isEnabled("capacity_select") && (capacity.SUNSTONE_CAPACITY_SELECT != "NO") ?
+      (Config.provision.create_vm.isEnabled("capacity_select") &&
+        !((capacity.SUNSTONE) && (capacity.SUNSTONE.CAPACITY_SELECT == "NO")) ?
       '<div class="row">'+
         '<div class="large-12 large-centered columns">'+
           '<dl class="accordion" data-accordion="provision_accordion_'+provision_instance_type_accordion_id+'">'+
@@ -449,7 +450,8 @@ define(function(require) {
       $(".provision_create_template_cost_div").hide();
     }
 
-    if (Config.provision.create_vm.isEnabled("capacity_select") && (capacity.SUNSTONE_CAPACITY_SELECT != "NO")) {
+    if (Config.provision.create_vm.isEnabled("capacity_select") &&
+        !((capacity.SUNSTONE) && (capacity.SUNSTONE.CAPACITY_SELECT == "NO"))) {
       provision_instance_type_accordion_id += 1;
 
       var provision_instance_types_datatable = $('.provision_instance_types_table', context).dataTable({
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
index 4741b463c6..da0014a731 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
@@ -118,31 +118,39 @@ define(function(require) {
       templateJSON["KEEP_DISKS_ON_DONE"] = $("#KEEP_DISKS", context).is(':checked')?"YES":"NO"
     }
 
+    var sunstone_template = {};
     if ($('#sunstone_capacity_select:checked', context).length > 0) {
-      templateJSON["SUNSTONE_CAPACITY_SELECT"] = "NO"
+      sunstone_template["CAPACITY_SELECT"] = "NO"
     }
 
     if ($('#sunstone_network_select:checked', context).length > 0) {
-      templateJSON["SUNSTONE_NETWORK_SELECT"] = "NO"
+      sunstone_template["NETWORK_SELECT"] = "NO"
+    }
+
+    if (!$.isEmptyObject(sunstone_template)) {
+      templateJSON['SUNSTONE'] = sunstone_template;
     }
 
     return templateJSON;
   }
 
   function _fill(context, templateJSON) {
-    if (templateJSON["SUNSTONE_CAPACITY_SELECT"] &&
-          (templateJSON["SUNSTONE_CAPACITY_SELECT"].toUpperCase() == "NO")) {
+    var sunstone_template = templateJSON.SUNSTONE;
+    if (sunstone_template && 
+        sunstone_template["CAPACITY_SELECT"] &&
+        sunstone_template["CAPACITY_SELECT"].toUpperCase() == "NO") {
       $("#sunstone_capacity_select", context).attr("checked", "checked");
     }
 
-    delete templateJSON["SUNSTONE_CAPACITY_SELECT"];
+    delete sunstone_template["CAPACITY_SELECT"];
 
-    if (templateJSON["SUNSTONE_NETWORK_SELECT"] &&
-          (templateJSON["SUNSTONE_NETWORK_SELECT"].toUpperCase() == "NO")) {
+    if (sunstone_template && 
+        sunstone_template["NETWORK_SELECT"] &&
+        sunstone_template["NETWORK_SELECT"].toUpperCase() == "NO") {
       $("#sunstone_network_select", context).attr("checked", "checked");
     }
 
-    delete templateJSON["SUNSTONE_NETWORK_SELECT"];
+    delete sunstone_template["NETWORK_SELECT"];
 
     if (templateJSON["HYPERVISOR"] == 'vcenter' &&
       templateJSON["KEEP_DISKS_ON_DONE"] &&
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js
index 4970c4c187..fcfc33d3d5 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js
@@ -227,8 +227,9 @@ define(function(require) {
             });
           }
 
-          if (template_json.VMTEMPLATE.TEMPLATE.SUNSTONE_CAPACITY_SELECT &&
-              template_json.VMTEMPLATE.TEMPLATE.SUNSTONE_CAPACITY_SELECT.toUpperCase() == "NO"){
+          if (template_json.VMTEMPLATE.TEMPLATE.SUNSTONE &&
+              template_json.VMTEMPLATE.TEMPLATE.SUNSTONE.CAPACITY_SELECT &&
+              template_json.VMTEMPLATE.TEMPLATE.SUNSTONE.CAPACITY_SELECT.toUpperCase() == "NO"){
 
             capacityContext.hide();
           }
diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js
index 3ad108ea0d..5eb27bb1c3 100644
--- a/src/sunstone/public/app/utils/nics-section.js
+++ b/src/sunstone/public/app/utils/nics-section.js
@@ -30,7 +30,8 @@ define(function(require) {
   }
 
   function _insert(template_json, context) {
-    if (template_json.VMTEMPLATE.TEMPLATE.SUNSTONE_NETWORK_SELECT != "NO") {
+    if (!(template_json.VMTEMPLATE.TEMPLATE.SUNSTONE &&
+          template_json.VMTEMPLATE.TEMPLATE.SUNSTONE.NETWORK_SELECT == "NO")) {
       var template_nic = template_json.VMTEMPLATE.TEMPLATE.NIC
       var nics = []
       if ($.isArray(template_nic))

From c65a7bb5b8230de9cc39cd34ee588cdb67e0c9e8 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Tue, 12 Jan 2016 14:08:41 +0100
Subject: [PATCH 061/197] bug #4285: Add wait loop prior to elastic_ip
 association

(cherry picked from commit dacf4a3f50386eee908d4ec319d3c6641bf42ffa)
---
 src/vmm_mad/remotes/ec2/ec2_driver.conf | 1 +
 src/vmm_mad/remotes/ec2/ec2_driver.rb   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.conf b/src/vmm_mad/remotes/ec2/ec2_driver.conf
index 9dc4532fd8..0329b1d59a 100644
--- a/src/vmm_mad/remotes/ec2/ec2_driver.conf
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.conf
@@ -1,4 +1,5 @@
 proxy_uri:
+state_wait_timeout_seconds: 300
 regions:
     default:
         region_name: us-east-1
diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb
index 787ab41a2a..9c87c6a1a0 100755
--- a/src/vmm_mad/remotes/ec2/ec2_driver.rb
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb
@@ -297,6 +297,11 @@ class EC2Driver
 
         if ec2_value(ec2_info, 'ELASTICIP')
             begin
+                start_time = Time.now
+                while instance.status == :pending
+                    break if Time.now - start_time > @state_change_timeout
+                    sleep 5
+                end
                 instance.associate_elastic_ip(ec2_value(ec2_info, 'ELASTICIP'))
             rescue => e
                 STDERR.puts(e.message)

From 346c1cdce99e383acab11a48262a970123146dfa Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Tue, 12 Jan 2016 15:49:40 +0100
Subject: [PATCH 062/197] bug #4285: Add missing timeout variable
 initialization

---
 src/vmm_mad/remotes/ec2/ec2_driver.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb
index 9c87c6a1a0..6c7226ed60 100755
--- a/src/vmm_mad/remotes/ec2/ec2_driver.rb
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb
@@ -215,6 +215,8 @@ class EC2Driver
 
         public_cloud_ec2_conf  = YAML::load(File.read(EC2_DRIVER_CONF))
 
+        @state_change_timeout = public_cloud_ec2_conf['state_wait_timeout_seconds'].to_i
+
         @instance_types = public_cloud_ec2_conf['instance_types']
 
         regions = public_cloud_ec2_conf['regions']

From c85877424e86460f10d3db18ac823250ee16fc5e Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 13 Jan 2016 17:45:04 +0100
Subject: [PATCH 063/197] bug #4227: Fix template instantiate when image size
 is 0

---
 src/sunstone/public/app/utils/disks-resize.js | 10 ++++++----
 src/sunstone/public/app/utils/range-slider.js |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/sunstone/public/app/utils/disks-resize.js b/src/sunstone/public/app/utils/disks-resize.js
index 0f28713e28..205c16dd63 100644
--- a/src/sunstone/public/app/utils/disks-resize.js
+++ b/src/sunstone/public/app/utils/disks-resize.js
@@ -154,10 +154,12 @@ define(function(require){
     $(".diskContainer", context).each(function(){
       if ($(this).data("template_disk")) {
         disk = $(this).data("template_disk");
-        original_size = $(this).data("original_size");
-        size = $("#SIZE", this).val();
-        if (size) {
-          disk['SIZE'] = Math.ceil(size * 1024);
+
+        if ($("#SIZE", this).is(':enabled')) {
+          size = $("#SIZE", this).val();
+          if (size) {
+            disk['SIZE'] = Math.ceil(size * 1024);
+          }
         }
       }
 
diff --git a/src/sunstone/public/app/utils/range-slider.js b/src/sunstone/public/app/utils/range-slider.js
index a5ebb4f867..a945f7ec2c 100644
--- a/src/sunstone/public/app/utils/range-slider.js
+++ b/src/sunstone/public/app/utils/range-slider.js
@@ -58,7 +58,7 @@ define(function(require) {
       }
     });
 
-    if (opts.startValue) {
+    if (opts.startValue != undefined) {
       slider.foundation('slider', 'set_value', opts.startValue);
       input.val(opts.startValue);
     }

From 0dba682cb40fee8a482e7d4a07386873966170a8 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Tue, 5 Jan 2016 18:21:00 +0100
Subject: [PATCH 064/197] bug #4263: take out deprecation warning from oneuser
 key

oneuser key is needed to extract ssh keys

(cherry picked from commit fa34559632cf85ba0a64b90f811dfe27f92f2d21)
---
 src/cli/oneuser | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/cli/oneuser b/src/cli/oneuser
index 6b9586d664..8dd9ffeb32 100755
--- a/src/cli/oneuser
+++ b/src/cli/oneuser
@@ -351,8 +351,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     key_desc = <<-EOT.unindent
-        DEPRECATED, use login to generate auth files.
-
         Shows a public key from a private SSH key. Use it as password
         for the SSH authentication mechanism.
     EOT

From 5c86035e9e7fa650a6a0cf3b68313fbc63860e04 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Tue, 5 Jan 2016 18:20:21 +0100
Subject: [PATCH 065/197] bug #4263: do not initialize client in oneuser key

(cherry picked from commit 3eb23ec3cb8c9fea35bebb90e2ea1de81af05351)
---
 src/cli/oneuser | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cli/oneuser b/src/cli/oneuser
index 8dd9ffeb32..5aecae946e 100755
--- a/src/cli/oneuser
+++ b/src/cli/oneuser
@@ -40,7 +40,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     helper = OneUserHelper.new
 
     before_proc do
-        helper.set_client(options) if @comm_name != :login
+        helper.set_client(options) if ![:login, :key].include?(@comm_name)
     end
 
     ########################################################################

From d8ffdf33039797d0631041c79c644e9c12280503 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Thu, 7 Jan 2016 12:01:47 +0100
Subject: [PATCH 066/197] feature #4206: do not crash getting disk info in poll

(cherry picked from commit 7d6f91a369cdd31a788d8d44cece531357fa7fb3)
---
 src/vmm_mad/remotes/poll_xen_kvm.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vmm_mad/remotes/poll_xen_kvm.rb b/src/vmm_mad/remotes/poll_xen_kvm.rb
index 47c293ee65..4b98d3deda 100755
--- a/src/vmm_mad/remotes/poll_xen_kvm.rb
+++ b/src/vmm_mad/remotes/poll_xen_kvm.rb
@@ -326,6 +326,7 @@ module KVM
             :snapshot_size   => []
         }
 
+        begin
         doc.elements.each('domain/devices/disk/source') do |ele|
             # read the disk path (for regular disks)
             file = ele.attributes['file'] rescue nil
@@ -420,6 +421,11 @@ module KVM
                 end
             end
         end
+        rescue Exception => e
+            STDERR.puts "Error getting disk information."
+            STDERR.puts e.message
+            STDERR.puts e.backtrace.join("\n  ")
+        end
 
         data
     end

From 38c5929356cc16755c9c062dd922404571e131b5 Mon Sep 17 00:00:00 2001
From: Anton Todorov <atodorov-storpool@users.noreply.github.com>
Date: Thu, 14 Jan 2016 19:39:07 +0200
Subject: [PATCH 067/197] fix vmm/kvm/migrate_local

Added MIGRATE_OPTIONS variable to sync with the remote `migrate` script
---
 src/vmm_mad/remotes/kvm/migrate_local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vmm_mad/remotes/kvm/migrate_local b/src/vmm_mad/remotes/kvm/migrate_local
index 22107d6a37..8da85090f2 100755
--- a/src/vmm_mad/remotes/kvm/migrate_local
+++ b/src/vmm_mad/remotes/kvm/migrate_local
@@ -23,5 +23,5 @@ dest_host=$2
 src_host=$3
 
 virsh --connect $QEMU_PROTOCOL://$src_host/system \
-    migrate --live $deploy_id $QEMU_PROTOCOL://$dest_host/system
+    migrate --live $deploy_id $MIGRATE_OPTIONS $QEMU_PROTOCOL://$dest_host/system
 

From 84353897170dbe50dde1f2dae8754150667ba23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 15 Jan 2016 15:40:27 +0100
Subject: [PATCH 068/197] Feature #4215: Add ethx_vrouter_ip to context

---
 src/vm/VirtualMachine.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 872a1db391..2349333771 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -144,15 +144,17 @@ const char * VirtualMachine::NETWORK_CONTEXT[][2] = {
         {"GATEWAY", "GATEWAY"},
         {"DNS", "DNS"},
         {"SEARCH_DOMAIN", "SEARCH_DOMAIN"},
-        {"MTU", "GUEST_MTU"}};
-const int VirtualMachine::NUM_NETWORK_CONTEXT = 8;
+        {"MTU", "GUEST_MTU"},
+        {"VROUTER_IP", "VROUTER_IP"}};
+const int VirtualMachine::NUM_NETWORK_CONTEXT = 9;
 
 const char*  VirtualMachine::NETWORK6_CONTEXT[][2] = {
         {"IP6", "IP6_GLOBAL"},
         {"GATEWAY6", "GATEWAY6"},
-        {"CONTEXT_FORCE_IPV4", "CONTEXT_FORCE_IPV4"}};
+        {"CONTEXT_FORCE_IPV4", "CONTEXT_FORCE_IPV4"},
+        {"VROUTER_IP6", "VROUTER_IP6_GLOBAL"}};
 
-const int VirtualMachine::NUM_NETWORK6_CONTEXT = 3;
+const int VirtualMachine::NUM_NETWORK6_CONTEXT = 4;
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

From f9c3a93e4b5cae8944ea11b01e240a93f853ed5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 15 Jan 2016 16:42:51 +0100
Subject: [PATCH 069/197] Feature #4215: Context var ethx_vrouter_ip_recipients

---
 include/ObjectCollection.h   |  10 ++-
 include/VirtualMachine.h     |   5 +-
 include/VirtualRouter.h      |   5 +-
 src/vm/VirtualMachine.cc     |  61 ++++++++++++++++++
 src/vrouter/VirtualRouter.cc | 118 +++++++++++++++++++++++++++++++++++
 5 files changed, 193 insertions(+), 6 deletions(-)

diff --git a/include/ObjectCollection.h b/include/ObjectCollection.h
index 115563a912..03f304d78e 100644
--- a/include/ObjectCollection.h
+++ b/include/ObjectCollection.h
@@ -80,11 +80,19 @@ public:
     /**
      *  Returns a copy of the IDs set
      */
-    set<int> get_collection_copy()
+    set<int> get_collection_copy() const
     {
         return set<int> (collection_set);
     };
 
+    /**
+     *  Returns a reference to the IDs set
+     */
+    const set<int>& get_collection() const
+    {
+        return collection_set;
+    };
+
     /**
      * Returns true if the collection contains the given id
      * @param id ID to search
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index edde6df239..3b80652344 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1318,6 +1318,8 @@ public:
      */
     const VectorAttribute* get_disk(int disk_id) const;
 
+    const VectorAttribute* get_nic(int nic_id) const;
+
     // ------------------------------------------------------------------------
     // Virtual Router related functions
     // ------------------------------------------------------------------------
@@ -1347,6 +1349,8 @@ public:
      */
     int  generate_context(string &files, int &disk_id, string& token_password);
 
+    int replace_context_attribute(const string& name, const string& value);
+
     // -------------------------------------------------------------------------
     // "Save as" Disk related functions (save_as hot)
     // -------------------------------------------------------------------------
@@ -1711,7 +1715,6 @@ public:
      */
     void delete_snapshots();
 
-
 private:
 
     // -------------------------------------------------------------------------
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index e4e938d1e4..197fc7287b 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -38,10 +38,7 @@ public:
      */
     string& to_xml(string& xml) const;
 
-    int add_vmid(int vmid)
-    {
-        return vms.add_collection_id(vmid);
-    }
+    int add_vmid(int vmid);
 
     // ------------------------------------------------------------------------
     // Template Contents
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 2349333771..619fa8fd07 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -3402,6 +3402,34 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+int VirtualMachine::replace_context_attribute(const string& name, const string& value)
+{
+    vector<Attribute *> array_context;
+    VectorAttribute *   context;
+    int                 num;
+
+    num = obj_template->get("CONTEXT", array_context);
+
+    if ( num != 1 )
+    {
+        return -1;
+    }
+
+    context = dynamic_cast<VectorAttribute *>(array_context[0]);
+
+    if ( context == 0 )
+    {
+        return -1;
+    }
+
+    context->replace(name, value);
+
+    return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 const VectorAttribute* VirtualMachine::get_disk(int disk_id) const
 {
     int num_disks;
@@ -3435,6 +3463,39 @@ const VectorAttribute* VirtualMachine::get_disk(int disk_id) const
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+const VectorAttribute* VirtualMachine::get_nic(int nic_id) const
+{
+    int num_nics;
+    int tnic_id;
+
+    vector<const Attribute  *> nics;
+    const VectorAttribute *    nic;
+
+    num_nics = obj_template->get("NIC", nics);
+
+    for(int i=0; i<num_nics; i++)
+    {
+        nic = dynamic_cast<const VectorAttribute * >(nics[i]);
+
+        if ( nic == 0 )
+        {
+            continue;
+        }
+
+        nic->vector_value("NIC_ID", tnic_id);
+
+        if ( tnic_id == nic_id )
+        {
+            return nic;
+        }
+    }
+
+    return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int VirtualMachine::set_saveas_disk(int disk_id, int snap_id, int &iid,
                                     long long &size, string& err_str)
 {
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index 4707604222..c4b3b11969 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -456,3 +456,121 @@ Template * VirtualRouter::get_nics() const
 
     return tmpl;
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualRouter::add_vmid(int vmid)
+{
+    VirtualMachine*         vm;
+    VirtualMachinePool*     vmpool = Nebula::instance().get_vmpool();
+
+    int                     num_nics;
+    int                     nic_id;
+    bool                    floating;
+    vector<Attribute  * >   nics;
+    VectorAttribute *       nic;
+    const VectorAttribute * vm_nic;
+    set<int>::iterator      it;
+    string                  ipstr;
+    ostringstream           oss;
+
+    int rc = vms.add_collection_id(vmid);
+
+    if (rc == -1)
+    {
+        return rc;
+    }
+
+    num_nics = obj_template->get("NIC",nics);
+
+    for(nic_id = 0; nic_id < num_nics; nic_id++)
+    {
+        vector<string> ip_vector;
+        vector<string> ip6_vector;
+
+        nic = static_cast<VectorAttribute * >(nics[nic_id]);
+
+        if (nic == 0)
+        {
+            continue;
+        }
+
+        floating = false;
+        nic->vector_value("FLOATING_IP", floating);
+
+        if (floating)
+        {
+            for (it = vms.get_collection().begin(); it != vms.get_collection().end(); it++)
+            {
+                vm = vmpool->get(*it, true);
+
+                if (vm == 0)
+                {
+                    continue;
+                }
+
+                vm_nic = vm->get_nic(nic_id);
+
+                if (vm_nic == 0)
+                {
+                    vm->unlock();
+                    continue;
+                }
+
+                if (vm_nic->vector_value("IP", ipstr) == 0)
+                {
+                    ip_vector.push_back(ipstr);
+                }
+
+                // TODO: do the same for is IP6_LINK and IP6_ULA?
+
+                if (vm_nic->vector_value("IP6_GLOBAL", ipstr) == 0)
+                {
+                    ip6_vector.push_back(ipstr);
+                }
+
+                vm->unlock();
+            }
+
+            string joined_ip = one_util::join(ip_vector.begin(), ip_vector.end(), ',');
+            string joined_ip6 = one_util::join(ip6_vector.begin(), ip6_vector.end(), ',');
+
+            oss.str("");
+            oss << "ETH" << nic_id << "_" << "VROUTER_IP_RECIPIENTS";
+
+            string ip_key = oss.str();
+
+            oss.str("");
+            oss << "ETH" << nic_id << "_" << "VROUTER_IP6_RECIPIENTS";
+
+            string ip6_key = oss.str();
+
+            for (it = vms.get_collection().begin(); it != vms.get_collection().end(); it++)
+            {
+                vm = vmpool->get(*it, true);
+
+                if (vm == 0)
+                {
+                    continue;
+                }
+
+                if (!joined_ip.empty())
+                {
+                    vm->replace_context_attribute(ip_key, joined_ip);
+                }
+
+                if (!joined_ip6.empty())
+                {
+                    vm->replace_context_attribute(ip6_key, joined_ip6);
+                }
+
+                vmpool->update(vm);
+
+                vm->unlock();
+            }
+        }
+    }
+
+    return rc;
+}

From 01ef480214c964a1914535dbb19417b293bc18ba Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Fri, 15 Jan 2016 10:42:02 +0100
Subject: [PATCH 070/197] feature #3671: Check if SUNSTONE vector is defined in
 the VM template

---
 .../form-panels/create/wizard-tabs/general.js | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
index da0014a731..16bbc2931a 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
@@ -136,22 +136,22 @@ define(function(require) {
 
   function _fill(context, templateJSON) {
     var sunstone_template = templateJSON.SUNSTONE;
-    if (sunstone_template && 
-        sunstone_template["CAPACITY_SELECT"] &&
-        sunstone_template["CAPACITY_SELECT"].toUpperCase() == "NO") {
-      $("#sunstone_capacity_select", context).attr("checked", "checked");
+    if (sunstone_template) {
+      if (sunstone_template["CAPACITY_SELECT"] &&
+          sunstone_template["CAPACITY_SELECT"].toUpperCase() == "NO") {
+        $("#sunstone_capacity_select", context).attr("checked", "checked");
+      }
+
+      delete sunstone_template["CAPACITY_SELECT"];
+
+      if (sunstone_template["NETWORK_SELECT"] &&
+          sunstone_template["NETWORK_SELECT"].toUpperCase() == "NO") {
+        $("#sunstone_network_select", context).attr("checked", "checked");
+      }
+
+      delete sunstone_template["NETWORK_SELECT"];
     }
 
-    delete sunstone_template["CAPACITY_SELECT"];
-
-    if (sunstone_template && 
-        sunstone_template["NETWORK_SELECT"] &&
-        sunstone_template["NETWORK_SELECT"].toUpperCase() == "NO") {
-      $("#sunstone_network_select", context).attr("checked", "checked");
-    }
-
-    delete sunstone_template["NETWORK_SELECT"];
-
     if (templateJSON["HYPERVISOR"] == 'vcenter' &&
       templateJSON["KEEP_DISKS_ON_DONE"] &&
         templateJSON["KEEP_DISKS_ON_DONE"].toLowerCase() == "yes" ) {

From 8d4a6f4ab5599a48c238559ec931112e989a3199 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Fri, 15 Jan 2016 10:42:37 +0100
Subject: [PATCH 071/197] bug #4275: Do not escape quotes for
 SCHED_REQUIREMENTS

---
 .../form-panels/create/wizard-tabs/scheduling.js              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js
index cdd7e1ae0b..5c11650994 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js
@@ -218,11 +218,11 @@ define(function(require) {
       var selected_clusters = this.clustersTable.retrieveResourceTableSelect();
 
       $.each(selected_hosts, function(index, hostId) {
-        req_string.push('ID=\\"'+hostId+'\\"');
+        req_string.push('ID="'+hostId+'"');
       });
 
       $.each(selected_clusters, function(index, clusterId) {
-        req_string.push('CLUSTER_ID=\\"'+clusterId+'\\"');
+        req_string.push('CLUSTER_ID="'+clusterId+'"');
       });
 
       $('#SCHED_REQUIREMENTS', context).val(req_string.join(" | "));

From e7604f8c3390f6fe579277dae80ad5c6d69c254e Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Fri, 15 Jan 2016 16:57:58 +0100
Subject: [PATCH 072/197] feature #3671: Fix sunstone join attrs method

---
 src/oca/ruby/opennebula/group.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/oca/ruby/opennebula/group.rb b/src/oca/ruby/opennebula/group.rb
index b4ee5e282e..895eca303f 100644
--- a/src/oca/ruby/opennebula/group.rb
+++ b/src/oca/ruby/opennebula/group.rb
@@ -164,7 +164,7 @@ module OpenNebula
             end
 
             if sunstone_attrs.length > 0
-                rc = self.update("SUNSTONE=[#{sunstone_attrs.join(',\n')}]", true)
+                rc = self.update("SUNSTONE=[#{sunstone_attrs.join(",\n")}]", true)
                 if OpenNebula.is_error?(rc)
                     self.delete
                     error_msg =  "Error updating group template: #{rc.message}"

From 79be9e1f12404e169b1fbe4b3d0f0eb2be16884d Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Fri, 15 Jan 2016 17:12:25 +0100
Subject: [PATCH 073/197] bug #4220: Fix fill checkbox in Firefox

---
 .../public/app/tabs/groups-tab/form-panels/create.js      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
index b04c3810ef..277421becb 100644
--- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
@@ -183,8 +183,8 @@ define(function(require) {
     });
 
     if (this.action == "create") {
-      $("input#group_view_cloud").attr('checked','checked').change();
-      $("input#group_admin_view_groupadmin").attr('checked','checked').change();
+      $("input#group_view_cloud").prop('checked', true).change();
+      $("input#group_admin_view_groupadmin").prop('checked', true).change();
 
       _generateViewsSelect(context, "admin", "groupadmin");
       _generateViewsSelect(context, "user", "cloud");
@@ -314,7 +314,7 @@ define(function(require) {
       var views = views_str.split(",");
       $.each(views, function(){
         $('input[id^="group_view"][value="'+this.trim()+'"]',
-          context).attr('checked','checked').change();
+          context).prop('checked', true).change();
       });
     }
 
@@ -334,7 +334,7 @@ define(function(require) {
       var views = views_str.split(",");
       $.each(views, function(){
         $('input[id^="group_admin_view"][value="'+this.trim()+'"]',
-          context).attr('checked','checked').change();
+          context).prop('checked', true).change();
       });
     }
 

From eabc88b83f6a90c113534a1a70bde4f6585a6d4b Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 18 Jan 2016 12:04:08 +0100
Subject: [PATCH 074/197] Fix reveal-modal header style

---
 src/sunstone/public/scss/app.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss
index 2fe123b13e..2045ab89ad 100644
--- a/src/sunstone/public/scss/app.scss
+++ b/src/sunstone/public/scss/app.scss
@@ -574,7 +574,6 @@ fieldset {
 // Reveal
 
 .reveal-modal h3 {
-    margin-left: -20px;
     margin-bottom: 25px !important;
 }
 

From d75d0af1754de8ee8a9ce441a3d7cbb277219cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 18 Jan 2016 12:36:56 +0100
Subject: [PATCH 075/197] Feature #4215: Make --userdata compatible with other
 instantiate options

---
 src/cli/one_helper.rb                    | 13 ++++++++++++-
 src/cli/one_helper/onetemplate_helper.rb |  2 +-
 src/cli/onetemplate                      | 13 ++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index 7520ecd254..dc84e0b567 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -963,7 +963,7 @@ EOT
         end
     end
 
-    def self.create_template(options)
+    def self.create_template(options, template_obj=nil)
         template=''
 
         template<<"NAME=\"#{options[:name]}\"\n" if options[:name]
@@ -1020,6 +1020,17 @@ EOT
         context=create_context(options)
         template<<context if context
 
+        if options[:userdata] && !template_obj.nil?
+            if template_obj.has_elements?('TEMPLATE/EC2')
+                template_obj.add_element(
+                    'TEMPLATE/EC2',
+                    'USERDATA' => options[:userdata])
+
+                template << template_obj.template_like_str(
+                    'TEMPLATE', false, 'EC2')
+            end
+        end
+
         [0, template]
     end
 
diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb
index 0d36625ea5..c6f486fabb 100644
--- a/src/cli/one_helper/onetemplate_helper.rb
+++ b/src/cli/one_helper/onetemplate_helper.rb
@@ -119,7 +119,7 @@ EOT
         table
     end
 
-    def get_user_inputs(template)
+    def self.get_user_inputs(template)
         user_inputs = template['VMTEMPLATE']['TEMPLATE']['USER_INPUTS']
 
         return "" if !user_inputs
diff --git a/src/cli/onetemplate b/src/cli/onetemplate
index b75348ee30..7a5b7b544f 100755
--- a/src/cli/onetemplate
+++ b/src/cli/onetemplate
@@ -209,17 +209,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
                 if args[1]
                     extra_template = File.read(args[1])
-                elsif options[:userdata]
-                    if t.has_elements?('TEMPLATE/EC2')
-                        t.add_element(
-                            'TEMPLATE/EC2',
-                            'USERDATA' => options[:userdata])
-
-                        extra_template = t.template_like_str(
-                            'TEMPLATE', false, 'EC2')
-                    end
                 else
-                    res = OpenNebulaHelper.create_template(options)
+                    res = OpenNebulaHelper.create_template(options, t)
 
                     if res.first != 0
                         STDERR.puts res.last
@@ -229,7 +220,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     extra_template = res.last
                 end
 
-                user_inputs = helper.get_user_inputs(t.to_hash) unless user_inputs
+                user_inputs = OneTemplateHelper.get_user_inputs(t.to_hash) unless user_inputs
 
                 extra_template << "\n" << user_inputs
 

From e537e105ec59a12dcabe425bc499adc7c27bf9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 18 Jan 2016 15:44:42 +0100
Subject: [PATCH 076/197] Feature #4215: New method one.vrouter.instantiate

---
 include/RequestManagerVMTemplate.h |  42 ++++++
 include/VirtualRouter.h            |   2 +
 src/rm/RequestManager.cc           |   2 +
 src/rm/RequestManagerVMTemplate.cc | 234 ++++++++++++++++++++---------
 src/vrouter/VirtualRouter.cc       |   8 +
 5 files changed, 213 insertions(+), 75 deletions(-)

diff --git a/include/RequestManagerVMTemplate.h b/include/RequestManagerVMTemplate.h
index e495eb45bf..9fc9aeef12 100644
--- a/include/RequestManagerVMTemplate.h
+++ b/include/RequestManagerVMTemplate.h
@@ -46,6 +46,26 @@ protected:
 
     virtual void request_execute(xmlrpc_c::paramList const& _paramList,
                                  RequestAttributes& att) = 0;
+
+
+    /**
+     * Instantiates the VM Template, checking permissions, quotas, etc
+     * @param att the specific request attributes
+     * @param id VM Template ID
+     * @param name Name for the new VM. Can be empty
+     * @param on_hold True to start the VM on HOLD state
+     * @param str_uattrs Template supplied by user to merge with the original
+     * contents. Can be empty
+     * @param extra_attrs Template to be merged. It should contain internal
+     * configuration, and it won't be authenticated or checked for restricted
+     * attributes. Can be 0
+     *
+     * @return VMID on success, -1 on failure. On failure, failure_response is set,
+     * but for success the calling method needs to set success_response
+     */
+    int instantiate(RequestAttributes& att, int id,
+                    string name, bool on_hold, string str_uattrs,
+                    Template* extra_attrs);
 };
 
 /* ------------------------------------------------------------------------- */
@@ -66,6 +86,28 @@ public:
 
     void request_execute(xmlrpc_c::paramList const& _paramList,
                          RequestAttributes& att);
+
+};
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterInstantiate : public RequestManagerVMTemplate
+{
+public:
+    VirtualRouterInstantiate():
+        RequestManagerVMTemplate("VirtualRouterInstantiate",
+                                 "Instantiates a new virtual machine associated to a virtual router",
+                                 "A:siiisbs")
+    {
+        auth_op = AuthRequest::USE;
+    };
+
+    ~VirtualRouterInstantiate(){};
+
+    void request_execute(xmlrpc_c::paramList const& _paramList,
+                         RequestAttributes& att);
+
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index 197fc7287b..d6354f5c3a 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -40,6 +40,8 @@ public:
 
     int add_vmid(int vmid);
 
+    bool has_vmids() const;
+
     // ------------------------------------------------------------------------
     // Template Contents
     // ------------------------------------------------------------------------
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index 9ab5bbce91..aefe7cc651 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -350,6 +350,7 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr cluster_update(new ClusterUpdateTemplate());
     xmlrpc_c::methodPtr secg_update(new SecurityGroupUpdateTemplate());
     xmlrpc_c::methodPtr vrouter_update(new VirtualRouterUpdateTemplate());
+    xmlrpc_c::methodPtr vrouter_instantiate(new VirtualRouterInstantiate());
 
     // Allocate Methods
     xmlrpc_c::methodPtr vm_allocate(new VirtualMachineAllocate());
@@ -900,6 +901,7 @@ void RequestManager::register_xml_methods()
     RequestManagerRegistry.addMethod("one.vrouter.chown", vrouter_chown);
     RequestManagerRegistry.addMethod("one.vrouter.chmod", vrouter_chmod);
     RequestManagerRegistry.addMethod("one.vrouter.rename", vrouter_rename);
+    RequestManagerRegistry.addMethod("one.vrouter.instantiate",vrouter_instantiate);
 
     RequestManagerRegistry.addMethod("one.vrouterpool.info",vrouter_pool_info);
 
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index 16df955ffc..c2c0cd6167 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -29,20 +29,155 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
     bool   on_hold = false; //Optional XML-RPC argument
     string str_uattrs;      //Optional XML-RPC argument
 
+    if ( paramList.size() > 3 )
+    {
+        on_hold = xmlrpc_c::value_boolean(paramList.getBoolean(3));
+
+        str_uattrs = xmlrpc_c::value_string(paramList.getString(4));
+    }
+
+    // TODO: if Template has VROUTER = YES, do not allow to instantiate here
+
+    int vid = instantiate(att, id, name, on_hold, str_uattrs, 0);
+
+    if (vid != -1)
+    {
+        success_response(vid, att);
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void VirtualRouterInstantiate::request_execute(
+        xmlrpc_c::paramList const& paramList, RequestAttributes& att)
+{
+    int    vrid       = xmlrpc_c::value_int(paramList.getInt(1));
+    int    n_vms      = xmlrpc_c::value_int(paramList.getInt(2));
+    int    tmpl_id    = xmlrpc_c::value_int(paramList.getInt(3));
+    string name       = xmlrpc_c::value_string(paramList.getString(4));
+    bool   on_hold    = xmlrpc_c::value_boolean(paramList.getBoolean(5));
+    string str_uattrs = xmlrpc_c::value_string(paramList.getString(6));
+
+    Nebula& nd = Nebula::instance();
+    VirtualRouterPool*  vrpool = nd.get_vrouterpool();
+    VirtualRouter *     vr;
+    DispatchManager*    dm = nd.get_dm();
+
+    PoolObjectAuth      vr_perms;
+    Template*           extra_attrs;
+    bool                has_vmids;
+    string              errorstr;
+
+    vector<int>             vms;
+    vector<int>::iterator   vmid;
+
+    /* ---------------------------------------------------------------------- */
+    /* Get the Virtual Router NICs                                            */
+    /* ---------------------------------------------------------------------- */
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr == 0)
+    {
+        failure_response(NO_EXISTS,
+                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
+                att);
+
+        return;
+    }
+
+    vr->get_permissions(vr_perms);
+
+    extra_attrs = vr->get_nics();
+
+    has_vmids = vr->has_vmids();
+
+    vr->unlock();
+
+    if ( att.uid != 0 )
+    {
+        AuthRequest ar(att.uid, att.group_ids);
+
+        ar.add_auth(AuthRequest::MANAGE, vr_perms); // MANAGE VROUTER
+
+        if (UserPool::authorize(ar) == -1)
+        {
+            failure_response(AUTHORIZATION,
+                    authorization_error(ar.message, att),
+                    att);
+
+            return;
+        }
+    }
+
+    if (has_vmids)
+    {
+        failure_response(ACTION,
+                request_error("Virtual Router already has VMs. Cannot instantiate new ones", ""),
+                att);
+
+        return;
+    }
+
+    for (int i=0; i<n_vms; i++)
+    {
+        int vid = instantiate(att, tmpl_id, name, true, str_uattrs, extra_attrs);
+
+        if (vid == -1)
+        {
+            return;
+        }
+
+        vms.push_back(vid);
+    }
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr != 0)
+    {
+        for (vmid = vms.begin(); vmid != vms.end(); vmid++)
+        {
+            vr->add_vmid(*vmid);
+        }
+
+        vrpool->update(vr);
+
+        vr->unlock();
+    }
+
+    // VMs are created on hold to wait for all the vr->add_vmid calls, that
+    // update each VM context with other VM IPs
+    if (!on_hold)
+    {
+        for (vmid = vms.begin(); vmid != vms.end(); vmid++)
+        {
+            dm->release(*vmid, errorstr);
+        }
+    }
+
+    success_response(vrid, att);
+}
+
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
+                                string name, bool on_hold, string str_uattrs,
+                                Template* extra_attrs)
+{
     int  rc;
     int  vid;
 
     ostringstream sid;
 
     PoolObjectAuth perms;
-    PoolObjectAuth vr_perms;
 
     Nebula& nd = Nebula::instance();
 
     VirtualMachinePool* vmpool  = nd.get_vmpool();
     VMTemplatePool *    tpool   = static_cast<VMTemplatePool *>(pool);
-    VirtualRouterPool*  vrpool  = nd.get_vrouterpool();
-    VirtualRouter *     vr;
 
     VirtualMachineTemplate * tmpl;
     VirtualMachineTemplate * extended_tmpl = 0;
@@ -51,18 +186,9 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     string error_str;
     string aname;
-    bool   has_vrouter_id;
-    int    vrid;
 
     string tmpl_name;
 
-    if ( paramList.size() > 3 )
-    {
-        on_hold = xmlrpc_c::value_boolean(paramList.getBoolean(3));
-
-        str_uattrs = xmlrpc_c::value_string(paramList.getString(4));
-    }
-
     /* ---------------------------------------------------------------------- */
     /* Get, check and clone the template                                      */
     /* ---------------------------------------------------------------------- */
@@ -75,7 +201,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
                 get_error(object_name(auth_object),id),
                 att);
 
-        return;
+        return -1;
     }
 
     tmpl_name = rtmpl->get_name();
@@ -94,7 +220,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
         {
             failure_response(INTERNAL, error_str, att);
             delete tmpl;
-            return;
+            return -1;
         }
 
         if (att.uid!=UserPool::ONEADMIN_ID && att.gid!=GroupPool::ONEADMIN_ID)
@@ -110,7 +236,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
                         att);
 
                 delete tmpl;
-                return;
+                return -1;
             }
         }
 
@@ -120,7 +246,19 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
         {
             failure_response(INTERNAL, error_str, att);
             delete tmpl;
-            return;
+            return -1;
+        }
+    }
+
+    if (extra_attrs != 0)
+    {
+        rc = tmpl->merge(extra_attrs, error_str);
+
+        if ( rc != 0 )
+        {
+            failure_response(INTERNAL, error_str, att);
+            delete tmpl;
+            return -1;
         }
     }
 
@@ -141,48 +279,13 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
         tmpl->set(new SingleAttribute("NAME",name));
     }
 
-    /* ---------------------------------------------------------------------- */
-    /* If it is a Virtual Router, get the NICs                                */
-    /* ---------------------------------------------------------------------- */
-
-    has_vrouter_id = tmpl->get("VROUTER_ID", vrid);
-
-    if ( has_vrouter_id )
-    {
-        vr = vrpool->get(vrid, true);
-
-        if (vr == 0)
-        {
-            failure_response(NO_EXISTS,
-                    get_error(object_name(PoolObjectSQL::VROUTER),vrid),
-                    att);
-
-            delete tmpl;
-            return;
-        }
-
-        vr->get_permissions(vr_perms);
-
-        tmpl->erase("NIC");
-        rc = tmpl->merge(vr->get_nics(), error_str);
-
-        vr->unlock();
-
-        if ( rc != 0 )
-        {
-            failure_response(INTERNAL, error_str, att);
-            delete tmpl;
-            return;
-        }
-    }
-
     //--------------------------------------------------------------------------
 
     if ( att.uid != 0 )
     {
         AuthRequest ar(att.uid, att.group_ids);
 
-        ar.add_auth(auth_op, perms); //USE TEMPLATE
+        ar.add_auth(AuthRequest::USE, perms); //USE TEMPLATE
 
         if (!str_uattrs.empty())
         {
@@ -196,11 +299,6 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
         VirtualMachine::set_auth_request(att.uid, ar, tmpl);
 
-        if (has_vrouter_id)
-        {
-            ar.add_auth(AuthRequest::MANAGE, vr_perms); // MANAGE VROUTER
-        }
-
         if (UserPool::authorize(ar) == -1)
         {
             failure_response(AUTHORIZATION,
@@ -208,7 +306,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
                     att);
 
             delete tmpl;
-            return;
+            return -1;
         }
 
         extended_tmpl = new VirtualMachineTemplate(*tmpl);
@@ -219,7 +317,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
         {
             delete tmpl;
             delete extended_tmpl;
-            return;
+            return -1;
         }
     }
 
@@ -239,26 +337,12 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
         delete extended_tmpl;
 
-        return;
+        return -1;
     }
 
     delete extended_tmpl;
 
-    if ( has_vrouter_id )
-    {
-        vr = vrpool->get(vrid, true);
-
-        if (vr != 0)
-        {
-            vr->add_vmid(vid);
-
-            vrpool->update(vr);
-
-            vr->unlock();
-        }
-    }
-
-    success_response(vid, att);
+    return vid;
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index c4b3b11969..69c349aee6 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -574,3 +574,11 @@ int VirtualRouter::add_vmid(int vmid)
 
     return rc;
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+bool VirtualRouter::has_vmids() const
+{
+    return vms.get_collection_size() > 0;
+}

From e7b53d6bb1d645dd4d2bbb2c5b935e4fc1712fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 18 Jan 2016 15:46:26 +0100
Subject: [PATCH 077/197] Feature #4215: Use new vrouter.instantiate method in
 cli and sunstone

---
 src/cli/one_helper/onetemplate_helper.rb      |  8 ---
 src/cli/one_helper/onevrouter_helper.rb       |  9 ++-
 src/cli/onetemplate                           |  7 +-
 src/cli/onevrouter                            | 68 ++++++++++++++++++-
 src/oca/ruby/opennebula/virtual_router.rb     | 21 ++++++
 .../OpenNebulaJSON/VirtualRouterJSON.rb       | 21 ++++++
 .../public/app/opennebula/virtualrouter.js    |  4 ++
 .../tabs/vrouters-tab/form-panels/create.js   | 51 ++++++--------
 8 files changed, 143 insertions(+), 46 deletions(-)

diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb
index c6f486fabb..30f0b385d6 100644
--- a/src/cli/one_helper/onetemplate_helper.rb
+++ b/src/cli/one_helper/onetemplate_helper.rb
@@ -51,14 +51,6 @@ EOT
                         "information, such as the SIZE for each DISK"
     }
 
-    VROUTER={
-        :name => "vrouter",
-        :large => "--vrouter vrid",
-        :format => Integer,
-        :description => "Creates a VM associated to the given Virtual Router. "+
-                        "The NIC elements defined in the Virtual Router will be used"
-    }
-
     def self.rname
         "VMTEMPLATE"
     end
diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb
index bcdd09f9df..594fcab569 100644
--- a/src/cli/one_helper/onevrouter_helper.rb
+++ b/src/cli/one_helper/onevrouter_helper.rb
@@ -17,6 +17,13 @@
 require 'one_helper'
 
 class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
+
+    ALL_TEMPLATE = {
+        :name       => "all",
+        :large      => "--all",
+        :description => "Show all template data"
+    }
+
     def self.rname
         "VROUTER"
     end
@@ -180,7 +187,7 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
 
         while obj.has_elements?("/VROUTER/TEMPLATE/NIC")
             obj.delete_element("/VROUTER/TEMPLATE/NIC")
-        end
+        end if !options[:all]
 
         puts
 
diff --git a/src/cli/onetemplate b/src/cli/onetemplate
index 7a5b7b544f..4ad216a382 100755
--- a/src/cli/onetemplate
+++ b/src/cli/onetemplate
@@ -55,8 +55,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         OneTemplateHelper::VM_NAME,
         OneTemplateHelper::MULTIPLE,
         OneTemplateHelper::USERDATA,
-        OneVMHelper::HOLD,
-        OneTemplateHelper::VROUTER,
+        OneVMHelper::HOLD
     ]
 
     ########################################################################
@@ -224,10 +223,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
                 extra_template << "\n" << user_inputs
 
-                if !options[:vrouter].nil?
-                    extra_template << "\n" << "VROUTER_ID = \"#{options[:vrouter]}\""
-                end
-
                 res = t.instantiate(name, on_hold, extra_template)
 
                 if !OpenNebula.is_error?(res)
diff --git a/src/cli/onevrouter b/src/cli/onevrouter
index cd3998a738..128dca34fb 100755
--- a/src/cli/onevrouter
+++ b/src/cli/onevrouter
@@ -29,6 +29,7 @@ $: << RUBY_LIB_LOCATION+"/cli"
 
 require 'command_parser'
 require 'one_helper/onevrouter_helper'
+require 'one_helper/onetemplate_helper'
 require 'one_helper/onevm_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
@@ -95,6 +96,70 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    instantiate_desc = <<-EOT.unindent
+        Creates a new VM instance from the given Template. This VM can be
+        managed with the 'onevm' command.
+
+        The NIC elements defined in the Virtual Router will be used. The
+        source Template can be modified adding or replacing attributes with
+        the optional file argument, or with the options.
+    EOT
+
+    instantiate_options = [
+        OneTemplateHelper::VM_NAME,
+        OneTemplateHelper::MULTIPLE,
+        OneVMHelper::HOLD
+    ]
+
+    command :instantiate, instantiate_desc, :vrouterid, :templateid, [:file, nil],
+            :options=>instantiate_options+OpenNebulaHelper::TEMPLATE_OPTIONS do
+        exit_code=0
+
+        if args[1] && OpenNebulaHelper.create_template_options_used?(options)
+            STDERR.puts "You cannot use both template file and template"<<
+                " creation options."
+            next -1
+        end
+
+        number = options[:multiple] || 1
+        user_inputs = nil
+
+        helper.perform_action(args[0], options, "instantiated") do |vr|
+            name = options[:name] || ""
+
+            t = OpenNebula::Template.new_with_id(args[1], helper.client)
+
+            on_hold = options[:hold] != nil
+
+            extra_template = ""
+            rc = t.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(-1)
+            end
+
+            if args[2]
+                extra_template = File.read(args[2])
+            else
+                res = OpenNebulaHelper.create_template(options, t)
+
+                if res.first != 0
+                    STDERR.puts res.last
+                    next -1
+                end
+
+                extra_template = res.last
+            end
+
+            user_inputs = OneTemplateHelper.get_user_inputs(t.to_hash) unless user_inputs
+
+            extra_template << "\n" << user_inputs
+
+            vr.instantiate(number, args[1], name, on_hold, extra_template)
+        end
+    end
+
     delete_desc = <<-EOT.unindent
         Deletes the given Virtual Router
     EOT
@@ -177,7 +242,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Virtual Router
     EOT
 
-    command :show, show_desc, :secgroupid, :options=>OpenNebulaHelper::XML do
+    command :show, show_desc, :vrouterid,
+            :options=>[OpenNebulaHelper::XML, OneVMHelper::ALL_TEMPLATE] do
         helper.show_resource(args[0],options)
     end
 
diff --git a/src/oca/ruby/opennebula/virtual_router.rb b/src/oca/ruby/opennebula/virtual_router.rb
index dfa8646be3..c25df1c0fd 100644
--- a/src/oca/ruby/opennebula/virtual_router.rb
+++ b/src/oca/ruby/opennebula/virtual_router.rb
@@ -25,6 +25,7 @@ module OpenNebula
 
         VIRTUAL_ROUTER_METHODS = {
             :allocate    => "vrouter.allocate",
+            :instantiate => "vrouter.instantiate",
             :info        => "vrouter.info",
             :update      => "vrouter.update",
             :delete      => "vrouter.delete",
@@ -78,6 +79,26 @@ module OpenNebula
             super(VIRTUAL_ROUTER_METHODS[:allocate], description)
         end
 
+        # Creates VM instances from a VM Template. New VMs will be associated
+        # to this Virtual Router, and its Virtual Networks
+        #
+        # @para n_vms [Integer] Number of VMs to instantiate
+        # @para template_id [Integer] VM Template id to instantiate
+        # @param name [String] Name for the VM instances. If it is an empty
+        #   string OpenNebula will set a default name
+        # @param hold [true,false] false to create the VM in pending state,
+        #   true to create it on hold
+        # @param template [String] User provided Template to merge with the
+        #   one being instantiated
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def instantiate(n_vms, template_id, name="", hold=false, template="")
+            return call(VIRTUAL_ROUTER_METHODS[:instantiate], @pe_id,
+                        n_vms.to_i, template_id.to_i, name, hold, template)
+        end
+
+
         # Deletes the VirtualRouter
         def delete()
             super(VIRTUAL_ROUTER_METHODS[:delete])
diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
index c850af9fbd..df4e0bd453 100644
--- a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
@@ -44,6 +44,7 @@ module OpenNebulaJSON
             end
 
             rc = case action_hash['perform']
+                 when "instantiate" then self.instantiate(action_hash['params'])
                  when "update"      then self.update(action_hash['params'])
                  when "chown"       then self.chown(action_hash['params'])
                  when "chmod"       then self.chmod_json(action_hash['params'])
@@ -55,6 +56,26 @@ module OpenNebulaJSON
                  end
         end
 
+        def instantiate(params=Hash.new)
+            if params['template']
+                select_capacity = self['TEMPLATE/SUNSTONE_CAPACITY_SELECT']
+                if (select_capacity && select_capacity.upcase == "NO")
+                    params['template'].delete("CPU")
+                    params['template'].delete("MEMORY")
+                end
+
+                select_network = self['TEMPLATE/SUNSTONE_NETWORK_SELECT']
+                if (select_network && select_network.upcase == "NO")
+                    params['template'].delete("NIC")
+                end
+
+                template = template_to_str(params['template'])
+                super(params['n_vms'], params['template_id'], params['vm_name'], params['hold'], template)
+            else
+                super(params['n_vms'], params['template_id'], params['vm_name'], params['hold'])
+            end
+        end
+
         def update(params=Hash.new)
             super(params['template_raw'])
         end
diff --git a/src/sunstone/public/app/opennebula/virtualrouter.js b/src/sunstone/public/app/opennebula/virtualrouter.js
index b990486a53..d73201e52b 100644
--- a/src/sunstone/public/app/opennebula/virtualrouter.js
+++ b/src/sunstone/public/app/opennebula/virtualrouter.js
@@ -25,6 +25,10 @@ define(function(require) {
     "create" : function(params) {
       OpenNebulaAction.create(params, RESOURCE);
     },
+    "instantiate" : function(params) {
+      var action_obj = params.data.extra_param ? params.data.extra_param : {};
+      OpenNebulaAction.simple_action(params, RESOURCE, "instantiate", action_obj);
+    },
     "del" : function(params) {
       OpenNebulaAction.del(params, RESOURCE);
     },
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index 02430addf8..5ef87691b5 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -163,41 +163,32 @@ define(function(require) {
         timeout: true,
         success: function (request, response) {
 
-          // TODO: close form panel only on instantiate success
-          Sunstone.resetFormPanel(TAB_ID, FORM_PANEL_ID);
-          Sunstone.hideFormPanel(TAB_ID);
-
-          var extra_msg = "";
-          if (n_times > 1) {
-            extra_msg = n_times + " times";
-          }
-
-          Notifier.notifySubmit("Template.instantiate", tmplId, extra_msg);
-
-          var extra_info = {
-            'hold': hold
-          };
+          //TODO: add support for vm_name.replace(/%i/gi, i), or remove tooltip
 
           var tmpl = WizardFields.retrieve($(".template_user_inputs", context));
-          tmpl["VROUTER_ID"] = response.VROUTER.ID;
 
-          extra_info['template'] = tmpl;
+          var extra_info = {
+            'n_vms': n_times,
+            'template_id': tmplId,
+            'vm_name': vm_name,
+            'hold': hold,
+            'template': tmpl
+          };
 
-          for (var i = 0; i < n_times; i++) {
-            extra_info['vm_name'] = vm_name.replace(/%i/gi, i);
+          OpenNebulaVirtualRouter.instantiate({
+            data:{
+              id: response.VROUTER.ID,
+              extra_param: extra_info
+            },
+            timeout: true,
+            success: function(request, response){
+              OpenNebulaAction.clear_cache("VM");
 
-            OpenNebulaTemplate.instantiate({
-              data:{
-                id: tmplId,
-                extra_param: extra_info
-              },
-              timeout: true,
-              success: function(request, response){
-                OpenNebulaAction.clear_cache("VM");
-              },
-              error: Notifier.onError
-            });
-          }
+              Sunstone.resetFormPanel(TAB_ID, FORM_PANEL_ID);
+              Sunstone.hideFormPanel(TAB_ID);
+            },
+            error: Notifier.onError
+          });
         },
         error: function(request, response) {
           Sunstone.hideFormPanelLoading(TAB_ID);

From 9528a0fe360cf2320d75e2f4e9ea590e0d424379 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 18 Jan 2016 16:22:32 +0100
Subject: [PATCH 078/197] feature #4273: Add IM_MAD and VM_MAD info

---
 src/sunstone/public/app/sunstone-config.js    | 12 +++++++
 .../app/tabs/hosts-tab/form-panels/create.js  | 21 ++++++++++-
 .../hosts-tab/form-panels/create/wizard.hbs   | 35 ++++++-------------
 src/sunstone/sunstone-server.rb               |  4 ++-
 4 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js
index 03da60bfd9..04000a5579 100644
--- a/src/sunstone/public/app/sunstone-config.js
+++ b/src/sunstone/public/app/sunstone-config.js
@@ -28,6 +28,8 @@ define(function(require) {
   };
 
   var _dsMadConf = {};
+  var _imMadConf = {};
+  var _vmMadConf = {};
 
   var Config = {
     'isTabEnabled': function(tabName) {
@@ -155,6 +157,8 @@ define(function(require) {
     'enabledTabs': _config['view']['enabled_tabs'],
     "defaultCost" : _defaultCost,
     'dsMadConf' : _dsMadConf,
+    'imMadConf' : _imMadConf,
+    'vmMadConf' : _vmMadConf,
     "initOnedConf" : function() {
       OpenNebulaSystem.onedconf({
         data : {},
@@ -175,6 +179,14 @@ define(function(require) {
           if (onedconf.DS_MAD_CONF != undefined){
             $.extend(true, _dsMadConf, onedconf.DS_MAD_CONF);
           }
+
+          if (onedconf.IM_MAD != undefined){
+            $.extend(true, _imMadConf, onedconf.IM_MAD);
+          }
+
+          if (onedconf.VM_MAD != undefined){
+            $.extend(true, _vmMadConf, onedconf.VM_MAD);
+          }
         },
         error: function(request, error_json){
           console.error("There was an error requesting oned.conf: "+
diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js
index 7aeab92ea3..84a9e429c9 100644
--- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js
@@ -28,6 +28,7 @@ define(function(require) {
   var VCenterClusters = require('utils/vcenter/clusters');
   var VCenterTemplates = require('utils/vcenter/templates');
   var VCenterNetworks = require('utils/vcenter/networks');
+  var Config = require('sunstone-config');
 
   /*
     TEMPLATES
@@ -61,6 +62,22 @@ define(function(require) {
     this.vCenterNetworks = new VCenterNetworks();
     this.vCenterTemplates = new VCenterTemplates();
 
+    var that = this;
+
+    that.vmMadNameList = [];
+    if (Config.vmMadConf !== undefined) {
+      $.each(Config.vmMadConf, function(index, vmMad) {
+        that.vmMadNameList.push(vmMad["NAME"]);
+      });
+    }
+
+    that.imMadNameList = [];
+    if (Config.imMadConf !== undefined) {
+      $.each(Config.imMadConf, function(index, imMad) {
+        that.imMadNameList.push(imMad["NAME"]);
+      });
+    }
+
     BaseFormPanel.call(this);
   };
 
@@ -83,7 +100,9 @@ define(function(require) {
       'formPanelId': this.formPanelId,
       'vCenterClustersHTML': this.vCenterClusters.html(),
       'vCenterTemplatesHTML': this.vCenterTemplates.html(),
-      'vCenterNetworksHTML': this.vCenterNetworks.html()
+      'vCenterNetworksHTML': this.vCenterNetworks.html(),
+      'vmMadNameList': this.vmMadNameList,
+      'imMadNameList': this.imMadNameList
     });
   }
 
diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs
index 98b1fde6f2..85268ffacc 100644
--- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs
@@ -19,14 +19,9 @@
     <div class="medium-6 columns">
       <label for="host_type">{{tr "Type"}}</label>
       <select id="host_type_mad" name="host_type">
-        <option value="kvm">{{tr "KVM"}}</option>
-        <option value="xen">{{tr "XEN"}}</option>
-        <option value="vmware">{{tr "VMware"}}</option>
-        <option value="vcenter">{{tr "vCenter"}}</option>
-        <option value="az">{{tr "Microsoft Azure"}}</option>
-        <option value="ec2">{{tr "Amazon EC2"}}</option>
-        <option value="sl">{{tr "IBM Softlayer"}}</option>
-        <option value="dummy">{{tr "Dummy"}}</option>
+        {{#each vmMadNameList}}
+          <option value="{{this}}">{{this}}</option>
+        {{/each}}
         <option value="custom">{{tr "Custom"}}</option>
       </select>
     </div>
@@ -71,14 +66,9 @@
             <div class="large-12 columns">
               <label for="vmm">{{tr "Virtualization"}}</label>
               <select id="vmm_mad" name="vmm">
-                <option value="kvm">{{tr "KVM"}}</option>
-                <option value="xen">{{tr "XEN"}}</option>
-                <option value="vmware">{{tr "VMware"}}</option>
-                <option value="vcenter">{{tr "vCenter"}}</option>
-                <option value="az">{{tr "Microsoft Azure"}}</option>
-                <option value="ec2">{{tr "Amazon EC2"}}</option>
-                <option value="sl">{{tr "IBM Softlayer"}}</option>
-                <option value="dummy">{{tr "Dummy"}}</option>
+                {{#each vmMadNameList}}
+                  <option value="{{this}}">{{this}}</option>
+                {{/each}}
                 <option value="custom">{{tr "Custom"}}</option>
               </select>
             </div>
@@ -92,15 +82,10 @@
           <div class="manager clear row" id="im_mads">
             <div class="large-12 columns">
               <label for="im">{{tr "Information"}}</label>
-              <select id="im_mad" name="im">
-                <option value="kvm">{{tr "KVM"}}</option>
-                <option value="xen">{{tr "XEN"}}</option>
-                <option value="vmware">{{tr "VMware"}}</option>
-                <option value="vcenter">{{tr "vCenter"}}</option>
-                <option value="az">{{tr "Microsoft Azure"}}</option>
-                <option value="ec2">{{tr "Amazon EC2"}}</option>
-                <option value="sl">{{tr "IBM Softlayer"}}</option>
-                <option value="dummy">{{tr "Dummy"}}</option>
+              <select id="im_mad" name="im">  
+                {{#each imMadNameList}}
+                  <option value="{{this}}">{{this}}</option>
+                {{/each}}
                 <option value="custom">{{tr "Custom"}}</option>
               </select>
             </div>
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index ea3ebcb6c5..d19609a054 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -527,7 +527,9 @@ get '/onedconf' do
 
     keys = [
         :DEFAULT_COST,
-        :DS_MAD_CONF
+        :DS_MAD_CONF,
+        :VM_MAD,
+        :IM_MAD
     ]
 
     onedconf = {}

From 4f5fd6dda6f3ad158b2c91ee41ff06fd1cbc4836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 18 Jan 2016 16:47:14 +0100
Subject: [PATCH 079/197] Feature #4215: Delete VMs when VRs are deleted.
 Disable actions on VRouter VMs

---
 include/VirtualMachine.h               |  7 ++
 include/VirtualRouter.h                |  9 ++-
 src/rm/RequestManagerVMTemplate.cc     |  2 +-
 src/rm/RequestManagerVirtualMachine.cc | 94 ++++++++++++++++++++++----
 src/vm/VirtualMachine.cc               | 19 ++++++
 src/vrouter/VirtualRouter.cc           | 35 +++++++++-
 6 files changed, 149 insertions(+), 17 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 3b80652344..debca0b776 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1336,6 +1336,13 @@ public:
      */
     bool is_vrouter();
 
+    /**
+     * Checks if the given action is supported for Virtual Router VMs
+     * @param action VM action to check
+     * @return true if the action is supported for Virtual Router VMs
+     */
+    static bool is_vrouter_action_supported(History::VMAction action);
+
     // ------------------------------------------------------------------------
     // Context related functions
     // ------------------------------------------------------------------------
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index d6354f5c3a..71165aa9ba 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -64,7 +64,7 @@ public:
                 *(static_cast<Template *>(obj_template)));
     };
 
-    Template * get_nics() const;
+    Template * get_vm_template() const;
 
 private:
     // -------------------------------------------------------------------------
@@ -184,6 +184,13 @@ private:
      * @return 0 on success, -1 otherwise
      */
     int release_network_leases(VectorAttribute const * nic);
+
+    /**
+     * Tries to shutdown, or delete, all this Virtual Router's VMs
+     *
+     * @return 0 on success, -1 otherwise
+     */
+    int shutdown_vms();
 };
 
 #endif /*VIRTUAL_ROUTER_H_*/
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index c2c0cd6167..1d7d4924e0 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -89,7 +89,7 @@ void VirtualRouterInstantiate::request_execute(
 
     vr->get_permissions(vr_perms);
 
-    extra_attrs = vr->get_nics();
+    extra_attrs = vr->get_vm_template();
 
     has_vmids = vr->has_vmids();
 
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index c826b1982e..686e407be5 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -553,6 +553,18 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
         return;
     }
 
+    if (vm->is_vrouter() && !vm->is_vrouter_action_supported(action))
+    {
+        oss << "Action \"" << action_st << "\" is not supported for Virtual Router VMs";
+
+        failure_response(ACTION,
+                request_error(oss.str(),""),
+                att);
+
+        vm->unlock();
+        return;
+    }
+
     vm->unlock();
 
     switch (action)
@@ -1029,6 +1041,16 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
         return;
     }
 
+    if (vm->is_vrouter() && !vm->is_vrouter_action_supported(action))
+    {
+        failure_response(ACTION,
+                request_error("Migration is not supported for Virtual Router VMs",""),
+                att);
+
+        vm->unlock();
+        return;
+    }
+
     // Get System DS information from current History record
     c_ds_id  = vm->get_ds_id();
     c_tm_mad = vm->get_tm_mad();
@@ -1537,7 +1559,6 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
     VirtualMachineTemplate tmpl;
     PoolObjectAuth         vm_perms;
 
-    VirtualMachinePool * vmpool = static_cast<VirtualMachinePool *>(pool);
     VirtualMachine *     vm;
 
     int    rc;
@@ -1568,13 +1589,8 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
         return;
     }
 
-    vm = vmpool->get(id, true);
-
-    if (vm == 0)
+    if ((vm = get_vm(id, att)) == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VM),id),
-                att);
         return;
     }
 
@@ -1582,6 +1598,16 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
 
     volatile_disk = vm->volatile_disk_extended_info(&tmpl);
 
+    if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::DISK_ATTACH_ACTION))
+    {
+        failure_response(ACTION,
+                request_error("Action is not supported for Virtual Router VMs",""),
+                att);
+
+        vm->unlock();
+        return;
+    }
+
     vm->unlock();
 
     RequestAttributes att_quota(vm_perms.uid, vm_perms.gid, att);
@@ -1636,6 +1662,7 @@ void VirtualMachineDetach::request_execute(xmlrpc_c::paramList const& paramList,
 {
     Nebula&             nd = Nebula::instance();
     DispatchManager *   dm = nd.get_dm();
+    VirtualMachine *    vm;
 
     int rc;
     string error_str;
@@ -1652,6 +1679,23 @@ void VirtualMachineDetach::request_execute(xmlrpc_c::paramList const& paramList,
         return;
     }
 
+    if ((vm = get_vm(id, att)) == 0)
+    {
+        return;
+    }
+
+    if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_DETACH_ACTION))
+    {
+        failure_response(ACTION,
+                request_error("Action is not supported for Virtual Router VMs",""),
+                att);
+
+        vm->unlock();
+        return;
+    }
+
+    vm->unlock();
+
     rc = dm->detach(id, disk_id, error_str);
 
     if ( rc != 0 )
@@ -2116,7 +2160,6 @@ void VirtualMachineAttachNic::request_execute(
     VirtualMachineTemplate tmpl;
 
     PoolObjectAuth       vm_perms;
-    VirtualMachinePool * vmpool = static_cast<VirtualMachinePool *>(pool);
     VirtualMachine *     vm;
 
     int    rc;
@@ -2146,18 +2189,23 @@ void VirtualMachineAttachNic::request_execute(
         return;
     }
 
-    vm = vmpool->get(id, true);
-
-    if (vm == 0)
+    if ((vm = get_vm(id, att)) == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VM),id),
-                att);
         return;
     }
 
     vm->get_permissions(vm_perms);
 
+    if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_ATTACH_ACTION))
+    {
+        failure_response(ACTION,
+                request_error("Action is not supported for Virtual Router VMs",""),
+                att);
+
+        vm->unlock();
+        return;
+    }
+
     vm->unlock();
 
     RequestAttributes att_quota(vm_perms.uid, vm_perms.gid, att);
@@ -2211,6 +2259,7 @@ void VirtualMachineDetachNic::request_execute(
 {
     Nebula&             nd = Nebula::instance();
     DispatchManager *   dm = nd.get_dm();
+    VirtualMachine *    vm;
 
     int rc;
     string error_str;
@@ -2227,6 +2276,23 @@ void VirtualMachineDetachNic::request_execute(
         return;
     }
 
+    if ((vm = get_vm(id, att)) == 0)
+    {
+        return;
+    }
+
+    if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_DETACH_ACTION))
+    {
+        failure_response(ACTION,
+                request_error("Action is not supported for Virtual Router VMs",""),
+                att);
+
+        vm->unlock();
+        return;
+    }
+
+    vm->unlock();
+
     rc = dm->detach_nic(id, nic_id, error_str);
 
     if ( rc != 0 )
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 619fa8fd07..85278e9312 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -3263,6 +3263,25 @@ bool VirtualMachine::is_vrouter()
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+bool VirtualMachine::is_vrouter_action_supported(History::VMAction action)
+{
+    return (action == History::MIGRATE_ACTION ||
+            action == History::LIVE_MIGRATE_ACTION ||
+            action == History::HOLD_ACTION ||
+            action == History::RELEASE_ACTION ||
+            action == History::RESUME_ACTION ||
+            action == History::BOOT_ACTION ||
+            action == History::REBOOT_ACTION ||
+            action == History::REBOOT_HARD_ACTION ||
+            action == History::RESCHED_ACTION ||
+            action == History::UNRESCHED_ACTION ||
+            action == History::DISK_SNAPSHOT_CREATE_ACTION ||
+            action == History::DISK_SNAPSHOT_DELETE_ACTION);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int VirtualMachine::generate_context(string &files, int &disk_id,
         string& token_password)
 {
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index 69c349aee6..0c50f660bf 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -127,6 +127,8 @@ int VirtualRouter::drop(SqlDB * db)
     if ( rc == 0 )
     {
         release_network_leases();
+
+        shutdown_vms();
     }
 
     return rc;
@@ -135,6 +137,35 @@ int VirtualRouter::drop(SqlDB * db)
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 
+int VirtualRouter::shutdown_vms()
+{
+    DispatchManager *   dm = Nebula::instance().get_dm();
+    set<int>::iterator  it;
+    string              error;
+    int                 rc;
+    int                 result = 0;
+
+    for (it = vms.get_collection().begin(); it != vms.get_collection().end(); it++)
+    {
+        rc = dm->shutdown(*it, true, error);
+
+        if (rc != 0)
+        {
+            result = -1;
+
+            if (rc == -2)
+            {
+                dm->finalize(*it, error);
+            }
+        }
+    }
+
+    return result;
+}
+
+/* ------------------------------------------------------------------------ */
+/* ------------------------------------------------------------------------ */
+
 int VirtualRouter::get_network_leases(string& estr)
 {
     int                   num_nics, rc;
@@ -414,7 +445,7 @@ void vrouter_prefix(VectorAttribute* nic, const string& attr)
 
 /* -------------------------------------------------------------------------- */
 
-Template * VirtualRouter::get_nics() const
+Template * VirtualRouter::get_vm_template() const
 {
     Template * tmpl = new Template();
 
@@ -454,6 +485,8 @@ Template * VirtualRouter::get_nics() const
         tmpl->set(nic);
     }
 
+    tmpl->replace("VROUTER_ID", oid);
+
     return tmpl;
 }
 

From 132290530de817429933fae532bc06e918a27847 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 18 Jan 2016 17:08:58 +0100
Subject: [PATCH 080/197] feature #4273: Add AUTH_MAD info

---
 src/sunstone/public/app/sunstone-config.js           |  6 ++++++
 .../public/app/tabs/users-tab/utils/user-creation.js | 10 +++++++++-
 .../app/tabs/users-tab/utils/user-creation/html.hbs  | 12 ++++++------
 src/sunstone/sunstone-server.rb                      |  3 ++-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js
index 04000a5579..ebb8380a91 100644
--- a/src/sunstone/public/app/sunstone-config.js
+++ b/src/sunstone/public/app/sunstone-config.js
@@ -30,6 +30,7 @@ define(function(require) {
   var _dsMadConf = {};
   var _imMadConf = {};
   var _vmMadConf = {};
+  var _authMadConf = {};
 
   var Config = {
     'isTabEnabled': function(tabName) {
@@ -159,6 +160,7 @@ define(function(require) {
     'dsMadConf' : _dsMadConf,
     'imMadConf' : _imMadConf,
     'vmMadConf' : _vmMadConf,
+    'authMadConf' : _authMadConf,
     "initOnedConf" : function() {
       OpenNebulaSystem.onedconf({
         data : {},
@@ -187,6 +189,10 @@ define(function(require) {
           if (onedconf.VM_MAD != undefined){
             $.extend(true, _vmMadConf, onedconf.VM_MAD);
           }
+
+          if (onedconf.AUTH_MAD != undefined){
+            $.extend(true, _authMadConf, onedconf.AUTH_MAD);
+          }
         },
         error: function(request, error_json){
           console.error("There was an error requesting oned.conf: "+
diff --git a/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js b/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js
index e82186f5c8..a57c9b8f4c 100644
--- a/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js
+++ b/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js
@@ -17,6 +17,7 @@
 define(function(require) {
 
   var TemplateHTML = require('hbs!./user-creation/html');
+  var Config = require('sunstone-config');
 
   /**
    * @param {string} idPrefix
@@ -46,6 +47,12 @@ define(function(require) {
     if (this.options.auth_driver == undefined){
       this.options.auth_driver = true;
     }
+
+    if (Config.authMadConf !== undefined && Config.authMadConf['AUTHN'] !== undefined) {
+      this.authMadNameList = Config.authMadConf['AUTHN'].split(',');
+    } else {
+      this.authMadNameList = []
+    }
   }
 
   UserCreation.prototype.constructor = UserCreation;
@@ -60,7 +67,8 @@ define(function(require) {
 
   function _html(){
     return TemplateHTML({
-      'idPrefix': this.idPrefix
+      'idPrefix': this.idPrefix,
+      'authMadNameList': this.authMadNameList
     });
   }
 
diff --git a/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs b/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs
index 0a05a68c8c..c6176b8674 100644
--- a/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs
+++ b/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs
@@ -35,12 +35,12 @@
   <div class="large-12 columns">
     <label for="driver">{{tr "Authentication"}}</label>
     <select name="driver" id="{{idPrefix}}_driver">
-      <option value="core" selected="selected">{{tr "Core"}}</option>
-      <option value="ssh">{{tr "SSH"}}</option>
-      <option value="x509">{{tr "x509"}}</option>
-      <option value="ldap">{{tr "LDAP"}}</option>
-      <option value="public">{{tr "Public"}}</option>
-      <option value="custom">{{tr "Custom"}}</option>
+      <option value="core" selected="selected">{{tr "core"}}</option>
+      <option value="public">{{tr "public"}}</option>
+      {{#each authMadNameList}}
+        <option value="{{this}}">{{this}}</option>
+      {{/each}}
+      <option value="custom">{{tr "custom"}}</option>
     </select>
     <div>
       <input type="text" id="{{idPrefix}}_custom_auth" name="custom_auth" />
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index d19609a054..42716690c8 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -529,7 +529,8 @@ get '/onedconf' do
         :DEFAULT_COST,
         :DS_MAD_CONF,
         :VM_MAD,
-        :IM_MAD
+        :IM_MAD,
+        :AUTH_MAD
     ]
 
     onedconf = {}

From fc27fc7a49b283f10e7a99b3ce43b9fa8b1b1adf Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Tue, 19 Jan 2016 12:50:21 +0100
Subject: [PATCH 081/197] feature #4215: add templateid format to onevrouter

---
 src/cli/onevrouter | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/cli/onevrouter b/src/cli/onevrouter
index 128dca34fb..587906fb94 100755
--- a/src/cli/onevrouter
+++ b/src/cli/onevrouter
@@ -75,6 +75,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.filterflag_to_i(arg)
     end
 
+    set :format, :templateid, OpenNebulaHelper.rname_to_id_desc("VMTEMPLATE") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "VMTEMPLATE")
+    end
+
     ########################################################################
     # Commands
     ########################################################################

From 49b883f4c9accc4e0ac634121bea596cdb46362d Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 19 Jan 2016 13:22:08 +0100
Subject: [PATCH 082/197] feature #4210: Add user groups dialog

---
 src/sunstone/etc/sunstone-views/admin.yaml    |   1 +
 .../etc/sunstone-views/admin_vcenter.yaml     |   1 +
 src/sunstone/etc/sunstone-views/user.yaml     |   1 +
 src/sunstone/public/app/tabs/users-tab.js     |   3 +-
 .../public/app/tabs/users-tab/actions.js      |  13 ++
 .../public/app/tabs/users-tab/buttons.js      |   5 +
 .../app/tabs/users-tab/dialogs/groups.js      | 153 ++++++++++++++++++
 .../tabs/users-tab/dialogs/groups/dialogId.js |  19 +++
 .../tabs/users-tab/dialogs/groups/html.hbs    |  33 ++++
 .../public/app/utils/common-actions.js        |  18 ++-
 10 files changed, 240 insertions(+), 7 deletions(-)
 create mode 100644 src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
 create mode 100644 src/sunstone/public/app/tabs/users-tab/dialogs/groups/dialogId.js
 create mode 100644 src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 5c20f87e53..27e4623f0b 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -69,6 +69,7 @@ tabs:
             User.create_dialog: true
             User.update_password: true
             User.quotas_dialog: true
+            User.groups_dialog: true
             User.chgrp: true
             User.addgroup: true
             User.delgroup: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 9bb7a8b8b4..af83c08207 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -69,6 +69,7 @@ tabs:
             User.create_dialog: true
             User.update_password: true
             User.quotas_dialog: true
+            User.groups_dialog: true
             User.chgrp: true
             User.addgroup: true
             User.delgroup: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 34b99b8da4..39d1ab84e4 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -70,6 +70,7 @@ tabs:
             User.create_dialog: true
             User.update_password: true
             User.quotas_dialog: true
+            User.groups_dialog: true
             User.chgrp: true
             User.addgroup: true
             User.delgroup: true
diff --git a/src/sunstone/public/app/tabs/users-tab.js b/src/sunstone/public/app/tabs/users-tab.js
index f00f2f4bec..ff846dca59 100644
--- a/src/sunstone/public/app/tabs/users-tab.js
+++ b/src/sunstone/public/app/tabs/users-tab.js
@@ -26,7 +26,8 @@ define(function(require) {
   var _dialogs = [
     require('./users-tab/dialogs/password'),
     require('./users-tab/dialogs/auth-driver'),
-    require('./users-tab/dialogs/quotas')
+    require('./users-tab/dialogs/quotas'),
+    require('./users-tab/dialogs/groups')
   ];
 
   var _panels = [
diff --git a/src/sunstone/public/app/tabs/users-tab/actions.js b/src/sunstone/public/app/tabs/users-tab/actions.js
index 8b97d98c81..0e1a60eb44 100644
--- a/src/sunstone/public/app/tabs/users-tab/actions.js
+++ b/src/sunstone/public/app/tabs/users-tab/actions.js
@@ -27,6 +27,7 @@ define(function(require) {
   var PASSWORD_DIALOG_ID = require('./dialogs/password/dialogId');
   var AUTH_DRIVER_DIALOG_ID = require('./dialogs/auth-driver/dialogId');
   var QUOTAS_DIALOG_ID = require('./dialogs/quotas/dialogId');
+  var GROUPS_DIALOG_ID = require('./dialogs/groups/dialogId');
 
   var RESOURCE = "User";
   var XML_ROOT = "USER";
@@ -43,6 +44,18 @@ define(function(require) {
     "User.chgrp": _commonActions.multipleAction('chgrp'),
     "User.addgroup": _commonActions.multipleAction('addgroup'),
     "User.delgroup": _commonActions.multipleAction('delgroup'),
+    "User.groups_dialog" : _commonActions.checkAndShow("groups"),
+
+    "User.groups" : {
+      type: "single",
+      call: OpenNebulaResource.show,
+      callback: function(request, response) {
+        Sunstone.getDialog(GROUPS_DIALOG_ID).setParams({element: response[XML_ROOT]});
+        Sunstone.getDialog(GROUPS_DIALOG_ID).reset();
+        Sunstone.getDialog(GROUPS_DIALOG_ID).show();
+      },
+      error: Notifier.onError
+    },
 
     "User.update_password" : {
       type: "custom",
diff --git a/src/sunstone/public/app/tabs/users-tab/buttons.js b/src/sunstone/public/app/tabs/users-tab/buttons.js
index bf1c4de331..5aa209ff41 100644
--- a/src/sunstone/public/app/tabs/users-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/users-tab/buttons.js
@@ -42,6 +42,11 @@ define(function(require) {
       layout: "main_buttons",
       text : Locale.tr("Quotas")
     },
+    "User.groups_dialog" : {
+      type : "action",
+      layout: "main_buttons",
+      text : Locale.tr("Groups")
+    },
     "User.chgrp" : {
       type: "confirm_with_select",
       text: Locale.tr("Change group"),
diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
new file mode 100644
index 0000000000..9e04db1c19
--- /dev/null
+++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
@@ -0,0 +1,153 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var BaseDialog = require('utils/dialogs/dialog');
+  var TemplateHTML = require('hbs!./groups/html');
+  //var Sunstone = require('sunstone');
+  //var DatastoreTable = require('tabs/datastores-tab/datatable')
+  //var Notifier = require('utils/notifier');
+  //var OpenNebulaImage = require('opennebula/image');
+  //var OpenNebulaDatastore = require('opennebula/datastore');
+
+  /*
+    CONSTANTS
+   */
+
+  var DIALOG_ID = require('./groups/dialogId');
+  //var IMAGES_TAB_ID = require('tabs/images-tab/tabId')
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Dialog() {
+    this.dialogId = DIALOG_ID;
+
+    //this.datastoreTable = new DatastoreTable('image_clone', {
+    //  'select': true,
+    //  'selectOptions': {
+    //    'filter_fn': function(ds) {
+    //      return ds.TYPE == OpenNebulaDatastore.TYPES.IMAGE_DS;
+    //    }
+    //  }
+    //});
+
+    BaseDialog.call(this);
+  };
+
+  Dialog.DIALOG_ID = DIALOG_ID;
+  Dialog.prototype = Object.create(BaseDialog.prototype);
+  Dialog.prototype.constructor = Dialog;
+  Dialog.prototype.html = _html;
+  Dialog.prototype.onShow = _onShow;
+  Dialog.prototype.setup = _setup;
+  Dialog.prototype.setParams = _setParams;
+
+  return Dialog;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _html() {
+    return TemplateHTML({
+      'dialogId': this.dialogId,
+      //'datastoreTableSelectHTML': this.datastoreTable.dataTableHTML
+    });
+  }
+
+  function _setup(dialog) {
+    var that = this;
+    // TODO: Show DS with the same ds mad only
+//    that.datastoreTable.initialize();
+//
+//    $('#image_clone_advanced_toggle', dialog).click(function() {
+//      $('#image_clone_advanced', dialog).toggle();
+//      return false;
+//    });
+//
+//    $('#' + DIALOG_ID + 'Form', dialog).submit(function() {
+//      var name = $('input[name="image_clone_name"]', this).val();
+//      var sel_elems = Sunstone.getDataTable(IMAGES_TAB_ID).elements();
+//
+//      if (!name || !sel_elems.length)
+//        Notifier.notifyError('A name or prefix is needed!');
+//
+//      var extra_info = {};
+//
+//      var targeDS = that.datastoreTable.retrieveResourceTableSelect();
+//      if (targeDS) {
+//        extra_info['target_ds'] = targeDS;
+//      }
+//
+//      if (sel_elems.length > 1) {
+//        for (var i = 0; i < sel_elems.length; i++) {
+//          //If we are cloning several images we
+//          //use the name as prefix
+//          extra_info['name'] = name + OpenNebulaImage.getName(sel_elems[i]);
+//          Sunstone.runAction('Image.clone', sel_elems[i], extra_info);
+//        }
+//      } else {
+//        extra_info['name'] = name;
+//        Sunstone.runAction('Image.clone', sel_elems[0], extra_info)
+//      }
+//
+//      Sunstone.getDialog(DIALOG_ID).hide();
+//      Sunstone.getDialog(DIALOG_ID).reset();
+//      setTimeout(function() {
+//        Sunstone.runAction('Image.refresh');
+//      }, 1500);
+//      return false;
+//    });
+
+    return false;
+  }
+
+
+  /**
+   * @param {object} params
+   *        - params.element : user object, or empty object {}
+   */
+  function _setParams(params) {
+    this.element = params.element;
+  }
+
+  function _onShow(dialog) {
+//    var sel_elems = Sunstone.getDataTable(IMAGES_TAB_ID).elements();
+//    //show different text depending on how many elements are selected
+//    if (sel_elems.length > 1) {
+//      $('.clone_one', dialog).hide();
+//      $('.clone_several', dialog).show();
+//      $('input[name="image_clone_name"]', dialog).val('Copy of ');
+//    } else {
+//      $('.clone_one', dialog).show();
+//      $('.clone_several', dialog).hide();
+//      $('input[name="image_clone_name"]', dialog).val('Copy of ' + OpenNebulaImage.getName(sel_elems[0]));
+//    };
+//
+//    $('#image_clone_advanced', dialog).hide();
+//    this.datastoreTable.resetResourceTableSelect();
+//
+//    $("input[name='image_clone_name']", dialog).focus();
+
+    return false;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups/dialogId.js b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/dialogId.js
new file mode 100644
index 0000000000..ec6cee554d
--- /dev/null
+++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/dialogId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'userGroupsDialog';
+});
diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs
new file mode 100644
index 0000000000..11cc9b12d8
--- /dev/null
+++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs
@@ -0,0 +1,33 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<div id="{{dialogId}}" class="reveal-modal large max-height" role="dialog" data-reveal>
+  <div class="row">
+    <h3 class="subheader">{{tr "User Groups"}}</h3>
+  </div>
+  <form data-abide="ajax" id="{{dialogId}}Form">
+    <div class="row">
+      <div class="large-12 columns">
+      </div>
+    </div>
+    <div class="form_buttons row">
+      <button type="submit" class="button radius right">
+        {{tr "Apply changes"}}
+      </button>
+    </div>
+    <a class="close-reveal-modal">&#215;</a>
+  </form>
+</div>
diff --git a/src/sunstone/public/app/utils/common-actions.js b/src/sunstone/public/app/utils/common-actions.js
index 6a6674099d..cfced4cb09 100644
--- a/src/sunstone/public/app/utils/common-actions.js
+++ b/src/sunstone/public/app/utils/common-actions.js
@@ -39,6 +39,7 @@ define(function(require) {
   CommonActions.prototype.create = _create;
   CommonActions.prototype.showCreate = _showCreate;
   CommonActions.prototype.showUpdate = _showUpdate;
+  CommonActions.prototype.checkAndShow = _checkAndShow;
   CommonActions.prototype.checkAndShowUpdate = _checkAndShowUpdate;
   CommonActions.prototype.update = _update;
   CommonActions.prototype.updateTemplate = _updateTemplate;
@@ -186,18 +187,23 @@ define(function(require) {
   }
 
   function _checkAndShowUpdate() {
+    var that = this;
+    return _checkAndShow("show_to_update");
+  }
+
+  function _checkAndShow(action) {
     var that = this;
     return {
-      type: "single",
+      type: 'single',
       call: function() {
-        var selected_nodes = Sunstone.getDataTable(that.tabId).elements();
-        if (selected_nodes.length != 1) {
-          Notifier.notifyMessage("Please select one (and just one) resource to update.");
+        var selectedNodes = Sunstone.getDataTable(that.tabId).elements();
+        if (selectedNodes.length != 1) {
+          Notifier.notifyMessage('Please select one (and just one) resource to update.');
           return false;
         }
 
-        var resource_id = "" + selected_nodes[0];
-        Sunstone.runAction(that.resourceStr + ".show_to_update", resource_id);
+        var resourceId = '' + selectedNodes[0];
+        Sunstone.runAction(that.resourceStr + '.' + action, resourceId);
       }
     }
   }

From 696e2cd0069e0a5b9d2719770785e0453e921496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 19 Jan 2016 15:18:34 +0100
Subject: [PATCH 083/197] Feature #4215: Add NIC/VROUTER_MANAGEMENT; IP can be
 requested from sunstone

---
 src/cli/one_helper/onevrouter_helper.rb       | 13 ++++
 .../tabs/vrouters-tab/form-panels/create.js   |  4 +-
 .../tabs/vrouters-tab/panels/info/html.hbs    |  4 +-
 src/sunstone/public/app/utils/nics-section.js | 59 +++++++++++++++++--
 src/vm/VirtualMachine.cc                      |  5 +-
 5 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb
index 594fcab569..e0283dcaa9 100644
--- a/src/cli/one_helper/onevrouter_helper.rb
+++ b/src/cli/one_helper/onevrouter_helper.rb
@@ -179,6 +179,19 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
                     end
                 end
 
+                column :MANAGEMENT, "", :left, :size=>10 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        if !d["VROUTER_MANAGEMENT"].nil?
+                            d["VROUTER_MANAGEMENT"]
+                        else
+                            "NO"
+                        end
+                    end
+                end
+
+
                 column :IP, "",:left, :donottruncate, :size=>15 do |d|
                     d["IP"]
                 end
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index 5ef87691b5..28b34f720b 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -98,7 +98,9 @@ define(function(require) {
   function _setup(context) {
     var that = this;
 
-    NicsSection.insert({}, $(".nicsContext", context), {floatingIP: true});
+    NicsSection.insert({},
+      $(".nicsContext", context),
+      {floatingIP: true, management: true});
 
     this.templatesTable.initialize();
 
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
index 22374b9c0a..d7c2a76550 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -36,7 +36,7 @@
   </div>
 </div>
 <div class="row">
-  <div class="large-9 columns">
+  <div class="large-12 columns">
     <table class="dataTable">
       <thead>
         <tr>
@@ -44,6 +44,7 @@
           <th>{{tr "Floating IP"}}</th>
           <th>{{tr "Floating IPv6 ULA"}}</th>
           <th>{{tr "Floating IPv6 Global"}}</th>
+          <th>{{tr "Management Interface"}}</th>
         </tr>
       </thead>
       <tbody>
@@ -53,6 +54,7 @@
           <td>{{valOrDefault IP "--"}}</td>
           <td>{{valOrDefault IP6_ULA "--"}}</td>
           <td>{{valOrDefault IP6_GLOBAL "--"}}</td>
+          <td>{{valOrDefault VROUTER_MANAGEMENT "--"}}</td>
         </tr>
         {{/each}}
       </tbody>
diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js
index f8b63e6ff7..76a07e40d1 100644
--- a/src/sunstone/public/app/utils/nics-section.js
+++ b/src/sunstone/public/app/utils/nics-section.js
@@ -36,8 +36,10 @@ define(function(require) {
    * @param  {object} context       JQuery selector
    * @param  {object} options       Options
    *                                - hide_add_button {bool}
-   *                                - floatingIPs {bool}: true to show the
+   *                                - floatingIP {bool}: true to show the
    *                                floating IP checkbox
+   *                                - management {bool}: true to show the
+   *                                management checkbox
    */
   function _insert(template_json, context, options) {
     if (options == undefined){
@@ -88,6 +90,16 @@ define(function(require) {
       if (nic) {
         if ($("input.floating_ip", $(this)).prop("checked")){
           nic["FLOATING_IP"] = "YES";
+
+          var ip4 = $("input.manual_ip4", $(this)).val();
+
+          if (ip4 != ""){
+            nic["IP"] = ip4;
+          }
+        }
+
+        if ($("input.management", $(this)).prop("checked")){
+          nic["VROUTER_MANAGEMENT"] = "YES";
         }
 
         nics.push(nic);
@@ -103,8 +115,10 @@ define(function(require) {
    *                                - nic {object}
    *                                - vnet_attr {object}
    *                                - hide_add_button {bool}
-   *                                - floatingIPs {bool}: true to show the
+   *                                - floatingIP {bool}: true to show the
    *                                floating IP checkbox
+   *                                - management {bool}: true to show the
+   *                                management checkbox
    */
   function _generate_provision_network_table(context, options) {
     context.off();
@@ -252,13 +266,40 @@ define(function(require) {
 
       if (options.floatingIP){
         html +=
-          '<br/>' +
+          '<div class="row noclick">' +
+            '<div class="small-12 columns">' +
+              '<label class="inline" style="color: #777; font-size: 16px">' +
+                '<input type="checkbox" class="floating_ip" />' +
+                Locale.tr("Floating IP") + " " +
+                '<span class="tip">' +
+                  Locale.tr("If checked, each Virtual Machine will have a floating IP added to its network interface.") +
+                '</span>' +
+              '</label>' +
+            '</div>' +
+          '</div>' +
+          '<div class="row noclick">' +
+            '<div class="small-5 columns">' +
+              '<label class="right inline" style="color: #777; font-size: 16px">' +
+                Locale.tr("Force IPv4:") + " " +
+                '<span class="tip">' +
+                  Locale.tr("Optionally, you can force the IP assigned to the floating IP.") +
+                '</span>' +
+              '</label>' +
+            '</div>' +
+            '<div class="small-7 columns">' +
+              '<input type="text" class="manual_ip4" />' +
+            '</div>' +
+          '</div>';
+      }
+
+      if (options.management){
+        html +=
           '<div class="noclick">' +
             '<label style="color: #777; font-size: 16px">' +
-              '<input type="checkbox" class="floating_ip" />' +
-              Locale.tr("Floating IP") +
+              '<input type="checkbox" class="management" />' +
+              Locale.tr("Management Interface") + " " +
               '<span class="tip">' +
-                Locale.tr("If checked, each Virtual Machine will have a floating IP added to its network interface.") +
+                Locale.tr("If checked, this network interface will be a Virtual Router management interface. Traffic will not be forwarded.") +
               '</span>' +
             '</label>' +
           '</div>';
@@ -271,6 +312,8 @@ define(function(require) {
       Tips.setup($(".selected_network", dd_context));
 
       $('a', dd_context).first().trigger("click");
+
+      $("input.floating_ip", dd_context).change();
     })
 
     dd_context.on("click", ".provision_remove_nic" , function() {
@@ -282,6 +325,10 @@ define(function(require) {
       event.stopPropagation();
     });
 
+    dd_context.on("change", "input.floating_ip" , function() {
+      $(".manual_ip4", dd_context).prop("disabled", !$(this).is(":checked"));
+    });
+
     if (!options.nic && !options.vnet_attr) {
       $('a', dd_context).trigger("click");
     }
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 85278e9312..577249e001 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -145,8 +145,9 @@ const char * VirtualMachine::NETWORK_CONTEXT[][2] = {
         {"DNS", "DNS"},
         {"SEARCH_DOMAIN", "SEARCH_DOMAIN"},
         {"MTU", "GUEST_MTU"},
-        {"VROUTER_IP", "VROUTER_IP"}};
-const int VirtualMachine::NUM_NETWORK_CONTEXT = 9;
+        {"VROUTER_IP", "VROUTER_IP"},
+        {"VROUTER_MANAGEMENT", "VROUTER_MANAGEMENT"}};
+const int VirtualMachine::NUM_NETWORK_CONTEXT = 10;
 
 const char*  VirtualMachine::NETWORK6_CONTEXT[][2] = {
         {"IP6", "IP6_GLOBAL"},

From 47c7d8f38b7994c78ac356d60005a1b45ed984fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 19 Jan 2016 15:35:55 +0100
Subject: [PATCH 084/197] Feature #4215: Add workaround to delete VMs if DB
 consistency fails

---
 src/rm/RequestManagerVirtualMachine.cc | 45 ++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index 686e407be5..33de5930b4 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -555,14 +555,47 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(action))
     {
-        oss << "Action \"" << action_st << "\" is not supported for Virtual Router VMs";
+        bool failure = true;
 
-        failure_response(ACTION,
-                request_error(oss.str(),""),
-                att);
+        // Just in case, we check if the VRouter does not exist for a delete
+        // operation.
+        if (action == History::DELETE_ACTION ||
+            action == History::SHUTDOWN_ACTION ||
+            action == History::SHUTDOWN_HARD_ACTION)
+        {
+            int vrid = vm->get_vrouter_id();
 
-        vm->unlock();
-        return;
+            vm->unlock();
+
+            VirtualRouterPool*  vrpool = Nebula::instance().get_vrouterpool();
+            VirtualRouter *     vrouter = vrpool->get(vrid, true);
+
+            if (vrouter == 0)
+            {
+                failure = false;
+            }
+            else
+            {
+                vrouter->unlock();
+            }
+
+            if ((vm = get_vm(id, att)) == 0)
+            {
+                return;
+            }
+        }
+
+        if (failure)
+        {
+            oss << "Action \"" << action_st << "\" is not supported for Virtual Router VMs";
+
+            failure_response(ACTION,
+                    request_error(oss.str(),""),
+                    att);
+
+            vm->unlock();
+            return;
+        }
     }
 
     vm->unlock();

From bb28de6de3feb7825eec939ce5f53515a94bd1ec Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 19 Jan 2016 16:54:48 +0100
Subject: [PATCH 085/197] feature #4210: Add groups table

---
 .../app/tabs/users-tab/dialogs/groups.js      | 123 +++++++-----------
 .../tabs/users-tab/dialogs/groups/html.hbs    |   1 +
 2 files changed, 49 insertions(+), 75 deletions(-)

diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
index 9e04db1c19..c6e1e3ce73 100644
--- a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
+++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
@@ -20,19 +20,20 @@ define(function(require) {
    */
 
   var BaseDialog = require('utils/dialogs/dialog');
+  var GroupsTable = require('tabs/groups-tab/datatable');
+  var Sunstone = require('sunstone');
+
+  /*
+    TEMPLATES
+   */
+
   var TemplateHTML = require('hbs!./groups/html');
-  //var Sunstone = require('sunstone');
-  //var DatastoreTable = require('tabs/datastores-tab/datatable')
-  //var Notifier = require('utils/notifier');
-  //var OpenNebulaImage = require('opennebula/image');
-  //var OpenNebulaDatastore = require('opennebula/datastore');
 
   /*
     CONSTANTS
    */
 
   var DIALOG_ID = require('./groups/dialogId');
-  //var IMAGES_TAB_ID = require('tabs/images-tab/tabId')
 
   /*
     CONSTRUCTOR
@@ -41,15 +42,6 @@ define(function(require) {
   function Dialog() {
     this.dialogId = DIALOG_ID;
 
-    //this.datastoreTable = new DatastoreTable('image_clone', {
-    //  'select': true,
-    //  'selectOptions': {
-    //    'filter_fn': function(ds) {
-    //      return ds.TYPE == OpenNebulaDatastore.TYPES.IMAGE_DS;
-    //    }
-    //  }
-    //});
-
     BaseDialog.call(this);
   };
 
@@ -68,57 +60,45 @@ define(function(require) {
    */
 
   function _html() {
+    this.groupsTable = new GroupsTable('user_groups', {
+        info: false,
+        select: true,
+        selectOptions: {'multiple_choice': true}
+      });
+
     return TemplateHTML({
       'dialogId': this.dialogId,
-      //'datastoreTableSelectHTML': this.datastoreTable.dataTableHTML
+      'groupsTableHTML': this.groupsTable.dataTableHTML
     });
   }
 
   function _setup(dialog) {
     var that = this;
-    // TODO: Show DS with the same ds mad only
-//    that.datastoreTable.initialize();
-//
-//    $('#image_clone_advanced_toggle', dialog).click(function() {
-//      $('#image_clone_advanced', dialog).toggle();
-//      return false;
-//    });
-//
-//    $('#' + DIALOG_ID + 'Form', dialog).submit(function() {
-//      var name = $('input[name="image_clone_name"]', this).val();
-//      var sel_elems = Sunstone.getDataTable(IMAGES_TAB_ID).elements();
-//
-//      if (!name || !sel_elems.length)
-//        Notifier.notifyError('A name or prefix is needed!');
-//
-//      var extra_info = {};
-//
-//      var targeDS = that.datastoreTable.retrieveResourceTableSelect();
-//      if (targeDS) {
-//        extra_info['target_ds'] = targeDS;
-//      }
-//
-//      if (sel_elems.length > 1) {
-//        for (var i = 0; i < sel_elems.length; i++) {
-//          //If we are cloning several images we
-//          //use the name as prefix
-//          extra_info['name'] = name + OpenNebulaImage.getName(sel_elems[i]);
-//          Sunstone.runAction('Image.clone', sel_elems[i], extra_info);
-//        }
-//      } else {
-//        extra_info['name'] = name;
-//        Sunstone.runAction('Image.clone', sel_elems[0], extra_info)
-//      }
-//
-//      Sunstone.getDialog(DIALOG_ID).hide();
-//      Sunstone.getDialog(DIALOG_ID).reset();
-//      setTimeout(function() {
-//        Sunstone.runAction('Image.refresh');
-//      }, 1500);
-//      return false;
-//    });
+    that.groupsTable.initialize();
 
-    return false;
+    $('#' + DIALOG_ID + 'Form', dialog).submit(function() {
+      var selectedGroupsList = that.groupsTable.retrieveResourceTableSelect();
+
+      $.each(selectedGroupsList, function(index, groupId) {
+        if ($.inArray(groupId, that.originalGroupIds) === -1) {
+          Sunstone.runAction('User.addgroup', [that.element.ID], groupId);
+        }
+      });
+
+      $.each(that.originalGroupIds, function(index, groupId) {
+        if ($.inArray(groupId, selectedGroupsList) === -1) {
+          Sunstone.runAction('User.delgroup', [that.element.ID], groupId);
+        }
+      });
+
+      Sunstone.getDialog(DIALOG_ID).hide();
+      Sunstone.getDialog(DIALOG_ID).reset();
+      setTimeout(function() {
+        Sunstone.runAction('User.refresh');
+      }, 1500);
+
+      return false;
+    });
   }
 
 
@@ -128,26 +108,19 @@ define(function(require) {
    */
   function _setParams(params) {
     this.element = params.element;
+
+    if (this.element.GROUPS !== undefined && this.element.GROUPS !== undefined) {
+      this.originalGroupIds = this.element.GROUPS.ID;
+    } else {
+      this.originalGroupIds = [];
+    }
   }
 
   function _onShow(dialog) {
-//    var sel_elems = Sunstone.getDataTable(IMAGES_TAB_ID).elements();
-//    //show different text depending on how many elements are selected
-//    if (sel_elems.length > 1) {
-//      $('.clone_one', dialog).hide();
-//      $('.clone_several', dialog).show();
-//      $('input[name="image_clone_name"]', dialog).val('Copy of ');
-//    } else {
-//      $('.clone_one', dialog).show();
-//      $('.clone_several', dialog).hide();
-//      $('input[name="image_clone_name"]', dialog).val('Copy of ' + OpenNebulaImage.getName(sel_elems[0]));
-//    };
-//
-//    $('#image_clone_advanced', dialog).hide();
-//    this.datastoreTable.resetResourceTableSelect();
-//
-//    $("input[name='image_clone_name']", dialog).focus();
+    this.groupsTable.refreshResourceTableSelect();
 
-    return false;
+    if (this.originalGroupIds !== undefined) {
+      this.groupsTable.selectResourceTableSelect({ids: this.originalGroupIds});
+    }
   }
 });
diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs
index 11cc9b12d8..322feae746 100644
--- a/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs
+++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs
@@ -21,6 +21,7 @@
   <form data-abide="ajax" id="{{dialogId}}Form">
     <div class="row">
       <div class="large-12 columns">
+        {{{groupsTableHTML}}}
       </div>
     </div>
     <div class="form_buttons row">

From fc0f573ee8985d1622d0a3a721cdb3b38d079e09 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 19 Jan 2016 16:55:40 +0100
Subject: [PATCH 086/197] feature #4184: Fix sidebar menu style when no labels
 are defined

---
 src/sunstone/public/scss/app.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss
index 2045ab89ad..cc54874634 100644
--- a/src/sunstone/public/scss/app.scss
+++ b/src/sunstone/public/scss/app.scss
@@ -1343,11 +1343,14 @@ hr {
 .labels-tree {
   font: inherit;
   list-style-type: none;
-  padding-bottom: 1em;
   padding-right: 1em;
   margin-left: 0;
   margin-bottom: 0;
 
+  & > li:last-child {
+    padding-bottom: 1em;
+  }
+
   .fa-angle-down, .fa-angle-right {
     padding: 3px;
     cursor: pointer;

From 546301463cf72adbd71ed829a053c39e22b515d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 19 Jan 2016 17:23:02 +0100
Subject: [PATCH 087/197] Feature #4215: Remove reservation from the topology

---
 .../public/app/tabs/vnets-topology-tab.js     | 36 ++++++-------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js
index 35dbc62e36..22a545a23a 100644
--- a/src/sunstone/public/app/tabs/vnets-topology-tab.js
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js
@@ -131,6 +131,10 @@ define(function(require) {
       var vnet = element.VNET;
       var vnetId = vnet.ID;
 
+      if (vnet.PARENT_NETWORK_ID.length > 0){
+        vnetId = vnet.PARENT_NETWORK_ID;
+      }
+
       // VNet node
       // ----------------
 
@@ -138,22 +142,14 @@ define(function(require) {
 
       var group = "vnet";
 
-      if (vnet.PARENT_NETWORK_ID.length > 0){
-        group = "reservation";
-
-        edges.push({
-          from: "vnet"+vnet.PARENT_NETWORK_ID,
-          to: vnetNodeId,
-          dashes: true,
-          color: "#0098c3"
-        });
+      if (!nodeIndex[vnetNodeId]){
+        nodeIndex[vnetNodeId] = true;
+        nodes.push({
+          id: vnetNodeId,
+          label: "      VNet "+vnet.NAME + "      ", // Spaces for padding, no other reason
+          group: group});
       }
 
-      nodes.push({
-        id: vnetNodeId,
-        label: "      VNet "+vnet.NAME + "      ", // Spaces for padding, no other reason
-        group: group});
-
       // VRouter nodes
       // ----------------
 
@@ -291,18 +287,6 @@ define(function(require) {
             color: "#fff"
           }
         },
-        reservation: {
-          shape: 'box',
-          color: {
-            border: "#007a9c",
-            background: "#0098c3",
-            hover: "#007a9c",
-            highlight: "#007a9c"
-          },
-          font: {
-            color: "#fff"
-          }
-        },
         vr: {
           shape: 'circle',
           color: {

From 2d30994135eae5e356a7e59a0ec05d89c6c216f5 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 19 Jan 2016 17:29:23 +0100
Subject: [PATCH 088/197] feature #4210: Check the size of the secondary groups

---
 src/sunstone/public/app/tabs/users-tab/dialogs/groups.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
index c6e1e3ce73..5fd889dab2 100644
--- a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
+++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
@@ -110,7 +110,11 @@ define(function(require) {
     this.element = params.element;
 
     if (this.element.GROUPS !== undefined && this.element.GROUPS !== undefined) {
-      this.originalGroupIds = this.element.GROUPS.ID;
+      if ($.isArray(this.element.GROUPS.ID)) {
+        this.originalGroupIds = this.element.GROUPS.ID;
+      } else {
+        this.originalGroupIds = [this.element.GROUPS.ID];
+      }
     } else {
       this.originalGroupIds = [];
     }
@@ -119,7 +123,7 @@ define(function(require) {
   function _onShow(dialog) {
     this.groupsTable.refreshResourceTableSelect();
 
-    if (this.originalGroupIds !== undefined) {
+    if (this.originalGroupIds !== undefined && this.originalGroupIds.length > 0) {
       this.groupsTable.selectResourceTableSelect({ids: this.originalGroupIds});
     }
   }

From 735d456cc2e02318232eb26bf8c8d72ef5a1831b Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 19 Jan 2016 17:39:17 +0100
Subject: [PATCH 089/197] feature #4210: Add groups panel

---
 src/sunstone/etc/sunstone-views/admin.yaml    |  1 +
 .../etc/sunstone-views/admin_vcenter.yaml     |  1 +
 src/sunstone/etc/sunstone-views/user.yaml     |  1 +
 src/sunstone/public/app/tabs/users-tab.js     |  1 +
 .../app/tabs/users-tab/dialogs/groups.js      |  2 +-
 .../app/tabs/users-tab/panels/groups.js       | 90 +++++++++++++++++++
 .../tabs/users-tab/panels/groups/panelId.js   | 19 ++++
 7 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 src/sunstone/public/app/tabs/users-tab/panels/groups.js
 create mode 100644 src/sunstone/public/app/tabs/users-tab/panels/groups/panelId.js

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 27e4623f0b..05ca6c5d06 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -50,6 +50,7 @@ tabs:
         panel_tabs:
             user_info_tab: true
             user_quotas_tab: true
+            user_groups_tab: true
             user_accounting_tab: true
             user_showback_tab: true
         table_columns:
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index af83c08207..f6639fc712 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -50,6 +50,7 @@ tabs:
         panel_tabs:
             user_info_tab: true
             user_quotas_tab: true
+            user_groups_tab: true
             user_accounting_tab: true
             user_showback_tab: true
         table_columns:
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 39d1ab84e4..b1249c2856 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -51,6 +51,7 @@ tabs:
         panel_tabs:
             user_info_tab: true
             user_quotas_tab: true
+            user_groups_tab: true
             user_accounting_tab: true
             user_showback_tab: true
         table_columns:
diff --git a/src/sunstone/public/app/tabs/users-tab.js b/src/sunstone/public/app/tabs/users-tab.js
index ff846dca59..bf8cac6fee 100644
--- a/src/sunstone/public/app/tabs/users-tab.js
+++ b/src/sunstone/public/app/tabs/users-tab.js
@@ -32,6 +32,7 @@ define(function(require) {
 
   var _panels = [
     require('./users-tab/panels/info'),
+    require('./users-tab/panels/groups'),
     require('./users-tab/panels/quotas'),
     require('./users-tab/panels/accounting'),
     require('./users-tab/panels/showback')
diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
index 5fd889dab2..9307ab1abb 100644
--- a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
+++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js
@@ -109,7 +109,7 @@ define(function(require) {
   function _setParams(params) {
     this.element = params.element;
 
-    if (this.element.GROUPS !== undefined && this.element.GROUPS !== undefined) {
+    if (this.element.GROUPS !== undefined && this.element.GROUPS.ID !== undefined) {
       if ($.isArray(this.element.GROUPS.ID)) {
         this.originalGroupIds = this.element.GROUPS.ID;
       } else {
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/groups.js b/src/sunstone/public/app/tabs/users-tab/panels/groups.js
new file mode 100644
index 0000000000..361b43e5eb
--- /dev/null
+++ b/src/sunstone/public/app/tabs/users-tab/panels/groups.js
@@ -0,0 +1,90 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var Locale = require('utils/locale');
+  var GroupsTable = require('tabs/groups-tab/datatable');
+
+  /*
+    CONSTANTS
+   */
+
+  var PANEL_ID = require('./groups/panelId');
+  var GROUPS_TABLE_ID = PANEL_ID + "GroupsTable";
+  var RESOURCE = "User";
+  var XML_ROOT = "USER";
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Panel(info) {
+    this.title = Locale.tr("Groups");
+    this.icon = "fa-users";
+
+    this.element = info[XML_ROOT];
+
+    return this;
+  }
+
+  Panel.PANEL_ID = PANEL_ID;
+  Panel.prototype.html = _html;
+  Panel.prototype.setup = _setup;
+
+  return Panel;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _html() {
+    var groups;
+
+    if (this.element.GROUPS !== undefined && this.element.GROUPS.ID !== undefined) {
+      if ($.isArray(this.element.GROUPS.ID)) {
+        groups = this.element.GROUPS.ID;
+      } else {
+        groups = [this.element.GROUPS.ID];
+      }
+    } else {
+      groups = [];
+    }
+
+    var opts = {
+      info: true,
+      select: true,
+      selectOptions: {
+        read_only: true,
+        fixed_ids: groups
+      }
+    };
+
+    this.GroupsTable = new GroupsTable(GROUPS_TABLE_ID, opts);
+
+    return this.GroupsTable.dataTableHTML;
+  }
+
+  function _setup(context) {
+    this.GroupsTable.initialize();
+    this.GroupsTable.refreshResourceTableSelect();
+
+    return false;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/groups/panelId.js b/src/sunstone/public/app/tabs/users-tab/panels/groups/panelId.js
new file mode 100644
index 0000000000..3c89fc60e9
--- /dev/null
+++ b/src/sunstone/public/app/tabs/users-tab/panels/groups/panelId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'user_groups_tab';
+})

From 038b55bb92431314edeb05eff2187bc5ad9f2a4c Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 19 Jan 2016 17:39:36 +0100
Subject: [PATCH 090/197] feature #4210: Remove secondary groups key from info
 panel

---
 .../public/app/tabs/users-tab/panels/info.js         | 12 ------------
 .../public/app/tabs/users-tab/panels/info/html.hbs   |  5 -----
 2 files changed, 17 deletions(-)

diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info.js b/src/sunstone/public/app/tabs/users-tab/panels/info.js
index 976c68c560..7ee3adfa2a 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/users-tab/panels/info.js
@@ -69,17 +69,6 @@ define(function(require) {
   function _html() {
     var groupTrHTML = TemplateChgrpTr({'element': this.element});
 
-    // TODO
-    //$(".resource-info-header", $("#users-tab")).html(this.element.NAME);
-
-    var secondaryGroups;
-
-    if (typeof this.element.GROUPS.ID == "object") {
-      secondaryGroups = this.element.GROUPS.ID.join(",");
-    } else {
-      secondaryGroups = "-";
-    }
-
     // TODO: simplify interface?
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);
     delete strippedTemplate["SSH_PUBLIC_KEY"];
@@ -93,7 +82,6 @@ define(function(require) {
       'element': this.element,
       'sunstone_template': this.element.TEMPLATE.SUNSTONE||{},
       'groupTrHTML': groupTrHTML,
-      'secondaryGroups': secondaryGroups,
       'templateTableHTML': templateTableHTML
     });
   }
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
index e412911275..d00376d365 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
@@ -34,11 +34,6 @@
           <td></td>
         </tr>
         {{{groupTrHTML}}}
-        <tr>
-          <td class="key_td">{{tr "Secondary groups"}}</td>
-          <td class="value_td">{{secondaryGroups}}</td>
-          <td></td>
-        </tr>
         <tr>
           <td class="key_td">{{tr "Authentication driver"}}</td>
           <td class="value_td">{{element.AUTH_DRIVER}}</td>

From c41d43f09a7268a149d0ff115134fb59d136f745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 19 Jan 2016 18:13:31 +0100
Subject: [PATCH 091/197] Feature #4215: Add keepalived_id/password

---
 include/VirtualMachine.h                      |  7 ++++
 .../form-panels/create/wizard.hbs             | 18 +++++++++-
 src/vm/VirtualMachine.cc                      | 36 +++++++++++++++----
 src/vrouter/VirtualRouter.cc                  | 16 +++++++++
 4 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index debca0b776..a1a0c536a6 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1988,6 +1988,13 @@ private:
      */
     int parse_vrouter(string& error_str);
 
+    /**
+     * Known Virtual Router attributes, to be moved from the user template
+     * to the template
+     */
+    static const char* VROUTER_ATTRIBUTES[];
+    static const int   NUM_VROUTER_ATTRIBUTES;
+
     /**
      * Known attributes for network contextualization rendered as:
      *   ETH_<nicid>_<context[0]> = $NETWORK[context[1], vnet_name]
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
index 264625279a..3eb9faf22e 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/wizard.hbs
@@ -20,7 +20,7 @@
       <div class="row">
         <div class="medium-6 columns">
           <label for="name" >
-            {{tr "Name"}}:
+            {{tr "Name"}}
           </label>
           <input type="text" wizard_field="NAME" required name="name" id="name"/>
         </div>
@@ -34,6 +34,22 @@
           <textarea type="text" wizard_field="DESCRIPTION" id="DESCRIPTION" name="DESCRIPTION"/>
         </div>
       </div>
+      <div class="row">
+        <div class="medium-6 columns">
+          <label for="keepalived_id" >
+            {{tr "Keepalived ID"}}
+            <span class="tip">{{tr "Optional. Sets keepalived configuration parameter 'virtual_router_id'"}}</span>
+          </label>
+          <input type="text" wizard_field="KEEPALIVED_ID" name="keepalived_id" id="keepalived_id"/>
+        </div>
+        <div class="medium-6 columns">
+          <label for="keepalived_password" >
+            {{tr "Keepalived password"}}
+            <span class="tip">{{tr "Optional. Sets keepalived configuration parameter 'authentication/auth_pass'"}}</span>
+          </label>
+          <input type="text" wizard_field="KEEPALIVED_PASSWORD" name="keepalived_password" id="keepalived_password"/>
+        </div>
+      </div>
     </div>
     <div class="row">
       <div class="large-12 columns nicsContext">
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 577249e001..ae0a438e5b 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -157,6 +157,12 @@ const char*  VirtualMachine::NETWORK6_CONTEXT[][2] = {
 
 const int VirtualMachine::NUM_NETWORK6_CONTEXT = 4;
 
+const char*  VirtualMachine::VROUTER_ATTRIBUTES[] = {
+        "VROUTER_ID",
+        "VROUTER_KEEPALIVED_ID",
+        "VROUTER_KEEPALIVED_PASSWORD"};
+const int VirtualMachine::NUM_VROUTER_ATTRIBUTES = 3;
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
@@ -845,14 +851,17 @@ int VirtualMachine::parse_vrouter(string& error_str)
 {
     string st;
 
-    user_obj_template->get("VROUTER_ID", st);
-
-    if (!st.empty())
+    for (int i = 0; i < NUM_VROUTER_ATTRIBUTES; i++)
     {
-        obj_template->replace("VROUTER_ID", st);
-    }
+        user_obj_template->get(VROUTER_ATTRIBUTES[i], st);
 
-    user_obj_template->erase("VROUTER_ID");
+        if (!st.empty())
+        {
+            obj_template->replace(VROUTER_ATTRIBUTES[i], st);
+        }
+
+        user_obj_template->erase(VROUTER_ATTRIBUTES[i]);
+    }
 
     return 0;
 }
@@ -907,6 +916,7 @@ int VirtualMachine::parse_context(string& error_str)
     string   parsed;
     string   files_ds;
     string   files_ds_parsed;
+    string   st;
 
     ostringstream oss_parsed;
 
@@ -1098,6 +1108,20 @@ int VirtualMachine::parse_context(string& error_str)
         add_template_attribute("CREATED_BY", uid);
     }
 
+    // -------------------------------------------------------------------------
+    // Virtual Router attributes
+    // -------------------------------------------------------------------------
+
+    for (int i = 0; i < NUM_VROUTER_ATTRIBUTES; i++)
+    {
+        obj_template->get(VROUTER_ATTRIBUTES[i], st);
+
+        if (!st.empty())
+        {
+            context_parsed->replace(VROUTER_ATTRIBUTES[i], st);
+        }
+    }
+
     return rc;
 
 error_cleanup:
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index 0c50f660bf..bc34ccf9bd 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -453,6 +453,8 @@ Template * VirtualRouter::get_vm_template() const
     bool                  floating;
     vector<Attribute  * > nics;
     VectorAttribute *     nic;
+    int                   keepalived_id;
+    string                st;
 
     num_nics = obj_template->get("NIC",nics);
 
@@ -487,6 +489,20 @@ Template * VirtualRouter::get_vm_template() const
 
     tmpl->replace("VROUTER_ID", oid);
 
+    if (!obj_template->get("KEEPALIVED_ID", keepalived_id))
+    {
+        keepalived_id = (oid & 0xFF);
+    }
+
+    tmpl->replace("VROUTER_KEEPALIVED_ID", keepalived_id);
+
+    obj_template->get("KEEPALIVED_PASSWORD", st);
+
+    if (!st.empty())
+    {
+        tmpl->replace("VROUTER_KEEPALIVED_PASSWORD", st);
+    }
+
     return tmpl;
 }
 

From 383babc8f7493b3c49ee895285c9de1333de8063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 20 Jan 2016 12:03:19 +0100
Subject: [PATCH 092/197] Feature #4215: Add support for %i name replacement in
 vrouter.instantiate

---
 include/NebulaUtil.h                          | 23 +++++++++++++
 src/common/NebulaUtil.cc                      | 34 +++++++++++++++++++
 src/rm/RequestManagerVMTemplate.cc            | 18 +++++++++-
 .../tabs/vrouters-tab/form-panels/create.js   |  2 --
 4 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/include/NebulaUtil.h b/include/NebulaUtil.h
index 441e24df4a..5dac3c1906 100644
--- a/include/NebulaUtil.h
+++ b/include/NebulaUtil.h
@@ -174,6 +174,29 @@ namespace one_util
      * @return trimed string
      */
     std::string trim(const std::string& str);
+
+    /**
+     * Returns a copy of st with the all occurrences of "find" substituted
+     * for "replacement"
+     * @param st string input
+     * @param find string to search for
+     * @param replacement string to replace occurrences with
+     * @return a string copy
+     */
+    std::string gsub(const std::string& st,
+                     const char *find, const char *replacement);
+
+
+    /**
+     * Returns a copy of st with the all occurrences of "find" substituted
+     * for "replacement"
+     * @param st string input
+     * @param find string to search for
+     * @param replacement string to replace occurrences with
+     * @return a string copy
+     */
+    std::string gsub(const std::string& st,
+                     const char *find, const std::string& replacement);
 };
 
 #endif /* _NEBULA_UTIL_H_ */
diff --git a/src/common/NebulaUtil.cc b/src/common/NebulaUtil.cc
index b172da2b51..01c681edad 100644
--- a/src/common/NebulaUtil.cc
+++ b/src/common/NebulaUtil.cc
@@ -25,6 +25,7 @@
 
 #include <string>
 #include <sstream>
+#include <cstring>
 #include <iomanip>
 #include <algorithm>
 #include <math.h>
@@ -306,3 +307,36 @@ std::string one_util::trim(const std::string& str)
 
 	return tstr;
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+string one_util::gsub(const string& st,
+        const char *find, const string& replacement)
+{
+    return gsub(st, find, replacement.c_str());
+}
+
+/* -------------------------------------------------------------------------- */
+
+string one_util::gsub(const string& st,
+        const char *find, const char *replacement)
+{
+    string result = st;
+
+    string::size_type pos = 0;
+    size_t find_len = strlen(find);
+    size_t replacement_len = strlen(replacement);
+
+    pos = result.find(find, pos);
+
+    while(pos != std::string::npos)
+    {
+        result.replace(pos, find_len, replacement);
+        pos += replacement_len;
+
+        pos = result.find(find, pos);
+    }
+
+    return result;
+}
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index 1d7d4924e0..4dc55ffbe2 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -68,6 +68,8 @@ void VirtualRouterInstantiate::request_execute(
     Template*           extra_attrs;
     bool                has_vmids;
     string              errorstr;
+    string              vr_name;
+    ostringstream       oss;
 
     vector<int>             vms;
     vector<int>::iterator   vmid;
@@ -93,6 +95,8 @@ void VirtualRouterInstantiate::request_execute(
 
     has_vmids = vr->has_vmids();
 
+    vr_name = vr->get_name();
+
     vr->unlock();
 
     if ( att.uid != 0 )
@@ -120,9 +124,21 @@ void VirtualRouterInstantiate::request_execute(
         return;
     }
 
+    if (name.empty())
+    {
+        oss.str("");
+        oss << "vr-" << vr_name << "-%i";
+        name = oss.str();
+    }
+
     for (int i=0; i<n_vms; i++)
     {
-        int vid = instantiate(att, tmpl_id, name, true, str_uattrs, extra_attrs);
+        oss.str("");
+        oss << i;
+
+        string tmp_name = one_util::gsub(name, "%i", oss.str());
+
+        int vid = instantiate(att, tmpl_id, tmp_name, true, str_uattrs, extra_attrs);
 
         if (vid == -1)
         {
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index 28b34f720b..52f4dd1074 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -165,8 +165,6 @@ define(function(require) {
         timeout: true,
         success: function (request, response) {
 
-          //TODO: add support for vm_name.replace(/%i/gi, i), or remove tooltip
-
           var tmpl = WizardFields.retrieve($(".template_user_inputs", context));
 
           var extra_info = {

From e5cfd6da73cfd496ec6c6c4248c18fb0cbbbf98c Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 16:49:47 +0100
Subject: [PATCH 093/197] Add documentation examples to the sunstone README

---
 src/sunstone/public/README.md | 75 ++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 5 deletions(-)

diff --git a/src/sunstone/public/README.md b/src/sunstone/public/README.md
index d626a41fee..a614139413 100644
--- a/src/sunstone/public/README.md
+++ b/src/sunstone/public/README.md
@@ -20,17 +20,26 @@ Sunstone dependencies
 Building minified JS and CSS files
 ==================================
 
-4. Run the following command to generate the app.css file in the css folder:
+The dependencies defined in the previous section must be instaled before running these commands:
+
+Option A - Grunt
+----------------
+
+* Run the following command to generate the app.css file in the css folder:
+
   ```
   grunt sass
   ```
-5. Run the following command to generate the minified js files in the dist foler
+
+* Run the following command to generate the minified js files in the dist foler
 and the app.min.css in the css folder:
+
   ```
   grunt requirejs
   ```
 
 These are the files generate by the grunt requirejs command:
+
   ```
   css
     app.min.css
@@ -40,10 +49,11 @@ These are the files generate by the grunt requirejs command:
       spice.js spice.js.map vnc.js vnc.js.map
   ```
 
-Scons
-=====
+Option B - Scons
+----------------
+
+Scons includes an option to build the minified JS and CSS files. 
 
-Scons includes an option to build the minified JS and CSS files. Steps 1, 2 and 3 have to be performed before running this command
   ```
   scons sunstone=yes
   ```
@@ -52,3 +62,58 @@ Install.sh
 ==========
 
 By default the install.sh script will install all the files, including the non-minified ones. Providing the -p option, only the minified files will be installed.
+
+Documentation
+=============
+
+[JSDoc](http://usejsdoc.org/) is used for the JS documentation.
+
+Examples
+--------
+
+* Parameters with properties
+
+  ```
+  /**
+   * Assign the project to an employee.
+   * @param {Object} employee - The employee who is responsible for the project.
+   * @param {string} employee.name - The name of the employee.
+   * @param {string} employee.department - The employee's department.
+   */
+  Project.prototype.assign = function(employee) {
+      // ...
+  };
+  ```
+
+* Optional parameter
+
+  ```
+  /**
+   * @param {string} [somebody] - Somebody's name.
+   */
+  function sayHello(somebody) {
+      if (!somebody) {
+          somebody = 'John Doe';
+      }
+      alert('Hello ' + somebody);
+  }
+  ```
+  
+* Returns
+
+  ```
+  /**
+   * Returns the sum of a and b
+   * @param {Number} a
+   * @param {Number} b
+   * @param {Boolean} retArr If set to true, the function will return an array
+   * @returns {Number|Array} Sum of a and b or an array that contains a, b and the sum of a and b.
+   */
+  function sum(a, b, retArr) {
+      if (retArr) {
+          return [a, b, a + b];
+      }
+      return a + b;
+  }
+  ```
+

From f1a670ddb6d56e9cc356352c8b9df4d436c18512 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 16:52:44 +0100
Subject: [PATCH 094/197] Refactor ResourceSelect module

---
 .../public/app/utils/resource-select.js       | 90 +++++++++++--------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/sunstone/public/app/utils/resource-select.js b/src/sunstone/public/app/utils/resource-select.js
index fc1fdbfdbe..fd4a6f1d6e 100644
--- a/src/sunstone/public/app/utils/resource-select.js
+++ b/src/sunstone/public/app/utils/resource-select.js
@@ -20,70 +20,82 @@ define(function(require) {
   require('opennebula/cluster');
   require('opennebula/user');
   require('opennebula/group');
-
-  var _insert = function(id, context, resource, init_val, empty_value,
-      extra_options, filter_att, filter_val, trigger_change, only_name) {
-
-    var Resource = require('opennebula/' + resource.toLowerCase());
-    $(id, context).html('<i class="fa fa-spinner fa-spin"></i>');
+  
+  /**
+   * Insert a select with the specified list of OpenNebula resources
+   * The list of resources will be retrieved running a Resource.list action
+   *
+   * @param {Object}  opts
+   * @param {Object}  opts.context - jQuery selector where the select will be added
+   * @param {string}  opts.resourceName - Name of the OpenNebula JS resource (i.e: Cluster, Host)
+   * @param {string}  [opts.initValue] - The value of an option to be selected by default
+   * @param {Boolean} [opts.emptyValue] - Add a first option with the text Please select
+   * @param {Boolean} [opts.triggerChange] - Trigger the change event after the select is added
+   * @param {Boolean} [opts.onlyName] - Show only the name of the resource instead of ID:NAME
+   * @param {string}  [opts.extraOptions] - Extra options to be included in the select as a HTML string
+   * @param {string}  [opts.includeDefaultCluster] - Include the default (none) option for Clusters
+   * @param {string}  [opts.filterKey] - Select the resources whose filterKey matches filterValue
+   * @param {string}  [opts.filterValue] - RegExp that will be evaluated to filter the resources
+   */
+  var _insert = function(opts) {
+    var Resource = require('opennebula/' + opts.resourceName.toLowerCase());
+    opts.context.html('<i class="fa fa-spinner fa-spin"></i>');
 
     Resource.list({
       timeout: true,
-      success: function (request, obj_list) {
-        var select_str = '<select class="resource_list_select">';
+      success: function (request, elemList) {
+        var selectHTML = '<select class="resource_list_select">';
 
-        if (empty_value) {
-          select_str += '<option class="empty_value" value="">' +
+        if (opts.emptyValue) {
+          selectHTML += '<option class="empty_value" value="">' +
                           Locale.tr("Please select") + '</option>';
         }
 
-        if (resource == "Cluster") {
-          if (!extra_options) {
-            extra_options = "";
+        if (opts.includeDefaultCluster === true) {
+          if (opts.extraOptions === undefined) {
+            opts.extraOptions = '';
           }
 
-          extra_options += '<option value="-1">Default (none)</option>';
+          opts.extraOptions += '<option value="-1">Default (none)</option>';
         }
 
-        if (extra_options) {
-          select_str += extra_options;
+        if (opts.extraOptions !== undefined) {
+          selectHTML += opts.extraOptions;
         }
 
-        if (!filter_att) {
-          filter_att = [];
-        }
+        var resourceXMLRoot = Resource.resource;
+        var elem, add;
+        $.each(elemList, function() {
+          elem = this[resourceXMLRoot];
 
-        var res_name = Resource.resource;
-        $.each(obj_list, function() {
-          var id = this[res_name].ID;
-          var name = this[res_name].NAME;
-          var add = true;
-
-          for (var i = 0; i < filter_att.length; i++) {
-            if (this[res_name][filter_att[i]] == filter_val[i]) {
+          if (opts.filterKey !== undefined && opts.filterValue !== undefined) {
+            if (elem[opts.filterKey] === opts.filterValue) {
+              add = true;
+            } else {
               add = false;
-              break;
             }
+          } else {
+            add = true;
           }
 
-          if (add) {
-            select_str += '<option elem_id="' + id + '" value="' + id + '">'
-            if (!only_name) {
-              select_str += id + ': '
+          if (add === true) {
+            selectHTML += '<option elem_id="' + elem.ID + '" value="' + elem.ID + '">';
+            if (!opts.onlyName) {
+              selectHTML += elem.ID + ': ';
             }
-            select_str += name + '</option>';
+            selectHTML += elem.NAME + '</option>';
           }
         });
 
-        select_str += "</select>";
+        selectHTML += '</select>';
 
-        $(id, context).html(select_str);
+        opts.context.html(selectHTML);
 
-        if (init_val) {
-          $(id + " .resource_list_select", context).val(init_val);
+        if (opts.initValue !== undefined) {
+          $('.resource_list_select', opts.context).val(opts.initValue);
         }
-        if (trigger_change) {
-          $(id + " .resource_list_select", context).change();
+        if (opts.triggerChange === true) {
+          $(' .resource_list_select', opts.context).change();
         }
       },
       error: Notifier.onError

From f823f0f2bd09338e001e2e2342ae32ac73fa4b06 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 16:53:14 +0100
Subject: [PATCH 095/197] Use new ResourceSelect in the ACL creation form

---
 .../app/tabs/acls-tab/form-panels/create.js   | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js b/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js
index 129827595e..76b71381f6 100644
--- a/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js
@@ -273,18 +273,35 @@ define(function(require) {
   }
 
   function _onShow(context) {
-    ResourceSelect.insert('div#applies_to_user', context, "User", null, true);
-    ResourceSelect.insert('div#applies_to_group', context, "Group", null, true);
+    ResourceSelect.insert({
+        context: $('#applies_to_user', context),
+        resourceName: 'User',
+        emptyValue: true
+      });
 
-    ResourceSelect.insert('div#belonging_to', context, "Group", null, true);
-    ResourceSelect.insert('#in_cluster',context, "Cluster", null, true);
+    ResourceSelect.insert({
+        context: $('#applies_to_group', context),
+        resourceName: 'Group',
+        emptyValue: true
+      });
 
-    // TODO BUG: doesn't work if the cluster.list callback is not finished yet
-    // Delete cluster -1 option
-    $('#in_cluster select option[value="-1"]',context).remove();
+    ResourceSelect.insert({
+        context: $('#belonging_to', context),
+        resourceName: 'Group',
+        emptyValue: true
+      });
 
-    ResourceSelect.insert('div#zones_applies', context, "Zone", "*", false,
-                        '<option value="*">'+Locale.tr("All")+'</option>');
+    ResourceSelect.insert({
+        context: $('#in_cluster', context),
+        resourceName: 'Cluster',
+        emptyValue: true
+      });
 
+    ResourceSelect.insert({
+        context: $('#zones_applies', context),
+        resourceName: 'Zone',
+        initValue: '*',
+        extraOptions: '<option value="*">' + Locale.tr("All") + '</option>'
+      });
   }
 });

From 873ed920cbafdfed0dc97a49da393585845651fe Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 17:38:10 +0100
Subject: [PATCH 096/197] Use new ResourceSelect in Datastore creation form

---
 .../app/tabs/datastores-tab/form-panels/create.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index 42663fa2f9..1d811a86f2 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -95,8 +95,19 @@ define(function(require) {
     var cluster_id_raw = $("div#datastore_cluster_raw .resource_list_select", dialog).val();
     if (!cluster_id_raw) cluster_id_raw = "-1";
 
-    ResourceSelect.insert('div#cluster_id', dialog, "Cluster", cluster_id, false);
-    ResourceSelect.insert('div#datastore_cluster_raw', dialog, "Cluster", cluster_id_raw, false);
+    ResourceSelect.insert({
+        context: $('#cluster_id', dialog),
+        resourceName: 'Cluster',
+        initValue: cluster_id,
+        includeDefaultCluster: true
+      });
+
+    ResourceSelect.insert({
+        context: $('#datastore_cluster_raw', dialog),
+        resourceName: 'Cluster',
+        initValue: cluster_id_raw,
+        includeDefaultCluster: true
+      });
 
     return false;
   }

From d2f39024caa9f13163915cb6dafcbef2aa95db64 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 18:04:59 +0100
Subject: [PATCH 097/197] Use new ResourceSelect in files creation form

---
 .../app/tabs/files-tab/form-panels/create.js  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/sunstone/public/app/tabs/files-tab/form-panels/create.js b/src/sunstone/public/app/tabs/files-tab/form-panels/create.js
index c689ae4c7a..ec4093e942 100644
--- a/src/sunstone/public/app/tabs/files-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/files-tab/form-panels/create.js
@@ -28,6 +28,7 @@ define(function(require) {
   var Tips = require('utils/tips');
   var ResourceSelect = require('utils/resource-select');
   var BrowserInfo = require('utils/browser-info');
+  var OpenNebulaDatastore = require('opennebula/datastore');
 
   var TemplateWizardHTML = require('hbs!./create/wizard');
   var TemplateAdvancedHTML = require('hbs!./create/advanced');
@@ -96,11 +97,21 @@ define(function(require) {
     var filter_att = ["TYPE", "TYPE"];
     var filter_val = ["0", "1"];
 
-    ResourceSelect.insert('div#file_datastore', context, "Datastore",
-                        ds_id, false, null, filter_att, filter_val);
+    ResourceSelect.insert({
+        context: $('#file_datastore', context),
+        resourceName: 'Datastore',
+        initValue: ds_id,
+        filterKey: 'TYPE',
+        filterValue: '' + OpenNebulaDatastore.TYPES.FILE_DS
+      });
 
-    ResourceSelect.insert('div#file_datastore_raw', context, "Datastore",
-                        ds_id_raw, false, null, filter_att, filter_val);
+    ResourceSelect.insert({
+        context: $('#file_datastore_raw', context),
+        resourceName: 'Datastore',
+        initValue: ds_id_raw,
+        filterKey: 'TYPE',
+        filterValue: '' + OpenNebulaDatastore.TYPES.FILE_DS
+      });
 
     return false;
   }

From e79cee805501ec87f3320646a16ae3420d482de9 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 18:09:58 +0100
Subject: [PATCH 098/197] Remove unused filter_att and filter_val

---
 src/sunstone/public/app/tabs/files-tab/form-panels/create.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/sunstone/public/app/tabs/files-tab/form-panels/create.js b/src/sunstone/public/app/tabs/files-tab/form-panels/create.js
index ec4093e942..1d287ede59 100644
--- a/src/sunstone/public/app/tabs/files-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/files-tab/form-panels/create.js
@@ -93,10 +93,6 @@ define(function(require) {
     var ds_id = $('#file_datastore .resource_list_select', context).val();
     var ds_id_raw = $('#file_datastore_raw .resource_list_select', context).val();
 
-    // Filter out DS with type image (0) or system (1)
-    var filter_att = ["TYPE", "TYPE"];
-    var filter_val = ["0", "1"];
-
     ResourceSelect.insert({
         context: $('#file_datastore', context),
         resourceName: 'Datastore',

From bb3cd87d74dce9c816f983daffb00201a6b7fab6 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 18:10:14 +0100
Subject: [PATCH 099/197] Use new ResourceSelect in image creation form

---
 .../app/tabs/images-tab/form-panels/create.js | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create.js
index ad959ce415..93a12da2eb 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create.js
@@ -94,15 +94,23 @@ define(function(require) {
     var ds_id = $('#img_datastore .resource_list_select', context).val();
     var ds_id_raw = $('#img_datastore_raw .resource_list_select', context).val();
 
-    // Filter out DS with type system (1) or file (2)
-    var filter_att = ["TYPE", "TYPE"];
-    var filter_val = ["1", "2"];
+    ResourceSelect.insert({
+        context: $('#img_datastore', context),
+        resourceName: 'Datastore',
+        initValue: ds_id,
+        filterKey: 'TYPE',
+        filterValue: '' + OpenNebulaDatastore.TYPES.IMAGE_DS,
+        triggerChange: true
+      });
 
-    ResourceSelect.insert('div#img_datastore', context, "Datastore",
-                        ds_id, false, null, filter_att, filter_val, true);
-
-    ResourceSelect.insert('div#img_datastore_raw', context, "Datastore",
-                        ds_id_raw, false, null, filter_att, filter_val, true);
+    ResourceSelect.insert({
+        context: $('#img_datastore_raw', context),
+        resourceName: 'Datastore',
+        initValue: ds_id_raw,
+        filterKey: 'TYPE',
+        filterValue: '' + OpenNebulaDatastore.TYPES.IMAGE_DS,
+        triggerChange: true
+      });
 
     return false;
   }

From e0fcd997d4fcee8d6722525f6a5739e14fea2360 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 18:12:06 +0100
Subject: [PATCH 100/197] Use new ResourceSelect in host creation form

---
 .../public/app/tabs/hosts-tab/form-panels/create.js        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js
index 84a9e429c9..07b47a3088 100644
--- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js
@@ -267,7 +267,12 @@ define(function(require) {
     var cluster_id = $("#host_cluster_id .resource_list_select", context).val();
     if (!cluster_id) cluster_id = "-1";
 
-    ResourceSelect.insert('#host_cluster_id', context, "Cluster", cluster_id, false);
+    ResourceSelect.insert({
+        context: $('#host_cluster_id', context),
+        resourceName: 'Cluster',
+        initValue: cluster_id,
+        includeDefaultCluster: true
+      });
 
     $("#host_type_mad", context).change();
 

From 5ac0cc16fd8887603bab5b260531b6210db3b697 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 18:20:23 +0100
Subject: [PATCH 101/197] Use new ResourceSelect in import from

---
 .../app/tabs/marketplace-tab/dialogs/import.js      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js b/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js
index 5c03796a58..af342220bd 100644
--- a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js
+++ b/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js
@@ -26,6 +26,7 @@ define(function(require) {
   var Notifier = require('utils/notifier');
   var Locale = require('utils/locale');
   var ResourceSelect = require('utils/resource-select');
+  var OpenNebulaDatastore = require('opennebula/datastore');
   var OpenNebulaImage = require('opennebula/image');
   var OpenNebulaTemplate = require('opennebula/template');
   var TemplateUtils = require('utils/template-utils');
@@ -76,12 +77,12 @@ define(function(require) {
       ContentHTML({'element': this.element})
     );
 
-    // Filter out DS with type system (1) or file (2)
-    var filter_att = ["TYPE", "TYPE"];
-    var filter_val = ["1", "2"];
-
-    ResourceSelect.insert('div#market_img_datastore', context, "Datastore",
-                        null, false, null, filter_att, filter_val);
+    ResourceSelect.insert({
+        context: $('#market_img_datastore', context),
+        resourceName: 'Datastore',
+        filterKey: 'TYPE',
+        filterValue: '' + OpenNebulaDatastore.TYPES.IMAGE_DS
+      });
 
     context.off('invalid.fndtn.abide', '#' + DIALOG_ID + 'Form');
     context.off('valid.fndtn.abide', '#' + DIALOG_ID + 'Form');

From b062783308e74faedb68db059641f2eb6eae6350 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 18:26:57 +0100
Subject: [PATCH 102/197] Use new ResourceSelect in cloud view

---
 src/sunstone/public/app/tabs/provision-tab.js |  1 -
 .../app/tabs/provision-tab/flows/list.js      | 19 ++++++++-----------
 .../app/tabs/provision-tab/templates/list.js  | 19 ++++++++-----------
 .../public/app/tabs/provision-tab/vms/list.js | 19 ++++++++-----------
 4 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js
index 4ed94e6421..99bf22da10 100644
--- a/src/sunstone/public/app/tabs/provision-tab.js
+++ b/src/sunstone/public/app/tabs/provision-tab.js
@@ -23,7 +23,6 @@ define(function(require) {
   var OpenNebula = require('opennebula');
   var Sunstone = require('sunstone');
   var Notifier = require('utils/notifier');
-  var ResourceSelect = require('utils/resource-select');
   var QuotaWidgets = require('utils/quotas/quota-widgets');
   var QuotaDefaults = require('utils/quotas/quota-defaults');
   var Accounting = require('utils/accounting');
diff --git a/src/sunstone/public/app/tabs/provision-tab/flows/list.js b/src/sunstone/public/app/tabs/provision-tab/flows/list.js
index 35d295a03f..bf480e0e41 100644
--- a/src/sunstone/public/app/tabs/provision-tab/flows/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/flows/list.js
@@ -239,17 +239,14 @@ define(function(require) {
       }
     })
 
-    ResourceSelect.insert(
-      ".provision_list_flows_filter",
-      context,
-      "User",
-      (opts.filter_expression ? opts.filter_expression : "-2"),
-      false,
-      '<option value="-2">'+Locale.tr("ALL")+'</option>',
-      null,
-      null,
-      true,
-      true);
+    ResourceSelect.insert({
+        context: $('.provision_list_flows_filter', context),
+        resourceName: 'User',
+        initValue: (opts.filter_expression ? opts.filter_expression : "-2"),
+        extraOptions: '<option value="-2">' + Locale.tr("ALL") + '</option>',
+        triggerChange: true,
+        onlyName: true
+      });
 
     context.on("click", ".provision_flows_list_filter_button", function(){
       $(".provision_list_flows_filter", context).fadeIn();
diff --git a/src/sunstone/public/app/tabs/provision-tab/templates/list.js b/src/sunstone/public/app/tabs/provision-tab/templates/list.js
index 96d0ae80a2..9d6b65e535 100644
--- a/src/sunstone/public/app/tabs/provision-tab/templates/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/templates/list.js
@@ -218,17 +218,14 @@ define(function(require) {
       }
     })
 
-    ResourceSelect.insert(
-      ".provision_list_templates_filter",
-      context,
-      "User",
-      (opts.filter_expression ? opts.filter_expression : "-2"),
-      false,
-      '<option value="-2">'+Locale.tr("ALL")+'</option>',
-      null,
-      null,
-      true,
-      true);
+    ResourceSelect.insert({
+        context: $('.provision_list_templates_filter', context),
+        resourceName: 'User',
+        initValue: (opts.filter_expression ? opts.filter_expression : "-2"),
+        extraOptions: '<option value="-2">' + Locale.tr("ALL") + '</option>',
+        triggerChange: true,
+        onlyName: true
+      });
 
     context.on("click", ".provision_templates_list_filter_button", function(){
       $(".provision_list_templates_filter", context).fadeIn();
diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
index c55d7acf96..289f8334ca 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
@@ -213,17 +213,14 @@ define(function(require) {
       }
     })
 
-    ResourceSelect.insert(
-      ".provision_list_vms_filter",
-      context,
-      "User",
-      (opts.filter_expression ? opts.filter_expression : "-2"),
-      false,
-      '<option value="-2">'+Locale.tr("ALL")+'</option>',
-      null,
-      null,
-      true,
-      true);
+    ResourceSelect.insert({
+        context: $('.provision_list_vms_filter', context),
+        resourceName: 'User',
+        initValue: (opts.filter_expression ? opts.filter_expression : "-2"),
+        extraOptions: '<option value="-2">' + Locale.tr("ALL") + '</option>',
+        triggerChange: true,
+        onlyName: true
+      });
 
     context.on("click", ".provision_vms_list_filter_button", function(){
       $(".provision_list_vms_filter", context).fadeIn();

From 1c0ee159c9cd156f56bf89093f4a246f4c689e7a Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 18:28:49 +0100
Subject: [PATCH 103/197] Use new ResourceSelect in user info panel

---
 src/sunstone/public/app/tabs/users-tab/panels/info.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info.js b/src/sunstone/public/app/tabs/users-tab/panels/info.js
index 7ee3adfa2a..ef717cf503 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/users-tab/panels/info.js
@@ -110,7 +110,11 @@ define(function(require) {
     // Chgrp
     context.off("click", "#div_edit_chg_group_link");
     context.on("click", "#div_edit_chg_group_link", function() {
-      ResourceSelect.insert("#value_td_group", context, "Group", that.element.GID, false);
+      ResourceSelect.insert({
+        context: $('#value_td_group', context),
+        resourceName: 'Group',
+        initValue: that.element.GID
+      });
     });
 
     context.off("change", "#value_td_group .resource_list_select");

From 914f1b0f6ad6ade53ad0250d34a49d5e42a283ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 20 Jan 2016 18:31:05 +0100
Subject: [PATCH 104/197] Feature #4215: Topology style tweaks

---
 .../public/app/tabs/vnets-topology-tab.js     | 75 ++++++++++++++++---
 1 file changed, 63 insertions(+), 12 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js
index 22a545a23a..94ff817be2 100644
--- a/src/sunstone/public/app/tabs/vnets-topology-tab.js
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js
@@ -28,6 +28,7 @@ define(function(require) {
 
   var _network;
   var _vnetList;
+  var _vnetLevel;
 
   var _buttons = {
     "NetworkTopology.refresh" : {
@@ -35,10 +36,16 @@ define(function(require) {
       layout: "refresh",
       alwaysActive: true
     },
-    "NetworkTopology.toggleVMs" : {
+    "NetworkTopology.collapseVMs" : {
       type: "action",
       layout: "main",
-      text:  Locale.tr("Toggle VMs"),
+      text:  Locale.tr("Collapse VMs"),
+      alwaysActive: true
+    },
+    "NetworkTopology.openVMs" : {
+      type: "action",
+      layout: "main",
+      text:  Locale.tr("Open VMs"),
       alwaysActive: true
     }
   };
@@ -48,9 +55,13 @@ define(function(require) {
       type: "custom",
       call: _refresh
     },
-    "NetworkTopology.toggleVMs" : {
+    "NetworkTopology.collapseVMs" : {
       type: "custom",
-      call: _toggleVMs
+      call: _collapseVMs
+    },
+    "NetworkTopology.openVMs" : {
+      type: "custom",
+      call: _openVMs
     }
   };
 
@@ -120,6 +131,7 @@ define(function(require) {
 
   function _doTopology(vnetList){
     _vnetList = vnetList;
+    _vnetLevel = {};
 
     var nodes = [];
     var edges = [];
@@ -127,27 +139,32 @@ define(function(require) {
     // Aux object to keep track of duplicated nodes (vms/vr attached to 2 vnets)
     var nodeIndex = {};
 
+    var level = 0;
+
     $.each(vnetList, function(i,element){
       var vnet = element.VNET;
       var vnetId = vnet.ID;
 
+      // VNet node
+      // ----------------
+
       if (vnet.PARENT_NETWORK_ID.length > 0){
         vnetId = vnet.PARENT_NETWORK_ID;
       }
 
-      // VNet node
-      // ----------------
-
       var vnetNodeId = "vnet"+vnetId;
 
-      var group = "vnet";
-
       if (!nodeIndex[vnetNodeId]){
+        level += 2;
+
+        _vnetLevel[vnetId] = level;
+
         nodeIndex[vnetNodeId] = true;
         nodes.push({
           id: vnetNodeId,
+          level: level,
           label: "      VNet "+vnet.NAME + "      ", // Spaces for padding, no other reason
-          group: group});
+          group: "vnet"});
       }
 
       // VRouter nodes
@@ -170,6 +187,7 @@ define(function(require) {
           nodeIndex[nodeId] = true;
           nodes.push({
             id: nodeId,
+            level: level+1,
             label: "VR "+vr,
             group: "vr"});
         }
@@ -206,6 +224,7 @@ define(function(require) {
               nodeIndex[nodeId] = true;
               nodes.push({
                 id: nodeId,
+                level: level+1,
                 label: "VM "+lease.VM,
                 group: "vm",
                 vnet: vnetId});
@@ -235,6 +254,7 @@ define(function(require) {
               nodeIndex[nodeId] = true;
               nodes.push({
                 id: nodeId,
+                level: level+1,
                 label: "VR "+vr,
                 group: "vr"});
             }
@@ -277,6 +297,14 @@ define(function(require) {
       groups: {
         vnet: {
           shape: 'box',
+          value: 2,
+          scaling: {
+            label: {
+              enabled: true,
+              max: 40
+            },
+            max: 30
+          },
           color: {
             border: "#007a9c",
             background: "#0098c3",
@@ -327,7 +355,8 @@ define(function(require) {
         font: {
           align: 'middle'
         },
-        color: '#cfcfcf'
+        color: '#cfcfcf',
+        length: 300
       },
 
       interaction: {
@@ -380,13 +409,17 @@ define(function(require) {
     });
   }
 
-  function _toggleVMs(){
+  function _collapseVMs(){
 
     // Clusters all VMs for each vnet, except those attached to more than one vnet
     $.each(_vnetList, function(i,element){
       var vnet = element.VNET;
       var vnetId = vnet.ID;
 
+      if (vnet.PARENT_NETWORK_ID.length > 0){
+        vnetId = vnet.PARENT_NETWORK_ID;
+      }
+
       var clusterOptionsByData = {
         joinCondition:function(childOptions) {
           return (childOptions.group == "vm" &&
@@ -395,6 +428,7 @@ define(function(require) {
         },
         clusterNodeProperties: {
           id:"vmCluster"+vnetId,
+          level: _vnetLevel[vnetId]+1,
           label: "VMs",
           group: "vmCluster"
         },
@@ -405,6 +439,23 @@ define(function(require) {
 
       _network.cluster(clusterOptionsByData);
     });
+
+    _network.stabilize();
   }
 
+  function _openVMs(){
+
+    // Opens all VMs Clusters
+    $.each(_vnetList, function(i,element){
+      var vnet = element.VNET;
+      var clusterId = "vmCluster"+vnet.ID;
+
+      try{
+        _network.openCluster(clusterId);
+      }catch(err){
+      }
+    });
+
+    _network.stabilize();
+  }
 });

From f8c1da160450723e2456974bdd24ac61f38ddbf7 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 18:37:28 +0100
Subject: [PATCH 105/197] Use new ResourceSelect in accounting

---
 src/sunstone/public/app/utils/accounting.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/sunstone/public/app/utils/accounting.js b/src/sunstone/public/app/utils/accounting.js
index e7c57d88ed..6fb93bb15e 100644
--- a/src/sunstone/public/app/utils/accounting.js
+++ b/src/sunstone/public/app/utils/accounting.js
@@ -111,13 +111,20 @@ define(function(require) {
 
         case "acct_owner_group":
           $("#acct_owner_select", context).show();
-          ResourceSelect.insert("#acct_owner_select", context, "Group");
+          ResourceSelect.insert({
+              context: $('#acct_owner_select', context),
+              resourceName: 'Group'
+            });
           break;
 
         case "acct_owner_user":
           $("#acct_owner_select", context).show();
-          ResourceSelect.insert("#acct_owner_select", context, "User", -1, false,
-              '<option value="-1">'+Locale.tr("<< me >>")+'</option>');
+          ResourceSelect.insert({
+              context: $('#acct_owner_select', context),
+              resourceName: 'User',
+              initValue: -1,
+              extraOptions: '<option value="-1">' + Locale.tr("<< me >>") + '</option>'
+            });
           break;
         }
       });

From 6628719c964cbed030124ac45c5eb565ecf06f80 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 20 Jan 2016 19:00:51 +0100
Subject: [PATCH 106/197] Use new ResourceSelect in panels

---
 .../app/utils/dialogs/confirm-with-select.js  |  6 +++-
 .../public/app/utils/panel/cluster-tr.js      |  7 ++++-
 .../app/utils/panel/permissions-table.js      | 13 ++++++--
 .../public/app/utils/quotas/quota-widgets.js  | 30 +++++++++----------
 src/sunstone/public/app/utils/showback.js     | 14 +++++++--
 5 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/sunstone/public/app/utils/dialogs/confirm-with-select.js b/src/sunstone/public/app/utils/dialogs/confirm-with-select.js
index db1d9da811..b0f7bbce65 100644
--- a/src/sunstone/public/app/utils/dialogs/confirm-with-select.js
+++ b/src/sunstone/public/app/utils/dialogs/confirm-with-select.js
@@ -111,7 +111,11 @@ define(function(require) {
     if (button.custom_select) {
       $('div#confirm_select', dialog).html(button.custom_select);
     } else {
-      ResourceSelect.insert('#confirm_select', dialog, button.select, null, true);
+      ResourceSelect.insert({
+          context: $('#confirm_select', dialog),
+          resourceName: button.select,
+          emptyValue: true
+        });
     }
 
     $('#confirm_with_select_tip', dialog).text(tip);
diff --git a/src/sunstone/public/app/utils/panel/cluster-tr.js b/src/sunstone/public/app/utils/panel/cluster-tr.js
index 56cd19ebeb..65e94cb283 100644
--- a/src/sunstone/public/app/utils/panel/cluster-tr.js
+++ b/src/sunstone/public/app/utils/panel/cluster-tr.js
@@ -48,7 +48,12 @@ define(function(require) {
     context.off("click", "#div_edit_chg_cluster_link");
     context.on("click", "#div_edit_chg_cluster_link", function() {
       var tr_context = $(this).parents("tr");
-      ResourceSelect.insert(".value_td_cluster", context, "Cluster", clusterId, false);
+      ResourceSelect.insert({
+          context: $('.value_td_cluster', context),
+          resourceName: 'Cluster',
+          initValue: clusterId,
+          includeDefaultCluster: true
+        });
     });
 
     context.off("change", ".value_td_cluster .resource_list_select");
diff --git a/src/sunstone/public/app/utils/panel/permissions-table.js b/src/sunstone/public/app/utils/panel/permissions-table.js
index 6fb22bd9ed..81162a6896 100644
--- a/src/sunstone/public/app/utils/panel/permissions-table.js
+++ b/src/sunstone/public/app/utils/panel/permissions-table.js
@@ -85,8 +85,11 @@ define(function(require) {
     if (Config.isTabActionEnabled(tabName, resourceType + '.chown')) {
       context.off("click", "#div_edit_chg_owner_link");
       context.on("click", "#div_edit_chg_owner_link", function() {
-          var tr_context = $(this).parents("tr");
-          ResourceSelect.insert("#value_td_owner", context, "User", element.UID, false);
+          ResourceSelect.insert({
+              context: $('#value_td_owner', context),
+              resourceName: 'User',
+              initValue: element.UID
+            });
         });
 
       context.off("change", "#value_td_owner .resource_list_select");
@@ -101,7 +104,11 @@ define(function(require) {
     if (Config.isTabActionEnabled(tabName, resourceType + '.chgrp')) {
       context.off("click", "#div_edit_chg_group_link");
       context.on("click", "#div_edit_chg_group_link", function() {
-          ResourceSelect.insert("#value_td_group", context, "Group", element.GID, false);
+          ResourceSelect.insert({
+              context: $('#value_td_group', context),
+              resourceName: 'Group',
+              initValue: element.GID
+            });
         });
 
       context.off("change", "#value_td_group .resource_list_select");
diff --git a/src/sunstone/public/app/utils/quotas/quota-widgets.js b/src/sunstone/public/app/utils/quotas/quota-widgets.js
index 67524be770..8bc5bfc5f5 100644
--- a/src/sunstone/public/app/utils/quotas/quota-widgets.js
+++ b/src/sunstone/public/app/utils/quotas/quota-widgets.js
@@ -344,11 +344,11 @@ define(function(require) {
           <td class="rvms_bar"></td>\
         </tr>');
 
-      ResourceSelect.insert(
-        'td.image_select',
-        $(".image_quota_table tbody tr", context).last(),
-        "Image",
-        null, true);
+      ResourceSelect.insert({
+          context: $('.image_select', $(".image_quota_table tbody tr", context).last()),
+          resourceName: 'Image',
+          emptyValue: true
+        });
 
       $(".image_quota_table tbody tr", context).last().off(
                                             "change", ".resource_list_select");
@@ -499,11 +499,11 @@ define(function(require) {
           <td class="size_bar"></td>\
         </tr>');
 
-      ResourceSelect.insert(
-        'td.ds_select',
-        $(".ds_quota_table tbody tr", context).last(),
-        "Datastore",
-        null, true);
+      ResourceSelect.insert({
+          context: $('.ds_select', $(".ds_quota_table tbody tr", context).last()),
+          resourceName: 'Datastore',
+          emptyValue: true
+        });
 
       $(".ds_quota_table tbody tr", context).last().off(
                                             "change", ".resource_list_select");
@@ -651,11 +651,11 @@ define(function(require) {
               <td class="leases_bar"></td>\
           </tr>');
 
-      ResourceSelect.insert(
-          'td.network_select',
-          $(".network_quota_table tbody tr", context).last(),
-          "Network",
-          null, true);
+      ResourceSelect.insert({
+          context: $('.network_select', $(".network_quota_table tbody tr", context).last()),
+          resourceName: 'Network',
+          emptyValue: true
+        });
 
       $(".network_quota_table tbody tr", context).last().off(
                                             "change", ".resource_list_select");
diff --git a/src/sunstone/public/app/utils/showback.js b/src/sunstone/public/app/utils/showback.js
index 2f866d563a..5b9af75c47 100644
--- a/src/sunstone/public/app/utils/showback.js
+++ b/src/sunstone/public/app/utils/showback.js
@@ -50,14 +50,22 @@ define(function(require) {
     if (opt.fixed_user != undefined){
       $("#showback_user_container", context).hide();
     } else {
-      ResourceSelect.insert("#showback_user_select", context, "User", -1, false,
-        '<option value="-1">'+Locale.tr("<< me >>")+'</option>');
+      ResourceSelect.insert({
+          context: $('#showback_user_select', context),
+          resourceName: 'User',
+          initValue: -1,
+          extraOptions: '<option value="-1">' + Locale.tr("<< me >>") + '</option>'
+        });
     }
 
     if (opt.fixed_group != undefined){
       $("#showback_group_container", context).hide();
     } else {
-      ResourceSelect.insert("#showback_group_select", context, "Group", "", true);
+      ResourceSelect.insert({
+          context: $('#showback_group_select', context),
+          resourceName: 'Group',
+          emptyValue: true
+        });
     }
 
     showback_dataTable = $("#showback_datatable",context).dataTable({

From 9555a98c1eefa268cd2d11482bd7cfd612a1ab01 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 21 Jan 2016 09:56:35 +0100
Subject: [PATCH 107/197] Bug #4221: disk detach / attach leaves VM in broken
 state

(cherry picked from commit 06bedfe8f6227043d2804aef2479a69545af6346)
---
 src/tm_mad/qcow2/ln | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tm_mad/qcow2/ln b/src/tm_mad/qcow2/ln
index fabd61fdce..58be295a48 100755
--- a/src/tm_mad/qcow2/ln
+++ b/src/tm_mad/qcow2/ln
@@ -82,6 +82,8 @@ if [ -z "\${SNAP}" ]; then
 fi
 
 ln -sf "$SNAP_DIR/\$SNAP" "$DST_PATH"
+
+$RM -f "${DST_PATH}.snap"
 ln -sf "$SNAP_DIR" "${DST_PATH}.snap"
 EOT
 )

From d059e542e2f58eabf6832aa3811850b2a2a0fba6 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 21 Jan 2016 13:24:50 +0100
Subject: [PATCH 108/197] feature #4240: Add Service Template clone dialog

---
 src/flow/oneflow-server.rb                    |   4 +
 src/sunstone/etc/sunstone-views/admin.yaml    |   1 +
 .../etc/sunstone-views/admin_vcenter.yaml     |   1 +
 src/sunstone/etc/sunstone-views/user.yaml     |   1 +
 .../public/app/opennebula/servicetemplate.js  |   5 +
 .../public/app/tabs/oneflow-templates-tab.js  |   1 +
 .../app/tabs/oneflow-templates-tab/actions.js |  14 +++
 .../app/tabs/oneflow-templates-tab/buttons.js |   5 +
 .../oneflow-templates-tab/dialogs/clone.js    | 115 ++++++++++++++++++
 .../dialogs/clone/dialogId.js                 |  19 +++
 .../dialogs/clone/html.hbs                    |  42 +++++++
 11 files changed, 208 insertions(+)
 create mode 100644 src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js
 create mode 100644 src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/dialogId.js
 create mode 100644 src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/html.hbs

diff --git a/src/flow/oneflow-server.rb b/src/flow/oneflow-server.rb
index debd322e1f..49001bd5ff 100644
--- a/src/flow/oneflow-server.rb
+++ b/src/flow/oneflow-server.rb
@@ -511,6 +511,10 @@ post '/service_template/:id/action' do
     when 'rename'
         status 204
         service_template.rename(opts['name'])
+    when 'clone'
+        status 204
+        service_template.clone(opts['name'])
+        # TODO return id of the new template
     else
         OpenNebula::Error.new("Action #{action['perform']} not supported")
     end
diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 05ca6c5d06..f2bf7d9255 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -532,6 +532,7 @@ tabs:
             ServiceTemplate.chgrp: true
             ServiceTemplate.chmod: true
             ServiceTemplate.rename: true
+            ServiceTemplate.clone: true
             ServiceTemplate.delete: true
     zones-tab:
         panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index f6639fc712..e32b1d0c08 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -532,6 +532,7 @@ tabs:
             ServiceTemplate.chgrp: true
             ServiceTemplate.chmod: true
             ServiceTemplate.rename: true
+            ServiceTemplate.clone: true
             ServiceTemplate.delete: true
     zones-tab:
         panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index b1249c2856..5e03ac338d 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -533,6 +533,7 @@ tabs:
             ServiceTemplate.chgrp: false
             ServiceTemplate.chmod: true
             ServiceTemplate.rename: true
+            ServiceTemplate.clone: true
             ServiceTemplate.delete: true
     zones-tab:
         panel_tabs:
diff --git a/src/sunstone/public/app/opennebula/servicetemplate.js b/src/sunstone/public/app/opennebula/servicetemplate.js
index 462d0e8328..cd679d78fc 100644
--- a/src/sunstone/public/app/opennebula/servicetemplate.js
+++ b/src/sunstone/public/app/opennebula/servicetemplate.js
@@ -67,6 +67,11 @@ define(function(require) {
       var action_obj = params.data.extra_param;
       OpenNebulaAction.simple_action(params, RESOURCE, "rename", action_obj, PATH);
     },
+    "clone" : function(params) {
+      var name = params.data.extra_param ? params.data.extra_param : "";
+      var action_obj = {"name" : name};
+      OpenNebulaAction.simple_action(params, RESOURCE, "clone", action_obj, PATH);
+    },
     "getName": function(id){
       return OpenNebulaAction.getName(id, CACHE_NAME);
     }
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab.js b/src/sunstone/public/app/tabs/oneflow-templates-tab.js
index e43220bcf8..faee265f8e 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab.js
@@ -25,6 +25,7 @@ define(function(require) {
   var RESOURCE = "ServiceTemplate";
 
   var _dialogs = [
+    require('./oneflow-templates-tab/dialogs/clone')
   ];
 
   var _panels = [
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/actions.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/actions.js
index 171189bc7e..55a8b2c3d9 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/actions.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/actions.js
@@ -25,6 +25,7 @@ define(function(require) {
   var TAB_ID = require('./tabId');
   var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId');
   var INSTANTIATE_DIALOG_ID = require('./form-panels/instantiate/formPanelId');
+  var CLONE_DIALOG_ID = require('./dialogs/clone/dialogId');
   var XML_ROOT = "DOCUMENT";
   var RESOURCE = "ServiceTemplate";
 
@@ -93,6 +94,19 @@ define(function(require) {
       }
     },
 
+    "ServiceTemplate.clone_dialog" : {
+      type: "custom",
+      call: function(){
+        Sunstone.getDialog(CLONE_DIALOG_ID).show();
+      }
+    },
+    
+    "ServiceTemplate.clone" : {
+      type: "single",
+      call: OpenNebulaResource.clone,
+      error: Notifier.onError,
+      notify: true
+    }
   };
 
   return _actions;
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js
index 369b5ec913..23f94bb2f0 100644
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js
@@ -51,6 +51,11 @@ define(function(require) {
       layout: "user_select",
       tip: Locale.tr("Select the new group")+":"
     },
+    "ServiceTemplate.clone_dialog" : {
+      type: "action",
+      layout: "main",
+      text: Locale.tr("Clone")
+    },
     "ServiceTemplate.delete" : {
       type: "confirm",
       text: Locale.tr("Delete"),
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js
new file mode 100644
index 0000000000..08dc5ae33f
--- /dev/null
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js
@@ -0,0 +1,115 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var BaseDialog = require('utils/dialogs/dialog');
+  var TemplateHTML = require('hbs!./clone/html');
+  var Sunstone = require('sunstone');
+  var Notifier = require('utils/notifier');
+  var OpenNebulaServiceTemplate = require('opennebula/servicetemplate');
+
+  /*
+    CONSTANTS
+   */
+
+  var DIALOG_ID = require('./clone/dialogId');
+  var ONEFLOW_TEMPLATES_TAB_ID = require('tabs/oneflow-templates-tab/tabId')
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Dialog() {
+    this.dialogId = DIALOG_ID;
+
+    BaseDialog.call(this);
+  };
+
+  Dialog.DIALOG_ID = DIALOG_ID;
+  Dialog.prototype = Object.create(BaseDialog.prototype);
+  Dialog.prototype.constructor = Dialog;
+  Dialog.prototype.html = _html;
+  Dialog.prototype.onShow = _onShow;
+  Dialog.prototype.setup = _setup;
+
+  return Dialog;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _html() {
+    return TemplateHTML({
+      'dialogId': this.dialogId
+    });
+  }
+
+  function _setup(context) {
+    var that = this;
+
+    $('#' + DIALOG_ID + 'Form', context).submit(function() {
+      var extra_info;
+      var name = $('input[name="name"]', this).val();
+      var sel_elems = Sunstone.getDataTable(ONEFLOW_TEMPLATES_TAB_ID).elements();
+
+      if (!name || !sel_elems.length)
+        Notifier.notifyError('A name or prefix is needed!');
+
+      if (sel_elems.length > 1) {
+        for (var i = 0; i < sel_elems.length; i++) {
+          //If we are cloning several images we
+          //use the name as prefix
+          extra_info = name + OpenNebulaServiceTemplate.getName(sel_elems[i]);
+          Sunstone.runAction('ServiceTemplate.clone', sel_elems[i], extra_info);
+        }
+      } else {
+        extra_info = name;
+        Sunstone.runAction('ServiceTemplate.clone', sel_elems[0], extra_info)
+      }
+
+      Sunstone.getDialog(DIALOG_ID).hide();
+      Sunstone.getDialog(DIALOG_ID).reset();
+      setTimeout(function() {
+        Sunstone.runAction('ServiceTemplate.refresh');
+      }, 1500);
+      return false;
+    });
+
+    return false;
+  }
+
+  function _onShow(context) {
+    var sel_elems = Sunstone.getDataTable(ONEFLOW_TEMPLATES_TAB_ID).elements();
+    //show different text depending on how many elements are selected
+    if (sel_elems.length > 1) {
+      $('.clone_one', context).hide();
+      $('.clone_several', context).show();
+      $('input[name="name"]',context).val('Copy of ');
+    } else {
+      $('.clone_one', context).show();
+      $('.clone_several', context).hide();
+      $('input[name="name"]', context).val('Copy of ' + OpenNebulaServiceTemplate.getName(sel_elems[0]));
+    };
+
+    $("input[name='name']", context).focus();
+
+    return false;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/dialogId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/dialogId.js
new file mode 100644
index 0000000000..c3fda56095
--- /dev/null
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/dialogId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'cloneServiceTemplateDialog';
+})
diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/html.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/html.hbs
new file mode 100644
index 0000000000..7a7433b632
--- /dev/null
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/html.hbs
@@ -0,0 +1,42 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<div id="{{dialogId}}" class="reveal-modal" role="dialog" data-reveal >
+  <div class="row">
+    <h3 class="subheader">{{tr "Clone Service Template"}}</h3>
+  </div>
+  <form id="{{dialogId}}Form" action="" class="custom creation">
+    <div class="row">
+      <div class="large-12 columns">
+        <div class="clone_one"></div>
+        <div class="clone_several">
+          {{tr "Several templates are selected, please choose prefix to name the new copies"}}
+          <br></div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="large-12 columns">
+        <label class="clone_one">{{tr "Name"}}</label>
+        <label class="clone_several">{{tr "Prefix"}}</label>
+        <input type="text" name="name"/>
+      </div>
+    </div>
+    <div class="form_buttons row">
+      <button class="button radius right" id="template_clone_button" value="ServiceTemplate.clone">{{tr "Clone"}}</button>
+    </div>
+    <a class="close-reveal-modal">&#215;</a>
+  </form>
+</div>

From c1ab60b3fb13fab94ab2aa6f8edc1418709ad911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 21 Jan 2016 17:59:21 +0100
Subject: [PATCH 109/197] Feature #4215: Hide vrouter VMs in topology, show IPs
 in VR tooltip

Plus new 'fit viewport' button, and more style tweaks
---
 .../public/app/tabs/vnets-topology-tab.js     | 249 ++++++++++++++----
 src/sunstone/public/scss/app.scss             |  13 +-
 2 files changed, 214 insertions(+), 48 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js
index 94ff817be2..d12e4e3e8e 100644
--- a/src/sunstone/public/app/tabs/vnets-topology-tab.js
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js
@@ -28,6 +28,10 @@ define(function(require) {
 
   var _network;
   var _vnetList;
+  var _vrList;
+  var _indexedVRs;
+  var _vrouterVMs;
+  var _vrouterTables;
   var _vnetLevel;
 
   var _buttons = {
@@ -36,6 +40,12 @@ define(function(require) {
       layout: "refresh",
       alwaysActive: true
     },
+    "NetworkTopology.fit" : {
+      type: "action",
+      layout: "main",
+      text: '<i class="fa fa-arrows-alt"/>',
+      alwaysActive: true
+    },
     "NetworkTopology.collapseVMs" : {
       type: "action",
       layout: "main",
@@ -55,6 +65,10 @@ define(function(require) {
       type: "custom",
       call: _refresh
     },
+    "NetworkTopology.fit" : {
+      type: "custom",
+      call: _fit
+    },
     "NetworkTopology.collapseVMs" : {
       type: "custom",
       call: _collapseVMs
@@ -90,47 +104,54 @@ define(function(require) {
 
   function _refresh() {
 
-    OpenNebula.Network.list({
-      timeout: true,
-      success: function (request, item_list) {
+    OpenNebula.VirtualRouter.list({
+      error: Notifier.onError,
+      success: function(request, item_list) {
+        _vrList = item_list;
 
-        // TODO: naive way to request all the individual networks info. It might
-        // be better to use promises, or a Network.list with an 'extended' option
+        OpenNebula.Network.list({
+          timeout: true,
+          success: function (request, item_list) {
 
-        var vnetList = [];
+            // TODO: naive way to request all the individual networks info. It might
+            // be better to use promises, or a Network.list with an 'extended' option
 
-        var i = 0;
+            var vnetList = [];
 
-        function _getVNet(index){
-          var vnetId = item_list[index].VNET.ID;
+            var i = 0;
 
-          OpenNebula.Network.show({
-            data : {
-              id: vnetId
-            },
-            timeout:true,
-            success: function(request,info){
-              vnetList.push(info);
+            function _getVNet(index){
+              var vnetId = item_list[index].VNET.ID;
 
-              i += 1;
-              if (i == item_list.length){
-                _doTopology(vnetList);
-              } else {
-                _getVNet(i);
-              }
-            },
-            error: Notifier.onError
-          });
-        }
+              OpenNebula.Network.show({
+                data : {
+                  id: vnetId
+                },
+                timeout:true,
+                success: function(request,info){
+                  vnetList.push(info);
 
-        _getVNet(i);
-      },
-      error: Notifier.onError
+                  i += 1;
+                  if (i == item_list.length){
+                    _vnetList = vnetList;
+                    _doTopology();
+                  } else {
+                    _getVNet(i);
+                  }
+                },
+                error: Notifier.onError
+              });
+            }
+
+            _getVNet(i);
+          },
+          error: Notifier.onError
+        });
+      }
     });
   }
 
-  function _doTopology(vnetList){
-    _vnetList = vnetList;
+  function _doTopology(){
     _vnetLevel = {};
 
     var nodes = [];
@@ -141,7 +162,34 @@ define(function(require) {
 
     var level = 0;
 
-    $.each(vnetList, function(i,element){
+    _indexedVRs = {};
+    _vrouterVMs = {};
+    _vrouterTables = {};
+
+    $.each(_vrList, function(i, element){
+      var vr = element.VROUTER;
+      _indexedVRs[vr.ID] = vr;
+
+      var vms = [];
+
+      if (vr.VMS.ID != undefined){
+        vms = vr.VMS.ID;
+
+        if (!$.isArray(vms)){
+          vms = [vms];
+        }
+      }
+
+      $.each(vms, function(n, vm){
+        _vrouterVMs[vm] = {
+          vmid: vm,
+          vrid: vr.ID,
+          leases: {}
+        };
+      });
+    });
+
+    $.each(_vnetList, function(i,element){
       var vnet = element.VNET;
       var vnetId = vnet.ID;
 
@@ -188,6 +236,7 @@ define(function(require) {
           nodes.push({
             id: nodeId,
             level: level+1,
+            title: '<div class="vrpopup"></div>',
             label: "VR "+vr,
             group: "vr"});
         }
@@ -198,8 +247,6 @@ define(function(require) {
       // VM nodes
       // ----------------
 
-      var vms = [];
-
       var arList = VNetUtils.getARList(vnet);
 
       for (var i=0; i<arList.length; i++){
@@ -218,8 +265,33 @@ define(function(require) {
           var lease = leases[j];
 
           if (lease.VM != undefined) { //used by a VM
+
             var nodeId = "vm"+lease.VM;
 
+            var edgeLabel = undefined;
+
+            if (lease.IP != undefined){
+              edgeLabel = lease.IP;
+            } else if (lease.IP6_GLOBAL != undefined){
+              edgeLabel = lease.IP6_GLOBAL;
+            } else if (lease.IP6_ULA != undefined){
+              edgeLabel = lease.IP6_ULA;
+            } else if (lease.IP6_LINK != undefined){
+              edgeLabel = lease.IP6_LINK;
+            }
+
+            // Skip VRouter VMs
+            var vrouterVMobj = _vrouterVMs[lease.VM];
+            if (vrouterVMobj != undefined){
+              if (vrouterVMobj.leases[vnetId] == undefined){
+                vrouterVMobj.leases[vnetId] = [];
+              }
+
+              vrouterVMobj.leases[vnetId].push(edgeLabel);
+
+              continue;
+            }
+
             if (!nodeIndex[nodeId]){
               nodeIndex[nodeId] = true;
               nodes.push({
@@ -234,19 +306,8 @@ define(function(require) {
               // So it doesn't matter if we don't store the rest of VNet IDs
             }
 
-            var label = undefined;
+            edges.push({from: vnetNodeId, to: nodeId, label: edgeLabel});
 
-            if (lease.IP != undefined){
-              label = lease.IP;
-            } else if (lease.IP6_GLOBAL != undefined){
-              label = lease.IP6_GLOBAL;
-            } else if (lease.IP6_ULA != undefined){
-              label = lease.IP6_ULA;
-            } else if (lease.IP6_LINK != undefined){
-              label = lease.IP6_LINK;
-            }
-
-            edges.push({from: vnetNodeId, to: nodeId, label: label});
           } else if (lease.VROUTER != undefined){
             var nodeId = "vr"+lease.VROUTER;
 
@@ -317,6 +378,7 @@ define(function(require) {
         },
         vr: {
           shape: 'circle',
+          borderWidth: 2,
           color: {
             border: "#43AC6A",
             background: "#fff",
@@ -332,6 +394,7 @@ define(function(require) {
         },
         vm: {
           shape: 'circle',
+          borderWidth: 2,
           color: {
             border: "#007a9c",
             background: "#fff",
@@ -347,7 +410,22 @@ define(function(require) {
         },
         vmCluster: {
           shape: 'circle',
-          color: '#cfcfcf'
+          borderWidth: 2,
+          shapeProperties: {
+            borderDashes: [5,5]
+          },
+          color: {
+            border: "#007a9c",
+            background: "#f7f7f7",
+            hover: {
+              border: "#007a9c",
+              background: "#c6c6c6"
+            },
+            highlight: {
+              border: "#007a9c",
+              background: "#f7f7f7"
+            }
+          }
         }
       },
 
@@ -407,6 +485,79 @@ define(function(require) {
         }
       }
     });
+
+    _network.on("showPopup", function (params) {
+      var parts = params.split("vr");
+
+      if (parts.lenght == 1){
+        return;
+      }
+
+      $(".vis-network-tooltip").html( _tableVR(parts[1]) );
+    });
+  }
+
+  function _tableVR(vrid){
+
+    if (_vrouterTables[vrid] != undefined){
+      return _vrouterTables[vrid];
+    }
+
+    var vr = _indexedVRs[vrid];
+    var vms = [];
+
+    if (vr.VMS.ID != undefined){
+      vms = vr.VMS.ID;
+
+      if (!$.isArray(vms)){
+        vms = [vms];
+      }
+    }
+
+    var headers = undefined;
+    var trs = [];
+
+    $.each(vms, function(i, vmid){
+      var vm = _vrouterVMs[vmid];
+
+      if (vm == undefined){
+        return true; // continue
+      }
+
+      if (headers == undefined){
+        headers =
+          "<thead>"+
+            "<th>"+Locale.tr("VM")+"</th>";
+
+        $.each(vm.leases, function(vnetId,ip){
+          headers += "<th>"+Locale.tr("VNet")+" " +vnetId+"</th>";
+        });
+
+        headers += "</thead>";
+      }
+
+      var tr = "<tr><td>"+vmid+"</td>";
+
+      $.each(vm.leases, function(vnetId,ips){
+        tr += "<td>" + ips.join("</br>") + "</td>";
+      });
+
+      tr += "</tr>";
+
+      trs.push(tr);
+    });
+
+    var html =
+      "<table class='dataTable'>"+
+        headers+
+        "<tbody>"+
+          trs.join("")+
+        "</tbody>"+
+      "</table>";
+
+    _vrouterTables[vrid] = html;
+
+    return html;
   }
 
   function _collapseVMs(){
@@ -458,4 +609,8 @@ define(function(require) {
 
     _network.stabilize();
   }
+
+  function _fit(){
+    _network.fit();
+  }
 });
diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss
index 5ea1e61659..8d957a6525 100644
--- a/src/sunstone/public/scss/app.scss
+++ b/src/sunstone/public/scss/app.scss
@@ -1,5 +1,6 @@
 @import "../bower_components/fontawesome/css/font-awesome.min.css";
 @import "../bower_components/jgrowl/jquery.jgrowl.min.css";
+@import "../bower_components/vis/dist/vis.min.css";
 @import "settings";
 @import "foundation";
 
@@ -1325,4 +1326,14 @@ hr {
 
 .custom_tags td {
   vertical-align: top; 
-}  
\ No newline at end of file
+}
+
+// Overwrite vis.js tooltip css
+div.vis-network-tooltip {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: condensed;
+
+  background-color: #ffffff;
+}
\ No newline at end of file

From d9acd68e09537a79c84f89a297725ec8472e87f7 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 21 Jan 2016 17:59:52 +0100
Subject: [PATCH 110/197] feature #4240: Unlock Document after a clone action

---
 include/RequestManagerClone.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/RequestManagerClone.h b/include/RequestManagerClone.h
index dcc85c937e..807df66dde 100644
--- a/include/RequestManagerClone.h
+++ b/include/RequestManagerClone.h
@@ -130,10 +130,13 @@ public:
             RequestAttributes&          att)
     {
         DocumentPool * docpool = static_cast<DocumentPool *>(pool);
-        Document * doc = docpool->get(source_id, true);
+        Document * doc         = docpool->get(source_id, true);
+        int document_type      = doc->get_document_type();
+
+        doc->unlock();
 
         return docpool->allocate(att.uid, att.gid, att.uname, att.gname,
-            att.umask, doc->get_document_type(), tmpl, &id, error_str);
+            att.umask, document_type, tmpl, &id, error_str);
     };
 };
 

From 3ff13fbcdc4e5918a45fca558c09e4150a0afb77 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 21 Jan 2016 17:56:02 +0100
Subject: [PATCH 111/197] Feature #4305: Add onedb sqlite2mysql command

(cherry picked from commit f9c950367be5cab8a464ba7460db58e22567bcaf)
---
 src/onedb/onedb            | 20 ++++++++++++++++++++
 src/onedb/onedb.rb         | 36 ++++++++++++++++++++++++++++++++++++
 src/onedb/onedb_backend.rb |  6 +++++-
 src/onedb/sqlite2mysql.rb  | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 src/onedb/sqlite2mysql.rb

diff --git a/src/onedb/onedb b/src/onedb/onedb
index 7afbb3b160..3112854b01 100755
--- a/src/onedb/onedb
+++ b/src/onedb/onedb
@@ -356,4 +356,24 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    ###########################################################################
+    # Migrate SQLite to MySQL
+    ###########################################################################
+    sqlite2mysql_desc = <<-EOT.unindent
+        Migrates a SQLite OpenNebula Database to MySQL
+    EOT
+
+    command :sqlite2mysql , sqlite2mysql_desc, :options=>[BACKUP, FORCE] do
+        begin
+            options[:backend] = :sqlite
+            sqlite = OneDB.new(options)
+
+            options[:backend] = :mysql
+            mysql = OneDB.new(options)
+
+            mysql.sqlite2mysql(options, sqlite)
+        rescue Exception => e
+            [-1, e.message]
+        end
+    end
 end
diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb
index 6df4b658a2..aed9f983b7 100644
--- a/src/onedb/onedb.rb
+++ b/src/onedb/onedb.rb
@@ -20,6 +20,8 @@ require 'onedb_backend'
 LOG_TIME = false
 
 class OneDB
+    attr_accessor :backend
+
     def initialize(ops)
         if ops[:backend] == :sqlite
             begin
@@ -519,6 +521,40 @@ is preserved.
         end
     end
 
+    def sqlite2mysql(options, sqlite)
+        one_not_running()
+
+        sqlite_v = sqlite.backend.read_db_version
+        mysql_v  = @backend.read_db_version
+
+        if !options[:force]
+            match = true
+            match = false if sqlite_v[:version] != mysql_v[:version]
+            match = false if sqlite_v[:local_version] != mysql_v[:local_version]
+
+            if !match
+                err_msg =  "SQLite version: #{sqlite_v[:version]}\n"
+                err_msg << "SQLite local version: #{sqlite_v[:local_version]}\n"
+                err_msg << "MySQL version: #{mysql_v[:version]}\n"
+                err_msg << "MySQL local version: #{mysql_v[:local_version]}\n"
+                err_msg << "The MySQL and SQLite versions do not match. Please run "
+                err_msg << "'onedb -i' in order to bootstrap a blank OpenNebula DB."
+
+                raise err_msg
+            end
+        end
+
+        backup(options[:backup], options)
+
+        file = "#{RUBY_LIB_LOCATION}/onedb/sqlite2mysql.rb"
+        load(file)
+        @backend.extend Sqlite2MySQL
+
+        @backend.convert(sqlite.backend.db)
+
+        return 0
+    end
+
     private
 
     def one_not_running()
diff --git a/src/onedb/onedb_backend.rb b/src/onedb/onedb_backend.rb
index e2970692a8..a689db5a44 100644
--- a/src/onedb/onedb_backend.rb
+++ b/src/onedb/onedb_backend.rb
@@ -286,7 +286,11 @@ class BackEndSQLite < OneDBBacKEnd
     require 'fileutils'
 
     def initialize(file)
-        @sqlite_file = file
+        if !file.nil?
+            @sqlite_file = file
+        else
+            raise "SQLite database path not supplied."
+        end
     end
 
     def bck_file
diff --git a/src/onedb/sqlite2mysql.rb b/src/onedb/sqlite2mysql.rb
new file mode 100644
index 0000000000..3b5ec585a4
--- /dev/null
+++ b/src/onedb/sqlite2mysql.rb
@@ -0,0 +1,33 @@
+module Sqlite2MySQL
+
+    PROGRESS = 1000
+
+    def convert(sqlite_db)
+        puts "Starting migration from SQLite to MySQL\n"
+
+        sqlite_db.tables.each do |table|
+            @db[table].delete
+
+            records = sqlite_db[table].count
+            puts "> #{table} (#{records} records)"
+
+            i=0
+            sqlite_db[table].each do |row|
+                @db[table].insert(row)
+
+                i+=1
+                if i % PROGRESS == 0
+                    if i < PROGRESS+1
+                        print "  #{i}"
+                    else
+                        print "...#{i}"
+                    end
+                end
+            end
+
+            puts if i > PROGRESS-1
+        end
+
+        puts "\nMigration successful."
+    end
+end

From 37624fcf96e63d3046aa610d7acb6bccddef875c Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 21 Jan 2016 18:38:05 +0100
Subject: [PATCH 112/197] Feature #4305: Install required files

(cherry picked from commit 8e67276b7c29b63ee4b5a1e579d4a1082b31a125)
---
 install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 7c7810bd9a..caf4bea7a5 100755
--- a/install.sh
+++ b/install.sh
@@ -1239,7 +1239,8 @@ DATASTORE_DRIVER_ISCSI_SCRIPTS="src/datastore_mad/remotes/iscsi/cp \
 ONEDB_FILES="src/onedb/fsck.rb \
             src/onedb/import_slave.rb \
             src/onedb/onedb.rb \
-            src/onedb/onedb_backend.rb"
+            src/onedb/onedb_backend.rb \
+            src/onedb/sqlite2mysql.rb"
 
 ONEDB_SHARED_MIGRATOR_FILES="src/onedb/shared/2.0_to_2.9.80.rb \
                              src/onedb/shared/2.9.80_to_2.9.85.rb \

From 8987396057ae67e92e78ac25647296c7315b3d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 21 Jan 2016 18:45:21 +0100
Subject: [PATCH 113/197] Feature #4215: pre-create VR tooltips, instead of on
 hover

---
 .../public/app/tabs/vnets-topology-tab.js     | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js
index d12e4e3e8e..b26a5e6dba 100644
--- a/src/sunstone/public/app/tabs/vnets-topology-tab.js
+++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js
@@ -31,7 +31,6 @@ define(function(require) {
   var _vrList;
   var _indexedVRs;
   var _vrouterVMs;
-  var _vrouterTables;
   var _vnetLevel;
 
   var _buttons = {
@@ -164,7 +163,6 @@ define(function(require) {
 
     _indexedVRs = {};
     _vrouterVMs = {};
-    _vrouterTables = {};
 
     $.each(_vrList, function(i, element){
       var vr = element.VROUTER;
@@ -236,7 +234,7 @@ define(function(require) {
           nodes.push({
             id: nodeId,
             level: level+1,
-            title: '<div class="vrpopup"></div>',
+            title: '',
             label: "VR "+vr,
             group: "vr"});
         }
@@ -345,6 +343,17 @@ define(function(require) {
       }
     });
 
+    // Fill VR nodes tooltips
+    $.each(nodes, function(i, node){
+      var parts = node.id.split("vr");
+
+      if (parts.length == 1){
+        return true;
+      }
+
+      node.title = _tableVR(parts[1]);
+    });
+
     // create a network
     var container = document.getElementById('visgraph');
 
@@ -485,24 +494,9 @@ define(function(require) {
         }
       }
     });
-
-    _network.on("showPopup", function (params) {
-      var parts = params.split("vr");
-
-      if (parts.lenght == 1){
-        return;
-      }
-
-      $(".vis-network-tooltip").html( _tableVR(parts[1]) );
-    });
   }
 
   function _tableVR(vrid){
-
-    if (_vrouterTables[vrid] != undefined){
-      return _vrouterTables[vrid];
-    }
-
     var vr = _indexedVRs[vrid];
     var vms = [];
 
@@ -555,8 +549,6 @@ define(function(require) {
         "</tbody>"+
       "</table>";
 
-    _vrouterTables[vrid] = html;
-
     return html;
   }
 

From c489e193dd984aa594e835dd130d2926ea2e0584 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 22 Jan 2016 10:27:33 +0100
Subject: [PATCH 114/197] Feature #4305: Remove --force option

(cherry picked from commit 1b41d5ee204a60682bd1c59f869f8d9de187edf5)
---
 src/onedb/onedb    |  2 +-
 src/onedb/onedb.rb | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/onedb/onedb b/src/onedb/onedb
index 3112854b01..4407dc1246 100755
--- a/src/onedb/onedb
+++ b/src/onedb/onedb
@@ -363,7 +363,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Migrates a SQLite OpenNebula Database to MySQL
     EOT
 
-    command :sqlite2mysql , sqlite2mysql_desc, :options=>[BACKUP, FORCE] do
+    command :sqlite2mysql , sqlite2mysql_desc, :options=>[BACKUP] do
         begin
             options[:backend] = :sqlite
             sqlite = OneDB.new(options)
diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb
index aed9f983b7..3b93b3ace9 100644
--- a/src/onedb/onedb.rb
+++ b/src/onedb/onedb.rb
@@ -527,21 +527,19 @@ is preserved.
         sqlite_v = sqlite.backend.read_db_version
         mysql_v  = @backend.read_db_version
 
-        if !options[:force]
-            match = true
-            match = false if sqlite_v[:version] != mysql_v[:version]
-            match = false if sqlite_v[:local_version] != mysql_v[:local_version]
+        match = true
+        match = false if sqlite_v[:version] != mysql_v[:version]
+        match = false if sqlite_v[:local_version] != mysql_v[:local_version]
 
-            if !match
-                err_msg =  "SQLite version: #{sqlite_v[:version]}\n"
-                err_msg << "SQLite local version: #{sqlite_v[:local_version]}\n"
-                err_msg << "MySQL version: #{mysql_v[:version]}\n"
-                err_msg << "MySQL local version: #{mysql_v[:local_version]}\n"
-                err_msg << "The MySQL and SQLite versions do not match. Please run "
-                err_msg << "'onedb -i' in order to bootstrap a blank OpenNebula DB."
+        if !match
+            err_msg =  "SQLite version: #{sqlite_v[:version]}\n"
+            err_msg << "SQLite local version: #{sqlite_v[:local_version]}\n"
+            err_msg << "MySQL version: #{mysql_v[:version]}\n"
+            err_msg << "MySQL local version: #{mysql_v[:local_version]}\n"
+            err_msg << "The MySQL and SQLite versions do not match. Please run "
+            err_msg << "'onedb -i' in order to bootstrap a blank OpenNebula DB."
 
-                raise err_msg
-            end
+            raise err_msg
         end
 
         backup(options[:backup], options)

From 8a05b49d59cf0a39a52764884e7ada413fa83c60 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 22 Jan 2016 10:37:09 +0100
Subject: [PATCH 115/197] Feature #4305: Accelerate database conversion to
 ludicrous speed

(cherry picked from commit 14a9ec048e3787e9151d1193e913798b91c1de3d)
---
 src/onedb/sqlite2mysql.rb | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/onedb/sqlite2mysql.rb b/src/onedb/sqlite2mysql.rb
index 3b5ec585a4..c893e6357c 100644
--- a/src/onedb/sqlite2mysql.rb
+++ b/src/onedb/sqlite2mysql.rb
@@ -11,21 +11,22 @@ module Sqlite2MySQL
             records = sqlite_db[table].count
             puts "> #{table} (#{records} records)"
 
-            i=0
-            sqlite_db[table].each do |row|
-                @db[table].insert(row)
+            @db.transaction do
+                i=0
+                sqlite_db[table].each do |row|
+                    @db[table].insert(row)
 
-                i+=1
-                if i % PROGRESS == 0
-                    if i < PROGRESS+1
-                        print "  #{i}"
-                    else
-                        print "...#{i}"
+                    i+=1
+                    if i % PROGRESS == 0
+                        if i < PROGRESS+1
+                            print "  #{i}"
+                        else
+                            print "...#{i}"
+                        end
                     end
                 end
+                puts if i > PROGRESS-1
             end
-
-            puts if i > PROGRESS-1
         end
 
         puts "\nMigration successful."

From e0ee90f34f6e855bdac360add035337554b1da99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 22 Jan 2016 13:02:15 +0100
Subject: [PATCH 116/197] Feature #4215: Add vrouter to new group wizard

---
 src/sunstone/public/app/tabs/groups-tab/form-panels/create.js   | 1 +
 .../public/app/tabs/groups-tab/form-panels/create/wizard.hbs    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
index 98d08bd39e..2f3f19d98c 100644
--- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js
@@ -171,6 +171,7 @@ define(function(require) {
     });
 
     $("#group_res_net", context).prop("checked", false);
+    $("#group_res_vr", context).prop("checked", false);
 
     $(context).off("change", ".admin_view_input");
     $(context).on("change", ".admin_view_input", function(){
diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs
index 02e83c4fdc..ad92dcad2d 100644
--- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs
@@ -144,6 +144,7 @@
             <th>{{tr "VMs"}}</th>
             <th>{{tr "VNets"}}</th>
             <th>{{tr "Security Groups"}}</th>
+            <th>{{tr "Virtual Routers"}}</th>
             <th>{{tr "Images"}}</th>
             <th>{{tr "Templates"}}</th>
             <th>{{tr "Documents"}}<span class="tip">{{tr "Documents are a special tool used for general purposes, mainly by OneFlow. If you want to enable users of this group to use service composition via OneFlow, let it checked."}}</span></th>
@@ -153,6 +154,7 @@
               <td><input type="checkbox" id="group_res_vm" name="group_res_vm" class="resource_cb" value="VM"></input></td>
               <td><input type="checkbox" id="group_res_net" name="group_res_net" class="resource_cb" value="NET"></input></td>
               <td><input type="checkbox" id="group_res_sg" name="group_res_sg" class="resource_cb" value="SECGROUP"></input></td>
+              <td><input type="checkbox" id="group_res_vr" name="group_res_vr" class="resource_cb" value="VROUTER"></input></td>
               <td><input type="checkbox" id="group_res_image" name="group_res_image" class="resource_cb" value="IMAGE"></input></td>
               <td><input type="checkbox" id="group_res_template" name="group_res_template" class="resource_cb" value="TEMPLATE"></input></td>
               <td><input type="checkbox" id="group_res_document" name="group_res_document" class="resource_cb" value="DOCUMENT"></input></td>

From 1ae516a08479ed28c3b968c66db35964ee1869d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 22 Jan 2016 17:10:12 +0100
Subject: [PATCH 117/197] Feature #4215: Add migrator to 4.90.0

---
 include/Nebula.h                     |  2 +-
 install.sh                           |  3 +-
 src/onedb/local/4.13.85_to_4.90.0.rb | 89 ++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 src/onedb/local/4.13.85_to_4.90.0.rb

diff --git a/include/Nebula.h b/include/Nebula.h
index c3a1f2cae5..415a81c00d 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -408,7 +408,7 @@ public:
      */
     static string local_db_version()
     {
-        return "4.13.85";
+        return "4.90.0";
     }
 
     /**
diff --git a/install.sh b/install.sh
index 9c079fd610..f551b8ad5b 100755
--- a/install.sh
+++ b/install.sh
@@ -1254,7 +1254,8 @@ ONEDB_LOCAL_MIGRATOR_FILES="src/onedb/local/4.5.80_to_4.7.80.rb \
                             src/onedb/local/4.9.80_to_4.10.3.rb \
                             src/onedb/local/4.10.3_to_4.11.80.rb \
                             src/onedb/local/4.11.80_to_4.13.80.rb \
-                            src/onedb/local/4.13.80_to_4.13.85.rb"
+                            src/onedb/local/4.13.80_to_4.13.85.rb \
+                            src/onedb/local/4.13.85_to_4.90.0.rb"
 
 ONEDB_PATCH_FILES="src/onedb/patches/4.14_monitoring.rb \
                    src/onedb/patches/history_times.rb"
diff --git a/src/onedb/local/4.13.85_to_4.90.0.rb b/src/onedb/local/4.13.85_to_4.90.0.rb
new file mode 100644
index 0000000000..c0822166e8
--- /dev/null
+++ b/src/onedb/local/4.13.85_to_4.90.0.rb
@@ -0,0 +1,89 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'opennebula'
+
+include OpenNebula
+
+module Migrator
+  def db_version
+    "4.90.0"
+  end
+
+  def one_version
+    "OpenNebula 4.90.0"
+  end
+
+  def up
+    init_log_time()
+
+    # 4215
+
+    @db.run "CREATE TABLE vrouter_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER);"
+
+    @db.transaction do
+      @db.fetch("SELECT oid,body FROM group_pool") do |row|
+        doc = Nokogiri::XML(row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks}
+
+        doc.root.xpath("ADMINS/ID").each do |uid|
+          user     = Acl::USERS["UID"] | uid.text.to_i
+          resource = 354936097341440 | Acl::USERS["GID"] | row[:oid]
+
+          @db[:acl].where({
+              :user=>user,          # #<uid>
+              :resource=>resource,  # VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP/@<gid>
+              :rights=>3,           # USE+MANAGE
+              :zone=>17179869184    # *
+            }).update(
+              # VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER/@101
+              :resource => (1480836004184064 | Acl::USERS["GID"] | row[:oid]))
+        end
+      end
+    end
+
+    log_time()
+
+    @db.run "ALTER TABLE network_pool RENAME TO old_network_pool;"
+    @db.run "CREATE TABLE network_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, cid INTEGER, pid INTEGER, UNIQUE(name,uid));"
+
+    @db.transaction do
+      @db.fetch("SELECT * FROM old_network_pool") do |row|
+        doc = Nokogiri::XML(row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks}
+
+        doc.root.add_child(doc.create_element("VROUTERS"))
+
+        @db[:network_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],
+          :cid      => row[:cid],
+          :pid      => row[:pid])
+      end
+    end
+
+    @db.run "DROP TABLE old_network_pool;"
+
+    log_time()
+
+    return true
+  end
+
+end
\ No newline at end of file

From 49b43ecc91f3e8224a79a451c784ae92f18d4f2f Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 22 Jan 2016 17:39:09 +0100
Subject: [PATCH 118/197] Feature #4217: Find ID of a Marketplace in the
 onemarketapp commands

---
 src/cli/one_helper.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index 7520ecd254..5f353d8fa7 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -714,16 +714,17 @@ EOT
         client=OneHelper.client
 
         pool = case poolname
-        when "HOST"      then OpenNebula::HostPool.new(client)
-        when "GROUP"     then OpenNebula::GroupPool.new(client)
-        when "USER"      then OpenNebula::UserPool.new(client)
-        when "DATASTORE" then OpenNebula::DatastorePool.new(client)
-        when "CLUSTER"   then OpenNebula::ClusterPool.new(client)
-        when "VNET"      then OpenNebula::VirtualNetworkPool.new(client)
-        when "IMAGE"     then OpenNebula::ImagePool.new(client)
-        when "VMTEMPLATE" then OpenNebula::TemplatePool.new(client)
-        when "VM"        then OpenNebula::VirtualMachinePool.new(client)
-        when "ZONE"      then OpenNebula::ZonePool.new(client)
+        when "HOST"        then OpenNebula::HostPool.new(client)
+        when "GROUP"       then OpenNebula::GroupPool.new(client)
+        when "USER"        then OpenNebula::UserPool.new(client)
+        when "DATASTORE"   then OpenNebula::DatastorePool.new(client)
+        when "CLUSTER"     then OpenNebula::ClusterPool.new(client)
+        when "VNET"        then OpenNebula::VirtualNetworkPool.new(client)
+        when "IMAGE"       then OpenNebula::ImagePool.new(client)
+        when "VMTEMPLATE"  then OpenNebula::TemplatePool.new(client)
+        when "VM"          then OpenNebula::VirtualMachinePool.new(client)
+        when "ZONE"        then OpenNebula::ZonePool.new(client)
+        when "MARKETPLACE" then OpenNebula::MarketPlacePool.new(client)
         end
 
         rc = pool.info

From d66fe153e5fbf76b9c6fd2af50d18c8cea79cfd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 22 Jan 2016 17:58:23 +0100
Subject: [PATCH 119/197] Feature #4215: Clean VMs in vrouter.instantiate on
 failure

---
 src/rm/RequestManagerVMTemplate.cc                        | 7 +++++++
 .../public/app/tabs/vrouters-tab/form-panels/create.js    | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index 4dc55ffbe2..bfa18f6200 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -142,6 +142,13 @@ void VirtualRouterInstantiate::request_execute(
 
         if (vid == -1)
         {
+            string tmp_error;
+
+            for (vmid = vms.begin(); vmid != vms.end(); vmid++)
+            {
+                dm->finalize(*vmid, tmp_error);
+            }
+
             return;
         }
 
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index 52f4dd1074..c5ea3a9ea5 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -187,7 +187,13 @@ define(function(require) {
               Sunstone.resetFormPanel(TAB_ID, FORM_PANEL_ID);
               Sunstone.hideFormPanel(TAB_ID);
             },
-            error: Notifier.onError
+            error: function(request, response) {
+              Sunstone.hideFormPanelLoading(TAB_ID);
+
+              Notifier.notifyError(Locale.tr(
+                "Failed to create VMs. Virtual Router may need to be deleted manually."));
+              Notifier.onError(request, response);
+            }
           });
         },
         error: function(request, response) {

From 3cee54afc9a0b4124aecd64b117d8b04d19154d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 25 Jan 2016 16:20:12 +0100
Subject: [PATCH 120/197] Feature #4215: Attach nic action updates the context
 cdrom

---
 include/LifeCycleManager.h             |   6 +
 include/TransferManager.h              |  20 +++
 include/VirtualMachine.h               |  19 ++-
 include/VirtualMachineManager.h        |  10 +-
 include/VirtualMachineManagerDriver.h  |  12 ++
 src/dm/DispatchManagerActions.cc       |   8 +
 src/lcm/LifeCycleActions.cc            |  26 +++
 src/lcm/LifeCycleManager.cc            |  16 ++
 src/lcm/LifeCycleStates.cc             |  58 +++++++
 src/tm/TransferManager.cc              |  75 ++++++---
 src/vm/VirtualMachine.cc               |  38 ++++-
 src/vmm/VirtualMachineManager.cc       | 213 ++++++++++++++++++++++++-
 src/vmm/VirtualMachineManagerDriver.cc |  19 +++
 13 files changed, 489 insertions(+), 31 deletions(-)

diff --git a/include/LifeCycleManager.h b/include/LifeCycleManager.h
index ab8ea6461d..ec39487d72 100644
--- a/include/LifeCycleManager.h
+++ b/include/LifeCycleManager.h
@@ -74,6 +74,8 @@ public:
         ATTACH_NIC_FAILURE,/**< Sent by the VMM when an attach nic action fails    */
         DETACH_NIC_SUCCESS,/**< Sent by the VMM when a detach nic action succeeds  */
         DETACH_NIC_FAILURE,/**< Sent by the VMM when a detach nic action fails     */
+        UPDATE_CONTEXT_SUCCESS,/**< Sent by the VMM when an update context action succeeds */
+        UPDATE_CONTEXT_FAILURE,/**< Sent by the VMM when an update context action fails    */
         CLEANUP_SUCCESS,  /**< Sent by the VMM when a cleanup action succeeds */
         CLEANUP_FAILURE,  /**< Sent by the VMM when a cleanup action fails    */
         SAVEAS_SUCCESS,        /**< Sent by the VMM when saveas succeeds      */
@@ -271,6 +273,10 @@ private:
 
     void detach_nic_failure_action(int vid);
 
+    void update_context_success_action(int vid);
+
+    void update_context_failure_action(int vid);
+
     void cleanup_callback_action(int vid);
 
     void snapshot_create_success(int vid);
diff --git a/include/TransferManager.h b/include/TransferManager.h
index 530d4bdd9b..2a184db211 100644
--- a/include/TransferManager.h
+++ b/include/TransferManager.h
@@ -123,6 +123,26 @@ public:
             ostream&                xfr,
             ostringstream&          error);
 
+    /**
+     * Inserts a context command in the xfs stream
+     *
+     * @param vm The VM
+     * @param token_password Owner user's token password
+     * @param system_tm_mad The Transfer Manager for the system datastore
+     * @param opennebula_hostname The front-end hostname
+     * @param xfr Stream where the transfer command will be written
+     * @param error Error reason, if any
+     *
+     * @return 0 on success
+     */
+    int prolog_context_command(
+            VirtualMachine *        vm,
+            const string&           token_password,
+            string&                 system_tm_mad,
+            string&                 opennebula_hostname,
+            ostream&                xfr,
+            ostringstream&          error);
+
     /**
      * Inserts a transfer command in the xfs stream
      *
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index a1a0c536a6..83b9773a61 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -166,7 +166,9 @@ public:
         DISK_SNAPSHOT_DELETE_SUSPENDED = 56,
         DISK_SNAPSHOT        = 57,
         DISK_SNAPSHOT_REVERT = 58,
-        DISK_SNAPSHOT_DELETE = 59
+        DISK_SNAPSHOT_DELETE = 59,
+        HOTPLUG_CONTEXT         = 60,
+        HOTPLUG_CONTEXT_FAILURE = 61
     };
 
     static int lcm_state_from_str(string& st, LcmState& state)
@@ -231,6 +233,8 @@ public:
         else if ( st == "DISK_SNAPSHOT") { state = DISK_SNAPSHOT; }
         else if ( st == "DISK_SNAPSHOT_REVERT") { state = DISK_SNAPSHOT_REVERT; }
         else if ( st == "DISK_SNAPSHOT_DELETE") { state = DISK_SNAPSHOT_DELETE; }
+        else if ( st == "HOTPLUG_CONTEXT") { state = HOTPLUG_CONTEXT; }
+        else if ( st == "HOTPLUG_CONTEXT_FAILURE") { state = HOTPLUG_CONTEXT_FAILURE; }
         else {return -1;}
 
         return 0;
@@ -298,6 +302,8 @@ public:
             case DISK_SNAPSHOT: st = "DISK_SNAPSHOT"; break;
             case DISK_SNAPSHOT_REVERT: st = "DISK_SNAPSHOT_REVERT"; break;
             case DISK_SNAPSHOT_DELETE: st = "DISK_SNAPSHOT_DELETE"; break;
+            case HOTPLUG_CONTEXT: st = "HOTPLUG_CONTEXT"; break;
+            case HOTPLUG_CONTEXT_FAILURE: st = "HOTPLUG_CONTEXT_FAILURE"; break;
         }
 
         return st;
@@ -1318,6 +1324,8 @@ public:
      */
     const VectorAttribute* get_disk(int disk_id) const;
 
+    const VectorAttribute* get_context_disk() const;
+
     const VectorAttribute* get_nic(int nic_id) const;
 
     // ------------------------------------------------------------------------
@@ -1354,7 +1362,7 @@ public:
      *    @param  token_password Password to encrypt the token, if it is set
      *    @return -1 in case of error, 0 if the VM has no context, 1 on success
      */
-    int  generate_context(string &files, int &disk_id, string& token_password);
+    int  generate_context(string &files, int &disk_id, const string& token_password);
 
     int replace_context_attribute(const string& name, const string& value);
 
@@ -1605,6 +1613,13 @@ public:
      */
     int set_attach_nic(int nic_id);
 
+    /**
+     *  Updates the network part of the context
+     *    @param error_str Returns the error reason, if any
+     *    @return 0 on success
+     */
+    int update_context(string& error_str);
+
     // ------------------------------------------------------------------------
     // Snapshot related functions
     // ------------------------------------------------------------------------
diff --git a/include/VirtualMachineManager.h b/include/VirtualMachineManager.h
index b527265d76..791e617d7e 100644
--- a/include/VirtualMachineManager.h
+++ b/include/VirtualMachineManager.h
@@ -68,7 +68,8 @@ public:
         SNAPSHOT_REVERT,
         SNAPSHOT_DELETE,
         DISK_SNAPSHOT_CREATE,
-        DISK_SNAPSHOT_REVERT
+        DISK_SNAPSHOT_REVERT,
+        UPDATE_CONTEXT
     };
 
     /**
@@ -374,6 +375,13 @@ private:
     void detach_action(
         int vid);
 
+    /**
+     * Updates the context cdrom
+     *    @param vid the id of the VM.
+     */
+    void update_context_action(
+        int vid);
+
     /**
      * Attaches a new NIC to a VM. The VM must have a NIC with the
      * attribute ATTACH = YES
diff --git a/include/VirtualMachineManagerDriver.h b/include/VirtualMachineManagerDriver.h
index 50bb69ce99..38606eb9a0 100644
--- a/include/VirtualMachineManagerDriver.h
+++ b/include/VirtualMachineManagerDriver.h
@@ -314,6 +314,18 @@ private:
         write_drv("DETACHDISK", oid, drv_msg);
     }
 
+    /**
+     *  Sends an update-context request to the MAD: "UPDATECONTEXT ID XML_DRV_MSG"
+     *    @param oid the virtual machine id.
+     *    @param drv_msg xml data for the mad operation
+     */
+    void update_context (
+        const int     oid,
+        const string& drv_msg) const
+    {
+        write_drv("UPDATECONTEXT", oid, drv_msg);
+    }
+
     /**
      *  Sends an attach NIC request to the MAD: "ATTACHNIC ID XML_DRV_MSG"
      *    @param oid the virtual machine id.
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index 320a7cd33a..2d1564960f 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -1443,6 +1443,7 @@ int DispatchManager::attach_nic(
     int uid;
     int oid;
     int rc;
+    string tmp_error;
 
     set<int> vm_sgs;
 
@@ -1579,6 +1580,8 @@ int DispatchManager::attach_nic(
 
     vm->set_attach_nic(nic, sg_rules);
 
+    vm->update_context(tmp_error);
+
     if (vm->get_lcm_state() == VirtualMachine::HOTPLUG_NIC)
     {
         time_t the_time = time(0);
@@ -1631,6 +1634,7 @@ int DispatchManager::detach_nic(
     string&  error_str)
 {
     ostringstream oss;
+    string        tmp_error;
 
     VirtualMachine * vm = vmpool->get(vid, true);
 
@@ -1682,6 +1686,8 @@ int DispatchManager::detach_nic(
         return -1;
     }
 
+    vm->update_context(tmp_error);
+
     if (vm->get_state()     == VirtualMachine::ACTIVE &&
         vm->get_lcm_state() == VirtualMachine::RUNNING )
     {
@@ -1724,6 +1730,8 @@ int DispatchManager::detach_nic(
     }
     else
     {
+        vmpool->update(vm);
+
         vm->unlock();
 
         vmpool->delete_attach_nic(vid);
diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc
index 20e7230d7e..7af9215133 100644
--- a/src/lcm/LifeCycleActions.cc
+++ b/src/lcm/LifeCycleActions.cc
@@ -937,6 +937,8 @@ void  LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag
         case VirtualMachine::SHUTDOWN_POWEROFF:
         case VirtualMachine::SHUTDOWN_UNDEPLOY:
         case VirtualMachine::HOTPLUG_SNAPSHOT:
+        case VirtualMachine::HOTPLUG_CONTEXT:
+        case VirtualMachine::HOTPLUG_CONTEXT_FAILURE:
             vm->set_running_etime(the_time);
             vmpool->update_history(vm);
 
@@ -1284,6 +1286,18 @@ void  LifeCycleManager::recover(VirtualMachine * vm, bool success)
             }
         break;
 
+        case VirtualMachine::HOTPLUG_CONTEXT:
+        case VirtualMachine::HOTPLUG_CONTEXT_FAILURE:
+            if (success)
+            {
+                lcm_action = LifeCycleManager::UPDATE_CONTEXT_SUCCESS;
+            }
+            else
+            {
+                lcm_action = LifeCycleManager::UPDATE_CONTEXT_FAILURE;
+            }
+        break;
+
         //This is for all snapshot actions (create, delete & revert)
         case VirtualMachine::HOTPLUG_SNAPSHOT:
             lcm_action = LifeCycleManager::SNAPSHOT_CREATE_FAILURE;
@@ -1496,6 +1510,18 @@ void LifeCycleManager::retry(VirtualMachine * vm)
             tm->trigger(TransferManager::EPILOG_STOP,vid);
             break;
 
+        case VirtualMachine::HOTPLUG_CONTEXT:
+            vmm->trigger(VirtualMachineManager::UPDATE_CONTEXT, vid);
+            break;
+
+        case VirtualMachine::HOTPLUG_CONTEXT_FAILURE:
+            vm->set_state(VirtualMachine::HOTPLUG_CONTEXT);
+
+            vmpool->update(vm);
+
+            vmm->trigger(VirtualMachineManager::UPDATE_CONTEXT, vid);
+            break;
+
         case VirtualMachine::LCM_INIT:
         case VirtualMachine::CLEANUP_RESUBMIT:
         case VirtualMachine::CLEANUP_DELETE:
diff --git a/src/lcm/LifeCycleManager.cc b/src/lcm/LifeCycleManager.cc
index c0101c5996..0db7471401 100644
--- a/src/lcm/LifeCycleManager.cc
+++ b/src/lcm/LifeCycleManager.cc
@@ -191,6 +191,14 @@ void LifeCycleManager::trigger(Actions action, int _vid)
         aname = "DETACH_NIC_FAILURE";
         break;
 
+    case UPDATE_CONTEXT_SUCCESS:
+        aname = "UPDATE_CONTEXT_SUCCESS";
+        break;
+
+    case UPDATE_CONTEXT_FAILURE:
+        aname = "UPDATE_CONTEXT_FAILURE";
+        break;
+
     case CLEANUP_SUCCESS:
         aname = "CLEANUP_SUCCESS";
         break;
@@ -424,6 +432,14 @@ void LifeCycleManager::do_action(const string &action, void * arg)
     {
         detach_nic_failure_action(vid);
     }
+    else if (action == "UPDATE_CONTEXT_SUCCESS")
+    {
+        update_context_success_action(vid);
+    }
+    else if (action == "UPDATE_CONTEXT_FAILURE")
+    {
+        update_context_failure_action(vid);
+    }
     else if (action == "CLEANUP_SUCCESS")
     {
         cleanup_callback_action(vid);
diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc
index 73e0a99c05..09d948d33b 100644
--- a/src/lcm/LifeCycleStates.cc
+++ b/src/lcm/LifeCycleStates.cc
@@ -1615,6 +1615,64 @@ void LifeCycleManager::detach_nic_failure_action(int vid)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+void LifeCycleManager::update_context_success_action(int vid)
+{
+    VirtualMachine * vm;
+
+    vm = vmpool->get(vid,true);
+
+    if ( vm == 0 )
+    {
+        return;
+    }
+
+    if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_CONTEXT ||
+         vm->get_lcm_state() == VirtualMachine::HOTPLUG_CONTEXT_FAILURE ) //recover success
+    {
+        vm->set_state(VirtualMachine::RUNNING);
+
+        vmpool->update(vm);
+    }
+    else
+    {
+        vm->log("LCM",Log::ERROR,"update_context_success_action, VM in a wrong state");
+    }
+
+    vm->unlock();
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void LifeCycleManager::update_context_failure_action(int vid)
+{
+    VirtualMachine *  vm;
+
+    vm = vmpool->get(vid,true);
+
+    if ( vm == 0 )
+    {
+        return;
+    }
+
+    if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_CONTEXT ||
+         vm->get_lcm_state() == VirtualMachine::HOTPLUG_CONTEXT_FAILURE ) //recover failure
+    {
+        vm->set_state(VirtualMachine::HOTPLUG_CONTEXT_FAILURE);
+
+        vmpool->update(vm);
+    }
+    else
+    {
+        vm->log("LCM",Log::ERROR,"update_context_failure_action, VM in a wrong state");
+    }
+
+    vm->unlock();
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 void LifeCycleManager::saveas_success_action(int vid)
 {
     int image_id;
diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc
index 47c572b9bb..7f710da038 100644
--- a/src/tm/TransferManager.cc
+++ b/src/tm/TransferManager.cc
@@ -607,6 +607,50 @@ static string prolog_os_transfer_commands(
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+int TransferManager::prolog_context_command(
+        VirtualMachine *        vm,
+        const string&           token_password,
+        string&                 vm_tm_mad,
+        string&                 opennebula_hostname,
+        ostream&                xfr,
+        ostringstream&          os)
+{
+    string  files;
+    int     context_result;
+    int     disk_id;
+
+    context_result = vm->generate_context(files, disk_id, token_password);
+
+    if ( context_result == -1 )
+    {
+        return -1;
+    }
+
+    if ( context_result )
+    {
+        //CONTEXT tm_mad files hostname:remote_system_dir/disk.i vmid dsid(=0)
+        xfr << "CONTEXT "
+            << vm_tm_mad << " "
+            << vm->get_context_file() << " ";
+
+        if (!files.empty())
+        {
+            xfr << files << " ";
+        }
+
+        xfr << vm->get_hostname() << ":"
+            << vm->get_remote_system_dir() << "/disk." << disk_id << " "
+            << vm->get_oid() << " "
+            << vm->get_ds_id()
+            << endl;
+    }
+
+    return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 void TransferManager::prolog_action(int vid)
 {
     ofstream      xfr;
@@ -628,9 +672,6 @@ void TransferManager::prolog_action(int vid)
 
     vector<const Attribute *> attrs;
     int                       num;
-    int                       disk_id;
-
-    int  context_result;
 
     string token_password;
 
@@ -771,32 +812,18 @@ void TransferManager::prolog_action(int vid)
     // Generate context file
     // -------------------------------------------------------------------------
 
-    context_result = vm->generate_context(files, disk_id, token_password);
+    rc = prolog_context_command( vm,
+                                 token_password,
+                                 vm_tm_mad,
+                                 opennebula_hostname,
+                                 xfr,
+                                 os);
 
-    if ( context_result == -1 )
+    if ( rc == -1 )
     {
         goto error_context;
     }
 
-    if ( context_result )
-    {
-        //CONTEXT tm_mad files hostname:remote_system_dir/disk.i vmid dsid(=0)
-        xfr << "CONTEXT "
-            << vm_tm_mad << " "
-            << vm->get_context_file() << " ";
-
-        if (!files.empty())
-        {
-            xfr << files << " ";
-        }
-
-        xfr << vm->get_hostname() << ":"
-            << vm->get_remote_system_dir() << "/disk." << disk_id << " "
-            << vm->get_oid() << " "
-            << vm->get_ds_id()
-            << endl;
-    }
-
     xfr.close();
 
     tm_md->transfer(vid,xfr_name);
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index ae0a438e5b..b53c545068 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -1136,6 +1136,16 @@ error_cleanup:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+int VirtualMachine::update_context(string& error_str)
+{
+    // TODO: context update may need to be limited to network attributes,
+    // but for now the full context is parsed again
+    return parse_context(error_str);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int VirtualMachine::parse_pci(string& error_str)
 {
     VectorAttribute *               pci;
@@ -3308,7 +3318,7 @@ bool VirtualMachine::is_vrouter_action_supported(History::VMAction action)
 /* -------------------------------------------------------------------------- */
 
 int VirtualMachine::generate_context(string &files, int &disk_id,
-        string& token_password)
+        const string& token_password)
 {
     ofstream file;
     string   files_ds;
@@ -3507,6 +3517,32 @@ const VectorAttribute* VirtualMachine::get_disk(int disk_id) const
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+const VectorAttribute* VirtualMachine::get_context_disk() const
+{
+    vector<const Attribute *> array_context;
+    const VectorAttribute *   context;
+    int                       num;
+
+    num = obj_template->get("CONTEXT", array_context);
+
+    if ( num != 1 )
+    {
+        return 0;
+    }
+
+    context = dynamic_cast<const VectorAttribute *>(array_context[0]);
+
+    if ( context == 0 )
+    {
+        return 0;
+    }
+
+    return context;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 const VectorAttribute* VirtualMachine::get_nic(int nic_id) const
 {
     int num_nics;
diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index 88edb6951d..cf13d52617 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -207,6 +207,10 @@ void VirtualMachineManager::trigger(Actions action, int _vid)
         aname = "DISK_SNAPSHOT_REVERT";
         break;
 
+    case UPDATE_CONTEXT:
+        aname = "UPDATE_CONTEXT";
+        break;
+
     default:
         delete vid;
         return;
@@ -330,6 +334,10 @@ void VirtualMachineManager::do_action(const string &action, void * arg)
     {
         disk_snapshot_revert_action(vid);
     }
+    else if (action == "UPDATE_CONTEXT")
+    {
+        update_context_action(vid);
+    }
     else if (action == ACTION_TIMER)
     {
         timer_action();
@@ -1905,6 +1913,150 @@ error_common:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+void VirtualMachineManager::update_context_action(
+    int vid)
+{
+    VirtualMachine *                    vm;
+    const VirtualMachineManagerDriver * vmd;
+
+    ostringstream os, error_os;
+
+    string  vm_tmpl;
+    string* drv_msg;
+    string  vm_tm_mad;
+    string  opennebula_hostname;
+    string  prolog_cmd;
+    string  epilog_cmd;
+    string  disk_path;
+
+    const VectorAttribute * disk;
+    int disk_id;
+    int rc;
+
+    Nebula& nd           = Nebula::instance();
+    TransferManager * tm = nd.get_tm();
+
+    // Get the VM from the pool
+    vm = vmpool->get(vid,true);
+
+    if (vm == 0)
+    {
+        return;
+    }
+
+    if (!vm->hasHistory())
+    {
+        goto error_history;
+    }
+
+    // Get the driver for this VM
+
+    vmd = get(vm->get_vmm_mad());
+
+    if ( vmd == 0 )
+    {
+        goto error_driver;
+    }
+
+    disk = vm->get_context_disk();
+
+    if ( disk == 0 )
+    {
+        goto error_disk;
+    }
+
+    vm_tm_mad = vm->get_tm_mad();
+
+    opennebula_hostname = nd.get_nebula_hostname();
+
+    rc = tm->prolog_context_command(
+                vm,
+                "",     // TODO token_password
+                vm_tm_mad,
+                opennebula_hostname,
+                os,
+                error_os);
+
+    prolog_cmd = os.str();
+
+    if ( prolog_cmd.empty() || rc != 0 )
+    {
+        goto error_no_tm_command;
+    }
+
+    os.str("");
+
+    tm->epilog_transfer_command(vm, disk, os);
+
+    epilog_cmd = os.str();
+
+    os.str("");
+
+    disk->vector_value("DISK_ID", disk_id);
+
+    os << vm->get_remote_system_dir() << "/disk." << disk_id;
+
+    disk_path = os.str();
+
+    // Invoke driver method
+    drv_msg = format_message(
+        vm->get_hostname(),
+        vm->get_vnm_mad(),
+        "",
+        "",
+        vm->get_deploy_id(),
+        "",
+        "",
+        "",
+        prolog_cmd,
+        epilog_cmd,
+        disk_path,
+        vm->to_xml(vm_tmpl),
+        vm->get_ds_id());
+
+
+    vmd->update_context(vid, *drv_msg);
+
+    delete drv_msg;
+
+    vm->unlock();
+
+    return;
+
+error_disk:
+    os.str("");
+    os << "update_context_action, could not find context disk";
+    goto error_common;
+
+error_history:
+    os.str("");
+    os << "update_context_action, VM has no history";
+    goto error_common;
+
+error_driver:
+    os.str("");
+    os << "update_context_action, error getting driver " << vm->get_vmm_mad();
+    goto error_common;
+
+error_no_tm_command:
+    os.str("");
+    os << "Cannot set context disk to update it for VM: " << error_os.str();
+    goto error_common;
+
+error_common:
+    Nebula              &ne = Nebula::instance();
+    LifeCycleManager *  lcm = ne.get_lcm();
+
+    lcm->trigger(LifeCycleManager::UPDATE_CONTEXT_FAILURE, vid);
+
+    vm->log("VMM", Log::ERROR, os);
+    vm->unlock();
+    return;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 void VirtualMachineManager::snapshot_create_action(int vid)
 {
     VirtualMachine *                    vm;
@@ -2382,6 +2534,18 @@ void VirtualMachineManager::attach_nic_action(
 
     string  vm_tmpl;
     string* drv_msg;
+    string  vm_tm_mad;
+    string  opennebula_hostname;
+    string  prolog_cmd;
+    string  epilog_cmd;
+    string  disk_path;
+
+    const VectorAttribute * disk;
+    int disk_id;
+    int rc;
+
+    Nebula& nd           = Nebula::instance();
+    TransferManager * tm = nd.get_tm();
 
     // Get the VM from the pool
     vm = vmpool->get(vid,true);
@@ -2404,6 +2568,44 @@ void VirtualMachineManager::attach_nic_action(
         goto error_driver;
     }
 
+    disk = vm->get_context_disk();
+
+    if ( disk != 0 )
+    {
+        vm_tm_mad = vm->get_tm_mad();
+
+        opennebula_hostname = nd.get_nebula_hostname();
+
+        rc = tm->prolog_context_command(
+                    vm,
+                    "",     // TODO token_password
+                    vm_tm_mad,
+                    opennebula_hostname,
+                    os,
+                    error_os);
+
+        prolog_cmd = os.str();
+
+        if ( prolog_cmd.empty() || rc != 0 )
+        {
+            goto error_no_tm_command;
+        }
+
+        os.str("");
+
+        tm->epilog_transfer_command(vm, disk, os);
+
+        epilog_cmd = os.str();
+
+        os.str("");
+
+        disk->vector_value("DISK_ID", disk_id);
+
+        os << vm->get_remote_system_dir() << "/disk." << disk_id;
+
+        disk_path = os.str();
+    }
+
     // Invoke driver method
     drv_msg = format_message(
         vm->get_hostname(),
@@ -2414,9 +2616,9 @@ void VirtualMachineManager::attach_nic_action(
         "",
         "",
         "",
-        "",
-        "",
-        "",
+        prolog_cmd,
+        epilog_cmd,
+        disk_path,
         vm->to_xml(vm_tmpl),
         vm->get_ds_id());
 
@@ -2438,6 +2640,11 @@ error_driver:
     os << "attach_nic_action, error getting driver " << vm->get_vmm_mad();
     goto error_common;
 
+error_no_tm_command:
+    os.str("");
+    os << "Cannot set context disk to update it for VM: " << error_os.str();
+    goto error_common;
+
 error_common:
     Nebula              &ne = Nebula::instance();
     LifeCycleManager *  lcm = ne.get_lcm();
diff --git a/src/vmm/VirtualMachineManagerDriver.cc b/src/vmm/VirtualMachineManagerDriver.cc
index 224eac86d6..a3b6b5bad4 100644
--- a/src/vmm/VirtualMachineManagerDriver.cc
+++ b/src/vmm/VirtualMachineManagerDriver.cc
@@ -524,6 +524,25 @@ void VirtualMachineManagerDriver::protocol(const string& message) const
             lcm->trigger(LifeCycleManager::DETACH_NIC_FAILURE, id);
         }
     }
+    else if ( action == "UPDATECONTEXT" )
+    {
+        Nebula           &ne  = Nebula::instance();
+        LifeCycleManager *lcm = ne.get_lcm();
+
+        if ( result == "SUCCESS" )
+        {
+            vm->log("VMM", Log::INFO, "VM CONTEXT Successfully updated.");
+
+            lcm->trigger(LifeCycleManager::UPDATE_CONTEXT_SUCCESS, id);
+        }
+        else
+        {
+            log_error(vm, os, is, "Error updating VM CONTEXT");
+            vmpool->update(vm);
+
+            lcm->trigger(LifeCycleManager::UPDATE_CONTEXT_FAILURE, id);
+        }
+    }
     else if ( action == "SNAPSHOTCREATE" )
     {
         Nebula           &ne  = Nebula::instance();

From 44111d5f1f3511d4988661735652e8671288832b Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 25 Jan 2016 16:42:59 +0100
Subject: [PATCH 121/197] Feature #4217: Add market_mad drivers for S3

---
 install.sh                        |   7 +-
 src/market_mad/remotes/s3/S3.rb   | 123 ++++++++++++++++++++++++++++
 src/market_mad/remotes/s3/delete  |  75 +++++++++++++++++
 src/market_mad/remotes/s3/import  | 132 ++++++++++++++++++++++++++++++
 src/market_mad/remotes/s3/monitor |  75 +++++++++++++++++
 5 files changed, 411 insertions(+), 1 deletion(-)
 create mode 100644 src/market_mad/remotes/s3/S3.rb
 create mode 100755 src/market_mad/remotes/s3/delete
 create mode 100755 src/market_mad/remotes/s3/import
 create mode 100755 src/market_mad/remotes/s3/monitor

diff --git a/install.sh b/install.sh
index 6ab032e3b2..ce6458d1eb 100755
--- a/install.sh
+++ b/install.sh
@@ -428,6 +428,7 @@ INSTALL_FILES=(
     DATASTORE_DRIVER_DEV_SCRIPTS:$VAR_LOCATION/remotes/datastore/dev
     MARKETPLACE_DRIVER_HTTP_SCRIPTS:$VAR_LOCATION/remotes/market/http
     MARKETPLACE_DRIVER_ONE_SCRIPTS:$VAR_LOCATION/remotes/market/one
+    MARKETPLACE_DRIVER_S3_SCRIPTS:$VAR_LOCATION/remotes/market/s3
     NETWORK_FILES:$VAR_LOCATION/remotes/vnm
     NETWORK_8021Q_FILES:$VAR_LOCATION/remotes/vnm/802.1Q
     NETWORK_VXLAN_FILES:$VAR_LOCATION/remotes/vnm/vxlan
@@ -1221,11 +1222,15 @@ MARKETPLACE_DRIVER_ONE_SCRIPTS="src/market_mad/remotes/one/import \
             src/market_mad/remotes/one/delete \
             src/market_mad/remotes/one/monitor"
 
+MARKETPLACE_DRIVER_S3_SCRIPTS="src/market_mad/remotes/s3/import \
+            src/market_mad/remotes/s3/delete \
+            src/market_mad/remotes/s3/monitor \
+            src/market_mad/remotes/s3/S3.rb"
+
 #-------------------------------------------------------------------------------
 # Migration scripts for onedb command, to be installed under $LIB_LOCATION
 #-------------------------------------------------------------------------------
 
-
 ONEDB_FILES="src/onedb/fsck.rb \
             src/onedb/import_slave.rb \
             src/onedb/onedb.rb \
diff --git a/src/market_mad/remotes/s3/S3.rb b/src/market_mad/remotes/s3/S3.rb
new file mode 100644
index 0000000000..4ea8165c65
--- /dev/null
+++ b/src/market_mad/remotes/s3/S3.rb
@@ -0,0 +1,123 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+# -------------------------------------------------------------------------- #
+
+# This class is a generic wrapper to the s3 upload and delete facilities.
+# It can either handle simple or multipart uploads, but the logic to decide
+# which uploader to use is not included in this class.
+class S3
+    def initialize(h)
+        @name = h[:name]
+
+        @config = {
+            :bucket            => h[:bucket],
+            :md5               => h[:md5],
+            :region            => h[:region],
+            :access_key_id     => h[:access_key_id],
+            :secret_access_key => h[:secret_access_key]
+        }
+
+        @client = Aws::S3::Client.new({
+            :region            => @config[:region],
+            :access_key_id     => @config[:access_key_id],
+            :secret_access_key => @config[:secret_access_key]
+        })
+
+        @parts = []
+        @part_number = 1
+    end
+
+    def create_multipart_upload
+        resp = @client.create_multipart_upload({
+            :bucket => @config[:bucket],
+            :key    => @name
+        })
+
+        @upload_id = resp.upload_id
+    end
+
+    def complete_multipart_upload
+        @client.complete_multipart_upload({
+          :bucket           => @config[:bucket],
+          :key              => @name,
+          :upload_id        => @upload_id,
+          :multipart_upload => {:parts => @parts}
+        })
+    end
+
+    def abort_multipart_upload
+        @client.abort_multipart_upload({
+            :upload_id   => @upload_id,
+            :key         => @name,
+            :bucket      => @config[:bucket]
+        })
+    end
+
+    def upload_part(body)
+        resp = @client.upload_part({
+            :body        => body,
+            :upload_id   => @upload_id,
+            :part_number => @part_number,
+            :key         => @name,
+            :bucket      => @config[:bucket]
+        })
+
+        @parts << {
+            :etag => resp.etag,
+            :part_number => @part_number
+        }
+
+        @part_number += 1
+    end
+
+    def put_object(body)
+        @client.put_object({
+            :body   => body,
+            :bucket => @config[:bucket],
+            :key    => @name
+        })
+    end
+
+    def delete_object
+        @client.delete_object({
+            :bucket => @config[:bucket],
+            :key    => @name
+        })
+    end
+
+    def exists?
+        begin
+            !!@client.head_object({
+                :bucket => @config[:bucket],
+                :key    => @name
+            })
+        rescue Aws::S3::Errors::NotFound
+            false
+        end
+    end
+
+    def get_bucket_size
+        resp = @client.list_objects({
+            bucket: @config[:bucket]
+        })
+
+        size = 0
+        resp.contents.each do |o|
+            size += o.size
+        end
+
+        return size
+    end
+end
diff --git a/src/market_mad/remotes/s3/delete b/src/market_mad/remotes/s3/delete
new file mode 100755
index 0000000000..a45709d96f
--- /dev/null
+++ b/src/market_mad/remotes/s3/delete
@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+# -------------------------------------------------------------------------- #
+
+###############################################################################
+# This script is used to import a file into the marketplace. The source file
+# is an opaque representation of an OpenNebula object, like a image file or a
+# tar.gz with several vm template or flow disk images
+###############################################################################
+
+ONE_LOCATION = ENV["ONE_LOCATION"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
+else
+    RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
+end
+
+UTILS_PATH = File.join(File.dirname(__FILE__), '../../datastore')
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+$: << File.dirname(__FILE__)
+
+require 'base64'
+require 'rexml/document'
+require 'getoptlong'
+require 'aws-sdk'
+require 'pp'
+
+require 'S3'
+
+def xpath(xml, xpath)
+    xml.elements[xpath].text.to_s rescue nil
+end
+
+xml = REXML::Document.new(Base64::decode64(ARGV[0])).root
+
+source = xpath(xml, 'MARKETPLACEAPP/SOURCE')
+
+access_key_id     = xpath(xml, 'MARKETPLACE/TEMPLATE/ACCESS_KEY_ID')
+secret_access_key = xpath(xml, 'MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY')
+bucket            = xpath(xml, 'MARKETPLACE/TEMPLATE/BUCKET')
+region            = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
+
+name = File.basename(source)
+
+s3 = S3.new(
+    :name              => name,
+    :bucket            => bucket,
+    :region            => region,
+    :access_key_id     => access_key_id,
+    :secret_access_key => secret_access_key
+)
+
+if !s3.exists?
+    STDERR.puts "Object '#{name}' does not exist."
+    exit 1
+end
+
+s3.delete_object
diff --git a/src/market_mad/remotes/s3/import b/src/market_mad/remotes/s3/import
new file mode 100755
index 0000000000..75ddfea93c
--- /dev/null
+++ b/src/market_mad/remotes/s3/import
@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+# -------------------------------------------------------------------------- #
+
+###############################################################################
+# This script is used to import a file into the marketplace. The source file
+# is an opaque representation of an OpenNebula object, like a image file or a
+# tar.gz with several vm template or flow disk images
+###############################################################################
+
+ONE_LOCATION = ENV["ONE_LOCATION"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
+else
+    RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
+end
+
+UTILS_PATH = File.join(File.dirname(__FILE__), '../../datastore')
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+$: << File.dirname(__FILE__)
+
+require 'base64'
+require 'rexml/document'
+require 'getoptlong'
+require 'aws-sdk'
+require 'open3'
+require 'pp'
+
+require 'S3'
+
+def xpath(xml, xpath)
+    xml.elements[xpath].text.to_s rescue nil
+end
+
+xml = REXML::Document.new(Base64::decode64(ARGV[0])).root
+
+import_source = xpath(xml, 'IMPORT_SOURCE')
+format        = xpath(xml, 'FORMAT')
+dispose       = xpath(xml, 'DISPOSE')
+size          = xpath(xml, 'SIZE')
+md5           = xpath(xml, 'MD5')
+
+id = xpath(xml, 'MARKETPLACEAPP/ID')
+
+access_key_id     = xpath(xml, 'MARKETPLACE/TEMPLATE/ACCESS_KEY_ID')
+secret_access_key = xpath(xml, 'MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY')
+bucket            = xpath(xml, 'MARKETPLACE/TEMPLATE/BUCKET')
+region            = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
+
+name   = "marketplaceapp-#{id}"
+source = "s3://#{bucket}/#{name}"
+
+# Upload
+
+READ_LENGTH = 10*1024*1024 # Read in chunks of 10MB
+
+s3 = S3.new(
+    :name              => name,
+    :md5               => md5,
+    :bucket            => bucket,
+    :region            => region,
+    :access_key_id     => access_key_id,
+    :secret_access_key => secret_access_key
+)
+
+if s3.exists?
+    STDERR.puts "Object '#{name}' already exists."
+    exit 1
+end
+
+cmd = "#{UTILS_PATH}/downloader.sh #{import_source} -"
+
+Open3.popen3(cmd) do |_, o, _, _|
+    body = o.read(READ_LENGTH)
+
+    if o.eof?
+        s3.put_object(body)
+    else
+        s3.create_multipart_upload
+
+        begin
+            s3.upload_part(body)
+
+            until o.eof?
+                body = o.read(READ_LENGTH)
+                s3.upload_part(body)
+            end
+
+            s3.complete_multipart_upload
+        rescue Exception => e
+            STDERR.puts(e.message)
+            STDERR.puts(e.backtrace)
+
+            resp = s3.abort_multipart_upload
+            STDERR.puts(resp.inspect)
+
+            exit 1
+        end
+    end
+end
+
+# Result
+
+marketplaceapp = {
+    :source => source,
+    :md5    => md5,
+    :size   => size,
+    :format => format
+}
+
+marketplaceapp.each do |k,v|
+    puts "#{k.upcase}=\"#{v}\""
+end
+
+exit 0
diff --git a/src/market_mad/remotes/s3/monitor b/src/market_mad/remotes/s3/monitor
new file mode 100755
index 0000000000..1677b700f7
--- /dev/null
+++ b/src/market_mad/remotes/s3/monitor
@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+# -------------------------------------------------------------------------- #
+
+###############################################################################
+# This script is used to import a file into the marketplace. The source file
+# is an opaque representation of an OpenNebula object, like a image file or a
+# tar.gz with several vm template or flow disk images
+###############################################################################
+
+ONE_LOCATION = ENV["ONE_LOCATION"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
+else
+    RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
+end
+
+UTILS_PATH = File.join(File.dirname(__FILE__), '../../datastore')
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+$: << File.dirname(__FILE__)
+
+TOTAL_MB_DEFAULT = 1048576 # Default maximum 1TB
+
+require 'base64'
+require 'rexml/document'
+require 'getoptlong'
+require 'aws-sdk'
+require 'pp'
+
+require 'S3'
+
+def xpath(xml, xpath)
+    xml.elements[xpath].text.to_s rescue nil
+end
+
+xml = REXML::Document.new(Base64::decode64(ARGV[0])).root
+
+access_key_id     = xpath(xml, 'MARKETPLACE/TEMPLATE/ACCESS_KEY_ID')
+secret_access_key = xpath(xml, 'MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY')
+bucket            = xpath(xml, 'MARKETPLACE/TEMPLATE/BUCKET')
+region            = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
+total_mb          = xpath(xml, 'MARKETPLACE/TEMPLATE/TOTAL_MB') || TOTAL_MB_DEFAULT
+
+s3 = S3.new(
+    :bucket            => bucket,
+    :region            => region,
+    :access_key_id     => access_key_id,
+    :secret_access_key => secret_access_key
+)
+
+used_mb = (s3.get_bucket_size.to_f/1024/1024).ceil
+free_mb = total_mb - used_mb
+
+puts <<EOF
+USED_MB="#{used_mb}"
+FREE_MB="#{free_mb}"
+TOTAL_MB="#{total_mb}"
+EOF

From 1d5fe15c1095124d28ea98a712c2d68d1b9c09d7 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 25 Jan 2016 16:43:21 +0100
Subject: [PATCH 122/197] Feature #4217: Minor improvement

---
 src/market_mad/remotes/http/import | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/market_mad/remotes/http/import b/src/market_mad/remotes/http/import
index 6fe892b772..baf140ea63 100755
--- a/src/market_mad/remotes/http/import
+++ b/src/market_mad/remotes/http/import
@@ -70,8 +70,8 @@ PUBLIC_DIR="${XPATH_ELEMENTS[i++]}"
 # -------- Copy source to public folder an generarte App data ------------
 
 APPNAME=`generate_image_hash`
-DST_PATH="${PUBLIC_DIR}/${APPNAME}"
-SOURCE="${BASE_URL}/${APPNAME}"
+DST_PATH="${PUBLIC_DIR%/}/${APPNAME}"
+SOURCE="${BASE_URL%/}/${APPNAME}"
 
 if [ -n "$BRIDGE_LIST" ]; then
     DST_HOST=`get_destination_host $ID`
@@ -88,17 +88,14 @@ else
     exec_and_log "$CP_CMD" "Error copying ${IMPORT_SOURCE} to ${DST_PATH}"
 
     if [ "${DISPOSE}" = "YES" ]; then
-    #TODO This should call a ds operation
+        #TODO This should call a ds operation
         exec_and_log "$RM ${IMPORT_SOURCE}" "Error removing ${IMPORT_SOURCE}"
     fi
 fi
 
-RESPONSE=$(cat << EOF
+cat << EOF
 SOURCE="$SOURCE"
 MD5="$MD5"
 SIZE="$SIZE"
 FORMAT="$FORMAT"
 EOF
-)
-
-echo "$RESPONSE"

From d7eb8769e14ca48ce24a3eeb27c0446c06e3e079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 25 Jan 2016 17:38:46 +0100
Subject: [PATCH 123/197] Feature #4215: update-context uses the user token
 password

---
 include/VirtualMachine.h         | 10 ++++++--
 src/vm/VirtualMachine.cc         | 16 ++++++++++++
 src/vmm/VirtualMachineManager.cc | 42 ++++++++++++++++++++++++++++++--
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 83b9773a61..151e833a88 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1324,8 +1324,6 @@ public:
      */
     const VectorAttribute* get_disk(int disk_id) const;
 
-    const VectorAttribute* get_context_disk() const;
-
     const VectorAttribute* get_nic(int nic_id) const;
 
     // ------------------------------------------------------------------------
@@ -1366,6 +1364,14 @@ public:
 
     int replace_context_attribute(const string& name, const string& value);
 
+    const VectorAttribute* get_context_disk() const;
+
+    /**
+     * Returns the CREATED_BY template attribute, or the uid if it does not exist
+     * @return uid
+     */
+    int get_created_by_uid() const;
+
     // -------------------------------------------------------------------------
     // "Save as" Disk related functions (save_as hot)
     // -------------------------------------------------------------------------
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index b53c545068..94ea8bdef5 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -3481,6 +3481,22 @@ int VirtualMachine::replace_context_attribute(const string& name, const string&
     return 0;
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualMachine::get_created_by_uid() const
+{
+    int created_by_uid;
+
+    if (obj_template->get("CREATED_BY", created_by_uid))
+    {
+        return created_by_uid;
+    }
+
+    return get_uid();
+}
+
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index cf13d52617..3fcb9b372f 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -1928,6 +1928,7 @@ void VirtualMachineManager::update_context_action(
     string  prolog_cmd;
     string  epilog_cmd;
     string  disk_path;
+    string  token_password;
 
     const VectorAttribute * disk;
     int disk_id;
@@ -1944,6 +1945,24 @@ void VirtualMachineManager::update_context_action(
         return;
     }
 
+    int uid = vm->get_created_by_uid();
+    vm->unlock();
+
+    User * user = Nebula::instance().get_upool()->get(uid, true);
+
+    if (user != 0)
+    {
+        user->get_template_attribute("TOKEN_PASSWORD", token_password);
+        user->unlock();
+    }
+
+    vm = vmpool->get(vid,true);
+
+    if (vm == 0)
+    {
+        return;
+    }
+
     if (!vm->hasHistory())
     {
         goto error_history;
@@ -1971,7 +1990,7 @@ void VirtualMachineManager::update_context_action(
 
     rc = tm->prolog_context_command(
                 vm,
-                "",     // TODO token_password
+                token_password,
                 vm_tm_mad,
                 opennebula_hostname,
                 os,
@@ -2539,6 +2558,7 @@ void VirtualMachineManager::attach_nic_action(
     string  prolog_cmd;
     string  epilog_cmd;
     string  disk_path;
+    string  token_password;
 
     const VectorAttribute * disk;
     int disk_id;
@@ -2555,6 +2575,24 @@ void VirtualMachineManager::attach_nic_action(
         return;
     }
 
+    int uid = vm->get_created_by_uid();
+    vm->unlock();
+
+    User * user = Nebula::instance().get_upool()->get(uid, true);
+
+    if (user != 0)
+    {
+        user->get_template_attribute("TOKEN_PASSWORD", token_password);
+        user->unlock();
+    }
+
+    vm = vmpool->get(vid,true);
+
+    if (vm == 0)
+    {
+        return;
+    }
+
     if (!vm->hasHistory())
     {
         goto error_history;
@@ -2578,7 +2616,7 @@ void VirtualMachineManager::attach_nic_action(
 
         rc = tm->prolog_context_command(
                     vm,
-                    "",     // TODO token_password
+                    token_password,
                     vm_tm_mad,
                     opennebula_hostname,
                     os,

From 9fb5c62c555122e1b691865bbfe5b6e675d674f5 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 25 Jan 2016 18:45:23 +0100
Subject: [PATCH 124/197] Feature #4217: Send the Market data to the driver if
 FROM_MARKET_ID is specified

---
 src/image/ImageManagerActions.cc          | 44 +++++++++++++++++++++--
 src/oca/ruby/opennebula/marketplaceapp.rb |  5 +--
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/image/ImageManagerActions.cc b/src/image/ImageManagerActions.cc
index c451de5fcd..7909accb48 100644
--- a/src/image/ImageManagerActions.cc
+++ b/src/image/ImageManagerActions.cc
@@ -17,11 +17,11 @@
 #include "ImageManager.h"
 #include "NebulaLog.h"
 #include "ImagePool.h"
+#include "MarketPlacePool.h"
 #include "SyncRequest.h"
 #include "Template.h"
 #include "Nebula.h"
 
-
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
@@ -717,11 +717,18 @@ int ImageManager::register_image(int iid, const string& ds_data, string& error)
 
     ostringstream oss;
     Image *       img;
+    MarketPlace * market;
 
     string        path;
     string        img_tmpl;
     string *      drv_msg;
+    string        extra_data = "";
 
+    int market_id;
+    bool rc;
+
+    Nebula&  nd = Nebula::instance();
+    MarketPlacePool * marketpool = nd.get_marketpool();
 
     if ( imd == 0 )
     {
@@ -738,7 +745,40 @@ int ImageManager::register_image(int iid, const string& ds_data, string& error)
         return -1;
     }
 
-    drv_msg = format_message(img->to_xml(img_tmpl), ds_data, "");
+    // Check if FROM_MARKET_ID is defined. If it is, release image, get XML
+    // of the MARKET_ID and get image again.
+
+    rc = img->get_template_attribute("FROM_MARKET_ID", market_id);
+
+    if ( rc )
+    {
+        img->unlock();
+
+        // Get the market
+        market = marketpool->get(market_id, true);
+
+        if (market == 0)
+        {
+            oss << "Could not find market '" << market_id << "'.";
+            error = oss.str();
+            return -1;
+        }
+
+        market->to_xml(extra_data);
+
+        market->unlock();
+
+        // Get the image again
+        img = ipool->get(iid,true);
+
+        if (img == 0)
+        {
+            error = "Image deleted during copy operation";
+            return -1;
+        }
+    }
+
+    drv_msg = format_message(img->to_xml(img_tmpl), ds_data, extra_data);
     path    = img->get_path();
 
     if ( path.empty() == true ) //NO PATH
diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb
index 0e9359c1f9..7041b2e669 100644
--- a/src/oca/ruby/opennebula/marketplaceapp.rb
+++ b/src/oca/ruby/opennebula/marketplaceapp.rb
@@ -189,8 +189,9 @@ module OpenNebula
                 tmpl << "PATH="   << self['SOURCE'] << "\n"
                 tmpl << "FORMAT=" << self['FORMAT'] << "\n"
                 tmpl << "MD5="    << self['MD5'] << "\n"
-                tmpl << "FROM_APP=\""      << self['ID'] << "\"\n"
-                tmpl << "FROM_APP_NAME=\"" << self['NAME'] << "\"\n"
+                tmpl << "FROM_APP=\""       << self['ID'] << "\"\n"
+                tmpl << "FROM_APP_NAME=\""  << self['NAME'] << "\"\n"
+                tmpl << "FROM_MARKET_ID=\"" << self['MARKETPLACE_ID'] << "\"\n"
 
                 image = Image.new(Image.build_xml, one)
                 rc    = image.allocate(tmpl, options[:dsid])

From b2a7e0ceafc6ee0717ba6aed0610fc0b723a75ab Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 25 Jan 2016 18:46:04 +0100
Subject: [PATCH 125/197] Feature #4217: Remove unnecessary line

---
 src/market_mad/one_market.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index fdcbf3536d..25dcb4856b 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -47,8 +47,7 @@ class MarketPlaceDriver < OpenNebulaDriver
         :import  => "IMPORT",
         :delete  => "DELETE",
         :log     => "LOG",
-        :monitor => "MONITOR",
-        :export  => "EXPORT"  #For Datastore export action
+        :monitor => "MONITOR"
     }
 
     # XPATHs for driver messages

From 29e2edc49cfb463c17fcfab4360d9ca643e53f6b Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 25 Jan 2016 18:46:56 +0100
Subject: [PATCH 126/197] Feature #4217: Better naming

---
 src/market_mad/remotes/s3/import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/market_mad/remotes/s3/import b/src/market_mad/remotes/s3/import
index 75ddfea93c..47e2a48057 100755
--- a/src/market_mad/remotes/s3/import
+++ b/src/market_mad/remotes/s3/import
@@ -64,7 +64,7 @@ secret_access_key = xpath(xml, 'MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY')
 bucket            = xpath(xml, 'MARKETPLACE/TEMPLATE/BUCKET')
 region            = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
 
-name   = "marketplaceapp-#{id}"
+name   = "marketapp-#{id}"
 source = "s3://#{bucket}/#{name}"
 
 # Upload

From 3ca02c27e2d4b6f499a1c0584e79c38faa37867c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 26 Jan 2016 11:34:46 +0100
Subject: [PATCH 127/197] Feature #4215: Remove update_context action

---
 include/LifeCycleManager.h             |   6 -
 include/VirtualMachine.h               |   8 +-
 include/VirtualMachineManager.h        |  10 +-
 include/VirtualMachineManagerDriver.h  |  12 --
 src/lcm/LifeCycleActions.cc            |  26 ----
 src/lcm/LifeCycleManager.cc            |  16 ---
 src/lcm/LifeCycleStates.cc             |  58 ---------
 src/vmm/VirtualMachineManager.cc       | 171 -------------------------
 src/vmm/VirtualMachineManagerDriver.cc |  19 ---
 9 files changed, 2 insertions(+), 324 deletions(-)

diff --git a/include/LifeCycleManager.h b/include/LifeCycleManager.h
index ec39487d72..ab8ea6461d 100644
--- a/include/LifeCycleManager.h
+++ b/include/LifeCycleManager.h
@@ -74,8 +74,6 @@ public:
         ATTACH_NIC_FAILURE,/**< Sent by the VMM when an attach nic action fails    */
         DETACH_NIC_SUCCESS,/**< Sent by the VMM when a detach nic action succeeds  */
         DETACH_NIC_FAILURE,/**< Sent by the VMM when a detach nic action fails     */
-        UPDATE_CONTEXT_SUCCESS,/**< Sent by the VMM when an update context action succeeds */
-        UPDATE_CONTEXT_FAILURE,/**< Sent by the VMM when an update context action fails    */
         CLEANUP_SUCCESS,  /**< Sent by the VMM when a cleanup action succeeds */
         CLEANUP_FAILURE,  /**< Sent by the VMM when a cleanup action fails    */
         SAVEAS_SUCCESS,        /**< Sent by the VMM when saveas succeeds      */
@@ -273,10 +271,6 @@ private:
 
     void detach_nic_failure_action(int vid);
 
-    void update_context_success_action(int vid);
-
-    void update_context_failure_action(int vid);
-
     void cleanup_callback_action(int vid);
 
     void snapshot_create_success(int vid);
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 151e833a88..029d61f740 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -166,9 +166,7 @@ public:
         DISK_SNAPSHOT_DELETE_SUSPENDED = 56,
         DISK_SNAPSHOT        = 57,
         DISK_SNAPSHOT_REVERT = 58,
-        DISK_SNAPSHOT_DELETE = 59,
-        HOTPLUG_CONTEXT         = 60,
-        HOTPLUG_CONTEXT_FAILURE = 61
+        DISK_SNAPSHOT_DELETE = 59
     };
 
     static int lcm_state_from_str(string& st, LcmState& state)
@@ -233,8 +231,6 @@ public:
         else if ( st == "DISK_SNAPSHOT") { state = DISK_SNAPSHOT; }
         else if ( st == "DISK_SNAPSHOT_REVERT") { state = DISK_SNAPSHOT_REVERT; }
         else if ( st == "DISK_SNAPSHOT_DELETE") { state = DISK_SNAPSHOT_DELETE; }
-        else if ( st == "HOTPLUG_CONTEXT") { state = HOTPLUG_CONTEXT; }
-        else if ( st == "HOTPLUG_CONTEXT_FAILURE") { state = HOTPLUG_CONTEXT_FAILURE; }
         else {return -1;}
 
         return 0;
@@ -302,8 +298,6 @@ public:
             case DISK_SNAPSHOT: st = "DISK_SNAPSHOT"; break;
             case DISK_SNAPSHOT_REVERT: st = "DISK_SNAPSHOT_REVERT"; break;
             case DISK_SNAPSHOT_DELETE: st = "DISK_SNAPSHOT_DELETE"; break;
-            case HOTPLUG_CONTEXT: st = "HOTPLUG_CONTEXT"; break;
-            case HOTPLUG_CONTEXT_FAILURE: st = "HOTPLUG_CONTEXT_FAILURE"; break;
         }
 
         return st;
diff --git a/include/VirtualMachineManager.h b/include/VirtualMachineManager.h
index 791e617d7e..b527265d76 100644
--- a/include/VirtualMachineManager.h
+++ b/include/VirtualMachineManager.h
@@ -68,8 +68,7 @@ public:
         SNAPSHOT_REVERT,
         SNAPSHOT_DELETE,
         DISK_SNAPSHOT_CREATE,
-        DISK_SNAPSHOT_REVERT,
-        UPDATE_CONTEXT
+        DISK_SNAPSHOT_REVERT
     };
 
     /**
@@ -375,13 +374,6 @@ private:
     void detach_action(
         int vid);
 
-    /**
-     * Updates the context cdrom
-     *    @param vid the id of the VM.
-     */
-    void update_context_action(
-        int vid);
-
     /**
      * Attaches a new NIC to a VM. The VM must have a NIC with the
      * attribute ATTACH = YES
diff --git a/include/VirtualMachineManagerDriver.h b/include/VirtualMachineManagerDriver.h
index 38606eb9a0..50bb69ce99 100644
--- a/include/VirtualMachineManagerDriver.h
+++ b/include/VirtualMachineManagerDriver.h
@@ -314,18 +314,6 @@ private:
         write_drv("DETACHDISK", oid, drv_msg);
     }
 
-    /**
-     *  Sends an update-context request to the MAD: "UPDATECONTEXT ID XML_DRV_MSG"
-     *    @param oid the virtual machine id.
-     *    @param drv_msg xml data for the mad operation
-     */
-    void update_context (
-        const int     oid,
-        const string& drv_msg) const
-    {
-        write_drv("UPDATECONTEXT", oid, drv_msg);
-    }
-
     /**
      *  Sends an attach NIC request to the MAD: "ATTACHNIC ID XML_DRV_MSG"
      *    @param oid the virtual machine id.
diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc
index 7af9215133..20e7230d7e 100644
--- a/src/lcm/LifeCycleActions.cc
+++ b/src/lcm/LifeCycleActions.cc
@@ -937,8 +937,6 @@ void  LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag
         case VirtualMachine::SHUTDOWN_POWEROFF:
         case VirtualMachine::SHUTDOWN_UNDEPLOY:
         case VirtualMachine::HOTPLUG_SNAPSHOT:
-        case VirtualMachine::HOTPLUG_CONTEXT:
-        case VirtualMachine::HOTPLUG_CONTEXT_FAILURE:
             vm->set_running_etime(the_time);
             vmpool->update_history(vm);
 
@@ -1286,18 +1284,6 @@ void  LifeCycleManager::recover(VirtualMachine * vm, bool success)
             }
         break;
 
-        case VirtualMachine::HOTPLUG_CONTEXT:
-        case VirtualMachine::HOTPLUG_CONTEXT_FAILURE:
-            if (success)
-            {
-                lcm_action = LifeCycleManager::UPDATE_CONTEXT_SUCCESS;
-            }
-            else
-            {
-                lcm_action = LifeCycleManager::UPDATE_CONTEXT_FAILURE;
-            }
-        break;
-
         //This is for all snapshot actions (create, delete & revert)
         case VirtualMachine::HOTPLUG_SNAPSHOT:
             lcm_action = LifeCycleManager::SNAPSHOT_CREATE_FAILURE;
@@ -1510,18 +1496,6 @@ void LifeCycleManager::retry(VirtualMachine * vm)
             tm->trigger(TransferManager::EPILOG_STOP,vid);
             break;
 
-        case VirtualMachine::HOTPLUG_CONTEXT:
-            vmm->trigger(VirtualMachineManager::UPDATE_CONTEXT, vid);
-            break;
-
-        case VirtualMachine::HOTPLUG_CONTEXT_FAILURE:
-            vm->set_state(VirtualMachine::HOTPLUG_CONTEXT);
-
-            vmpool->update(vm);
-
-            vmm->trigger(VirtualMachineManager::UPDATE_CONTEXT, vid);
-            break;
-
         case VirtualMachine::LCM_INIT:
         case VirtualMachine::CLEANUP_RESUBMIT:
         case VirtualMachine::CLEANUP_DELETE:
diff --git a/src/lcm/LifeCycleManager.cc b/src/lcm/LifeCycleManager.cc
index 0db7471401..c0101c5996 100644
--- a/src/lcm/LifeCycleManager.cc
+++ b/src/lcm/LifeCycleManager.cc
@@ -191,14 +191,6 @@ void LifeCycleManager::trigger(Actions action, int _vid)
         aname = "DETACH_NIC_FAILURE";
         break;
 
-    case UPDATE_CONTEXT_SUCCESS:
-        aname = "UPDATE_CONTEXT_SUCCESS";
-        break;
-
-    case UPDATE_CONTEXT_FAILURE:
-        aname = "UPDATE_CONTEXT_FAILURE";
-        break;
-
     case CLEANUP_SUCCESS:
         aname = "CLEANUP_SUCCESS";
         break;
@@ -432,14 +424,6 @@ void LifeCycleManager::do_action(const string &action, void * arg)
     {
         detach_nic_failure_action(vid);
     }
-    else if (action == "UPDATE_CONTEXT_SUCCESS")
-    {
-        update_context_success_action(vid);
-    }
-    else if (action == "UPDATE_CONTEXT_FAILURE")
-    {
-        update_context_failure_action(vid);
-    }
     else if (action == "CLEANUP_SUCCESS")
     {
         cleanup_callback_action(vid);
diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc
index 09d948d33b..73e0a99c05 100644
--- a/src/lcm/LifeCycleStates.cc
+++ b/src/lcm/LifeCycleStates.cc
@@ -1615,64 +1615,6 @@ void LifeCycleManager::detach_nic_failure_action(int vid)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void LifeCycleManager::update_context_success_action(int vid)
-{
-    VirtualMachine * vm;
-
-    vm = vmpool->get(vid,true);
-
-    if ( vm == 0 )
-    {
-        return;
-    }
-
-    if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_CONTEXT ||
-         vm->get_lcm_state() == VirtualMachine::HOTPLUG_CONTEXT_FAILURE ) //recover success
-    {
-        vm->set_state(VirtualMachine::RUNNING);
-
-        vmpool->update(vm);
-    }
-    else
-    {
-        vm->log("LCM",Log::ERROR,"update_context_success_action, VM in a wrong state");
-    }
-
-    vm->unlock();
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-void LifeCycleManager::update_context_failure_action(int vid)
-{
-    VirtualMachine *  vm;
-
-    vm = vmpool->get(vid,true);
-
-    if ( vm == 0 )
-    {
-        return;
-    }
-
-    if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_CONTEXT ||
-         vm->get_lcm_state() == VirtualMachine::HOTPLUG_CONTEXT_FAILURE ) //recover failure
-    {
-        vm->set_state(VirtualMachine::HOTPLUG_CONTEXT_FAILURE);
-
-        vmpool->update(vm);
-    }
-    else
-    {
-        vm->log("LCM",Log::ERROR,"update_context_failure_action, VM in a wrong state");
-    }
-
-    vm->unlock();
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
 void LifeCycleManager::saveas_success_action(int vid)
 {
     int image_id;
diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index 3fcb9b372f..336460fc06 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -207,10 +207,6 @@ void VirtualMachineManager::trigger(Actions action, int _vid)
         aname = "DISK_SNAPSHOT_REVERT";
         break;
 
-    case UPDATE_CONTEXT:
-        aname = "UPDATE_CONTEXT";
-        break;
-
     default:
         delete vid;
         return;
@@ -334,10 +330,6 @@ void VirtualMachineManager::do_action(const string &action, void * arg)
     {
         disk_snapshot_revert_action(vid);
     }
-    else if (action == "UPDATE_CONTEXT")
-    {
-        update_context_action(vid);
-    }
     else if (action == ACTION_TIMER)
     {
         timer_action();
@@ -1913,169 +1905,6 @@ error_common:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void VirtualMachineManager::update_context_action(
-    int vid)
-{
-    VirtualMachine *                    vm;
-    const VirtualMachineManagerDriver * vmd;
-
-    ostringstream os, error_os;
-
-    string  vm_tmpl;
-    string* drv_msg;
-    string  vm_tm_mad;
-    string  opennebula_hostname;
-    string  prolog_cmd;
-    string  epilog_cmd;
-    string  disk_path;
-    string  token_password;
-
-    const VectorAttribute * disk;
-    int disk_id;
-    int rc;
-
-    Nebula& nd           = Nebula::instance();
-    TransferManager * tm = nd.get_tm();
-
-    // Get the VM from the pool
-    vm = vmpool->get(vid,true);
-
-    if (vm == 0)
-    {
-        return;
-    }
-
-    int uid = vm->get_created_by_uid();
-    vm->unlock();
-
-    User * user = Nebula::instance().get_upool()->get(uid, true);
-
-    if (user != 0)
-    {
-        user->get_template_attribute("TOKEN_PASSWORD", token_password);
-        user->unlock();
-    }
-
-    vm = vmpool->get(vid,true);
-
-    if (vm == 0)
-    {
-        return;
-    }
-
-    if (!vm->hasHistory())
-    {
-        goto error_history;
-    }
-
-    // Get the driver for this VM
-
-    vmd = get(vm->get_vmm_mad());
-
-    if ( vmd == 0 )
-    {
-        goto error_driver;
-    }
-
-    disk = vm->get_context_disk();
-
-    if ( disk == 0 )
-    {
-        goto error_disk;
-    }
-
-    vm_tm_mad = vm->get_tm_mad();
-
-    opennebula_hostname = nd.get_nebula_hostname();
-
-    rc = tm->prolog_context_command(
-                vm,
-                token_password,
-                vm_tm_mad,
-                opennebula_hostname,
-                os,
-                error_os);
-
-    prolog_cmd = os.str();
-
-    if ( prolog_cmd.empty() || rc != 0 )
-    {
-        goto error_no_tm_command;
-    }
-
-    os.str("");
-
-    tm->epilog_transfer_command(vm, disk, os);
-
-    epilog_cmd = os.str();
-
-    os.str("");
-
-    disk->vector_value("DISK_ID", disk_id);
-
-    os << vm->get_remote_system_dir() << "/disk." << disk_id;
-
-    disk_path = os.str();
-
-    // Invoke driver method
-    drv_msg = format_message(
-        vm->get_hostname(),
-        vm->get_vnm_mad(),
-        "",
-        "",
-        vm->get_deploy_id(),
-        "",
-        "",
-        "",
-        prolog_cmd,
-        epilog_cmd,
-        disk_path,
-        vm->to_xml(vm_tmpl),
-        vm->get_ds_id());
-
-
-    vmd->update_context(vid, *drv_msg);
-
-    delete drv_msg;
-
-    vm->unlock();
-
-    return;
-
-error_disk:
-    os.str("");
-    os << "update_context_action, could not find context disk";
-    goto error_common;
-
-error_history:
-    os.str("");
-    os << "update_context_action, VM has no history";
-    goto error_common;
-
-error_driver:
-    os.str("");
-    os << "update_context_action, error getting driver " << vm->get_vmm_mad();
-    goto error_common;
-
-error_no_tm_command:
-    os.str("");
-    os << "Cannot set context disk to update it for VM: " << error_os.str();
-    goto error_common;
-
-error_common:
-    Nebula              &ne = Nebula::instance();
-    LifeCycleManager *  lcm = ne.get_lcm();
-
-    lcm->trigger(LifeCycleManager::UPDATE_CONTEXT_FAILURE, vid);
-
-    vm->log("VMM", Log::ERROR, os);
-    vm->unlock();
-    return;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
 void VirtualMachineManager::snapshot_create_action(int vid)
 {
     VirtualMachine *                    vm;
diff --git a/src/vmm/VirtualMachineManagerDriver.cc b/src/vmm/VirtualMachineManagerDriver.cc
index a3b6b5bad4..224eac86d6 100644
--- a/src/vmm/VirtualMachineManagerDriver.cc
+++ b/src/vmm/VirtualMachineManagerDriver.cc
@@ -524,25 +524,6 @@ void VirtualMachineManagerDriver::protocol(const string& message) const
             lcm->trigger(LifeCycleManager::DETACH_NIC_FAILURE, id);
         }
     }
-    else if ( action == "UPDATECONTEXT" )
-    {
-        Nebula           &ne  = Nebula::instance();
-        LifeCycleManager *lcm = ne.get_lcm();
-
-        if ( result == "SUCCESS" )
-        {
-            vm->log("VMM", Log::INFO, "VM CONTEXT Successfully updated.");
-
-            lcm->trigger(LifeCycleManager::UPDATE_CONTEXT_SUCCESS, id);
-        }
-        else
-        {
-            log_error(vm, os, is, "Error updating VM CONTEXT");
-            vmpool->update(vm);
-
-            lcm->trigger(LifeCycleManager::UPDATE_CONTEXT_FAILURE, id);
-        }
-    }
     else if ( action == "SNAPSHOTCREATE" )
     {
         Nebula           &ne  = Nebula::instance();

From c83565fe569f4a8b3e509bb39d53d8a2dd322174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 26 Jan 2016 13:24:42 +0100
Subject: [PATCH 128/197] Feature #4215: Perform TM:CONTEXT on prolog_resume

---
 include/TransferManager.h        |  6 +---
 src/tm/TransferManager.cc        | 48 ++++++++++++++++++++++++++++----
 src/vmm/VirtualMachineManager.cc | 11 ++------
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/include/TransferManager.h b/include/TransferManager.h
index 2a184db211..fd75f67eb6 100644
--- a/include/TransferManager.h
+++ b/include/TransferManager.h
@@ -129,9 +129,7 @@ public:
      * @param vm The VM
      * @param token_password Owner user's token password
      * @param system_tm_mad The Transfer Manager for the system datastore
-     * @param opennebula_hostname The front-end hostname
      * @param xfr Stream where the transfer command will be written
-     * @param error Error reason, if any
      *
      * @return 0 on success
      */
@@ -139,9 +137,7 @@ public:
             VirtualMachine *        vm,
             const string&           token_password,
             string&                 system_tm_mad,
-            string&                 opennebula_hostname,
-            ostream&                xfr,
-            ostringstream&          error);
+            ostream&                xfr);
 
     /**
      * Inserts a transfer command in the xfs stream
diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc
index 7f710da038..86004d7212 100644
--- a/src/tm/TransferManager.cc
+++ b/src/tm/TransferManager.cc
@@ -611,9 +611,7 @@ int TransferManager::prolog_context_command(
         VirtualMachine *        vm,
         const string&           token_password,
         string&                 vm_tm_mad,
-        string&                 opennebula_hostname,
-        ostream&                xfr,
-        ostringstream&          os)
+        ostream&                xfr)
 {
     string  files;
     int     context_result;
@@ -815,9 +813,7 @@ void TransferManager::prolog_action(int vid)
     rc = prolog_context_command( vm,
                                  token_password,
                                  vm_tm_mad,
-                                 opennebula_hostname,
-                                 xfr,
-                                 os);
+                                 xfr);
 
     if ( rc == -1 )
     {
@@ -1013,9 +1009,11 @@ void TransferManager::prolog_resume_action(int vid)
     const VectorAttribute * disk;
     string tm_mad;
     string vm_tm_mad;
+    string token_password;
 
     int ds_id;
     int disk_id;
+    int rc;
 
     vector<const Attribute *> attrs;
     int                       num;
@@ -1035,6 +1033,24 @@ void TransferManager::prolog_resume_action(int vid)
         return;
     }
 
+    int uid = vm->get_created_by_uid();
+    vm->unlock();
+
+    User * user = Nebula::instance().get_upool()->get(uid, true);
+
+    if (user != 0)
+    {
+        user->get_template_attribute("TOKEN_PASSWORD", token_password);
+        user->unlock();
+    }
+
+    vm = vmpool->get(vid,true);
+
+    if (vm == 0)
+    {
+        return;
+    }
+
     if (!vm->hasHistory())
     {
         goto error_history;
@@ -1107,6 +1123,20 @@ void TransferManager::prolog_resume_action(int vid)
         << vm->get_oid() << " "
         << vm->get_ds_id() << endl;
 
+    // -------------------------------------------------------------------------
+    // Generate context file
+    // -------------------------------------------------------------------------
+
+    rc = prolog_context_command( vm,
+                                 token_password,
+                                 vm_tm_mad,
+                                 xfr);
+
+    if ( rc == -1 )
+    {
+        goto error_context;
+    }
+
     xfr.close();
 
     tm_md->transfer(vid,xfr_name);
@@ -1129,6 +1159,12 @@ error_file:
     os << "prolog_resume, could not open file: " << xfr_name;
     goto error_common;
 
+error_context:
+    os << "prolog_resume, could not write context file for VM " << vid;
+
+    xfr.close();
+    goto error_common;
+
 error_common:
     (nd.get_lcm())->trigger(LifeCycleManager::PROLOG_FAILURE,vid);
     vm->log("TM", Log::ERROR, os);
diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index 336460fc06..265e5e1843 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -2378,7 +2378,7 @@ void VirtualMachineManager::attach_nic_action(
     VirtualMachine *                    vm;
     const VirtualMachineManagerDriver * vmd;
 
-    ostringstream os, error_os;
+    ostringstream os;
 
     string  vm_tmpl;
     string* drv_msg;
@@ -2441,15 +2441,11 @@ void VirtualMachineManager::attach_nic_action(
     {
         vm_tm_mad = vm->get_tm_mad();
 
-        opennebula_hostname = nd.get_nebula_hostname();
-
         rc = tm->prolog_context_command(
                     vm,
                     token_password,
                     vm_tm_mad,
-                    opennebula_hostname,
-                    os,
-                    error_os);
+                    os);
 
         prolog_cmd = os.str();
 
@@ -2509,7 +2505,7 @@ error_driver:
 
 error_no_tm_command:
     os.str("");
-    os << "Cannot set context disk to update it for VM: " << error_os.str();
+    os << "Cannot set context disk to update it for VM " << vm->get_oid();
     goto error_common;
 
 error_common:
@@ -2535,7 +2531,6 @@ void VirtualMachineManager::detach_nic_action(
     ostringstream os;
     string        vm_tmpl;
     string *      drv_msg;
-    string        opennebula_hostname;
     string        error_str;
 
     // Get the VM from the pool

From 2b89eaaa47463de5367af569a45765b6c79cfe5a Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 26 Jan 2016 15:26:06 +0100
Subject: [PATCH 129/197] Feature #4217: Revert "Feature #4217: Send the Market
 data to the driver if FROM_MARKET_ID is"

This reverts commit 9fb5c62c555122e1b691865bbfe5b6e675d674f5.
---
 src/image/ImageManagerActions.cc          | 44 ++---------------------
 src/oca/ruby/opennebula/marketplaceapp.rb |  5 ++-
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/src/image/ImageManagerActions.cc b/src/image/ImageManagerActions.cc
index 7909accb48..c451de5fcd 100644
--- a/src/image/ImageManagerActions.cc
+++ b/src/image/ImageManagerActions.cc
@@ -17,11 +17,11 @@
 #include "ImageManager.h"
 #include "NebulaLog.h"
 #include "ImagePool.h"
-#include "MarketPlacePool.h"
 #include "SyncRequest.h"
 #include "Template.h"
 #include "Nebula.h"
 
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
@@ -717,18 +717,11 @@ int ImageManager::register_image(int iid, const string& ds_data, string& error)
 
     ostringstream oss;
     Image *       img;
-    MarketPlace * market;
 
     string        path;
     string        img_tmpl;
     string *      drv_msg;
-    string        extra_data = "";
 
-    int market_id;
-    bool rc;
-
-    Nebula&  nd = Nebula::instance();
-    MarketPlacePool * marketpool = nd.get_marketpool();
 
     if ( imd == 0 )
     {
@@ -745,40 +738,7 @@ int ImageManager::register_image(int iid, const string& ds_data, string& error)
         return -1;
     }
 
-    // Check if FROM_MARKET_ID is defined. If it is, release image, get XML
-    // of the MARKET_ID and get image again.
-
-    rc = img->get_template_attribute("FROM_MARKET_ID", market_id);
-
-    if ( rc )
-    {
-        img->unlock();
-
-        // Get the market
-        market = marketpool->get(market_id, true);
-
-        if (market == 0)
-        {
-            oss << "Could not find market '" << market_id << "'.";
-            error = oss.str();
-            return -1;
-        }
-
-        market->to_xml(extra_data);
-
-        market->unlock();
-
-        // Get the image again
-        img = ipool->get(iid,true);
-
-        if (img == 0)
-        {
-            error = "Image deleted during copy operation";
-            return -1;
-        }
-    }
-
-    drv_msg = format_message(img->to_xml(img_tmpl), ds_data, extra_data);
+    drv_msg = format_message(img->to_xml(img_tmpl), ds_data, "");
     path    = img->get_path();
 
     if ( path.empty() == true ) //NO PATH
diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb
index 7041b2e669..0e9359c1f9 100644
--- a/src/oca/ruby/opennebula/marketplaceapp.rb
+++ b/src/oca/ruby/opennebula/marketplaceapp.rb
@@ -189,9 +189,8 @@ module OpenNebula
                 tmpl << "PATH="   << self['SOURCE'] << "\n"
                 tmpl << "FORMAT=" << self['FORMAT'] << "\n"
                 tmpl << "MD5="    << self['MD5'] << "\n"
-                tmpl << "FROM_APP=\""       << self['ID'] << "\"\n"
-                tmpl << "FROM_APP_NAME=\""  << self['NAME'] << "\"\n"
-                tmpl << "FROM_MARKET_ID=\"" << self['MARKETPLACE_ID'] << "\"\n"
+                tmpl << "FROM_APP=\""      << self['ID'] << "\"\n"
+                tmpl << "FROM_APP_NAME=\"" << self['NAME'] << "\"\n"
 
                 image = Image.new(Image.build_xml, one)
                 rc    = image.allocate(tmpl, options[:dsid])

From 0477eb2ad66b56e19cbe8fc86bd3d662619c5254 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 26 Jan 2016 18:30:46 +0100
Subject: [PATCH 130/197] Feature #4217: Read the market data when creating an
 image

---
 src/oca/ruby/opennebula/marketplaceapp.rb |  6 +-
 src/rm/RequestManagerAllocate.cc          | 98 +++++++++++++++++++++--
 2 files changed, 91 insertions(+), 13 deletions(-)

diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb
index 0e9359c1f9..7b91a56aff 100644
--- a/src/oca/ruby/opennebula/marketplaceapp.rb
+++ b/src/oca/ruby/opennebula/marketplaceapp.rb
@@ -186,11 +186,7 @@ module OpenNebula
 
                 tmpl << "\n"
                 tmpl << "NAME=\"" << name << "\"\n"
-                tmpl << "PATH="   << self['SOURCE'] << "\n"
-                tmpl << "FORMAT=" << self['FORMAT'] << "\n"
-                tmpl << "MD5="    << self['MD5'] << "\n"
-                tmpl << "FROM_APP=\""      << self['ID'] << "\"\n"
-                tmpl << "FROM_APP_NAME=\"" << self['NAME'] << "\"\n"
+                tmpl << "FROM_APP=\""       << self['ID'] << "\"\n"
 
                 image = Image.new(Image.build_xml, one)
                 rc    = image.allocate(tmpl, options[:dsid])
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index ed74c08c25..1a83ccfdf9 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -18,6 +18,8 @@
 
 #include "Nebula.h"
 #include "PoolObjectSQL.h"
+#include "MarketPlacePool.h"
+#include "MarketPlaceAppPool.h"
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -318,16 +320,26 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
     ImagePool *     ipool  = static_cast<ImagePool *>(pool);
     ImageManager *  imagem = nd.get_imagem();
 
+    MarketPlacePool *     marketpool = nd.get_marketpool();
+    MarketPlaceAppPool *  apppool    = nd.get_apppool();
+
     ImageTemplate * tmpl;
     Template        img_usage;
 
     Datastore *     ds;
     Image::DiskType ds_disk_type;
 
+    MarketPlaceApp *  app;
+    MarketPlace *     market;
+    int               app_id;
+    int               market_id;
+
     long long       avail;
 
     bool ds_check;
 
+    string extra_data = "";
+
     // ------------------------- Parse image template --------------------------
 
     tmpl = new ImageTemplate;
@@ -382,15 +394,85 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     // --------------- Get the SIZE for the Image, (DS driver) -----------------
 
-    rc = imagem->stat_image(tmpl, ds_data, size_str);
-
-    if ( rc == -1 )
+    if ( tmpl->get("FROM_APP", app_id ) )
     {
-        failure_response(INTERNAL,
-                         request_error("Cannot determine Image SIZE", size_str),
-                         att);
-        delete tmpl;
-        return;
+        // This image comes from a MarketPlaceApp. Get the Market info and
+        // the size.
+
+        string app_path;
+        string app_format;
+        string app_md5;
+        string app_name;
+
+        bool market_check;
+
+        app = apppool->get(app_id, true);
+
+        if ( app_id == 0 )
+        {
+            failure_response(INTERNAL,
+                             "Cannot find appliance referenced by FROM_APP",
+                             att);
+            delete tmpl;
+            return;
+        }
+
+        app->get_template_attribute("SOURCE", app_path);
+        app->get_template_attribute("FORMAT", app_format);
+        app->get_template_attribute("MD5",    app_md5);
+        app->get_template_attribute("NAME",   app_name);
+        app->get_template_attribute("SIZE",   size_str);
+
+        market_check = app->get_template_attribute("MARKETPLACE_ID", market_id);
+
+        app->unlock();
+
+        if ( app_path.empty() )
+        {
+            failure_response(INTERNAL, "The appliance has no SOURCE", att);
+            delete tmpl;
+            return;
+        }
+
+        if ( !market_check )
+        {
+            failure_response(INTERNAL, "The appliance has no MARKETPLACE_ID",
+                             att);
+            delete tmpl;
+            return;
+        }
+
+        tmpl->replace("PATH", app_path);
+        tmpl->replace("FORMAT", app_format);
+        tmpl->replace("MD5", app_format);
+        tmpl->replace("FROM_APP_NAME", app_name);
+
+        market = marketpool->get(market_id, true);
+
+        if (market == 0)
+        {
+            failure_response(INTERNAL, "Could not get the appliance's market.",
+                             att);
+            delete tmpl;
+            return;
+        }
+
+        market->to_xml(extra_data);
+
+        market->unlock();
+    }
+    else
+    {
+        rc = imagem->stat_image(tmpl, ds_data, size_str);
+
+        if ( rc == -1 )
+        {
+            failure_response(INTERNAL,
+                             request_error("Cannot determine Image SIZE", size_str),
+                             att);
+            delete tmpl;
+            return;
+        }
     }
 
     iss.str(size_str);

From 15e54f59ea298662554258b6d8eb4903fa126900 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 26 Jan 2016 20:24:33 +0100
Subject: [PATCH 131/197] Feature #4217: Send the market data to the driver

---
 include/ImagePool.h                    |  2 ++
 include/MarketPlaceApp.h               |  9 ++++++
 src/image/ImagePool.cc                 |  1 +
 src/market/MarketPlaceApp.cc           | 33 ++++++++++++++++++++++
 src/rm/RequestManagerAllocate.cc       | 39 +++++++++++++-------------
 src/rm/RequestManagerImage.cc          |  1 +
 src/rm/RequestManagerVirtualMachine.cc |  1 +
 7 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/include/ImagePool.h b/include/ImagePool.h
index a1994f06a6..f0bb89f064 100644
--- a/include/ImagePool.h
+++ b/include/ImagePool.h
@@ -65,6 +65,7 @@ public:
      *    @param ds_type disk type for the image
      *    @param ds_data the datastore data
      *    @param ds_type the datastore type
+     *    @param extra_data extra data that will be sent to the driver
      *    @param source_img_id If the new Image is a clone, this must be the
      *      source Image ID. Otherwise, it must be set to -1
      *    @param oid the id assigned to the Image
@@ -85,6 +86,7 @@ public:
         Image::DiskType          disk_type,
         const string&            ds_data,
         Datastore::DatastoreType ds_type,
+        const string&            extra_data,
         int                      source_img_id,
         int *                    oid,
         string&                  error_str);
diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index cb7c49dd3d..3be441db6f 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -117,6 +117,15 @@ public:
      */
     int from_template64(const std::string &xml_str, std::string& error_str);
 
+    /**
+     *  Copies the special attributes of the App to the template
+     *    @param tmp The template object
+     *    @param error_str Returns the error reason, if any
+     *
+     *    @return 0 on success, -1 otherwise
+     */
+    int to_template(Template * tmpl, std::string& error_str);
+
     /**
      * Enable or disable the app. A disabled app cannot be exported
      * @param enable true to enable
diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc
index 12b64c9c8e..5900707160 100644
--- a/src/image/ImagePool.cc
+++ b/src/image/ImagePool.cc
@@ -89,6 +89,7 @@ int ImagePool::allocate (
         Image::DiskType          disk_type,
         const string&            ds_data,
         Datastore::DatastoreType ds_type,
+        const string&            extra_data,
         int                      cloning_id,
         int *                    oid,
         string&                  error_str)
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index a57420534e..1fdc8aeab1 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -411,6 +411,39 @@ int MarketPlaceApp::enable(bool enable, string& error_str)
 /* --------------------------------------------------------------------------- */
 /* --------------------------------------------------------------------------- */
 
+int MarketPlaceApp::to_template(Template * tmpl, std::string& error_str)
+{
+    bool rc;
+
+    string app_path;
+    string app_format;
+    string app_md5;
+    string app_name;
+
+    int market_id;
+
+    get_template_attribute("SOURCE", app_path);
+    get_template_attribute("FORMAT", app_format);
+    get_template_attribute("MD5",    app_md5);
+    get_template_attribute("NAME",   app_name);
+
+    if ( app_path.empty() )
+    {
+        error_str = "The appliance has no SOURCE";
+        return -1;
+    }
+
+    tmpl->replace("PATH", app_path);
+    tmpl->replace("FORMAT", app_format);
+    tmpl->replace("MD5", app_format);
+    tmpl->replace("FROM_APP_NAME", app_name);
+
+    return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
 int MarketPlaceApp::from_template64(const std::string &info64, std::string& err)
 {
     std::string * info = one_util::base64_decode(info64);
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 1a83ccfdf9..5a4bb1f138 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -398,12 +398,6 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
     {
         // This image comes from a MarketPlaceApp. Get the Market info and
         // the size.
-
-        string app_path;
-        string app_format;
-        string app_md5;
-        string app_name;
-
         bool market_check;
 
         app = apppool->get(app_id, true);
@@ -417,39 +411,43 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
             return;
         }
 
-        app->get_template_attribute("SOURCE", app_path);
-        app->get_template_attribute("FORMAT", app_format);
-        app->get_template_attribute("MD5",    app_md5);
-        app->get_template_attribute("NAME",   app_name);
-        app->get_template_attribute("SIZE",   size_str);
+        rc = app->to_template(tmpl, error_str);
+
+        app->get_template_attribute("SIZE", size_str);
 
         market_check = app->get_template_attribute("MARKETPLACE_ID", market_id);
 
         app->unlock();
 
-        if ( app_path.empty() )
+        if ( rc == -1 )
         {
-            failure_response(INTERNAL, "The appliance has no SOURCE", att);
+            failure_response(INTERNAL, allocate_error(error_str), att);
+
             delete tmpl;
             return;
         }
 
         if ( !market_check )
         {
-            failure_response(INTERNAL, "The appliance has no MARKETPLACE_ID",
-                             att);
+            error_str = "The appliance has no MARKETPLACE_ID";
+            failure_response(INTERNAL, allocate_error(error_str), att);
+
             delete tmpl;
             return;
         }
 
-        tmpl->replace("PATH", app_path);
-        tmpl->replace("FORMAT", app_format);
-        tmpl->replace("MD5", app_format);
-        tmpl->replace("FROM_APP_NAME", app_name);
+        if ( size_str.empty() )
+        {
+            error_str = "The appliance has no SIZE";
+            failure_response(INTERNAL, allocate_error(error_str), att);
+
+            delete tmpl;
+            return;
+        }
 
         market = marketpool->get(market_id, true);
 
-        if (market == 0)
+        if ( market == 0 )
         {
             failure_response(INTERNAL, "Could not get the appliance's market.",
                              att);
@@ -565,6 +563,7 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
                          ds_disk_type,
                          ds_data,
                          ds_type,
+                         extra_data,
                          -1,
                          &id,
                          error_str);
diff --git a/src/rm/RequestManagerImage.cc b/src/rm/RequestManagerImage.cc
index 819f65cfed..e8353eb6bb 100644
--- a/src/rm/RequestManagerImage.cc
+++ b/src/rm/RequestManagerImage.cc
@@ -444,6 +444,7 @@ void ImageClone::request_execute(
                          disk_type,
                          ds_data,
                          Datastore::IMAGE_DS,
+                         "",
                          clone_id,
                          &new_id,
                          error_str);
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index c826b1982e..61ad53e304 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -1403,6 +1403,7 @@ void VirtualMachineDiskSaveas::request_execute(
                          ds_disk_type,
                          ds_data,
                          Datastore::IMAGE_DS,
+                         "",
                          -1,
                          &iid,
                          error);

From 8a4135faafc1d8b5e8ab34af8c8e533e3d1981ab Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 26 Jan 2016 20:46:45 +0100
Subject: [PATCH 132/197] Feature #4217: Add extra_data to the register and
 clone operations

---
 include/ImageManager.h           |  8 +++++++-
 src/image/ImageManagerActions.cc | 10 +++++++---
 src/image/ImagePool.cc           | 14 ++++++++++++--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/include/ImageManager.h b/include/ImageManager.h
index e0acf44ddd..755d50b655 100644
--- a/include/ImageManager.h
+++ b/include/ImageManager.h
@@ -133,11 +133,15 @@ public:
      *  Adds a new image to the repository copying or creating it as needed
      *    @param img pointer to the image
      *    @param ds_data data of the associated datastore in XML format
+     *    @param extra_data data to be sent to the driver
      *    @param error Error reason
      *
      *    @return 0 on success
      */
-    int register_image(int iid, const string& ds_data, string& error);
+    int register_image(int iid,
+                       const string& ds_data,
+                       const string& extra_data,
+                       string& error);
 
     /**
      * Checks if an image is ready to be cloned
@@ -163,12 +167,14 @@ public:
      *    @param new_id of the new image
      *    @param cloning_id of the image to be cloned
      *    @param ds_data data of the associated datastore in XML format
+     *    @param extra_data data to be sent to the driver
      *    @param error describing the error
      *    @return 0 on success
      */
     int clone_image(int new_id,
                     int cloning_id,
                     const string& ds_data,
+                    const string& extra_data,
                     string& error);
     /**
      *  Deletes an image from the repository and the DB. The Datastore image list
diff --git a/src/image/ImageManagerActions.cc b/src/image/ImageManagerActions.cc
index c451de5fcd..25bf7d2c30 100644
--- a/src/image/ImageManagerActions.cc
+++ b/src/image/ImageManagerActions.cc
@@ -658,6 +658,7 @@ int ImageManager::set_clone_state(int new_id, int cloning_id, std::string& error
 int ImageManager::clone_image(int   new_id,
                               int   cloning_id,
                               const string& ds_data,
+                              const string& extra_data,
                               string& error)
 {
     const ImageManagerDriver* imd = get();
@@ -692,7 +693,7 @@ int ImageManager::clone_image(int   new_id,
         return -1;
     }
 
-    drv_msg = format_message(img->to_xml(img_tmpl), ds_data, "");
+    drv_msg = format_message(img->to_xml(img_tmpl), ds_data, extra_data);
 
     imd->clone(img->get_oid(), *drv_msg);
 
@@ -711,7 +712,10 @@ int ImageManager::clone_image(int   new_id,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int ImageManager::register_image(int iid, const string& ds_data, string& error)
+int ImageManager::register_image(int iid,
+                                 const string& ds_data,
+                                 const string& extra_data,
+                                 string& error)
 {
     const ImageManagerDriver* imd = get();
 
@@ -738,7 +742,7 @@ int ImageManager::register_image(int iid, const string& ds_data, string& error)
         return -1;
     }
 
-    drv_msg = format_message(img->to_xml(img_tmpl), ds_data, "");
+    drv_msg = format_message(img->to_xml(img_tmpl), ds_data, extra_data);
     path    = img->get_path();
 
     if ( path.empty() == true ) //NO PATH
diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc
index 5900707160..57671186cb 100644
--- a/src/image/ImagePool.cc
+++ b/src/image/ImagePool.cc
@@ -103,6 +103,8 @@ int ImagePool::allocate (
     string          type;
     ostringstream   oss;
 
+    int rc;
+
     img = new Image(uid, gid, uname, gname, umask, img_template);
 
     // -------------------------------------------------------------------------
@@ -169,7 +171,9 @@ int ImagePool::allocate (
     {
         if (cloning_id == -1)
         {
-            if ( imagem->register_image(*oid, ds_data, error_str) == -1 )
+            rc = imagem->register_image(*oid, ds_data, extra_data, error_str);
+
+            if ( rc == -1 )
             {
                 img = get(*oid, true);
 
@@ -188,7 +192,13 @@ int ImagePool::allocate (
         }
         else
         {
-            if (imagem->clone_image(*oid, cloning_id, ds_data, error_str) == -1)
+            rc = imagem->clone_image(*oid,
+                                     cloning_id,
+                                     ds_data,
+                                     extra_data,
+                                     error_str);
+
+            if (rc == -1)
             {
                 img = get(*oid, true);
 

From e5c1c549bb5062d2ff6e3f26b74cf94a2a83df1c Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 26 Jan 2016 23:19:31 +0100
Subject: [PATCH 133/197] Feature #4217: Get the attributes from the App
 properly

---
 include/MarketPlaceApp.h         | 20 ++++++++--
 src/market/MarketPlaceApp.cc     | 32 +++-------------
 src/rm/RequestManagerAllocate.cc | 64 ++++++++++----------------------
 3 files changed, 41 insertions(+), 75 deletions(-)

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index 3be441db6f..9aa10dfbdd 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -121,10 +121,8 @@ public:
      *  Copies the special attributes of the App to the template
      *    @param tmp The template object
      *    @param error_str Returns the error reason, if any
-     *
-     *    @return 0 on success, -1 otherwise
      */
-    int to_template(Template * tmpl, std::string& error_str);
+    void to_template(Template * tmpl);
 
     /**
      * Enable or disable the app. A disabled app cannot be exported
@@ -182,6 +180,22 @@ public:
         return source;
     }
 
+    const string& get_md5()
+    {
+        return md5;
+    }
+
+    long long get_size()
+    {
+        return size_mb;
+    }
+
+    const string& get_format()
+    {
+        return format;
+    }
+
+
     MarketPlaceAppState get_state()
     {
         return state;
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 1fdc8aeab1..1b1e18d8a9 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -411,34 +411,12 @@ int MarketPlaceApp::enable(bool enable, string& error_str)
 /* --------------------------------------------------------------------------- */
 /* --------------------------------------------------------------------------- */
 
-int MarketPlaceApp::to_template(Template * tmpl, std::string& error_str)
+void MarketPlaceApp::to_template(Template * tmpl)
 {
-    bool rc;
-
-    string app_path;
-    string app_format;
-    string app_md5;
-    string app_name;
-
-    int market_id;
-
-    get_template_attribute("SOURCE", app_path);
-    get_template_attribute("FORMAT", app_format);
-    get_template_attribute("MD5",    app_md5);
-    get_template_attribute("NAME",   app_name);
-
-    if ( app_path.empty() )
-    {
-        error_str = "The appliance has no SOURCE";
-        return -1;
-    }
-
-    tmpl->replace("PATH", app_path);
-    tmpl->replace("FORMAT", app_format);
-    tmpl->replace("MD5", app_format);
-    tmpl->replace("FROM_APP_NAME", app_name);
-
-    return 0;
+    tmpl->replace("FROM_APP_NAME", get_name());
+    tmpl->replace("PATH", get_source());
+    tmpl->replace("FORMAT", get_format());
+    tmpl->replace("MD5", get_md5());
 }
 
 /* --------------------------------------------------------------------------- */
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 5a4bb1f138..b9339f446b 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -398,53 +398,25 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
     {
         // This image comes from a MarketPlaceApp. Get the Market info and
         // the size.
-        bool market_check;
 
         app = apppool->get(app_id, true);
 
-        if ( app_id == 0 )
+        if ( app == 0 )
         {
             failure_response(INTERNAL,
-                             "Cannot find appliance referenced by FROM_APP",
+                             "Cannot find appliance referenced by FROM_APP.",
                              att);
             delete tmpl;
             return;
         }
 
-        rc = app->to_template(tmpl, error_str);
+        app->to_template(tmpl);
 
-        app->get_template_attribute("SIZE", size_str);
-
-        market_check = app->get_template_attribute("MARKETPLACE_ID", market_id);
+        size_mb   = app->get_size();
+        market_id = app->get_market_id();
 
         app->unlock();
 
-        if ( rc == -1 )
-        {
-            failure_response(INTERNAL, allocate_error(error_str), att);
-
-            delete tmpl;
-            return;
-        }
-
-        if ( !market_check )
-        {
-            error_str = "The appliance has no MARKETPLACE_ID";
-            failure_response(INTERNAL, allocate_error(error_str), att);
-
-            delete tmpl;
-            return;
-        }
-
-        if ( size_str.empty() )
-        {
-            error_str = "The appliance has no SIZE";
-            failure_response(INTERNAL, allocate_error(error_str), att);
-
-            delete tmpl;
-            return;
-        }
-
         market = marketpool->get(market_id, true);
 
         if ( market == 0 )
@@ -466,24 +438,26 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
         if ( rc == -1 )
         {
             failure_response(INTERNAL,
-                             request_error("Cannot determine Image SIZE", size_str),
+                             request_error("Cannot determine Image SIZE",
+                                           size_str),
+                             att);
+            delete tmpl;
+            return;
+        }
+
+        iss.str(size_str);
+        iss >> size_mb;
+
+        if ( iss.fail() )
+        {
+            failure_response(INTERNAL,
+                             request_error("Cannot parse SIZE", size_str),
                              att);
             delete tmpl;
             return;
         }
     }
 
-    iss.str(size_str);
-    iss >> size_mb;
-
-    if ( iss.fail() )
-    {
-        failure_response(INTERNAL,
-                         request_error("Cannot parse SIZE", size_str),
-                         att);
-        delete tmpl;
-        return;
-    }
 
     if (ds_check && (size_mb > avail))
     {

From 364d9ecda826b06ee34aba5ea9aa86f70d5b00ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 27 Jan 2016 11:27:26 +0100
Subject: [PATCH 134/197] Feature #4215: Redo context variables when a NIC is
 attached/detached

---
 include/Template.h               |  10 ++
 include/VirtualMachine.h         |  56 ++++---
 include/VirtualMachinePool.h     |  18 ++-
 src/dm/DispatchManagerActions.cc |  10 +-
 src/lcm/LifeCycleActions.cc      |   3 +-
 src/lcm/LifeCycleStates.cc       |  62 +++++++-
 src/template/Template.cc         |  24 +++
 src/vm/VirtualMachine.cc         | 247 ++++++++++++++++++++++++++-----
 src/vm/VirtualMachinePool.cc     |  28 +++-
 9 files changed, 389 insertions(+), 69 deletions(-)

diff --git a/include/Template.h b/include/Template.h
index 18ef02d38b..026f2181af 100644
--- a/include/Template.h
+++ b/include/Template.h
@@ -301,6 +301,16 @@ public:
         const string& name,
         vector<Attribute*>& values);
 
+    /**
+     *  Gets the first VectorAttribute with the given name
+     *    @param name the attribute name.
+     *    @param vatt stores the first vector attribute found, or 0
+     *    @return true if a vector attribute was found
+     */
+    virtual bool get(
+        const string& name,
+        VectorAttribute*& vatt);
+
     /**
      *  Gets the value of a Single attributes (string) with the given name.
      *    @param name the attribute name.
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 029d61f740..bc653be79f 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1586,18 +1586,6 @@ public:
                             int                      uid,
                             string&                  error_str);
 
-    /**
-     * Cleans the ATTACH = YES attribute from the NICs
-     */
-    void clear_attach_nic();
-
-    /**
-     * Deletes the NIC that was in the process of being attached
-     *
-     * @return the deleted NIC or 0 if none was deleted
-     */
-    VectorAttribute * delete_attach_nic();
-
     /**
      *  Adds a new NIC to the virtual machine template. The NIC should be
      *  generated by the build_attach_nic
@@ -1606,19 +1594,37 @@ public:
      */
     void set_attach_nic(VectorAttribute * new_nic, vector<VectorAttribute*> &rules);
 
+    /**
+     * Cleans the ATTACH = YES attribute from the NICs
+     */
+    void attach_nic_success();
+
+    /**
+     * Deletes the NIC that was in the process of being attached
+     *
+     * @return the deleted NIC or 0 if none was deleted
+     */
+    VectorAttribute * attach_nic_failure();
+
     /**
      *  Sets the attach attribute to the given NIC
      *    @param nic_id of the NIC
      *    @return 0 if the nic_id was found, -1 otherwise
      */
-    int set_attach_nic(int nic_id);
+    int set_detach_nic(int nic_id);
 
     /**
-     *  Updates the network part of the context
-     *    @param error_str Returns the error reason, if any
-     *    @return 0 on success
+     * Deletes the NIC that was in the process of being detached
+     *
+     * @return the deleted NIC or 0 if none was deleted
      */
-    int update_context(string& error_str);
+    VectorAttribute * detach_nic_success();
+
+    /**
+     * Cleans the ATTACH = YES attribute from the NIC, restores the NIC context
+     * variables
+     */
+    void detach_nic_failure();
 
     // ------------------------------------------------------------------------
     // Snapshot related functions
@@ -2053,6 +2059,15 @@ private:
      */
     int parse_context(string& error_str);
 
+    /**
+     * Parses the current contents of the context vector attribute,
+     * without adding any attributes. Substitutes $VARIABLE,
+     * $VARIABLE[ATTR] and $VARIABLE[ATTR, ATTR = VALUE]
+     *
+     * @return 0 on success
+     */
+    int reparse_context();
+
     /**
      *  Parse the "SCHED_REQUIREMENTS" attribute of the template by substituting
      *  $VARIABLE, $VARIABLE[ATTR] and $VARIABLE[ATTR, ATTR = VALUE]
@@ -2155,6 +2170,13 @@ private:
                 static_cast<const VirtualMachine&>(*this).get_disk(disk_id));
     };
 
+    /**
+     * Returns the NIC that is waiting for an attachment action
+     *
+     * @return the NIC waiting for an attachment action, or 0
+     */
+    VectorAttribute* get_attach_nic();
+
     // ------------------------------------------------------------------------
     // Public cloud templates related functions
     // ------------------------------------------------------------------------
diff --git a/include/VirtualMachinePool.h b/include/VirtualMachinePool.h
index 1551e8054f..1ac97896c0 100644
--- a/include/VirtualMachinePool.h
+++ b/include/VirtualMachinePool.h
@@ -353,7 +353,14 @@ public:
      *
      * @param vid VM id
      */
-    void delete_attach_nic(int vid);
+    void attach_nic_failure(int vid);
+
+    /**
+     * Deletes the NIC that was in the process of being detached
+     *
+     * @param vid VM id
+     */
+    void detach_nic_success(int vid);
 
     /**
      * Deletes an entry in the HV-2-vmid mapping table for imported VMs
@@ -411,6 +418,15 @@ private:
      *   @return 0 on success
      */
     int insert_index(const string& deploy_id, int vm_id, bool replace);
+
+    // -------------------------------------------------------------------------
+
+    /**
+     * Helper method for delete attach/detach
+     * @param vid VM id
+     * @param attach true for an attach action, false for detach
+     */
+    void delete_hotplug_nic(int vid, bool attach);
 };
 
 #endif /*VIRTUAL_MACHINE_POOL_H_*/
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index 2d1564960f..a871d58313 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -1580,8 +1580,6 @@ int DispatchManager::attach_nic(
 
     vm->set_attach_nic(nic, sg_rules);
 
-    vm->update_context(tmp_error);
-
     if (vm->get_lcm_state() == VirtualMachine::HOTPLUG_NIC)
     {
         time_t the_time = time(0);
@@ -1615,7 +1613,7 @@ int DispatchManager::attach_nic(
     {
         vm->log("DiM", Log::INFO, "VM NIC Successfully attached.");
 
-        vm->clear_attach_nic();
+        vm->attach_nic_success();
     }
 
     vmpool->update(vm);
@@ -1674,7 +1672,7 @@ int DispatchManager::detach_nic(
         return -1;
     }
 
-    if ( vm->set_attach_nic(nic_id) == -1 )
+    if ( vm->set_detach_nic(nic_id) == -1 )
     {
         oss << "Could not detach NIC with NIC_ID " << nic_id
             << ", it does not exist.";
@@ -1686,8 +1684,6 @@ int DispatchManager::detach_nic(
         return -1;
     }
 
-    vm->update_context(tmp_error);
-
     if (vm->get_state()     == VirtualMachine::ACTIVE &&
         vm->get_lcm_state() == VirtualMachine::RUNNING )
     {
@@ -1734,7 +1730,7 @@ int DispatchManager::detach_nic(
 
         vm->unlock();
 
-        vmpool->delete_attach_nic(vid);
+        vmpool->detach_nic_success(vid);
 
         vm->log("DiM", Log::INFO, "VM NIC Successfully detached.");
     }
diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc
index 20e7230d7e..ba0c9599a7 100644
--- a/src/lcm/LifeCycleActions.cc
+++ b/src/lcm/LifeCycleActions.cc
@@ -956,7 +956,8 @@ void  LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag
         break;
 
         case VirtualMachine::HOTPLUG_NIC:
-            vm->clear_attach_nic();
+            vm->attach_nic_success();
+            vm->detach_nic_success();
             vmpool->update(vm);
 
             vm->set_running_etime(the_time);
diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc
index 73e0a99c05..773fc9d82d 100644
--- a/src/lcm/LifeCycleStates.cc
+++ b/src/lcm/LifeCycleStates.cc
@@ -1542,7 +1542,7 @@ void LifeCycleManager::attach_nic_success_action(int vid)
 
     if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_NIC )
     {
-        vm->clear_attach_nic();
+        vm->attach_nic_success();
 
         vm->set_state(VirtualMachine::RUNNING);
 
@@ -1574,7 +1574,7 @@ void LifeCycleManager::attach_nic_failure_action(int vid)
     {
         vm->unlock();
 
-        vmpool->delete_attach_nic(vid);
+        vmpool->attach_nic_failure(vid);
 
         vm = vmpool->get(vid,true);
 
@@ -1601,7 +1601,39 @@ void LifeCycleManager::attach_nic_failure_action(int vid)
 
 void LifeCycleManager::detach_nic_success_action(int vid)
 {
-    attach_nic_failure_action(vid);
+    VirtualMachine *  vm;
+
+    vm = vmpool->get(vid,true);
+
+    if ( vm == 0 )
+    {
+        return;
+    }
+
+    if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_NIC )
+    {
+        vm->unlock();
+
+        vmpool->detach_nic_success(vid);
+
+        vm = vmpool->get(vid,true);
+
+        if ( vm == 0 )
+        {
+            return;
+        }
+
+        vm->set_state(VirtualMachine::RUNNING);
+
+        vmpool->update(vm);
+
+        vm->unlock();
+    }
+    else
+    {
+        vm->log("LCM",Log::ERROR,"detach_nic_success_action, VM in a wrong state");
+        vm->unlock();
+    }
 }
 
 /* -------------------------------------------------------------------------- */
@@ -1609,7 +1641,29 @@ void LifeCycleManager::detach_nic_success_action(int vid)
 
 void LifeCycleManager::detach_nic_failure_action(int vid)
 {
-    attach_nic_success_action(vid);
+    VirtualMachine * vm;
+
+    vm = vmpool->get(vid,true);
+
+    if ( vm == 0 )
+    {
+        return;
+    }
+
+    if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_NIC )
+    {
+        vm->detach_nic_failure();
+
+        vm->set_state(VirtualMachine::RUNNING);
+
+        vmpool->update(vm);
+    }
+    else
+    {
+        vm->log("LCM",Log::ERROR,"detach_nic_failure_action, VM in a wrong state");
+    }
+
+    vm->unlock();
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/template/Template.cc b/src/template/Template.cc
index 2d333ef2cf..ecdd10d589 100644
--- a/src/template/Template.cc
+++ b/src/template/Template.cc
@@ -386,6 +386,30 @@ int Template::get(
     return j;
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+bool Template::get(
+    const string& name,
+    VectorAttribute*& vatt)
+{
+    vector<Attribute *> array_attr;
+    int                 num;
+
+    num = get(name, array_attr);
+
+    if ( num < 1 )
+    {
+        vatt = 0;
+        return false;
+    }
+
+    vatt = dynamic_cast<VectorAttribute *>(array_attr[0]);
+
+    return ( vatt != 0 );
+}
+
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 94ea8bdef5..13b403b784 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -904,6 +904,23 @@ static void parse_context_network(const char* vars[][2], int num_vars,
 
 /* -------------------------------------------------------------------------- */
 
+static void clear_context_network(const char* vars[][2], int num_vars,
+        VectorAttribute * context, int nic_id)
+{
+    ostringstream att_name;
+
+    for (int i=0; i < num_vars; i++)
+    {
+        att_name.str("");
+
+        att_name << "ETH" << nic_id << "_" << vars[i][0];
+
+        context->remove(att_name.str());
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
 int VirtualMachine::parse_context(string& error_str)
 {
     int rc, num;
@@ -1136,11 +1153,46 @@ error_cleanup:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualMachine::update_context(string& error_str)
+int VirtualMachine::reparse_context()
 {
-    // TODO: context update may need to be limited to network attributes,
-    // but for now the full context is parsed again
-    return parse_context(error_str);
+    int rc;
+
+    VectorAttribute * context;
+    VectorAttribute * context_parsed;
+
+    string * str;
+    string   parsed;
+    string   error_str;
+
+    obj_template->get("CONTEXT", context);
+
+    // -------------------------------------------------------------------------
+    // Parse CONTEXT variables & free vector attributes
+    // -------------------------------------------------------------------------
+
+    str = context->marshall();
+
+    if (str == 0)
+    {
+        return -1;
+    }
+
+    rc = parse_template_attribute(*str, parsed, error_str);
+
+    delete str;
+
+    if (rc != 0)
+    {
+        return -1;
+    }
+
+    context_parsed = new VectorAttribute("CONTEXT");
+    context_parsed->unmarshall(parsed);
+
+    obj_template->erase("CONTEXT");
+    obj_template->set(context_parsed);
+
+    return 0;
 }
 
 /* -------------------------------------------------------------------------- */
@@ -2651,7 +2703,7 @@ int VirtualMachine::set_up_attach_nic(
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void VirtualMachine::clear_attach_nic()
+VectorAttribute* VirtualMachine::get_attach_nic()
 {
     int                  num_nics;
     vector<Attribute  *> nics;
@@ -2670,34 +2722,7 @@ void VirtualMachine::clear_attach_nic()
 
         if ( nic->vector_value("ATTACH") == "YES" )
         {
-            nic->remove("ATTACH");
-            return;
-        }
-    }
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-VectorAttribute * VirtualMachine::delete_attach_nic()
-{
-    vector<Attribute  *> nics;
-    VectorAttribute *    nic;
-
-    int num_nics = obj_template->get("NIC", nics);
-
-    for(int i=0; i<num_nics; i++)
-    {
-        nic = dynamic_cast<VectorAttribute * >(nics[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
-        if ( nic->vector_value("ATTACH") == "YES" )
-        {
-            return static_cast<VectorAttribute * >(obj_template->remove(nic));
+            return nic;
         }
     }
 
@@ -2707,10 +2732,116 @@ VectorAttribute * VirtualMachine::delete_attach_nic()
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+void VirtualMachine::attach_nic_success()
+{
+    VectorAttribute * nic = get_attach_nic();
+
+    if (nic != 0)
+    {
+        nic->remove("ATTACH");
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+VectorAttribute * VirtualMachine::attach_nic_failure()
+{
+    VectorAttribute *    nic;
+    VectorAttribute *    context = 0;
+    int                  nic_id;
+
+    nic = get_attach_nic();
+
+    if (nic == 0)
+    {
+        return 0;
+    }
+
+    obj_template->remove(nic);
+
+    obj_template->get("CONTEXT", context);
+
+    if (context != 0)
+    {
+        nic->vector_value("NIC_ID", nic_id);
+
+        clear_context_network(NETWORK_CONTEXT,  NUM_NETWORK_CONTEXT,  context, nic_id);
+        clear_context_network(NETWORK6_CONTEXT, NUM_NETWORK6_CONTEXT, context, nic_id);
+    }
+
+    return nic;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void VirtualMachine::detach_nic_failure()
+{
+    VectorAttribute *    nic;
+    VectorAttribute *    context = 0;
+    bool                 net_context;
+
+    nic = get_attach_nic();
+
+    if (nic == 0)
+    {
+        return;
+    }
+
+    nic->remove("ATTACH");
+
+    obj_template->get("CONTEXT", context);
+
+    if (context == 0)
+    {
+        return;
+    }
+
+    context->vector_value("NETWORK", net_context);
+
+    if (net_context)
+    {
+        parse_context_network(NETWORK_CONTEXT, NUM_NETWORK_CONTEXT,
+                context, nic);
+
+        if (!nic->vector_value("IP6_GLOBAL").empty())
+        {
+            parse_context_network(NETWORK6_CONTEXT, NUM_NETWORK6_CONTEXT,
+                    context, nic);
+        }
+
+        reparse_context();
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+VectorAttribute * VirtualMachine::detach_nic_success()
+{
+    VectorAttribute * nic = get_attach_nic();
+
+    if (nic == 0)
+    {
+        return 0;
+    }
+
+    obj_template->remove(nic);
+
+    return nic;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 void VirtualMachine::set_attach_nic(
         VectorAttribute *       new_nic,
         vector<VectorAttribute*> &rules)
 {
+    VectorAttribute *   context = 0;
+    bool                net_context;
+
     vector<VectorAttribute*>::iterator it;
 
     new_nic->replace("ATTACH", "YES");
@@ -2721,22 +2852,48 @@ void VirtualMachine::set_attach_nic(
     {
         obj_template->set(*it);
     }
+
+    obj_template->get("CONTEXT", context);
+
+    if (context == 0)
+    {
+        return;
+    }
+
+    context->vector_value("NETWORK", net_context);
+
+    if (net_context)
+    {
+        parse_context_network(NETWORK_CONTEXT, NUM_NETWORK_CONTEXT,
+                context, new_nic);
+
+        if (!new_nic->vector_value("IP6_GLOBAL").empty())
+        {
+            parse_context_network(NETWORK6_CONTEXT, NUM_NETWORK6_CONTEXT,
+                    context, new_nic);
+        }
+
+        reparse_context();
+    }
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualMachine::set_attach_nic(int nic_id)
+int VirtualMachine::set_detach_nic(int nic_id)
 {
     int num_nics;
     int n_id;
 
     vector<Attribute  *> nics;
     VectorAttribute *    nic;
+    VectorAttribute *    context = 0;
+
+    bool found = false;
 
     num_nics = obj_template->get("NIC", nics);
 
-    for(int i=0; i<num_nics; i++)
+    for(int i=0; !found && i<num_nics; i++)
     {
         nic = dynamic_cast<VectorAttribute * >(nics[i]);
 
@@ -2750,11 +2907,27 @@ int VirtualMachine::set_attach_nic(int nic_id)
         if ( n_id == nic_id )
         {
             nic->replace("ATTACH", "YES");
-            return 0;
+            found = true;
         }
     }
 
-    return -1;
+    if (!found)
+    {
+        return -1;
+    }
+
+    obj_template->get("CONTEXT", context);
+
+    if (context != 0)
+    {
+        clear_context_network(NETWORK_CONTEXT,  NUM_NETWORK_CONTEXT,
+                            context, nic_id);
+
+        clear_context_network(NETWORK6_CONTEXT, NUM_NETWORK6_CONTEXT,
+                            context, nic_id);
+    }
+
+    return 0;
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc
index 6c386fc91b..571baaa53e 100644
--- a/src/vm/VirtualMachinePool.cc
+++ b/src/vm/VirtualMachinePool.cc
@@ -1111,7 +1111,7 @@ void VirtualMachinePool::delete_attach_disk(int vid)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void VirtualMachinePool::delete_attach_nic(int vid)
+void VirtualMachinePool::delete_hotplug_nic(int vid, bool attach)
 {
     VirtualMachine *  vm;
     VectorAttribute * nic;
@@ -1127,7 +1127,15 @@ void VirtualMachinePool::delete_attach_nic(int vid)
         return;
     }
 
-    nic  = vm->delete_attach_nic();
+    if (attach)
+    {
+        nic  = vm->attach_nic_failure();
+    }
+    else
+    {
+        nic = vm->detach_nic_success();
+    }
+
     uid  = vm->get_uid();
     gid  = vm->get_gid();
     oid  = vm->get_oid();
@@ -1147,3 +1155,19 @@ void VirtualMachinePool::delete_attach_nic(int vid)
         VirtualMachine::release_network_leases(nic, oid);
     }
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void VirtualMachinePool::attach_nic_failure(int vid)
+{
+    delete_hotplug_nic(vid, true);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void VirtualMachinePool::detach_nic_success(int vid)
+{
+    delete_hotplug_nic(vid, false);
+}

From 41739b8e7e845694a1b3a7b6efff509744fe2693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 27 Jan 2016 11:37:24 +0100
Subject: [PATCH 135/197] Feature #4215: Fix attach nic rollback in wrong order

---
 src/dm/DispatchManagerActions.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index a871d58313..901f8db676 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -1528,8 +1528,6 @@ int DispatchManager::attach_nic(
 
     if ( vm == 0 )
     {
-        delete nic;
-
         if ( rc == 0 )
         {
             VirtualMachine::release_network_leases(nic, vid);
@@ -1541,6 +1539,8 @@ int DispatchManager::attach_nic(
             }
         }
 
+        delete nic;
+
         oss << "Could not attach a new NIC to VM " << vid
             << ", VM does not exist after setting its state to HOTPLUG." ;
         error_str = oss.str();

From 0a94c3b48fc09f82b05312c79ae69efe869ec405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 27 Jan 2016 13:29:30 +0100
Subject: [PATCH 136/197] Feature #4215: Refactor VR instantiate

---
 include/Request.h                     | 281 +++++++++++++-------------
 include/RequestManagerVMTemplate.h    |  60 ++----
 include/RequestManagerVirtualRouter.h |  76 +++++++
 src/rm/RequestManager.cc              |   1 +
 src/rm/RequestManagerVMTemplate.cc    | 174 ++--------------
 src/rm/RequestManagerVirtualRouter.cc | 160 +++++++++++++++
 src/rm/SConstruct                     |   1 +
 7 files changed, 419 insertions(+), 334 deletions(-)
 create mode 100644 include/RequestManagerVirtualRouter.h
 create mode 100644 src/rm/RequestManagerVirtualRouter.cc

diff --git a/include/Request.h b/include/Request.h
index f606def3c0..8582678fec 100644
--- a/include/Request.h
+++ b/include/Request.h
@@ -167,82 +167,6 @@ protected:
     /* -------------------------------------------------------------------- */
     /* -------------------------------------------------------------------- */
 
-    /**
-     *  Performs a basic authorization for this request using the uid/gid
-     *  from the request. The function gets the object from the pool to get
-     *  the public attribute and its owner. The authorization is based on
-     *  object and type of operation for the request.
-     *    @param oid of the object, can be -1 for objects to be created, or
-     *    pools.
-     *    @param att the specific request attributes
-     *
-     *    @return true if the user is authorized.
-     */
-    bool basic_authorization(int oid, RequestAttributes& att)
-    {
-        return basic_authorization(oid, auth_op, att);
-    };
-
-    /**
-     *  Performs a basic authorization for this request using the uid/gid
-     *  from the request. The function gets the object from the pool to get
-     *  the public attribute and its owner. The authorization is based on
-     *  object and type of operation for the request.
-     *    @param oid of the object, can be -1 for objects to be created, or
-     *    pools.
-     *    @param op operation of the request.
-     *    @param att the specific request attributes
-     *
-     *    @return true if the user is authorized.
-     */
-    bool basic_authorization(int oid, AuthRequest::Operation op,
-                             RequestAttributes& att);
-
-    /**
-     *  Performs a basic quota check for this request using the uid/gid
-     *  from the request. Usage counters are updated for the user/group.
-     *  On case of error, the failure_response return values are set
-     *
-     *    @param tmpl describing the object
-     *    @param object type of the object
-     *    @param att the specific request attributes
-     *
-     *    @return true if the user is authorized.
-     */
-    bool quota_authorization(
-            Template *          tmpl,
-            Quotas::QuotaType   qtype,
-            RequestAttributes&  att);
-
-    /**
-     *  Performs a basic quota check for this request using the uid/gid
-     *  from the request. Usage counters are updated for the user/group.
-     *  On case of error, the failure_response return values is not set, instead
-     *  the error reason is returned in error_str
-     *
-     *    @param tmpl describing the object
-     *    @param object type of the object
-     *    @param att the specific request attributes
-     *
-     *    @param error_str Error reason, if any
-     *    @return true if the user is authorized.
-     */
-    bool quota_authorization(
-            Template *          tmpl,
-            Quotas::QuotaType   qtype,
-            RequestAttributes&  att,
-            string&             error_str);
-
-    /**
-     *  Performs rollback on usage counters for a previous  quota check operation
-     *  for the request.
-     *    @param tmpl describing the object
-     *    @param att the specific request attributes
-     */
-    void quota_rollback(Template *         tmpl,
-                        Quotas::QuotaType  qtype,
-                        RequestAttributes& att);
-
     /**
      *  Actual Execution method for the request. Must be implemented by the
      *  XML-RPC requests
@@ -252,6 +176,82 @@ protected:
     virtual void request_execute(xmlrpc_c::paramList const& _paramList,
                                  RequestAttributes& att) = 0;
 
+    /**
+     * Locks the requested object, gets information, and unlocks it
+     *
+     * @param pool object pool
+     * @param id of the object
+     * @param type of the object
+     * @param att the specific request attributes
+     *
+     * @param perms returns the object's permissions
+     * @param name returns the object's name
+     * @param throw_error send error response to client if object not found
+     *
+     * @return 0 on success, -1 otherwise
+     */
+    int get_info (PoolSQL *                 pool,
+                  int                       id,
+                  PoolObjectSQL::ObjectType type,
+                  RequestAttributes&        att,
+                  PoolObjectAuth&           perms,
+                  string&                   name,
+                  bool                      throw_error);
+
+    /**
+     * Logs the method result, including the output data or error message
+     *
+     * @param att the specific request attributes
+     */
+    virtual void log_result(
+            const RequestAttributes&    att);
+
+    /**
+     * Formats and adds a xmlrpc_c::value to oss.
+     *
+     * @param v value to format
+     * @param oss stream to write v
+     */
+    virtual void log_xmlrpc_value(
+            const xmlrpc_c::value&  v,
+            ostringstream&          oss);
+
+private:
+
+    /**
+     * Logs the method invocation, including the arguments
+     *
+     * @param att the specific request attributes
+     * @param paramList list of XML parameters
+     */
+    void log_method_invoked(
+            const RequestAttributes&    att,
+            const xmlrpc_c::paramList&  paramList);
+
+    /* ------------- Functions to manage user and group quotas -------------- */
+
+    bool user_quota_authorization(Template * tmpl,
+                                  Quotas::QuotaType  qtype,
+                                  RequestAttributes& att,
+                                  string& error_str);
+
+    bool group_quota_authorization(Template * tmpl,
+                                   Quotas::QuotaType  qtype,
+                                   RequestAttributes& att,
+                                   string& error_str);
+
+    void user_quota_rollback(Template * tmpl,
+                             Quotas::QuotaType  qtype,
+                             RequestAttributes& att);
+
+    void group_quota_rollback(Template * tmpl,
+                              Quotas::QuotaType  qtype,
+                              RequestAttributes& att);
+
+public:
+
+    /* -------------------- Responses and errors ---------------------------- */
+
     /**
      *  Builds an XML-RPC response updating retval. After calling this function
      *  the xml-rpc excute method should return
@@ -340,77 +340,84 @@ protected:
      */
     string allocate_error (PoolObjectSQL::ObjectType obj, const string& error);
 
-    /**
-     * Locks the requested object, gets information, and unlocks it
-     *
-     * @param pool object pool
-     * @param id of the object
-     * @param type of the object
-     * @param att the specific request attributes
-     *
-     * @param perms returns the object's permissions
-     * @param name returns the object's name
-     * @param throw_error send error response to client if object not found
-     *
-     * @return 0 on success, -1 otherwise
-     */
-    int get_info (PoolSQL *                 pool,
-                  int                       id,
-                  PoolObjectSQL::ObjectType type,
-                  RequestAttributes&        att,
-                  PoolObjectAuth&           perms,
-                  string&                   name,
-                  bool                      throw_error);
+    /* -------------------- Authorization ----------------------------------- */
 
     /**
-     * Logs the method result, including the output data or error message
+     *  Performs a basic authorization for this request using the uid/gid
+     *  from the request. The function gets the object from the pool to get
+     *  the public attribute and its owner. The authorization is based on
+     *  object and type of operation for the request.
+     *    @param oid of the object, can be -1 for objects to be created, or
+     *    pools.
+     *    @param att the specific request attributes
      *
-     * @param att the specific request attributes
+     *    @return true if the user is authorized.
      */
-    virtual void log_result(
-            const RequestAttributes&    att);
+    bool basic_authorization(int oid, RequestAttributes& att)
+    {
+        return basic_authorization(oid, auth_op, att);
+    };
 
     /**
-     * Formats and adds a xmlrpc_c::value to oss.
+     *  Performs a basic authorization for this request using the uid/gid
+     *  from the request. The function gets the object from the pool to get
+     *  the public attribute and its owner. The authorization is based on
+     *  object and type of operation for the request.
+     *    @param oid of the object, can be -1 for objects to be created, or
+     *    pools.
+     *    @param op operation of the request.
+     *    @param att the specific request attributes
      *
-     * @param v value to format
-     * @param oss stream to write v
+     *    @return true if the user is authorized.
      */
-    virtual void log_xmlrpc_value(
-            const xmlrpc_c::value&  v,
-            ostringstream&          oss);
-
-private:
-
-    /**
-     * Logs the method invocation, including the arguments
-     *
-     * @param att the specific request attributes
-     * @param paramList list of XML parameters
-     */
-    void log_method_invoked(
-            const RequestAttributes&    att,
-            const xmlrpc_c::paramList&  paramList);
-
-    /* ------------- Functions to manage user and group quotas -------------- */
-
-    bool user_quota_authorization(Template * tmpl,
-                                  Quotas::QuotaType  qtype,
-                                  RequestAttributes& att,
-                                  string& error_str);
-
-    bool group_quota_authorization(Template * tmpl,
-                                   Quotas::QuotaType  qtype,
-                                   RequestAttributes& att,
-                                   string& error_str);
-
-    void user_quota_rollback(Template * tmpl,
-                             Quotas::QuotaType  qtype,
+    bool basic_authorization(int oid, AuthRequest::Operation op,
                              RequestAttributes& att);
 
-    void group_quota_rollback(Template * tmpl,
-                              Quotas::QuotaType  qtype,
-                              RequestAttributes& att);
+    /**
+     *  Performs a basic quota check for this request using the uid/gid
+     *  from the request. Usage counters are updated for the user/group.
+     *  On case of error, the failure_response return values are set
+     *
+     *    @param tmpl describing the object
+     *    @param object type of the object
+     *    @param att the specific request attributes
+     *
+     *    @return true if the user is authorized.
+     */
+    bool quota_authorization(
+            Template *          tmpl,
+            Quotas::QuotaType   qtype,
+            RequestAttributes&  att);
+
+    /**
+     *  Performs a basic quota check for this request using the uid/gid
+     *  from the request. Usage counters are updated for the user/group.
+     *  On case of error, the failure_response return values is not set, instead
+     *  the error reason is returned in error_str
+     *
+     *    @param tmpl describing the object
+     *    @param object type of the object
+     *    @param att the specific request attributes
+     *
+     *    @param error_str Error reason, if any
+     *    @return true if the user is authorized.
+     */
+    bool quota_authorization(
+            Template *          tmpl,
+            Quotas::QuotaType   qtype,
+            RequestAttributes&  att,
+            string&             error_str);
+
+    /**
+     *  Performs rollback on usage counters for a previous  quota check operation
+     *  for the request.
+     *    @param tmpl describing the object
+     *    @param att the specific request attributes
+     */
+    void quota_rollback(Template *         tmpl,
+                        Quotas::QuotaType  qtype,
+                        RequestAttributes& att);
+
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerVMTemplate.h b/include/RequestManagerVMTemplate.h
index 9fc9aeef12..33292b64e5 100644
--- a/include/RequestManagerVMTemplate.h
+++ b/include/RequestManagerVMTemplate.h
@@ -46,26 +46,6 @@ protected:
 
     virtual void request_execute(xmlrpc_c::paramList const& _paramList,
                                  RequestAttributes& att) = 0;
-
-
-    /**
-     * Instantiates the VM Template, checking permissions, quotas, etc
-     * @param att the specific request attributes
-     * @param id VM Template ID
-     * @param name Name for the new VM. Can be empty
-     * @param on_hold True to start the VM on HOLD state
-     * @param str_uattrs Template supplied by user to merge with the original
-     * contents. Can be empty
-     * @param extra_attrs Template to be merged. It should contain internal
-     * configuration, and it won't be authenticated or checked for restricted
-     * attributes. Can be 0
-     *
-     * @return VMID on success, -1 on failure. On failure, failure_response is set,
-     * but for success the calling method needs to set success_response
-     */
-    int instantiate(RequestAttributes& att, int id,
-                    string name, bool on_hold, string str_uattrs,
-                    Template* extra_attrs);
 };
 
 /* ------------------------------------------------------------------------- */
@@ -87,27 +67,25 @@ public:
     void request_execute(xmlrpc_c::paramList const& _paramList,
                          RequestAttributes& att);
 
-};
-
-/* ------------------------------------------------------------------------- */
-/* ------------------------------------------------------------------------- */
-
-class VirtualRouterInstantiate : public RequestManagerVMTemplate
-{
-public:
-    VirtualRouterInstantiate():
-        RequestManagerVMTemplate("VirtualRouterInstantiate",
-                                 "Instantiates a new virtual machine associated to a virtual router",
-                                 "A:siiisbs")
-    {
-        auth_op = AuthRequest::USE;
-    };
-
-    ~VirtualRouterInstantiate(){};
-
-    void request_execute(xmlrpc_c::paramList const& _paramList,
-                         RequestAttributes& att);
-
+    /**
+     * Instantiates the VM Template, checking permissions, quotas, etc
+     * @param req Calling Request object
+     * @param att the specific request attributes
+     * @param id VM Template ID
+     * @param name Name for the new VM. Can be empty
+     * @param on_hold True to start the VM on HOLD state
+     * @param str_uattrs Template supplied by user to merge with the original
+     * contents. Can be empty
+     * @param extra_attrs Template to be merged. It should contain internal
+     * configuration, and it won't be authenticated or checked for restricted
+     * attributes. Can be 0
+     *
+     * @return VMID on success, -1 on failure. On failure, failure_response is set,
+     * but for success the calling method needs to set success_response
+     */
+    static int instantiate(Request* req, RequestAttributes& att, int id,
+                    string name, bool on_hold, string str_uattrs,
+                    Template* extra_attrs);
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerVirtualRouter.h b/include/RequestManagerVirtualRouter.h
new file mode 100644
index 0000000000..ffed216f6e
--- /dev/null
+++ b/include/RequestManagerVirtualRouter.h
@@ -0,0 +1,76 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef REQUEST_MANAGER_VIRTUAL_ROUTER_H
+#define REQUEST_MANAGER_VIRTUAL_ROUTER_H
+
+#include "Request.h"
+#include "Nebula.h"
+
+using namespace std;
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class RequestManagerVirtualRouter: public Request
+{
+protected:
+    RequestManagerVirtualRouter(const string& method_name,
+                             const string& help,
+                             const string& params)
+        :Request(method_name,params,help)
+    {
+        Nebula& nd  = Nebula::instance();
+        pool        = nd.get_vrouterpool();
+
+        auth_object = PoolObjectSQL::VROUTER;
+    };
+
+    ~RequestManagerVirtualRouter(){};
+
+    /* -------------------------------------------------------------------- */
+
+    virtual void request_execute(xmlrpc_c::paramList const& _paramList,
+                                 RequestAttributes& att) = 0;
+};
+
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterInstantiate : public RequestManagerVirtualRouter
+{
+public:
+    VirtualRouterInstantiate():
+        RequestManagerVirtualRouter("VirtualRouterInstantiate",
+                                 "Instantiates a new virtual machine associated to a virtual router",
+                                 "A:siiisbs")
+    {
+        auth_op = AuthRequest::MANAGE;
+    };
+
+    ~VirtualRouterInstantiate(){};
+
+    void request_execute(xmlrpc_c::paramList const& _paramList,
+                         RequestAttributes& att);
+
+};
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+#endif
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index aefe7cc651..02b2a97609 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -40,6 +40,7 @@
 #include "RequestManagerGroup.h"
 #include "RequestManagerVdc.h"
 #include "RequestManagerDatastore.h"
+#include "RequestManagerVirtualRouter.h"
 
 #include "RequestManagerSystem.h"
 #include "RequestManagerProxy.h"
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index bfa18f6200..b448f8b13d 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -38,7 +38,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     // TODO: if Template has VROUTER = YES, do not allow to instantiate here
 
-    int vid = instantiate(att, id, name, on_hold, str_uattrs, 0);
+    int vid = instantiate(this, att, id, name, on_hold, str_uattrs, 0);
 
     if (vid != -1)
     {
@@ -49,146 +49,8 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void VirtualRouterInstantiate::request_execute(
-        xmlrpc_c::paramList const& paramList, RequestAttributes& att)
-{
-    int    vrid       = xmlrpc_c::value_int(paramList.getInt(1));
-    int    n_vms      = xmlrpc_c::value_int(paramList.getInt(2));
-    int    tmpl_id    = xmlrpc_c::value_int(paramList.getInt(3));
-    string name       = xmlrpc_c::value_string(paramList.getString(4));
-    bool   on_hold    = xmlrpc_c::value_boolean(paramList.getBoolean(5));
-    string str_uattrs = xmlrpc_c::value_string(paramList.getString(6));
-
-    Nebula& nd = Nebula::instance();
-    VirtualRouterPool*  vrpool = nd.get_vrouterpool();
-    VirtualRouter *     vr;
-    DispatchManager*    dm = nd.get_dm();
-
-    PoolObjectAuth      vr_perms;
-    Template*           extra_attrs;
-    bool                has_vmids;
-    string              errorstr;
-    string              vr_name;
-    ostringstream       oss;
-
-    vector<int>             vms;
-    vector<int>::iterator   vmid;
-
-    /* ---------------------------------------------------------------------- */
-    /* Get the Virtual Router NICs                                            */
-    /* ---------------------------------------------------------------------- */
-
-    vr = vrpool->get(vrid, true);
-
-    if (vr == 0)
-    {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
-                att);
-
-        return;
-    }
-
-    vr->get_permissions(vr_perms);
-
-    extra_attrs = vr->get_vm_template();
-
-    has_vmids = vr->has_vmids();
-
-    vr_name = vr->get_name();
-
-    vr->unlock();
-
-    if ( att.uid != 0 )
-    {
-        AuthRequest ar(att.uid, att.group_ids);
-
-        ar.add_auth(AuthRequest::MANAGE, vr_perms); // MANAGE VROUTER
-
-        if (UserPool::authorize(ar) == -1)
-        {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
-                    att);
-
-            return;
-        }
-    }
-
-    if (has_vmids)
-    {
-        failure_response(ACTION,
-                request_error("Virtual Router already has VMs. Cannot instantiate new ones", ""),
-                att);
-
-        return;
-    }
-
-    if (name.empty())
-    {
-        oss.str("");
-        oss << "vr-" << vr_name << "-%i";
-        name = oss.str();
-    }
-
-    for (int i=0; i<n_vms; i++)
-    {
-        oss.str("");
-        oss << i;
-
-        string tmp_name = one_util::gsub(name, "%i", oss.str());
-
-        int vid = instantiate(att, tmpl_id, tmp_name, true, str_uattrs, extra_attrs);
-
-        if (vid == -1)
-        {
-            string tmp_error;
-
-            for (vmid = vms.begin(); vmid != vms.end(); vmid++)
-            {
-                dm->finalize(*vmid, tmp_error);
-            }
-
-            return;
-        }
-
-        vms.push_back(vid);
-    }
-
-    vr = vrpool->get(vrid, true);
-
-    if (vr != 0)
-    {
-        for (vmid = vms.begin(); vmid != vms.end(); vmid++)
-        {
-            vr->add_vmid(*vmid);
-        }
-
-        vrpool->update(vr);
-
-        vr->unlock();
-    }
-
-    // VMs are created on hold to wait for all the vr->add_vmid calls, that
-    // update each VM context with other VM IPs
-    if (!on_hold)
-    {
-        for (vmid = vms.begin(); vmid != vms.end(); vmid++)
-        {
-            dm->release(*vmid, errorstr);
-        }
-    }
-
-    success_response(vrid, att);
-}
-
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
-                                string name, bool on_hold, string str_uattrs,
-                                Template* extra_attrs)
+int VMTemplateInstantiate::instantiate(Request * req, RequestAttributes& att,
+    int id, string name, bool on_hold, string str_uattrs, Template* extra_attrs)
 {
     int  rc;
     int  vid;
@@ -200,7 +62,7 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
     Nebula& nd = Nebula::instance();
 
     VirtualMachinePool* vmpool  = nd.get_vmpool();
-    VMTemplatePool *    tpool   = static_cast<VMTemplatePool *>(pool);
+    VMTemplatePool *    tpool   = nd.get_tpool();
 
     VirtualMachineTemplate * tmpl;
     VirtualMachineTemplate * extended_tmpl = 0;
@@ -220,8 +82,8 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
 
     if ( rtmpl == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),id),
+        req->failure_response(Request::NO_EXISTS,
+                req->get_error(Request::object_name(PoolObjectSQL::TEMPLATE),id),
                 att);
 
         return -1;
@@ -241,7 +103,7 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
 
         if ( rc != 0 )
         {
-            failure_response(INTERNAL, error_str, att);
+            req->failure_response(Request::INTERNAL, error_str, att);
             delete tmpl;
             return -1;
         }
@@ -254,8 +116,8 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
 
                 oss << "User Template includes a restricted attribute "<< aname;
 
-                failure_response(AUTHORIZATION,
-                        authorization_error(oss.str(), att),
+                req->failure_response(Request::AUTHORIZATION,
+                        req->authorization_error(oss.str(), att),
                         att);
 
                 delete tmpl;
@@ -267,7 +129,7 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
 
         if ( rc != 0 )
         {
-            failure_response(INTERNAL, error_str, att);
+            req->failure_response(Request::INTERNAL, error_str, att);
             delete tmpl;
             return -1;
         }
@@ -279,7 +141,7 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
 
         if ( rc != 0 )
         {
-            failure_response(INTERNAL, error_str, att);
+            req->failure_response(Request::INTERNAL, error_str, att);
             delete tmpl;
             return -1;
         }
@@ -317,15 +179,15 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
             tmpl->to_xml(tmpl_str);
 
             // CREATE TEMPLATE
-            ar.add_create_auth(att.uid, att.gid, auth_object, tmpl_str);
+            ar.add_create_auth(att.uid, att.gid, PoolObjectSQL::TEMPLATE, tmpl_str);
         }
 
         VirtualMachine::set_auth_request(att.uid, ar, tmpl);
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
+            req->failure_response(Request::AUTHORIZATION,
+                    req->authorization_error(ar.message, att),
                     att);
 
             delete tmpl;
@@ -336,7 +198,7 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
 
         VirtualMachine::disk_extended_info(att.uid, extended_tmpl);
 
-        if ( quota_authorization(extended_tmpl, Quotas::VIRTUALMACHINE, att) == false )
+        if ( req->quota_authorization(extended_tmpl, Quotas::VIRTUALMACHINE, att) == false )
         {
             delete tmpl;
             delete extended_tmpl;
@@ -349,13 +211,13 @@ int RequestManagerVMTemplate::instantiate(RequestAttributes& att, int id,
 
     if ( rc < 0 )
     {
-        failure_response(INTERNAL,
-                allocate_error(PoolObjectSQL::VM,error_str),
+        req->failure_response(Request::INTERNAL,
+                req->allocate_error(PoolObjectSQL::VM,error_str),
                 att);
 
         if (extended_tmpl != 0)
         {
-            quota_rollback(extended_tmpl, Quotas::VIRTUALMACHINE, att);
+            req->quota_rollback(extended_tmpl, Quotas::VIRTUALMACHINE, att);
         }
 
         delete extended_tmpl;
diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc
new file mode 100644
index 0000000000..a454865e3f
--- /dev/null
+++ b/src/rm/RequestManagerVirtualRouter.cc
@@ -0,0 +1,160 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+#include "RequestManagerVirtualRouter.h"
+#include "RequestManagerVMTemplate.h"
+#include "PoolObjectAuth.h"
+#include "Nebula.h"
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void VirtualRouterInstantiate::request_execute(
+        xmlrpc_c::paramList const& paramList, RequestAttributes& att)
+{
+    int    vrid       = xmlrpc_c::value_int(paramList.getInt(1));
+    int    n_vms      = xmlrpc_c::value_int(paramList.getInt(2));
+    int    tmpl_id    = xmlrpc_c::value_int(paramList.getInt(3));
+    string name       = xmlrpc_c::value_string(paramList.getString(4));
+    bool   on_hold    = xmlrpc_c::value_boolean(paramList.getBoolean(5));
+    string str_uattrs = xmlrpc_c::value_string(paramList.getString(6));
+
+    Nebula& nd = Nebula::instance();
+    VirtualRouterPool*  vrpool = nd.get_vrouterpool();
+    VirtualRouter *     vr;
+    DispatchManager*    dm = nd.get_dm();
+
+    PoolObjectAuth      vr_perms;
+    Template*           extra_attrs;
+    bool                has_vmids;
+    string              errorstr;
+    string              vr_name;
+    ostringstream       oss;
+
+    vector<int>             vms;
+    vector<int>::iterator   vmid;
+
+    /* ---------------------------------------------------------------------- */
+    /* Get the Virtual Router NICs                                            */
+    /* ---------------------------------------------------------------------- */
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr == 0)
+    {
+        failure_response(NO_EXISTS,
+                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
+                att);
+
+        return;
+    }
+
+    vr->get_permissions(vr_perms);
+
+    extra_attrs = vr->get_vm_template();
+
+    has_vmids = vr->has_vmids();
+
+    vr_name = vr->get_name();
+
+    vr->unlock();
+
+    if ( att.uid != 0 )
+    {
+        AuthRequest ar(att.uid, att.group_ids);
+
+        ar.add_auth(AuthRequest::MANAGE, vr_perms); // MANAGE VROUTER
+
+        if (UserPool::authorize(ar) == -1)
+        {
+            failure_response(AUTHORIZATION,
+                    authorization_error(ar.message, att),
+                    att);
+
+            return;
+        }
+    }
+
+    if (has_vmids)
+    {
+        failure_response(ACTION,
+                request_error("Virtual Router already has VMs. Cannot instantiate new ones", ""),
+                att);
+
+        return;
+    }
+
+    if (name.empty())
+    {
+        oss.str("");
+        oss << "vr-" << vr_name << "-%i";
+        name = oss.str();
+    }
+
+    for (int i=0; i<n_vms; i++)
+    {
+        oss.str("");
+        oss << i;
+
+        string tmp_name = one_util::gsub(name, "%i", oss.str());
+
+        int vid = VMTemplateInstantiate::instantiate(
+                this, att, tmpl_id, tmp_name, true, str_uattrs, extra_attrs);
+
+        if (vid == -1)
+        {
+            string tmp_error;
+
+            for (vmid = vms.begin(); vmid != vms.end(); vmid++)
+            {
+                dm->finalize(*vmid, tmp_error);
+            }
+
+            return;
+        }
+
+        vms.push_back(vid);
+    }
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr != 0)
+    {
+        for (vmid = vms.begin(); vmid != vms.end(); vmid++)
+        {
+            vr->add_vmid(*vmid);
+        }
+
+        vrpool->update(vr);
+
+        vr->unlock();
+    }
+
+    // VMs are created on hold to wait for all the vr->add_vmid calls, that
+    // update each VM context with other VM IPs
+    if (!on_hold)
+    {
+        for (vmid = vms.begin(); vmid != vms.end(); vmid++)
+        {
+            dm->release(*vmid, errorstr);
+        }
+    }
+
+    success_response(vrid, att);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
diff --git a/src/rm/SConstruct b/src/rm/SConstruct
index 09e3d43eea..510820c53c 100644
--- a/src/rm/SConstruct
+++ b/src/rm/SConstruct
@@ -47,6 +47,7 @@ source_files=[
     'RequestManagerVdc.cc',
     'RequestManagerDatastore.cc',
     'RequestManagerLock.cc',
+    'RequestManagerVirtualRouter.cc',
 ]
 
 # Build library

From 35035eceb78b84abda037778ca494467d9f9b399 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 28 Jan 2016 10:26:43 +0100
Subject: [PATCH 137/197] Feature #4217: Add support to downloader.sh for the
 s3:// protocol

---
 src/datastore_mad/remotes/downloader.sh | 32 ++++++++++++++++++++++++-
 src/datastore_mad/remotes/fs/cp         | 10 +++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/datastore_mad/remotes/downloader.sh b/src/datastore_mad/remotes/downloader.sh
index b887322698..5d242a85f3 100755
--- a/src/datastore_mad/remotes/downloader.sh
+++ b/src/datastore_mad/remotes/downloader.sh
@@ -117,6 +117,27 @@ function unarchive
     fi
 }
 
+function s3_request
+{
+    FROM="$1"
+
+    OBJECT=$(basename $FROM)
+    BUCKET=$(basename $(dirname $FROM))
+
+    DATE="`date +'%a, %d %b %Y %H:%M:%S %z'`"
+    AUTH_STRING="GET\n\n\n${DATE}\n/${BUCKET}/${OBJECT}"
+
+    SIGNED_AUTH_STRING=`echo -en "$AUTH_STRING" | \
+                        openssl sha1 -hmac ${S3_SECRET_ACCESS_KEY} -binary | \
+                        base64`
+
+    echo " -H \"Date: ${DATE}\"" \
+         " -H \"Authorization: AWS ${S3_ACCESS_KEY_ID}:${SIGNED_AUTH_STRING}\"" \
+         " https://${BUCKET}.s3.amazonaws.com/${OBJECT}"
+}
+
+
+
 TEMP=`getopt -o m:s:l:n -l md5:,sha1:,limit:,nodecomp -- "$@"`
 
 if [ $? != 0 ] ; then
@@ -186,6 +207,15 @@ ssh://*)
 
     command="ssh ${ssh_arg[0]} $rmt_cmd"
     ;;
+s3://*)
+    if [ -z "$S3_ACCESS_KEY_ID" -o -z "$S3_SECRET_ACCESS_KEY" ]; then
+        echo "S3_ACCESS_KEY_ID and S3_SECRET_ACCESS_KEY are required" >&2
+        exit -1
+    fi
+
+    curl_args="$(s3_request $FROM)"
+    command="curl $curl_args"
+    ;;
 *)
     if [ ! -r $FROM ]; then
         echo "Cannot read from $FROM" >&2
@@ -198,7 +228,7 @@ esac
 file_type=$(get_type "$command")
 decompressor=$(get_decompressor "$file_type")
 
-$command | tee >( hasher $HASH_TYPE) | decompress "$decompressor" "$TO"
+eval "$command" | tee >( hasher $HASH_TYPE) | decompress "$decompressor" "$TO"
 
 if [ "$?" != "0" ]; then
     echo "Error copying" >&2
diff --git a/src/datastore_mad/remotes/fs/cp b/src/datastore_mad/remotes/fs/cp
index d5d0acf8a9..3f779d5853 100755
--- a/src/datastore_mad/remotes/fs/cp
+++ b/src/datastore_mad/remotes/fs/cp
@@ -57,7 +57,9 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW)
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW \
+                    /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ACCESS_KEY_ID \
+                    /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY)
 
 unset i
 
@@ -72,6 +74,12 @@ MD5="${XPATH_ELEMENTS[i++]}"
 SHA1="${XPATH_ELEMENTS[i++]}"
 NO_DECOMPRESS="${XPATH_ELEMENTS[i++]}"
 LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[i++]}"
+S3_ACCESS_KEY_ID="${XPATH_ELEMENTS[i++]}"
+S3_SECRET_ACCESS_KEY="${XPATH_ELEMENTS[i++]}"
+
+# Must be made available to downloader.sh
+export S3_ACCESS_KEY_ID
+export S3_SECRET_ACCESS_KEY
 
 DST=`generate_image_path`
 IMAGE_HASH=`basename $DST`

From a4b466fa6a2034765040b308baa3c99dca2b58b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 28 Jan 2016 16:06:18 +0100
Subject: [PATCH 138/197] Feature #4215: New method vrouter.attachnic

---
 include/RequestManagerVirtualMachine.h    |   3 +
 include/RequestManagerVirtualRouter.h     |  21 ++++
 include/Template.h                        |  18 +++
 include/VirtualNetworkPool.h              |  28 +----
 include/VirtualRouter.h                   |  20 ++++
 src/cli/one_helper/onevm_helper.rb        |   8 ++
 src/cli/onevm                             |  10 +-
 src/cli/onevrouter                        |  44 +++++++
 src/dm/DispatchManagerActions.cc          |  26 ----
 src/oca/ruby/opennebula/virtual_router.rb |  22 +++-
 src/rm/RequestManager.cc                  |   7 +-
 src/rm/RequestManagerVirtualMachine.cc    | 129 ++++++++++++++------
 src/rm/RequestManagerVirtualRouter.cc     | 138 ++++++++++++++++++++++
 src/template/Template.cc                  |  57 +++++++++
 src/vm/VirtualMachine.cc                  |   5 +-
 src/vnm/VirtualNetworkPool.cc             |  72 +++--------
 src/vrouter/VirtualRouter.cc              | 135 ++++++++++++++++-----
 17 files changed, 558 insertions(+), 185 deletions(-)

diff --git a/include/RequestManagerVirtualMachine.h b/include/RequestManagerVirtualMachine.h
index 88bd255120..7c13662cac 100644
--- a/include/RequestManagerVirtualMachine.h
+++ b/include/RequestManagerVirtualMachine.h
@@ -255,6 +255,9 @@ public:
 
     void request_execute(xmlrpc_c::paramList const& _paramList,
             RequestAttributes& att);
+
+    static int attach(Request* req, RequestAttributes& att, int id,
+                    VirtualMachineTemplate& tmpl);
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerVirtualRouter.h b/include/RequestManagerVirtualRouter.h
index ffed216f6e..5a454bc5d6 100644
--- a/include/RequestManagerVirtualRouter.h
+++ b/include/RequestManagerVirtualRouter.h
@@ -69,6 +69,27 @@ public:
 
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterAttachNic : public RequestManagerVirtualRouter
+{
+public:
+    VirtualRouterAttachNic():
+        RequestManagerVirtualRouter("VirtualRouterAttachNic",
+                                 "Attaches a new NIC to the virtual router, and its virtual machines",
+                                 "A:sis")
+    {
+        auth_op = AuthRequest::MANAGE;
+    };
+
+    ~VirtualRouterAttachNic(){};
+
+    void request_execute(xmlrpc_c::paramList const& _paramList,
+                         RequestAttributes& att);
+
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/Template.h b/include/Template.h
index 026f2181af..07658fa286 100644
--- a/include/Template.h
+++ b/include/Template.h
@@ -311,6 +311,24 @@ public:
         const string& name,
         VectorAttribute*& vatt);
 
+    /**
+     *  Gets all the Vector Attributes with the given name
+     *    @param name the attribute name.
+     *    @return the number of elements in the vector
+     */
+    virtual int get(
+        const string& name,
+        vector<const VectorAttribute*>& values) const;
+
+    /**
+     *  Gets all the Vector Attributes with the given name, non-const version
+     *    @param name the attribute name.
+     *    @return the number of elements in the vector
+     */
+    virtual int get(
+        const string& name,
+        vector<VectorAttribute*>& values);
+
     /**
      *  Gets the value of a Single attributes (string) with the given name.
      *    @param name the attribute name.
diff --git a/include/VirtualNetworkPool.h b/include/VirtualNetworkPool.h
index b211e143ac..79afc1b9f3 100644
--- a/include/VirtualNetworkPool.h
+++ b/include/VirtualNetworkPool.h
@@ -113,28 +113,12 @@ public:
      *            -2 not using the pool
      */
     int nic_attribute(
-            VectorAttribute*    nic,
-            int                 nic_id,
-            int                 uid,
-            int                 vid,
-            string&             error_str);
-
-    /**
-     *  Generates a NIC attribute for VRouters using the VirtualNetwork
-     *  metadata
-     *    @param nic the nic attribute to be generated
-     *    @param uid of the VM owner
-     *    @param vrid of the VRouter requesting the lease
-     *    @param error_str string describing the error
-     *    @return 0 on success,
-     *            -1 error,
-     *            -2 not using the pool
-     */
-    int vrouter_nic_attribute(
-            VectorAttribute *   nic,
-            int                 uid,
-            int                 vrid,
-            string&             error_str);
+            PoolObjectSQL::ObjectType   ot,
+            VectorAttribute*            nic,
+            int                         nic_id,
+            int                         uid,
+            int                         vid,
+            string&                     error_str);
 
     /**
      *  Generates an Authorization token for a NIC attribute
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index 71165aa9ba..e67c40e685 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -20,6 +20,7 @@
 #include "PoolObjectSQL.h"
 #include "Template.h"
 #include "ObjectCollection.h"
+#include "VirtualMachineTemplate.h"
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -42,6 +43,11 @@ public:
 
     bool has_vmids() const;
 
+    /**
+     *  Returns a copy of the VM IDs set
+     */
+    set<int> get_vms() const;
+
     // ------------------------------------------------------------------------
     // Template Contents
     // ------------------------------------------------------------------------
@@ -66,6 +72,20 @@ public:
 
     Template * get_vm_template() const;
 
+    // ------------------------------------------------------------------------
+    // Attach and detach NIC
+    // ------------------------------------------------------------------------
+
+    /**
+     * Adds a new NIC to the virtual router template.
+     * @param tmpl Template, should contain only one NIC
+     * @param error_str error reason, if any
+     *
+     * @return 0 on failure, the NIC to attach to each VM on success
+     */
+    VectorAttribute * set_attach_nic(
+            VirtualMachineTemplate * tmpl, string& error_str);
+
 private:
     // -------------------------------------------------------------------------
     // Friends
diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index f3d4052cb5..8d062efb5f 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -84,6 +84,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         }
     }
 
+    IP={
+        :name => "ip",
+        :short => "-i ip",
+        :large => "--ip ip",
+        :format => String,
+        :description => "IP address for the new NIC"
+    }
+
     FILE = {
         :name   => "file",
         :short  => "-f file",
diff --git a/src/cli/onevm b/src/cli/onevm
index 270311d217..286b1ad1c6 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -63,14 +63,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Overrides the DEV_PREFIX of the image"
     }
 
-    IP={
-        :name => "ip",
-        :short => "-i ip",
-        :large => "--ip ip",
-        :format => String,
-        :description => "IP address for the new NIC"
-    }
-
     CACHE={
         :name => "cache",
         :large => "--cache cache_mode",
@@ -666,7 +658,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"nic-attach", nic_attach_desc, :vmid,
-            :options => [OneVMHelper::FILE, OneVMHelper::NETWORK, IP] do
+            :options => [OneVMHelper::FILE, OneVMHelper::NETWORK, OneVMHelper::IP] do
 
         if options[:file].nil? and options[:network].nil?
             STDERR.puts "Provide a template file or a network:"
diff --git a/src/cli/onevrouter b/src/cli/onevrouter
index 587906fb94..1d91daaaad 100755
--- a/src/cli/onevrouter
+++ b/src/cli/onevrouter
@@ -234,6 +234,50 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    nic_attach_desc = <<-EOT.unindent
+        Attaches a NIC to a VirtualRouter, and each one of its VMs. When using
+        --file add only one NIC instance.
+    EOT
+
+    command :"nic-attach", nic_attach_desc, :vrouterid,
+            :options => [OneVMHelper::FILE, OneVMHelper::NETWORK, OneVMHelper::IP] do
+
+        if options[:file].nil? and options[:network].nil?
+            STDERR.puts "Provide a template file or a network:"
+            STDERR.puts "\t--file    <file>"
+            STDERR.puts "\t--network <network>"
+            exit -1
+        end
+
+        if options[:file]
+            template = File.read(options[:file])
+        else
+            network_id = options[:network]
+            ip = options[:ip]
+            if ip
+                template = "NIC = [ NETWORK_ID = #{network_id}, IP = #{ip} ]"
+            else
+                template = "NIC = [ NETWORK_ID = #{network_id} ]"
+            end
+        end
+
+        helper.perform_action(args[0],options,"Attach NIC") do |vr|
+            vr.nic_attach(template)
+        end
+    end
+
+    nic_detach_desc = <<-EOT.unindent
+        Detaches a NIC from a VirtualRouter, and each one of its VMs
+    EOT
+
+    command :"nic-detach", nic_detach_desc, :vrouterid, :nicid do
+        nicid = args[1].to_i
+
+        helper.perform_action(args[0],options,"Detach NIC") do |vr|
+            vr.nic_detach(nicid)
+        end
+    end
+
     list_desc = <<-EOT.unindent
         Lists the Virtual Routers in the pool
     EOT
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index 901f8db676..bd02eec4f2 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -1477,19 +1477,6 @@ int DispatchManager::attach_nic(
         return -1;
     }
 
-    if (vm->is_vrouter())
-    {
-        oss << "Could not add a new NIC to VM " << vid
-            << ", it is associated to the Virtual Router "
-            << vm->get_vrouter_id() << ".";
-        error_str = oss.str();
-
-        NebulaLog::log("DiM", Log::ERROR, error_str);
-
-        vm->unlock();
-        return -1;
-    }
-
     nic = vm->get_attach_nic_info(tmpl, max_nic_id, error_str);
 
     if ( nic == 0 )
@@ -1659,19 +1646,6 @@ int DispatchManager::detach_nic(
         return -1;
     }
 
-    if (vm->is_vrouter())
-    {
-        oss << "Could not detach NIC from VM " << vid
-            << ", it is associated to the Virtual Router "
-            << vm->get_vrouter_id() << ".";
-        error_str = oss.str();
-
-        NebulaLog::log("DiM", Log::ERROR, error_str);
-
-        vm->unlock();
-        return -1;
-    }
-
     if ( vm->set_detach_nic(nic_id) == -1 )
     {
         oss << "Could not detach NIC with NIC_ID " << nic_id
diff --git a/src/oca/ruby/opennebula/virtual_router.rb b/src/oca/ruby/opennebula/virtual_router.rb
index c25df1c0fd..fa46c961e9 100644
--- a/src/oca/ruby/opennebula/virtual_router.rb
+++ b/src/oca/ruby/opennebula/virtual_router.rb
@@ -31,7 +31,9 @@ module OpenNebula
             :delete      => "vrouter.delete",
             :chown       => "vrouter.chown",
             :chmod       => "vrouter.chmod",
-            :rename      => "vrouter.rename"
+            :rename      => "vrouter.rename",
+            :attachnic   => "vrouter.attachnic",
+            :detachnic   => "vrouter.detachnic",
         }
 
         # Creates a VirtualRouter description with just its identifier
@@ -155,6 +157,24 @@ module OpenNebula
             return call(VIRTUAL_ROUTER_METHODS[:rename], @pe_id, name)
         end
 
+        # Attaches a NIC to this VirtualRouter, and each one of its VMs
+        #
+        # @param nic_template [String] Template containing a NIC element
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def nic_attach(nic_template)
+            return call(VIRTUAL_ROUTER_METHODS[:attachnic], @pe_id, nic_template)
+        end
+
+        # Detaches a NIC from this VirtualRouter, and each one of its VMs
+        #
+        # @param nic_id [Integer] Id of the NIC to be detached
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def nic_detach(nic_id)
+            return call(VIRTUAL_ROUTER_METHODS[:detachnic], @pe_id, nic_id)
+        end
+
         #######################################################################
         # Helpers to get VirtualRouter information
         #######################################################################
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index 02b2a97609..3deeae82db 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -351,7 +351,6 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr cluster_update(new ClusterUpdateTemplate());
     xmlrpc_c::methodPtr secg_update(new SecurityGroupUpdateTemplate());
     xmlrpc_c::methodPtr vrouter_update(new VirtualRouterUpdateTemplate());
-    xmlrpc_c::methodPtr vrouter_instantiate(new VirtualRouterInstantiate());
 
     // Allocate Methods
     xmlrpc_c::methodPtr vm_allocate(new VirtualMachineAllocate());
@@ -470,6 +469,11 @@ void RequestManager::register_xml_methods()
     xmlrpc_c::methodPtr secg_rename(new SecurityGroupRename());
     xmlrpc_c::methodPtr vrouter_rename(new VirtualRouterRename());
 
+    // Virtual Router Methods
+    xmlrpc_c::methodPtr vrouter_instantiate(new VirtualRouterInstantiate());
+    xmlrpc_c::methodPtr vrouter_attachnic(new VirtualRouterAttachNic());
+    //xmlrpc_c::methodPtr vrouter_detachnic(new VirtualRouterDetachNic());
+
     /* VM related methods  */
     RequestManagerRegistry.addMethod("one.vm.deploy", vm_deploy);
     RequestManagerRegistry.addMethod("one.vm.action", vm_action);
@@ -903,6 +907,7 @@ void RequestManager::register_xml_methods()
     RequestManagerRegistry.addMethod("one.vrouter.chmod", vrouter_chmod);
     RequestManagerRegistry.addMethod("one.vrouter.rename", vrouter_rename);
     RequestManagerRegistry.addMethod("one.vrouter.instantiate",vrouter_instantiate);
+    RequestManagerRegistry.addMethod("one.vrouter.attachnic", vrouter_attachnic);
 
     RequestManagerRegistry.addMethod("one.vrouterpool.info",vrouter_pool_info);
 
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index 33de5930b4..b5f291ee7f 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -2187,20 +2187,36 @@ void VirtualMachineAttachNic::request_execute(
         xmlrpc_c::paramList const&  paramList,
         RequestAttributes&          att)
 {
-    Nebula&           nd = Nebula::instance();
-    DispatchManager * dm = nd.get_dm();
+    VirtualMachine *        vm;
+    VirtualMachineTemplate  tmpl;
 
-    VirtualMachineTemplate tmpl;
-
-    PoolObjectAuth       vm_perms;
-    VirtualMachine *     vm;
-
-    int    rc;
-    string error_str;
+    string  error_str;
+    int     rc;
 
     int     id       = xmlrpc_c::value_int(paramList.getInt(1));
     string  str_tmpl = xmlrpc_c::value_string(paramList.getString(2));
 
+    // -------------------------------------------------------------------------
+    // Check if the VM is a Virtual Router
+    // -------------------------------------------------------------------------
+
+    if ((vm = get_vm(id, att)) == 0)
+    {
+        return;
+    }
+
+    if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_ATTACH_ACTION))
+    {
+        failure_response(Request::ACTION,
+                request_error("Action is not supported for Virtual Router VMs",""),
+                att);
+
+        vm->unlock();
+        return;
+    }
+
+    vm->unlock();
+
     // -------------------------------------------------------------------------
     // Parse NIC template
     // -------------------------------------------------------------------------
@@ -2209,38 +2225,74 @@ void VirtualMachineAttachNic::request_execute(
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL, error_str, att);
+        failure_response(Request::INTERNAL, error_str, att);
         return;
     }
 
+    // -------------------------------------------------------------------------
+    // Perform the attach
+    // -------------------------------------------------------------------------
+
+    rc = attach(this, att, id, tmpl);
+
+    if (rc == 0)
+    {
+        success_response(id, att);
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualMachineAttachNic::attach(Request* req, RequestAttributes& att,
+        int id, VirtualMachineTemplate& tmpl)
+{
+    Nebula&             nd      = Nebula::instance();
+    DispatchManager *   dm      = nd.get_dm();
+    VirtualMachinePool* vmpool  = nd.get_vmpool();
+
+    PoolObjectAuth       vm_perms;
+    VirtualMachine *     vm;
+
+    int    rc;
+    string error_str;
+
     // -------------------------------------------------------------------------
     // Authorize the operation, restricted attributes & check quotas
     // -------------------------------------------------------------------------
 
-    if ( vm_authorization(id, 0, &tmpl, att, 0, 0, 0, auth_op) == false )
-    {
-        return;
-    }
+    vm = vmpool->get(id, true);
 
-    if ((vm = get_vm(id, att)) == 0)
+    if ( vm == 0 )
     {
-        return;
+        req->failure_response(Request::NO_EXISTS,
+                req->get_error(object_name(PoolObjectSQL::VM),id), att);
+
+        return -1;
     }
 
     vm->get_permissions(vm_perms);
 
-    if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_ATTACH_ACTION))
-    {
-        failure_response(ACTION,
-                request_error("Action is not supported for Virtual Router VMs",""),
-                att);
-
-        vm->unlock();
-        return;
-    }
-
     vm->unlock();
 
+    if ( att.uid != 0 )
+    {
+        AuthRequest ar(att.uid, att.group_ids);
+
+        ar.add_auth(AuthRequest::MANAGE, vm_perms);
+
+        VirtualMachine::set_auth_request(att.uid, ar, &tmpl);
+
+        if (UserPool::authorize(ar) == -1)
+        {
+            req->failure_response(Request::AUTHORIZATION,
+                    req->authorization_error(ar.message, att),
+                    att);
+
+            return -1;
+        }
+    }
+
     RequestAttributes att_quota(vm_perms.uid, vm_perms.gid, att);
 
     if (att.uid != UserPool::ONEADMIN_ID && att.gid!=GroupPool::ONEADMIN_ID)
@@ -2253,34 +2305,33 @@ void VirtualMachineAttachNic::request_execute(
 
             oss << "NIC includes a restricted attribute " << aname;
 
-            failure_response(AUTHORIZATION,
-                    authorization_error(oss.str(), att),
+            req->failure_response(Request::AUTHORIZATION,
+                    req->authorization_error(oss.str(), att),
                     att);
-            return;
+
+            return -1;
         }
     }
 
-    if ( quota_authorization(&tmpl, Quotas::NETWORK, att_quota) == false )
+    if ( req->quota_authorization(&tmpl, Quotas::NETWORK, att_quota) == false )
     {
-        return;
+        return -1;
     }
 
     rc = dm->attach_nic(id, &tmpl, error_str);
 
     if ( rc != 0 )
     {
-        quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
+        req->quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
 
-        failure_response(ACTION,
-                request_error(error_str, ""),
+        req->failure_response(Request::ACTION,
+                req->request_error(error_str, ""),
                 att);
-    }
-    else
-    {
-        success_response(id, att);
+
+        return -1;
     }
 
-    return;
+    return 0;
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc
index a454865e3f..8f952c823f 100644
--- a/src/rm/RequestManagerVirtualRouter.cc
+++ b/src/rm/RequestManagerVirtualRouter.cc
@@ -16,6 +16,7 @@
 
 #include "RequestManagerVirtualRouter.h"
 #include "RequestManagerVMTemplate.h"
+#include "RequestManagerVirtualMachine.h"
 #include "PoolObjectAuth.h"
 #include "Nebula.h"
 
@@ -158,3 +159,140 @@ void VirtualRouterInstantiate::request_execute(
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
+
+void VirtualRouterAttachNic::request_execute(
+        xmlrpc_c::paramList const& paramList, RequestAttributes& att)
+{
+    VirtualRouterPool*  vrpool = static_cast<VirtualRouterPool*>(pool);
+    VirtualRouter *     vr;
+    VectorAttribute*    nic;
+
+    VirtualMachineTemplate  tmpl;
+    PoolObjectAuth          vr_perms;
+
+    int    rc;
+    string error_str;
+
+    int    vrid     = xmlrpc_c::value_int(paramList.getInt(1));
+    string str_tmpl = xmlrpc_c::value_string(paramList.getString(2));
+
+    // -------------------------------------------------------------------------
+    // Parse NIC template
+    // -------------------------------------------------------------------------
+
+    rc = tmpl.parse_str_or_xml(str_tmpl, error_str);
+
+    if ( rc != 0 )
+    {
+        failure_response(INTERNAL, error_str, att);
+        return;
+    }
+
+    // -------------------------------------------------------------------------
+    // Authorize the operation & check quotas
+    // -------------------------------------------------------------------------
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr == 0)
+    {
+        failure_response(NO_EXISTS,
+                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
+                att);
+
+        return;
+    }
+
+    vr->get_permissions(vr_perms);
+
+    vr->unlock();
+
+    if ( att.uid != 0 )
+    {
+        AuthRequest ar(att.uid, att.group_ids);
+
+        ar.add_auth(AuthRequest::MANAGE, vr_perms); // MANAGE VROUTER
+
+        VirtualMachine::set_auth_request(att.uid, ar, &tmpl); // USE VNET
+
+        if (UserPool::authorize(ar) == -1)
+        {
+            failure_response(AUTHORIZATION,
+                    authorization_error(ar.message, att),
+                    att);
+
+            return;
+        }
+    }
+
+    RequestAttributes att_quota(vr_perms.uid, vr_perms.gid, att);
+
+    if ( quota_authorization(&tmpl, Quotas::NETWORK, att_quota) == false )
+    {
+        return;
+    }
+
+    // -------------------------------------------------------------------------
+    // Attach NIC to the Virtual Router
+    // -------------------------------------------------------------------------
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr == 0)
+    {
+        quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
+
+        failure_response(NO_EXISTS,
+                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
+                att);
+
+        return;
+    }
+
+    nic = vr->set_attach_nic(&tmpl, error_str);
+
+    set<int> vms = vr->get_vms();
+
+    vrpool->update(vr);
+
+    vr->unlock();
+
+    if (nic == 0)
+    {
+        quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
+
+        failure_response(ACTION,
+                request_error(error_str, ""),
+                att);
+
+        return;
+    }
+
+    // -------------------------------------------------------------------------
+    // Attach NIC to each VM
+    // -------------------------------------------------------------------------
+
+    for (set<int>::iterator vmid = vms.begin(); vmid != vms.end(); vmid++)
+    {
+        VirtualMachineTemplate tmpl;
+
+        tmpl.set(nic->clone());
+
+        rc = VirtualMachineAttachNic::attach(this, att, *vmid, tmpl);
+
+        if (rc == -1)
+        {
+            // TODO: manage individual attach error, do rollback?
+
+            delete nic;
+            return;
+        }
+    }
+
+    delete nic;
+
+    success_response(vrid, att);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
diff --git a/src/template/Template.cc b/src/template/Template.cc
index ecdd10d589..9a97c9bb01 100644
--- a/src/template/Template.cc
+++ b/src/template/Template.cc
@@ -409,6 +409,63 @@ bool Template::get(
     return ( vatt != 0 );
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int Template::get(
+    const string& name,
+    vector<const VectorAttribute*>& values) const
+{
+    multimap<string, Attribute *>::const_iterator       i;
+    pair<multimap<string, Attribute *>::const_iterator,
+    multimap<string, Attribute *>::const_iterator>      index;
+    const VectorAttribute *                             vatt;
+
+    index = attributes.equal_range(name);
+
+    for ( i = index.first ; i != index.second ; i++ )
+    {
+        vatt = dynamic_cast<const VectorAttribute * >(i->second);
+
+        if ( vatt == 0 )
+        {
+            continue;
+        }
+
+        values.push_back(vatt);
+    }
+
+    return values.size();
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int Template::get(
+    const string& name,
+    vector<VectorAttribute*>& values)
+{
+    multimap<string, Attribute *>::iterator       i;
+    pair<multimap<string, Attribute *>::iterator,
+    multimap<string, Attribute *>::iterator>      index;
+    VectorAttribute *                             vatt;
+
+    index = attributes.equal_range(name);
+
+    for ( i = index.first ; i != index.second ; i++ )
+    {
+        vatt = dynamic_cast<VectorAttribute * >(i->second);
+
+        if ( vatt == 0 )
+        {
+            continue;
+        }
+
+        values.push_back(vatt);
+    }
+
+    return values.size();
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 13b403b784..2135d9fc63 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -2681,7 +2681,8 @@ int VirtualMachine::set_up_attach_nic(
 
     set<int> nic_sgs;
 
-    int rc = vnpool->nic_attribute(new_nic, max_nic_id+1, uid, vm_id, error_str);
+    int rc = vnpool->nic_attribute(PoolObjectSQL::VM,
+                        new_nic, max_nic_id+1, uid, vm_id, error_str);
 
     if ( rc == -1 ) //-2 is not using a pre-defined network
     {
@@ -3202,7 +3203,7 @@ int VirtualMachine::get_network_leases(string& estr)
 
         merge_nic_defaults(nic);
 
-        rc = vnpool->nic_attribute(nic, i, uid, oid, estr);
+        rc = vnpool->nic_attribute(PoolObjectSQL::VM, nic, i, uid, oid, estr);
 
         if (rc == -1)
         {
diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc
index cfbae08750..69f49f25a1 100644
--- a/src/vnm/VirtualNetworkPool.cc
+++ b/src/vnm/VirtualNetworkPool.cc
@@ -239,12 +239,15 @@ VirtualNetwork * VirtualNetworkPool::get_nic_by_id(const string& id_s,
     return vnet;
 }
 
-int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
-                                      int     nic_id,
-                                      int     uid,
-                                      int     vid,
-                                      string& error)
+int VirtualNetworkPool::nic_attribute(
+        PoolObjectSQL::ObjectType   ot,
+        VectorAttribute*            nic,
+        int                         nic_id,
+        int                         uid,
+        int                         vid,
+        string&                     error)
 {
+    int              rc;
     string           network;
     VirtualNetwork * vnet = 0;
 
@@ -268,7 +271,14 @@ int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
         return -1;
     }
 
-    int rc = vnet->nic_attribute(nic, vid, inherit_attrs);
+    if (ot == PoolObjectSQL::VM)
+    {
+        rc = vnet->nic_attribute(nic, vid, inherit_attrs);
+    }
+    else // (ot == PoolObjectSQL::VROUTER)
+    {
+        rc = vnet->vrouter_nic_attribute(nic, vid, inherit_attrs);
+    }
 
     if ( rc == 0 )
     {
@@ -291,56 +301,6 @@ int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualNetworkPool::vrouter_nic_attribute(
-                        VectorAttribute *   nic,
-                        int                 uid,
-                        int                 vrid,
-                        string&             error_str)
-{
-    string           network;
-    VirtualNetwork * vnet = 0;
-
-    if (!(network = nic->vector_value("NETWORK")).empty())
-    {
-        vnet = get_nic_by_name (nic, network, uid, error_str);
-    }
-    else if (!(network = nic->vector_value("NETWORK_ID")).empty())
-    {
-        vnet = get_nic_by_id(network, error_str);
-    }
-    else //Not using a pre-defined network
-    {
-        return -2;
-    }
-
-    if (vnet == 0)
-    {
-        return -1;
-    }
-
-    int rc = vnet->vrouter_nic_attribute(nic, vrid, inherit_attrs);
-
-    if ( rc == 0 )
-    {
-        update(vnet);
-    }
-    else
-    {
-        ostringstream oss;
-        oss << "Cannot get IP/MAC lease from virtual network " << vnet->get_oid() << ".";
-
-        error_str = oss.str();
-    }
-
-    vnet->unlock();
-
-
-    return rc;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
 void VirtualNetworkPool::authorize_nic(VectorAttribute * nic,
                                        int uid,
                                        AuthRequest * ar)
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index bc34ccf9bd..15dc4bc6cd 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -182,7 +182,8 @@ int VirtualRouter::get_network_leases(string& estr)
     {
         nic = static_cast<VectorAttribute * >(nics[i]);
 
-        rc = vnpool->vrouter_nic_attribute(nic, uid, oid, estr);
+        rc = vnpool->nic_attribute(PoolObjectSQL::VROUTER,
+                nic, i, uid, oid, estr);
 
         if (rc == -1)
         {
@@ -445,12 +446,31 @@ void vrouter_prefix(VectorAttribute* nic, const string& attr)
 
 /* -------------------------------------------------------------------------- */
 
+void prepare_nic_vm(VectorAttribute* nic)
+{
+    bool floating = false;
+    nic->vector_value("FLOATING_IP", floating);
+
+    if (floating)
+    {
+        nic->remove("MAC");
+
+        vrouter_prefix(nic, "IP");
+        vrouter_prefix(nic, "IP6_LINK");
+        vrouter_prefix(nic, "IP6_ULA");
+        vrouter_prefix(nic, "IP6_GLOBAL");
+
+        // TODO: remove all other attrs, such as AR, BRIDGE, etc?
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+
 Template * VirtualRouter::get_vm_template() const
 {
     Template * tmpl = new Template();
 
     int                   num_nics;
-    bool                  floating;
     vector<Attribute  * > nics;
     VectorAttribute *     nic;
     int                   keepalived_id;
@@ -469,20 +489,7 @@ Template * VirtualRouter::get_vm_template() const
 
         nic = nic->clone();
 
-        floating = false;
-        nic->vector_value("FLOATING_IP", floating);
-
-        if (floating)
-        {
-            nic->remove("MAC");
-
-            vrouter_prefix(nic, "IP");
-            vrouter_prefix(nic, "IP6_LINK");
-            vrouter_prefix(nic, "IP6_ULA");
-            vrouter_prefix(nic, "IP6_GLOBAL");
-
-            // TODO: remove all other attrs, such as AR, BRIDGE, etc?
-        }
+        prepare_nic_vm(nic);
 
         tmpl->set(nic);
     }
@@ -514,11 +521,11 @@ int VirtualRouter::add_vmid(int vmid)
     VirtualMachine*         vm;
     VirtualMachinePool*     vmpool = Nebula::instance().get_vmpool();
 
-    int                     num_nics;
     int                     nic_id;
     bool                    floating;
-    vector<Attribute  * >   nics;
-    VectorAttribute *       nic;
+    vector<const VectorAttribute* >   nics;
+    vector<const VectorAttribute* >::iterator nic_it;
+
     const VectorAttribute * vm_nic;
     set<int>::iterator      it;
     string                  ipstr;
@@ -531,22 +538,16 @@ int VirtualRouter::add_vmid(int vmid)
         return rc;
     }
 
-    num_nics = obj_template->get("NIC",nics);
+    obj_template->get("NIC",nics);
 
-    for(nic_id = 0; nic_id < num_nics; nic_id++)
+    for (nic_it = nics.begin(); nic_it != nics.end(); nic_it++)
     {
         vector<string> ip_vector;
         vector<string> ip6_vector;
 
-        nic = static_cast<VectorAttribute * >(nics[nic_id]);
-
-        if (nic == 0)
-        {
-            continue;
-        }
-
         floating = false;
-        nic->vector_value("FLOATING_IP", floating);
+        (*nic_it)->vector_value("FLOATING_IP", floating);
+        (*nic_it)->vector_value("NIC_ID", nic_id);
 
         if (floating)
         {
@@ -631,3 +632,79 @@ bool VirtualRouter::has_vmids() const
 {
     return vms.get_collection_size() > 0;
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+set<int> VirtualRouter::get_vms() const
+{
+    return vms.get_collection_copy();
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+VectorAttribute * VirtualRouter::set_attach_nic(
+        VirtualMachineTemplate * tmpl, string& error_str)
+{
+    VirtualNetworkPool *        vnpool;
+    vector<VectorAttribute *>   nics;
+
+    vector<VectorAttribute *>::const_iterator it;
+    VectorAttribute *           nic;
+
+    int rc;
+    int nic_id;
+
+    vnpool = Nebula::instance().get_vnpool();
+
+    // -------------------------------------------------------------------------
+    // Get the highest NIC_ID
+    // -------------------------------------------------------------------------
+
+    int max_nic_id = -1;
+
+    obj_template->get("NIC", nics);
+
+    for(it = nics.begin(); it != nics.end(); it++)
+    {
+        (*it)->vector_value("NIC_ID", nic_id);
+
+        if ( nic_id > max_nic_id )
+        {
+            max_nic_id = nic_id;
+        }
+    }
+
+    nic_id = max_nic_id+1;
+
+    // -------------------------------------------------------------------------
+    // Get the new NIC attribute from the template
+    // -------------------------------------------------------------------------
+
+    nics.clear();
+
+    if ( tmpl->get("NIC", nics) != 1 )
+    {
+        error_str = "The template must contain one NIC attribute";
+        return 0;
+    }
+
+    nic = nics[0];
+
+    rc = vnpool->nic_attribute(PoolObjectSQL::VROUTER,
+                        nic, nic_id, uid, oid, error_str);
+
+    if (rc == -1)
+    {
+        return 0;
+    }
+
+    obj_template->set(nic->clone());
+
+    nic = nic->clone();
+
+    prepare_nic_vm(nic);
+
+    return nic;
+}

From 7a7f07cdadb63ea7016660e7c36119e58ed2b3e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 28 Jan 2016 16:17:34 +0100
Subject: [PATCH 139/197] Feature #4215: Remove vrouter ip recipients from
 context

---
 include/VirtualMachine.h              |   2 -
 src/rm/RequestManagerVirtualRouter.cc |   4 +-
 src/vm/VirtualMachine.cc              |  28 -------
 src/vrouter/VirtualRouter.cc          | 106 +-------------------------
 4 files changed, 3 insertions(+), 137 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index bc653be79f..43c7de0e32 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1356,8 +1356,6 @@ public:
      */
     int  generate_context(string &files, int &disk_id, const string& token_password);
 
-    int replace_context_attribute(const string& name, const string& value);
-
     const VectorAttribute* get_context_disk() const;
 
     /**
diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc
index 8f952c823f..fa01ca4e47 100644
--- a/src/rm/RequestManagerVirtualRouter.cc
+++ b/src/rm/RequestManagerVirtualRouter.cc
@@ -144,8 +144,8 @@ void VirtualRouterInstantiate::request_execute(
         vr->unlock();
     }
 
-    // VMs are created on hold to wait for all the vr->add_vmid calls, that
-    // update each VM context with other VM IPs
+    // VMs are created on hold to wait for all of them to be created
+    // successfully, to avoid the rollback dm->finalize call on prolog
     if (!on_hold)
     {
         for (vmid = vms.begin(); vmid != vms.end(); vmid++)
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 2135d9fc63..19f183fa74 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -3630,34 +3630,6 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualMachine::replace_context_attribute(const string& name, const string& value)
-{
-    vector<Attribute *> array_context;
-    VectorAttribute *   context;
-    int                 num;
-
-    num = obj_template->get("CONTEXT", array_context);
-
-    if ( num != 1 )
-    {
-        return -1;
-    }
-
-    context = dynamic_cast<VectorAttribute *>(array_context[0]);
-
-    if ( context == 0 )
-    {
-        return -1;
-    }
-
-    context->replace(name, value);
-
-    return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
 int VirtualMachine::get_created_by_uid() const
 {
     int created_by_uid;
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index 15dc4bc6cd..b080c1b102 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -518,111 +518,7 @@ Template * VirtualRouter::get_vm_template() const
 
 int VirtualRouter::add_vmid(int vmid)
 {
-    VirtualMachine*         vm;
-    VirtualMachinePool*     vmpool = Nebula::instance().get_vmpool();
-
-    int                     nic_id;
-    bool                    floating;
-    vector<const VectorAttribute* >   nics;
-    vector<const VectorAttribute* >::iterator nic_it;
-
-    const VectorAttribute * vm_nic;
-    set<int>::iterator      it;
-    string                  ipstr;
-    ostringstream           oss;
-
-    int rc = vms.add_collection_id(vmid);
-
-    if (rc == -1)
-    {
-        return rc;
-    }
-
-    obj_template->get("NIC",nics);
-
-    for (nic_it = nics.begin(); nic_it != nics.end(); nic_it++)
-    {
-        vector<string> ip_vector;
-        vector<string> ip6_vector;
-
-        floating = false;
-        (*nic_it)->vector_value("FLOATING_IP", floating);
-        (*nic_it)->vector_value("NIC_ID", nic_id);
-
-        if (floating)
-        {
-            for (it = vms.get_collection().begin(); it != vms.get_collection().end(); it++)
-            {
-                vm = vmpool->get(*it, true);
-
-                if (vm == 0)
-                {
-                    continue;
-                }
-
-                vm_nic = vm->get_nic(nic_id);
-
-                if (vm_nic == 0)
-                {
-                    vm->unlock();
-                    continue;
-                }
-
-                if (vm_nic->vector_value("IP", ipstr) == 0)
-                {
-                    ip_vector.push_back(ipstr);
-                }
-
-                // TODO: do the same for is IP6_LINK and IP6_ULA?
-
-                if (vm_nic->vector_value("IP6_GLOBAL", ipstr) == 0)
-                {
-                    ip6_vector.push_back(ipstr);
-                }
-
-                vm->unlock();
-            }
-
-            string joined_ip = one_util::join(ip_vector.begin(), ip_vector.end(), ',');
-            string joined_ip6 = one_util::join(ip6_vector.begin(), ip6_vector.end(), ',');
-
-            oss.str("");
-            oss << "ETH" << nic_id << "_" << "VROUTER_IP_RECIPIENTS";
-
-            string ip_key = oss.str();
-
-            oss.str("");
-            oss << "ETH" << nic_id << "_" << "VROUTER_IP6_RECIPIENTS";
-
-            string ip6_key = oss.str();
-
-            for (it = vms.get_collection().begin(); it != vms.get_collection().end(); it++)
-            {
-                vm = vmpool->get(*it, true);
-
-                if (vm == 0)
-                {
-                    continue;
-                }
-
-                if (!joined_ip.empty())
-                {
-                    vm->replace_context_attribute(ip_key, joined_ip);
-                }
-
-                if (!joined_ip6.empty())
-                {
-                    vm->replace_context_attribute(ip6_key, joined_ip6);
-                }
-
-                vmpool->update(vm);
-
-                vm->unlock();
-            }
-        }
-    }
-
-    return rc;
+    return vms.add_collection_id(vmid);
 }
 
 /* -------------------------------------------------------------------------- */

From 4851a0c49f5cceb5fbac5a8b460b169342df68c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 28 Jan 2016 17:20:52 +0100
Subject: [PATCH 140/197] Feature #4215: New method vrouter.detachnic

---
 include/RequestManagerVirtualMachine.h |   2 +
 include/RequestManagerVirtualRouter.h  |  21 +++++
 include/VirtualRouter.h                |  21 ++++-
 src/rm/RequestManager.cc               |   3 +-
 src/rm/RequestManagerVirtualMachine.cc |  99 ++++++++++++++++++-----
 src/rm/RequestManagerVirtualRouter.cc  | 107 ++++++++++++++++++++++++-
 src/vrouter/VirtualRouter.cc           |  44 +++++++++-
 7 files changed, 273 insertions(+), 24 deletions(-)

diff --git a/include/RequestManagerVirtualMachine.h b/include/RequestManagerVirtualMachine.h
index 7c13662cac..776e789f2e 100644
--- a/include/RequestManagerVirtualMachine.h
+++ b/include/RequestManagerVirtualMachine.h
@@ -275,6 +275,8 @@ public:
 
     void request_execute(xmlrpc_c::paramList const& _paramList,
             RequestAttributes& att);
+
+    static int detach(Request* req, RequestAttributes& att, int id, int nic_id);
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerVirtualRouter.h b/include/RequestManagerVirtualRouter.h
index 5a454bc5d6..a48f942398 100644
--- a/include/RequestManagerVirtualRouter.h
+++ b/include/RequestManagerVirtualRouter.h
@@ -90,6 +90,27 @@ public:
 
 };
 
+/* ------------------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+
+class VirtualRouterDetachNic : public RequestManagerVirtualRouter
+{
+public:
+    VirtualRouterDetachNic():
+        RequestManagerVirtualRouter("VirtualRouterDetachNic",
+                                 "Detaches a NIC from a virtual router, and its virtual machines",
+                                 "A:sii")
+    {
+        auth_op = AuthRequest::MANAGE;
+    };
+
+    ~VirtualRouterDetachNic(){};
+
+    void request_execute(xmlrpc_c::paramList const& _paramList,
+                         RequestAttributes& att);
+
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index e67c40e685..679eb1ef25 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -83,9 +83,17 @@ public:
      *
      * @return 0 on failure, the NIC to attach to each VM on success
      */
-    VectorAttribute * set_attach_nic(
+    VectorAttribute * attach_nic(
             VirtualMachineTemplate * tmpl, string& error_str);
 
+    /**
+     * Deletes the NIC from the virtual router template.
+     *
+     * @param nic_id of the NIC
+     * @return 0 if the nic_id was found, -1 otherwise
+     */
+    int detach_nic(int nic_id);
+
 private:
     // -------------------------------------------------------------------------
     // Friends
@@ -205,6 +213,17 @@ private:
      */
     int release_network_leases(VectorAttribute const * nic);
 
+    /**
+     * Returns the nic with the giver nic_id, or 0
+     * @param nic_id
+     * @return nic if found, 0 if not found
+     */
+    VectorAttribute* get_nic(int nic_id) const;
+
+    // -------------------------------------------------------------------------
+    // VM Management
+    // -------------------------------------------------------------------------
+
     /**
      * Tries to shutdown, or delete, all this Virtual Router's VMs
      *
diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc
index 3deeae82db..249f256f15 100644
--- a/src/rm/RequestManager.cc
+++ b/src/rm/RequestManager.cc
@@ -472,7 +472,7 @@ void RequestManager::register_xml_methods()
     // Virtual Router Methods
     xmlrpc_c::methodPtr vrouter_instantiate(new VirtualRouterInstantiate());
     xmlrpc_c::methodPtr vrouter_attachnic(new VirtualRouterAttachNic());
-    //xmlrpc_c::methodPtr vrouter_detachnic(new VirtualRouterDetachNic());
+    xmlrpc_c::methodPtr vrouter_detachnic(new VirtualRouterDetachNic());
 
     /* VM related methods  */
     RequestManagerRegistry.addMethod("one.vm.deploy", vm_deploy);
@@ -908,6 +908,7 @@ void RequestManager::register_xml_methods()
     RequestManagerRegistry.addMethod("one.vrouter.rename", vrouter_rename);
     RequestManagerRegistry.addMethod("one.vrouter.instantiate",vrouter_instantiate);
     RequestManagerRegistry.addMethod("one.vrouter.attachnic", vrouter_attachnic);
+    RequestManagerRegistry.addMethod("one.vrouter.detachnic", vrouter_detachnic);
 
     RequestManagerRegistry.addMethod("one.vrouterpool.info",vrouter_pool_info);
 
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index b5f291ee7f..89ace04aa1 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -2318,6 +2318,10 @@ int VirtualMachineAttachNic::attach(Request* req, RequestAttributes& att,
         return -1;
     }
 
+    // -------------------------------------------------------------------------
+    // Perform the attach
+    // -------------------------------------------------------------------------
+
     rc = dm->attach_nic(id, &tmpl, error_str);
 
     if ( rc != 0 )
@@ -2341,25 +2345,16 @@ void VirtualMachineDetachNic::request_execute(
         xmlrpc_c::paramList const&  paramList,
         RequestAttributes&          att)
 {
-    Nebula&             nd = Nebula::instance();
-    DispatchManager *   dm = nd.get_dm();
-    VirtualMachine *    vm;
-
-    int rc;
-    string error_str;
+    VirtualMachine * vm;
+    int              rc;
 
     int id      = xmlrpc_c::value_int(paramList.getInt(1));
     int nic_id  = xmlrpc_c::value_int(paramList.getInt(2));
 
     // -------------------------------------------------------------------------
-    // Authorize the operation
+    // Check if the VM is a Virtual Router
     // -------------------------------------------------------------------------
 
-    if ( vm_authorization(id, 0, 0, att, 0, 0, 0, auth_op) == false )
-    {
-        return;
-    }
-
     if ((vm = get_vm(id, att)) == 0)
     {
         return;
@@ -2367,7 +2362,7 @@ void VirtualMachineDetachNic::request_execute(
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_DETACH_ACTION))
     {
-        failure_response(ACTION,
+        failure_response(Request::ACTION,
                 request_error("Action is not supported for Virtual Router VMs",""),
                 att);
 
@@ -2377,20 +2372,84 @@ void VirtualMachineDetachNic::request_execute(
 
     vm->unlock();
 
+    // -------------------------------------------------------------------------
+    // Perform the detach
+    // -------------------------------------------------------------------------
+
+    rc = detach(this, att, id, nic_id);
+
+    if (rc == 0)
+    {
+        success_response(id, att);
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualMachineDetachNic::detach(
+        Request* req, RequestAttributes& att, int id, int nic_id)
+{
+    Nebula&             nd      = Nebula::instance();
+    DispatchManager *   dm      = nd.get_dm();
+    VirtualMachinePool* vmpool  = nd.get_vmpool();
+
+    PoolObjectAuth      vm_perms;
+    VirtualMachine *    vm;
+
+    int    rc;
+    string error_str;
+
+    // -------------------------------------------------------------------------
+    // Authorize the operation
+    // -------------------------------------------------------------------------
+
+    vm = vmpool->get(id, true);
+
+    if ( vm == 0 )
+    {
+        req->failure_response(Request::NO_EXISTS,
+                req->get_error(object_name(PoolObjectSQL::VM),id), att);
+
+        return -1;
+    }
+
+    vm->get_permissions(vm_perms);
+
+    vm->unlock();
+
+    if ( att.uid != 0 )
+    {
+        AuthRequest ar(att.uid, att.group_ids);
+
+        ar.add_auth(AuthRequest::MANAGE, vm_perms);
+
+        if (UserPool::authorize(ar) == -1)
+        {
+            req->failure_response(Request::AUTHORIZATION,
+                    req->authorization_error(ar.message, att),
+                    att);
+
+            return -1;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Perform the detach
+    // -------------------------------------------------------------------------
+
     rc = dm->detach_nic(id, nic_id, error_str);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION,
-                request_error(error_str, ""),
+        req->failure_response(Request::ACTION,
+                req->request_error(error_str, ""),
                 att);
-    }
-    else
-    {
-        success_response(id, att);
+
+        return -1;
     }
 
-    return;
+    return 0;
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc
index fa01ca4e47..ed4d528ef3 100644
--- a/src/rm/RequestManagerVirtualRouter.cc
+++ b/src/rm/RequestManagerVirtualRouter.cc
@@ -249,7 +249,7 @@ void VirtualRouterAttachNic::request_execute(
         return;
     }
 
-    nic = vr->set_attach_nic(&tmpl, error_str);
+    nic = vr->attach_nic(&tmpl, error_str);
 
     set<int> vms = vr->get_vms();
 
@@ -296,3 +296,108 @@ void VirtualRouterAttachNic::request_execute(
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
+
+void VirtualRouterDetachNic::request_execute(
+        xmlrpc_c::paramList const& paramList, RequestAttributes& att)
+{
+    VirtualRouterPool*  vrpool = static_cast<VirtualRouterPool*>(pool);
+    VirtualRouter *     vr;
+    PoolObjectAuth      vr_perms;
+
+    int    rc;
+
+    int vrid    = xmlrpc_c::value_int(paramList.getInt(1));
+    int nic_id  = xmlrpc_c::value_int(paramList.getInt(2));
+
+    // -------------------------------------------------------------------------
+    // Authorize the operation
+    // -------------------------------------------------------------------------
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr == 0)
+    {
+        failure_response(NO_EXISTS,
+                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
+                att);
+
+        return;
+    }
+
+    vr->get_permissions(vr_perms);
+
+    vr->unlock();
+
+    if ( att.uid != 0 )
+    {
+        AuthRequest ar(att.uid, att.group_ids);
+
+        ar.add_auth(AuthRequest::MANAGE, vr_perms); // MANAGE VROUTER
+
+        if (UserPool::authorize(ar) == -1)
+        {
+            failure_response(AUTHORIZATION,
+                    authorization_error(ar.message, att),
+                    att);
+
+            return;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Detach the NIC from the Virtual Router
+    // -------------------------------------------------------------------------
+
+    vr = vrpool->get(vrid, true);
+
+    if (vr == 0)
+    {
+        failure_response(NO_EXISTS,
+                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
+                att);
+
+        return;
+    }
+
+    rc = vr->detach_nic(nic_id);
+
+    set<int> vms = vr->get_vms();
+
+    vrpool->update(vr);
+
+    vr->unlock();
+
+    if (rc != 0)
+    {
+        ostringstream oss;
+
+        oss << "Could not detach NIC with NIC_ID " << nic_id
+            << ", it does not exist.";
+
+        failure_response(Request::ACTION,
+                request_error(oss.str(), ""),
+                att);
+
+        return;
+    }
+
+    // -------------------------------------------------------------------------
+    // Detach NIC from each VM
+    // -------------------------------------------------------------------------
+
+    for (set<int>::iterator vmid = vms.begin(); vmid != vms.end(); vmid++)
+    {
+        rc = VirtualMachineDetachNic::detach(this, att, *vmid, nic_id);
+
+        if (rc == -1)
+        {
+            // TODO: manage individual error, do rollback?
+            return;
+        }
+    }
+
+    success_response(vrid, att);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index b080c1b102..280f460160 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -540,7 +540,7 @@ set<int> VirtualRouter::get_vms() const
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-VectorAttribute * VirtualRouter::set_attach_nic(
+VectorAttribute * VirtualRouter::attach_nic(
         VirtualMachineTemplate * tmpl, string& error_str)
 {
     VirtualNetworkPool *        vnpool;
@@ -604,3 +604,45 @@ VectorAttribute * VirtualRouter::set_attach_nic(
 
     return nic;
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualRouter::detach_nic(int nic_id)
+{
+    VectorAttribute * nic = get_nic(nic_id);
+
+    if (nic == 0)
+    {
+        return -1;
+    }
+
+    obj_template->remove(nic);
+
+    return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+VectorAttribute* VirtualRouter::get_nic(int nic_id) const
+{
+    int tnic_id;
+
+    vector<VectorAttribute  *> nics;
+    vector<VectorAttribute *>::iterator nic_it;
+
+    obj_template->get("NIC", nics);
+
+    for(nic_it = nics.begin(); nic_it != nics.end(); nic_it++)
+    {
+        (*nic_it)->vector_value("NIC_ID", tnic_id);
+
+        if ( tnic_id == nic_id )
+        {
+            return (*nic_it);
+        }
+    }
+
+    return 0;
+}

From d4867b44ae00d0d3af254d6dd59473d0f0b11daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 28 Jan 2016 17:28:58 +0100
Subject: [PATCH 141/197] Feature #4215: Show nic-id for VR nics, CLI and
 sunstone

---
 src/cli/one_helper/onevrouter_helper.rb                   | 8 ++++++++
 .../public/app/tabs/vrouters-tab/panels/info/html.hbs     | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb
index e0283dcaa9..b0ed03a548 100644
--- a/src/cli/one_helper/onevrouter_helper.rb
+++ b/src/cli/one_helper/onevrouter_helper.rb
@@ -171,6 +171,14 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
             }
 
             CLIHelper::ShowTable.new(nil, self) do
+                column :ID, "", :size=>3 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["NIC_ID"]
+                    end
+                end
+
                 column :NETWORK, "", :left, :size=>20 do |d|
                     if d["DOUBLE_ENTRY"]
                         ""
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
index d7c2a76550..d5067751a9 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -40,6 +40,7 @@
     <table class="dataTable">
       <thead>
         <tr>
+          <th>{{tr "ID"}}</th>
           <th>{{tr "Network"}}</th>
           <th>{{tr "Floating IP"}}</th>
           <th>{{tr "Floating IPv6 ULA"}}</th>
@@ -50,6 +51,7 @@
       <tbody>
         {{#each nics}}
         <tr>
+          <td>{{NIC_ID}}</td>
           <td>{{NETWORK}}</td>
           <td>{{valOrDefault IP "--"}}</td>
           <td>{{valOrDefault IP6_ULA "--"}}</td>

From 7410c789814db22511e9a58afe9f5dd72ec53394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 28 Jan 2016 18:03:16 +0100
Subject: [PATCH 142/197] Feature #4215: Reverse NETWORK and NETWORK_ID
 priority

When requesting a vnet, NETWORK had priority over _ID.
If the NIC was taken from the VR, the NETWORK was set
but the _UNAME or _UID was not. In this case, VR
instantiate only worked for the owner of the VNet.

The priority of IMAGE and IMAGE_ID for disks is also
reversed, for consistency
---
 src/image/ImagePool.cc        | 36 +++++++++++++++++------------------
 src/vnm/VirtualNetworkPool.cc | 10 +++++-----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc
index 12b64c9c8e..c79584f4cd 100644
--- a/src/image/ImagePool.cc
+++ b/src/image/ImagePool.cc
@@ -322,7 +322,24 @@ int ImagePool::acquire_disk(int               vm_id,
 
     *snap = 0;
 
-    if (!(source = disk->vector_value("IMAGE")).empty())
+    if (!(source = disk->vector_value("IMAGE_ID")).empty())
+    {
+        iid = get_disk_id(source);
+
+        if ( iid == -1)
+        {
+            error_str = "Wrong ID set in IMAGE_ID";
+            return -1;
+        }
+
+        img = imagem->acquire_image(vm_id, iid, error_str);
+
+        if ( img == 0 )
+        {
+            return -1;
+        }
+    }
+    else if (!(source = disk->vector_value("IMAGE")).empty())
     {
         int uiid = get_disk_uid(disk,uid);
 
@@ -346,23 +363,6 @@ int ImagePool::acquire_disk(int               vm_id,
 
         iid = img->get_oid();
     }
-    else if (!(source = disk->vector_value("IMAGE_ID")).empty())
-    {
-        iid = get_disk_id(source);
-
-        if ( iid == -1)
-        {
-            error_str = "Wrong ID set in IMAGE_ID";
-            return -1;
-        }
-
-        img = imagem->acquire_image(vm_id, iid, error_str);
-
-        if ( img == 0 )
-        {
-            return -1;
-        }
-    }
     else //Not using the image repository (volatile DISK)
     {
         string type = disk->vector_value("TYPE");
diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc
index 69f49f25a1..6746925803 100644
--- a/src/vnm/VirtualNetworkPool.cc
+++ b/src/vnm/VirtualNetworkPool.cc
@@ -253,14 +253,14 @@ int VirtualNetworkPool::nic_attribute(
 
     nic->replace("NIC_ID", nic_id);
 
-    if (!(network = nic->vector_value("NETWORK")).empty())
-    {
-        vnet = get_nic_by_name (nic, network, uid, error);
-    }
-    else if (!(network = nic->vector_value("NETWORK_ID")).empty())
+    if (!(network = nic->vector_value("NETWORK_ID")).empty())
     {
         vnet = get_nic_by_id(network, error);
     }
+    else if (!(network = nic->vector_value("NETWORK")).empty())
+    {
+        vnet = get_nic_by_name (nic, network, uid, error);
+    }
     else //Not using a pre-defined network
     {
         return -2;

From f0006da6e18d4aa10210f18fc1dcd71e9a1a0c49 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 29 Jan 2016 10:28:07 +0100
Subject: [PATCH 143/197] feature #4217: Constness change for some
 MarketPlaceApp methods

---
 include/MarketPlaceApp.h     | 12 ++++++------
 src/market/MarketPlaceApp.cc |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index 9aa10dfbdd..ca5ff1f982 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -122,7 +122,7 @@ public:
      *    @param tmp The template object
      *    @param error_str Returns the error reason, if any
      */
-    void to_template(Template * tmpl);
+    void to_template(Template * tmpl) const;
 
     /**
      * Enable or disable the app. A disabled app cannot be exported
@@ -175,28 +175,28 @@ public:
         return origin_id;
     };
 
-    const string& get_source()
+    const string& get_source() const
     {
         return source;
     }
 
-    const string& get_md5()
+    const string& get_md5() const
     {
         return md5;
     }
 
-    long long get_size()
+    long long get_size() const
     {
         return size_mb;
     }
 
-    const string& get_format()
+    const string& get_format() const
     {
         return format;
     }
 
 
-    MarketPlaceAppState get_state()
+    MarketPlaceAppState get_state() const
     {
         return state;
     }
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 1b1e18d8a9..18081ad684 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -411,7 +411,7 @@ int MarketPlaceApp::enable(bool enable, string& error_str)
 /* --------------------------------------------------------------------------- */
 /* --------------------------------------------------------------------------- */
 
-void MarketPlaceApp::to_template(Template * tmpl)
+void MarketPlaceApp::to_template(Template * tmpl) const
 {
     tmpl->replace("FROM_APP_NAME", get_name());
     tmpl->replace("PATH", get_source());

From 5f1bacf81b70dd32e46176f8404a9b7404d651ee Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Fri, 29 Jan 2016 15:51:07 +0100
Subject: [PATCH 144/197] feature #4215: context cd change in KVM VMM driver

---
 install.sh                           |  4 +++-
 src/vmm_mad/exec/one_vmm_exec.rb     | 22 ++++++++++++++++++++
 src/vmm_mad/remotes/kvm/cdrom_change | 30 ++++++++++++++++++++++++++++
 src/vmm_mad/remotes/kvm/cdrom_eject  | 28 ++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100755 src/vmm_mad/remotes/kvm/cdrom_change
 create mode 100755 src/vmm_mad/remotes/kvm/cdrom_eject

diff --git a/install.sh b/install.sh
index f551b8ad5b..c2bcf3722b 100755
--- a/install.sh
+++ b/install.sh
@@ -686,7 +686,9 @@ VMM_EXEC_KVM_SCRIPTS="src/vmm_mad/remotes/kvm/cancel \
                     src/vmm_mad/remotes/kvm/snapshot_create \
                     src/vmm_mad/remotes/kvm/snapshot_revert \
                     src/vmm_mad/remotes/kvm/snapshot_delete \
-                    src/vmm_mad/remotes/kvm/shutdown"
+                    src/vmm_mad/remotes/kvm/shutdown \
+                    src/vmm_mad/remotes/kvm/cdrom_exec \
+                    src/vmm_mad/remotes/kvm/cdrom_change"
 
 #-------------------------------------------------------------------------------
 # VMM SH Driver Xen scripts, to be installed under $REMOTES_LOCATION/vmm/xen
diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index bb9eb884f8..d9de9acad0 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -793,8 +793,15 @@ class ExecDriver < VirtualMachineDriver
     #  ATTACHNIC action to attach a new nic interface
     #
     def attach_nic(id, drv_message)
+        action = ACTION[:attach_nic]
         xml_data = decode(drv_message)
 
+        tm_command = ensure_xpath(xml_data, id, action, 'TM_COMMAND') || return
+        target_path = ensure_xpath(xml_data, id, action,
+                                   'DISK_TARGET_PATH') || return
+        target_device = ensure_xpath(xml_data, id, action,
+                                     'VM/TEMPLATE/CONTEXT/TARGET') || return
+
         begin
             source = xml_data.elements["VM/TEMPLATE/NIC[ATTACH='YES']/BRIDGE"]
             source_ovs =
@@ -851,6 +858,21 @@ class ExecDriver < VirtualMachineDriver
                         :parameters => [:deploy_id, mac]
                     }
                 ]
+            },
+            {
+                :driver     => :vmm,
+                :action     => :cdrom_eject,
+                :parameters => [:deploy_id, target_device]
+            },
+            {
+                :driver     => :tm,
+                :action     => :tm_context,
+                :parameters => tm_command.split
+            },
+            {
+                :driver     => :vmm,
+                :action     => :cdrom_change,
+                :parameters => [:deploy_id, target_device, target_path]
             }
         ]
 
diff --git a/src/vmm_mad/remotes/kvm/cdrom_change b/src/vmm_mad/remotes/kvm/cdrom_change
new file mode 100755
index 0000000000..7a22b42b7b
--- /dev/null
+++ b/src/vmm_mad/remotes/kvm/cdrom_change
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+source $(dirname $0)/kvmrc
+source $(dirname $0)/../../scripts_common.sh
+
+DOMAIN=$1
+TARGET_DEVICE=$2
+ISO_PATH=$3
+
+CMD="virsh --connect $LIBVIRT_URI \
+     change-media $DOMAIN $TARGET_DEVICE $ISO_PATH --insert"
+
+exec_and_log "$CMD" "Could not insert CDROM $ISO_PATH to $TARGET_DEVICE"
+
diff --git a/src/vmm_mad/remotes/kvm/cdrom_eject b/src/vmm_mad/remotes/kvm/cdrom_eject
new file mode 100755
index 0000000000..f06a11a47d
--- /dev/null
+++ b/src/vmm_mad/remotes/kvm/cdrom_eject
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+source $(dirname $0)/kvmrc
+source $(dirname $0)/../../scripts_common.sh
+
+DOMAIN=$1
+TARGET_DEVICE=$2
+
+CMD="virsh --connect $LIBVIRT_URI change-media $DOMAIN $TARGET_DEVICE --eject"
+
+exec_and_log "$CMD" "Could not eject CDROM $TARGET_DEVICE"
+

From a7677a4e1eee7e1f249ddef3aefd1f14efa19978 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Fri, 29 Jan 2016 16:28:31 +0100
Subject: [PATCH 145/197] feature #4215: change names for VMM reconfigure
 actions

---
 install.sh                                              | 4 ++--
 src/vmm_mad/exec/one_vmm_exec.rb                        | 4 ++--
 src/vmm_mad/remotes/kvm/{cdrom_eject => prereconfigure} | 0
 src/vmm_mad/remotes/kvm/{cdrom_change => reconfigure}   | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/vmm_mad/remotes/kvm/{cdrom_eject => prereconfigure} (100%)
 rename src/vmm_mad/remotes/kvm/{cdrom_change => reconfigure} (100%)

diff --git a/install.sh b/install.sh
index c2bcf3722b..14708f3624 100755
--- a/install.sh
+++ b/install.sh
@@ -687,8 +687,8 @@ VMM_EXEC_KVM_SCRIPTS="src/vmm_mad/remotes/kvm/cancel \
                     src/vmm_mad/remotes/kvm/snapshot_revert \
                     src/vmm_mad/remotes/kvm/snapshot_delete \
                     src/vmm_mad/remotes/kvm/shutdown \
-                    src/vmm_mad/remotes/kvm/cdrom_exec \
-                    src/vmm_mad/remotes/kvm/cdrom_change"
+                    src/vmm_mad/remotes/kvm/reconfigure \
+                    src/vmm_mad/remotes/kvm/prereconfigure"
 
 #-------------------------------------------------------------------------------
 # VMM SH Driver Xen scripts, to be installed under $REMOTES_LOCATION/vmm/xen
diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index d9de9acad0..ce3e9c1daf 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -861,7 +861,7 @@ class ExecDriver < VirtualMachineDriver
             },
             {
                 :driver     => :vmm,
-                :action     => :cdrom_eject,
+                :action     => :prereconfigure,
                 :parameters => [:deploy_id, target_device]
             },
             {
@@ -871,7 +871,7 @@ class ExecDriver < VirtualMachineDriver
             },
             {
                 :driver     => :vmm,
-                :action     => :cdrom_change,
+                :action     => :reconfigure,
                 :parameters => [:deploy_id, target_device, target_path]
             }
         ]
diff --git a/src/vmm_mad/remotes/kvm/cdrom_eject b/src/vmm_mad/remotes/kvm/prereconfigure
similarity index 100%
rename from src/vmm_mad/remotes/kvm/cdrom_eject
rename to src/vmm_mad/remotes/kvm/prereconfigure
diff --git a/src/vmm_mad/remotes/kvm/cdrom_change b/src/vmm_mad/remotes/kvm/reconfigure
similarity index 100%
rename from src/vmm_mad/remotes/kvm/cdrom_change
rename to src/vmm_mad/remotes/kvm/reconfigure

From 3d8d2fd81eac0c67a53466c3b1b7e2365ba3b208 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 30 Jan 2016 13:55:13 +0100
Subject: [PATCH 146/197] feature #4215: Simplify interface for util::gsub.
 Decouple Request methods to better support static request actions.

---
 include/NebulaUtil.h                   |  18 +-
 include/PoolObjectSQL.h                |   1 +
 include/Request.h                      | 392 +++++++---------
 include/RequestManagerAllocate.h       |  17 +-
 include/RequestManagerClone.h          |  10 +-
 include/RequestManagerVMTemplate.h     |  12 +-
 include/RequestManagerVirtualMachine.h |  22 +-
 src/common/NebulaUtil.cc               |  27 +-
 src/rm/Request.cc                      | 381 +++++++---------
 src/rm/RequestManagerAcl.cc            |  26 +-
 src/rm/RequestManagerAllocate.cc       | 146 +++---
 src/rm/RequestManagerChmod.cc          |  28 +-
 src/rm/RequestManagerChown.cc          |  82 ++--
 src/rm/RequestManagerClone.cc          |  17 +-
 src/rm/RequestManagerCluster.cc        |  32 +-
 src/rm/RequestManagerDatastore.cc      |  11 +-
 src/rm/RequestManagerDelete.cc         |  19 +-
 src/rm/RequestManagerGroup.cc          |  44 +-
 src/rm/RequestManagerHost.cc           |  10 +-
 src/rm/RequestManagerImage.cc          | 127 +++---
 src/rm/RequestManagerInfo.cc           |  21 +-
 src/rm/RequestManagerLock.cc           |  10 +-
 src/rm/RequestManagerPoolInfoFilter.cc |  49 +-
 src/rm/RequestManagerProxy.cc          |   3 +-
 src/rm/RequestManagerRename.cc         |  29 +-
 src/rm/RequestManagerSystem.cc         |  20 +-
 src/rm/RequestManagerUpdateTemplate.cc |  22 +-
 src/rm/RequestManagerUser.cc           |  41 +-
 src/rm/RequestManagerVMTemplate.cc     |  77 ++--
 src/rm/RequestManagerVdc.cc            |  67 +--
 src/rm/RequestManagerVirtualMachine.cc | 605 ++++++++++---------------
 src/rm/RequestManagerVirtualNetwork.cc | 123 +++--
 src/rm/RequestManagerVirtualRouter.cc  | 143 +++---
 33 files changed, 1102 insertions(+), 1530 deletions(-)

diff --git a/include/NebulaUtil.h b/include/NebulaUtil.h
index 5dac3c1906..39fe962724 100644
--- a/include/NebulaUtil.h
+++ b/include/NebulaUtil.h
@@ -179,24 +179,12 @@ namespace one_util
      * Returns a copy of st with the all occurrences of "find" substituted
      * for "replacement"
      * @param st string input
-     * @param find string to search for
+     * @param sfind string to search for
      * @param replacement string to replace occurrences with
      * @return a string copy
      */
-    std::string gsub(const std::string& st,
-                     const char *find, const char *replacement);
-
-
-    /**
-     * Returns a copy of st with the all occurrences of "find" substituted
-     * for "replacement"
-     * @param st string input
-     * @param find string to search for
-     * @param replacement string to replace occurrences with
-     * @return a string copy
-     */
-    std::string gsub(const std::string& st,
-                     const char *find, const std::string& replacement);
+    std::string gsub(const std::string& st, const std::string& sfind,
+            const std::string& replacement);
 };
 
 #endif /* _NEBULA_UTIL_H_ */
diff --git a/include/PoolObjectSQL.h b/include/PoolObjectSQL.h
index 0aff690c42..81200de32d 100644
--- a/include/PoolObjectSQL.h
+++ b/include/PoolObjectSQL.h
@@ -49,6 +49,7 @@ public:
      */
     enum ObjectType
     {
+        NONE        = 0x0000000000000000LL,
         VM          = 0x0000001000000000LL,
         HOST        = 0x0000002000000000LL,
         NET         = 0x0000004000000000LL,
diff --git a/include/Request.h b/include/Request.h
index 8582678fec..2263c7218c 100644
--- a/include/Request.h
+++ b/include/Request.h
@@ -27,6 +27,77 @@
 
 using namespace std;
 
+/**
+ * This class represents the dynamic attributes: specific for a request of the
+ * same method.
+ */
+struct RequestAttributes
+{
+public:
+    int uid;                  /**< id of the user */
+    int gid;                  /**< id of the user's group */
+
+    string uname;             /**< name of the user */
+    string gname;             /**< name of the user's group */
+
+    string password;          /**< password of the user */
+
+    set<int> group_ids;       /**< set of user's group ids */
+
+    string session;           /**< Session from ONE XML-RPC API */
+    int    req_id;            /**< Request ID for log messages */
+
+    int umask;                /**< User umask for new objects */
+
+    xmlrpc_c::value * retval; /**< Return value from libxmlrpc-c */
+
+    PoolObjectSQL::ObjectType resp_obj; /**< object type */
+    int                       resp_id;  /**< Id of the object */
+    string                    resp_msg; /**< Additional response message */
+
+    RequestAttributes(){};
+
+    RequestAttributes(const RequestAttributes& ra)
+    {
+        uid = ra.uid;
+        gid = ra.gid;
+
+        uname = ra.uname;
+        gname = ra.gname;
+
+        password = ra.password;
+
+        session  = ra.session;
+        retval   = ra.retval;
+
+        umask = ra.umask;
+
+        resp_obj = ra.resp_obj;
+        resp_id  = ra.resp_id;
+        resp_msg = ra.resp_msg;
+    };
+
+    RequestAttributes(int _uid, int _gid, const RequestAttributes& ra)
+    {
+        uid = _uid;
+        gid = _gid;
+
+        password = "";
+
+        uname = "";
+        gname = "";
+
+        umask = 0;
+
+        session  = ra.session;
+        retval   = ra.retval;
+
+        resp_obj = PoolObjectSQL::NONE;
+        resp_id  = -1;
+        resp_msg = "";
+    };
+};
+
 /**
  *  The Request Class represents the basic abstraction for the OpenNebula
  *  XML-RPC API. This interface must be implemented by any XML-RPC API call
@@ -34,16 +105,6 @@ using namespace std;
 class Request: public xmlrpc_c::method
 {
 public:
-    /**
-     *  Wraps the actual execution function by authorizing the user
-     *  and calling the request_execute virtual function
-     *    @param _paramlist list of XML parameters
-     *    @param _retval value to be returned to the client
-     */
-    virtual void execute(
-        xmlrpc_c::paramList const& _paramList,
-        xmlrpc_c::value *   const  _retval);
-
     /**
      *  Error codes for the XML-RPC API
      */
@@ -55,8 +116,17 @@ public:
         ACTION         = 0x0800,
         XML_RPC_API    = 0x1000,
         INTERNAL       = 0x2000,
+        ALLOCATE       = 0x4000
     };
 
+    /**
+     *  Gets a string representation for the Auth object in the
+     *  request.
+     *    @param ob object for the auth operation
+     *    @return string equivalent of the object
+     */
+    static string object_name(PoolObjectSQL::ObjectType ob);
+
     /**
      *  Sets the format string to log xml-rpc method calls. The format string
      *  interprets the following sequences:
@@ -77,69 +147,9 @@ public:
     }
 
 protected:
-
-    /* ---------------------------------------------------------------------*/
-    /*                     Attributes of the Request                        */
-    /* ---------------------------------------------------------------------*/
-
-    /* -------- Dynamic (specific for a request of the same method) -------- */
-
-    struct RequestAttributes
-    {
-        int uid;                  /**< id of the user */
-        int gid;                  /**< id of the user's group */
-
-        string uname;             /**< name of the user */
-        string gname;             /**< name of the user's group */
-
-        string password;          /**< password of the user */
-
-        set<int> group_ids;       /**< set of user's group ids */
-
-        string session;           /**< Session from ONE XML-RPC API */
-        int    req_id;            /**< Request ID for log messages */
-
-        int umask;                /**< User umask for new objects */
-
-        xmlrpc_c::value * retval; /**< Return value from libxmlrpc-c */
-
-        RequestAttributes(){};
-
-        RequestAttributes(const RequestAttributes& ra)
-        {
-            uid = ra.uid;
-            gid = ra.gid;
-
-            uname = ra.uname;
-            gname = ra.gname;
-
-            password = ra.password;
-
-            session  = ra.session;
-            retval   = ra.retval;
-
-            umask = ra.umask;
-        };
-
-        RequestAttributes(int _uid, int _gid, const RequestAttributes& ra)
-        {
-            uid = _uid;
-            gid = _gid;
-
-            password = "";
-
-            uname = "";
-            gname = "";
-
-            umask = 0;
-
-            session  = ra.session;
-            retval   = ra.retval;
-        };
-    };
-
-    /* -------- Static (shared among request of the same method) -------- */
-
+    /* ---------------------------------------------------------------------- */
+    /* Static Request Attributes: shared among request of the same method     */
+    /* ---------------------------------------------------------------------- */
     PoolSQL * pool;           /**< Pool of objects */
     string    method_name;    /**< The name of the XML-RPC method */
 
@@ -150,11 +160,11 @@ protected:
 
     static string format_str;
 
-    /* -------------------- Constructors ---------------------------------- */
-
-    Request(const string& mn,
-            const string& signature,
-            const string& help): pool(0),method_name(mn)
+    /* ---------------------------------------------------------------------- */
+    /* Class Constructors                                                     */
+    /* ---------------------------------------------------------------------- */
+    Request(const string& mn, const string& signature, const string& help):
+        pool(0),method_name(mn)
     {
         _signature = signature;
         _help      = help;
@@ -164,8 +174,17 @@ protected:
 
     virtual ~Request(){};
 
-    /* -------------------------------------------------------------------- */
-    /* -------------------------------------------------------------------- */
+    /* ---------------------------------------------------------------------- */
+    /* Methods to execute the request when received at the server             */
+    /* ---------------------------------------------------------------------- */
+    /**
+     *  Wraps the actual execution function by authorizing the user
+     *  and calling the request_execute virtual function
+     *    @param _paramlist list of XML parameters
+     *    @param _retval value to be returned to the client
+     */
+    virtual void execute(xmlrpc_c::paramList const& _paramList,
+        xmlrpc_c::value * const _retval);
 
     /**
      *  Actual Execution method for the request. Must be implemented by the
@@ -175,7 +194,6 @@ protected:
      */
     virtual void request_execute(xmlrpc_c::paramList const& _paramList,
                                  RequestAttributes& att) = 0;
-
     /**
      * Locks the requested object, gets information, and unlocks it
      *
@@ -190,68 +208,17 @@ protected:
      *
      * @return 0 on success, -1 otherwise
      */
-    int get_info (PoolSQL *                 pool,
-                  int                       id,
-                  PoolObjectSQL::ObjectType type,
-                  RequestAttributes&        att,
-                  PoolObjectAuth&           perms,
-                  string&                   name,
-                  bool                      throw_error);
-
-    /**
-     * Logs the method result, including the output data or error message
-     *
-     * @param att the specific request attributes
-     */
-    virtual void log_result(
-            const RequestAttributes&    att);
-
-    /**
-     * Formats and adds a xmlrpc_c::value to oss.
-     *
-     * @param v value to format
-     * @param oss stream to write v
-     */
-    virtual void log_xmlrpc_value(
-            const xmlrpc_c::value&  v,
-            ostringstream&          oss);
-
-private:
-
-    /**
-     * Logs the method invocation, including the arguments
-     *
-     * @param att the specific request attributes
-     * @param paramList list of XML parameters
-     */
-    void log_method_invoked(
-            const RequestAttributes&    att,
-            const xmlrpc_c::paramList&  paramList);
-
-    /* ------------- Functions to manage user and group quotas -------------- */
-
-    bool user_quota_authorization(Template * tmpl,
-                                  Quotas::QuotaType  qtype,
-                                  RequestAttributes& att,
-                                  string& error_str);
-
-    bool group_quota_authorization(Template * tmpl,
-                                   Quotas::QuotaType  qtype,
-                                   RequestAttributes& att,
-                                   string& error_str);
-
-    void user_quota_rollback(Template * tmpl,
-                             Quotas::QuotaType  qtype,
-                             RequestAttributes& att);
-
-    void group_quota_rollback(Template * tmpl,
-                              Quotas::QuotaType  qtype,
-                              RequestAttributes& att);
-
-public:
-
-    /* -------------------- Responses and errors ---------------------------- */
+    int get_info(PoolSQL *                 pool,
+                 int                       id,
+                 PoolObjectSQL::ObjectType type,
+                 RequestAttributes&        att,
+                 PoolObjectAuth&           perms,
+                 string&                   name,
+                 bool                      throw_error);
 
+    /* ---------------------------------------------------------------------- */
+    /* Methods to send response to xml-rpc client                             */
+    /* ---------------------------------------------------------------------- */
     /**
      *  Builds an XML-RPC response updating retval. After calling this function
      *  the xml-rpc excute method should return
@@ -278,70 +245,17 @@ public:
 
     /**
      *  Builds an XML-RPC response updating retval. After calling this function
-     *  the xml-rpc excute method should return
+     *  the xml-rpc excute method should return. A descriptive error message
+     *  is constructed using att.resp_obj, att.resp_id and/or att.resp_msg and
+     *  the ErrorCode
      *    @param ec error code for this call
-     *    @param val string representation of the error
-     *    @param att the specific request attributes
+     *    @param ra the specific request attributes
      */
-    void failure_response(ErrorCode ec,
-                          const string& val,
-                          RequestAttributes& att);
-
-    /**
-     *  Gets a string representation for the Auth object in the
-     *  request.
-     *    @param ob object for the auth operation
-     *    @return string equivalent of the object
-     */
-    static string object_name(PoolObjectSQL::ObjectType ob);
-
-    /**
-     *  Logs authorization errors
-     *    @param message with the authorization error details
-     *    @return string for logging
-     *    @param att the specific request attributes
-     */
-    string authorization_error (const string &message, RequestAttributes& att);
-
-    /**
-     *  Logs authenticate errors
-     *    @return string for logging
-     */
-    string authenticate_error ();
-
-    /**
-     *  Logs get object errors
-     *    @param object over which the get failed
-     *    @param id of the object over which the get failed
-     *    @return string for logging
-     */
-    string get_error (const string &object, int id);
-
-    /**
-     *  Logs action errors
-     *    @param err_desc brief description of the error
-     *    @param err_detail additional error details from Managers & Pools
-     *    @return string for logging
-     */
-    string request_error (const string &err_desc, const string &err_detail);
-
-    /**
-     *  Logs allocate errors
-     *    @param message with the allocate error details
-     *    @return string for logging
-     */
-    string allocate_error (const string& error);
-
-    /**
-     *  Logs allocate errors for a given resource
-     *    @param obj the resource
-     *    @param message with the allocate error details
-     *    @return string for logging
-     */
-    string allocate_error (PoolObjectSQL::ObjectType obj, const string& error);
-
-    /* -------------------- Authorization ----------------------------------- */
+    void failure_response(ErrorCode ec, RequestAttributes& ra);
 
+    /* ---------------------------------------------------------------------- */
+    /* Authorization methods for requests                                     */
+    /* ---------------------------------------------------------------------- */
     /**
      *  Performs a basic authorization for this request using the uid/gid
      *  from the request. The function gets the object from the pool to get
@@ -371,7 +285,7 @@ public:
      *    @return true if the user is authorized.
      */
     bool basic_authorization(int oid, AuthRequest::Operation op,
-                             RequestAttributes& att);
+        RequestAttributes& att);
 
     /**
      *  Performs a basic quota check for this request using the uid/gid
@@ -384,10 +298,8 @@ public:
      *
      *    @return true if the user is authorized.
      */
-    bool quota_authorization(
-            Template *          tmpl,
-            Quotas::QuotaType   qtype,
-            RequestAttributes&  att);
+    bool quota_authorization(Template * tmpl, Quotas::QuotaType qtype,
+        RequestAttributes&  att);
 
     /**
      *  Performs a basic quota check for this request using the uid/gid
@@ -402,11 +314,8 @@ public:
      *    @param error_str Error reason, if any
      *    @return true if the user is authorized.
      */
-    bool quota_authorization(
-            Template *          tmpl,
-            Quotas::QuotaType   qtype,
-            RequestAttributes&  att,
-            string&             error_str);
+    static bool quota_authorization(Template * tmpl, Quotas::QuotaType qtype,
+        RequestAttributes& att, string& error_str);
 
     /**
      *  Performs rollback on usage counters for a previous  quota check operation
@@ -414,10 +323,61 @@ public:
      *    @param tmpl describing the object
      *    @param att the specific request attributes
      */
-    void quota_rollback(Template *         tmpl,
-                        Quotas::QuotaType  qtype,
-                        RequestAttributes& att);
+    static void quota_rollback(Template * tmpl, Quotas::QuotaType qtype,
+        RequestAttributes& att);
 
+private:
+    /* ---------------------------------------------------------------------- */
+    /* Functions to manage user and group quotas                              */
+    /* ---------------------------------------------------------------------- */
+    static bool user_quota_authorization(Template * tmpl, Quotas::QuotaType  qtype,
+        RequestAttributes& att, string& error_str);
+
+    static bool group_quota_authorization(Template * tmpl, Quotas::QuotaType  qtype,
+        RequestAttributes& att, string& error_str);
+
+    static void user_quota_rollback(Template * tmpl, Quotas::QuotaType  qtype,
+        RequestAttributes& att);
+
+    static void group_quota_rollback(Template * tmpl, Quotas::QuotaType  qtype,
+        RequestAttributes& att);
+
+    /**
+     *  Builds an XML-RPC response updating retval. After calling this function
+     *  the xml-rpc excute method should return
+     *    @param ec error code for this call
+     *    @param va string representation of the error
+     *    @param ra the specific request attributes
+     */
+    void failure_response(ErrorCode ec, const string& va, RequestAttributes& ra);
+
+    /**
+     * Logs the method invocation, including the arguments
+     * @param att the specific request attributes
+     * @param paramList list of XML parameters
+     * @param format_str for the log
+     * @param hidden_params params not to be shown
+     */
+    static void log_method_invoked(const RequestAttributes& att,
+        const xmlrpc_c::paramList&  paramList, const string& format_str,
+        const std::string& method_name, const std::set<int>& hidden_params);
+
+    /**
+     * Logs the method result, including the output data or error message
+     *
+     * @param att the specific request attributes
+     * @param method_name that produced the error
+     */
+    static void log_result(const RequestAttributes& att,
+            const std::string& method_name);
+
+    /**
+     * Formats and adds a xmlrpc_c::value to oss.
+     *
+     * @param v value to format
+     * @param oss stream to write v
+     */
+    static void log_xmlrpc_value(const xmlrpc_c::value& v, std::ostringstream& oss);
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h
index 97013c78ae..7409ab2ab2 100644
--- a/include/RequestManagerAllocate.h
+++ b/include/RequestManagerAllocate.h
@@ -64,7 +64,6 @@ protected:
     virtual int pool_allocate(xmlrpc_c::paramList const& _paramList,
                               Template * tmpl,
                               int& id,
-                              string& error_str,
                               RequestAttributes& att)
     {
         return -1;
@@ -73,12 +72,11 @@ protected:
     virtual int pool_allocate(xmlrpc_c::paramList const& _paramList,
                               Template * tmpl,
                               int& id,
-                              string& error_str,
                               RequestAttributes& att,
                               int cluster_id,
                               const string& cluster_name)
     {
-        return pool_allocate(_paramList, tmpl, id, error_str, att);
+        return pool_allocate(_paramList, tmpl, id, att);
     };
 
     virtual int get_cluster_id(xmlrpc_c::paramList const&  paramList)
@@ -138,7 +136,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 
     bool allocate_authorization(Template *          obj_template,
@@ -175,7 +172,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att,
                       int cluster_id,
                       const string& cluster_name);
@@ -249,7 +245,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 
     bool allocate_authorization(Template *          obj_template,
@@ -281,7 +276,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att,
                       int cluster_id,
                       const string& cluster_name);
@@ -325,7 +319,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 };
 
@@ -353,7 +346,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 
 private:
@@ -389,7 +381,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att,
                       int cluster_id,
                       const string& cluster_name);
@@ -445,7 +436,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 };
 
@@ -478,7 +468,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 };
 
@@ -514,7 +503,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 };
 
@@ -547,7 +535,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 };
 
@@ -580,7 +567,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 };
 
@@ -614,7 +600,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template * tmpl,
                       int& id,
-                      string& error_str,
                       RequestAttributes& att);
 };
 
diff --git a/include/RequestManagerClone.h b/include/RequestManagerClone.h
index dcc85c937e..2d03a5efa1 100644
--- a/include/RequestManagerClone.h
+++ b/include/RequestManagerClone.h
@@ -48,7 +48,6 @@ protected:
             int                         source_id,
             Template *                  tmpl,
             int&                        id,
-            string&                     error_str,
             RequestAttributes&          att) = 0;
 };
 
@@ -82,7 +81,6 @@ public:
             int                         source_id,
             Template *                  tmpl,
             int&                        id,
-            string&                     error_str,
             RequestAttributes&          att)
     {
         VMTemplatePool * tpool = static_cast<VMTemplatePool *>(pool);
@@ -91,7 +89,7 @@ public:
                 static_cast<VirtualMachineTemplate *>(tmpl);
 
         return tpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-                ttmpl, &id, error_str);
+                ttmpl, &id, att.resp_msg);
     };
 };
 
@@ -126,14 +124,13 @@ public:
             int                         source_id,
             Template *                  tmpl,
             int&                        id,
-            string&                     error_str,
             RequestAttributes&          att)
     {
         DocumentPool * docpool = static_cast<DocumentPool *>(pool);
         Document * doc = docpool->get(source_id, true);
 
         return docpool->allocate(att.uid, att.gid, att.uname, att.gname,
-            att.umask, doc->get_document_type(), tmpl, &id, error_str);
+            att.umask, doc->get_document_type(), tmpl, &id, att.resp_msg);
     };
 };
 
@@ -167,13 +164,12 @@ public:
             int                         source_id,
             Template *                  tmpl,
             int&                        id,
-            string&                     error_str,
             RequestAttributes&          att)
     {
         SecurityGroupPool * secgrouppool = static_cast<SecurityGroupPool *>(pool);
 
         return secgrouppool->allocate(att.uid, att.gid, att.uname, att.gname,
-            att.umask, tmpl, &id, error_str);
+            att.umask, tmpl, &id, att.resp_msg);
     };
 };
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerVMTemplate.h b/include/RequestManagerVMTemplate.h
index 33292b64e5..f53f4808bb 100644
--- a/include/RequestManagerVMTemplate.h
+++ b/include/RequestManagerVMTemplate.h
@@ -69,8 +69,6 @@ public:
 
     /**
      * Instantiates the VM Template, checking permissions, quotas, etc
-     * @param req Calling Request object
-     * @param att the specific request attributes
      * @param id VM Template ID
      * @param name Name for the new VM. Can be empty
      * @param on_hold True to start the VM on HOLD state
@@ -79,13 +77,13 @@ public:
      * @param extra_attrs Template to be merged. It should contain internal
      * configuration, and it won't be authenticated or checked for restricted
      * attributes. Can be 0
+     * @param vmid on success of the new VM
+     * @param att the specific request attributes
      *
-     * @return VMID on success, -1 on failure. On failure, failure_response is set,
-     * but for success the calling method needs to set success_response
+     * @return ErroCode for the request.
      */
-    static int instantiate(Request* req, RequestAttributes& att, int id,
-                    string name, bool on_hold, string str_uattrs,
-                    Template* extra_attrs);
+    static ErrorCode instantiate(int id, string name, bool on_hold,
+            string str_uattrs, Template* extra_attrs, int& vid, RequestAttributes& att);
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/RequestManagerVirtualMachine.h b/include/RequestManagerVirtualMachine.h
index 776e789f2e..5c3bbc3872 100644
--- a/include/RequestManagerVirtualMachine.h
+++ b/include/RequestManagerVirtualMachine.h
@@ -253,11 +253,16 @@ public:
 
     ~VirtualMachineAttachNic(){};
 
-    void request_execute(xmlrpc_c::paramList const& _paramList,
-            RequestAttributes& att);
+    void request_execute(xmlrpc_c::paramList const& pl, RequestAttributes& ra);
 
-    static int attach(Request* req, RequestAttributes& att, int id,
-                    VirtualMachineTemplate& tmpl);
+    /**
+     * Process a NIC attahment request to a Virtual Machine
+     *   @param id of the VirtualMachine
+     *   @param tmpl with the new NIC description
+     *   @param att attributes of this request
+     *   @return ErroCode as defined in Request
+     */
+    static ErrorCode attach(int id, VirtualMachineTemplate& tmpl, RequestAttributes& att);
 };
 
 /* -------------------------------------------------------------------------- */
@@ -276,7 +281,14 @@ public:
     void request_execute(xmlrpc_c::paramList const& _paramList,
             RequestAttributes& att);
 
-    static int detach(Request* req, RequestAttributes& att, int id, int nic_id);
+    /**
+     * Process a NIC detach request to a Virtual Machine
+     *   @param id of the VirtualMachine
+     *   @param nic_id id of the NIC
+     *   @param att attributes of this request
+     *   @return ErroCode as defined in Request
+     */
+    static ErrorCode detach(int id, int nic_id, RequestAttributes& att);
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/common/NebulaUtil.cc b/src/common/NebulaUtil.cc
index 01c681edad..cc9976710c 100644
--- a/src/common/NebulaUtil.cc
+++ b/src/common/NebulaUtil.cc
@@ -311,31 +311,24 @@ std::string one_util::trim(const std::string& str)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-string one_util::gsub(const string& st,
-        const char *find, const string& replacement)
+std::string one_util::gsub(const std::string& st, const std::string& sfind,
+    const std::string& srepl)
 {
-    return gsub(st, find, replacement.c_str());
-}
+    std::string result = st;
 
-/* -------------------------------------------------------------------------- */
+    std::string::size_type pos = 0;
 
-string one_util::gsub(const string& st,
-        const char *find, const char *replacement)
-{
-    string result = st;
+    size_t srepl_len = srepl.length();
+    size_t sfind_len = sfind.length();
 
-    string::size_type pos = 0;
-    size_t find_len = strlen(find);
-    size_t replacement_len = strlen(replacement);
-
-    pos = result.find(find, pos);
+    pos = result.find(sfind, pos);
 
     while(pos != std::string::npos)
     {
-        result.replace(pos, find_len, replacement);
-        pos += replacement_len;
+        result.replace(pos, sfind_len , srepl);
+        pos += srepl_len;
 
-        pos = result.find(find, pos);
+        pos = result.find(sfind, pos);
     }
 
     return result;
diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index 38130da14e..06a6bc79b1 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -19,56 +19,59 @@
 
 #include "PoolObjectAuth.h"
 
-string Request::format_str;
-
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* RequestLog Methods                                                         */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void Request::execute(
-        xmlrpc_c::paramList const& _paramList,
-        xmlrpc_c::value *   const  _retval)
+string Request::object_name(PoolObjectSQL::ObjectType ob)
 {
-    RequestAttributes att;
-
-    att.retval  = _retval;
-    att.session = xmlrpc_c::value_string (_paramList.getString(0));
-
-    att.req_id = (reinterpret_cast<uintptr_t>(this) * rand()) % 10000;
-
-    Nebula& nd = Nebula::instance();
-    UserPool* upool = nd.get_upool();
-
-    bool authenticated = upool->authenticate(att.session,
-                                             att.password,
-                                             att.uid,
-                                             att.gid,
-                                             att.uname,
-                                             att.gname,
-                                             att.group_ids,
-                                             att.umask);
-
-    log_method_invoked(att, _paramList);
-
-    if ( authenticated == false )
+    switch (ob)
     {
-        failure_response(AUTHENTICATION, authenticate_error(), att);
-    }
-    else
-    {
-        request_execute(_paramList, att);
-    }
-
-    log_result(att);
+        case PoolObjectSQL::VM:
+            return "virtual machine";
+        case PoolObjectSQL::HOST:
+            return "host";
+        case PoolObjectSQL::NET:
+            return "virtual network";
+        case PoolObjectSQL::IMAGE:
+            return "image";
+        case PoolObjectSQL::USER:
+            return "user";
+        case PoolObjectSQL::TEMPLATE:
+            return "virtual machine template";
+        case PoolObjectSQL::GROUP:
+            return "group";
+        case PoolObjectSQL::ACL:
+            return "ACL";
+        case PoolObjectSQL::DATASTORE:
+            return "datastore";
+        case PoolObjectSQL::CLUSTER:
+            return "cluster";
+        case PoolObjectSQL::DOCUMENT:
+            return "document";
+        case PoolObjectSQL::ZONE:
+            return "zone";
+        case PoolObjectSQL::SECGROUP:
+            return "security group";
+        case PoolObjectSQL::VDC:
+            return "VDC";
+        case PoolObjectSQL::VROUTER:
+            return "virtual router";
+        default:
+            return "-";
+      }
 };
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void Request::log_method_invoked(
-        const RequestAttributes&    att,
-        const xmlrpc_c::paramList&  paramList)
+void Request::log_method_invoked(const RequestAttributes& att,
+        const xmlrpc_c::paramList&  paramList, const string& format_str,
+        const std::string& method_name, const std::set<int>& hidden_params)
 {
-    ostringstream oss;
+    std::ostringstream oss;
 
     for (unsigned int j = 0 ;j < format_str.length() - 1; j++ )
     {
@@ -141,16 +144,15 @@ void Request::log_method_invoked(
         }
     }
 
-    NebulaLog::log("ReM",Log::DEBUG, oss);
+    NebulaLog::log("ReM", Log::DEBUG, oss);
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void Request::log_result(
-        const RequestAttributes&    att)
+void Request::log_result(const RequestAttributes& att, const string& method_name)
 {
-    ostringstream oss;
+    std::ostringstream oss;
 
     oss << "Req:" << att.req_id << " UID:";
 
@@ -177,23 +179,21 @@ void Request::log_result(
             log_xmlrpc_value(vvalue[i], oss);
         }
 
-        NebulaLog::log("ReM",Log::DEBUG, oss);
+        NebulaLog::log("ReM", Log::DEBUG, oss);
     }
     else
     {
         oss << "FAILURE "
             << static_cast<string>(xmlrpc_c::value_string(vvalue[1]));
 
-        NebulaLog::log("ReM",Log::ERROR, oss);
+        NebulaLog::log("ReM", Log::ERROR, oss);
     }
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void Request::log_xmlrpc_value(
-        const xmlrpc_c::value&  v,
-        ostringstream&          oss)
+void Request::log_xmlrpc_value(const xmlrpc_c::value& v, std::ostringstream& oss)
 {
     size_t st_limit = 20;
     size_t st_newline;
@@ -245,6 +245,53 @@ void Request::log_xmlrpc_value(
     }
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* Request Methods                                                            */
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+string Request::format_str;
+
+/* -------------------------------------------------------------------------- */
+
+void Request::execute(
+        xmlrpc_c::paramList const& _paramList,
+        xmlrpc_c::value *   const  _retval)
+{
+    RequestAttributes att;
+
+    att.retval  = _retval;
+    att.session = xmlrpc_c::value_string (_paramList.getString(0));
+
+    att.req_id = (reinterpret_cast<uintptr_t>(this) * rand()) % 10000;
+
+    Nebula& nd = Nebula::instance();
+    UserPool* upool = nd.get_upool();
+
+    bool authenticated = upool->authenticate(att.session,
+                                             att.password,
+                                             att.uid,
+                                             att.gid,
+                                             att.uname,
+                                             att.gname,
+                                             att.group_ids,
+                                             att.umask);
+
+    log_method_invoked(att, _paramList, format_str, method_name, hidden_params);
+
+    if ( authenticated == false )
+    {
+        failure_response(AUTHENTICATION, att);
+    }
+    else
+    {
+        request_execute(_paramList, att);
+    }
+
+    log_result(att, method_name);
+};
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
@@ -261,9 +308,8 @@ bool Request::basic_authorization(int oid,
 
         if ( object == 0 )
         {
-            failure_response(NO_EXISTS,
-                             get_error(object_name(auth_object),oid),
-                             att);
+            att.resp_id = oid;
+            failure_response(NO_EXISTS, att);
             return false;
         }
 
@@ -293,9 +339,8 @@ bool Request::basic_authorization(int oid,
 
     if (UserPool::authorize(ar) == -1)
     {
-        failure_response(AUTHORIZATION,
-                         authorization_error(ar.message, att),
-                         att);
+        att.resp_msg = ar.message;
+        failure_response(AUTHORIZATION, att);
 
         return false;
     }
@@ -449,15 +494,11 @@ bool Request::quota_authorization(Template *         tmpl,
                                   Quotas::QuotaType  qtype,
                                   RequestAttributes& att)
 {
-    string error_str;
-
-    bool auth = quota_authorization(tmpl, qtype, att, error_str);
+    bool auth = quota_authorization(tmpl, qtype, att, att.resp_msg);
 
     if ( auth == false )
     {
-        failure_response(AUTHORIZATION,
-                         request_error(error_str, ""),
-                         att);
+        failure_response(AUTHORIZATION, att);
     }
 
     return auth;
@@ -538,6 +579,78 @@ void Request::failure_response(ErrorCode ec, const string& str_val,
     *(att.retval) = arrayresult;
 }
 
+/* -------------------------------------------------------------------------- */
+
+void Request::failure_response(ErrorCode ec, RequestAttributes& att)
+{
+    std::ostringstream oss;
+    std::string        obname;
+
+    if ( att.resp_obj == PoolObjectSQL::NONE )
+    {
+        obname = object_name(auth_object);
+    }
+    else
+    {
+        obname = object_name(att.resp_obj);
+    }
+
+    oss << "[" << method_name << "]";
+
+    switch(ec)
+    {
+        case SUCCESS:
+            return;
+
+        case AUTHORIZATION:
+            oss << " User [" << att.uid << "] ";
+
+            if (att.resp_msg.empty())
+            {
+                oss << "not authorized to perform action on " << obname << ".";
+            }
+            else
+            {
+                oss << ": " << att.resp_msg << ".";
+            }
+            break;
+
+        case AUTHENTICATION:
+            oss << " User couldn't be authenticated, aborting call.";
+            break;
+
+        case ACTION:
+        case XML_RPC_API:
+        case INTERNAL:
+            oss << att.resp_msg;
+            break;
+
+        case NO_EXISTS:
+            oss << " Error getting " << obname;
+
+            if ( att.resp_id != -1 )
+            {
+               oss << " [" << att.resp_id << "].";
+            }
+            else
+            {
+              oss << " Pool.";
+            }
+            break;
+
+        case ALLOCATE:
+            oss << "Error allocating a new " << obname << ".";
+
+            if (!att.resp_msg.empty())
+            {
+                oss << " " << att.resp_msg;
+            }
+            break;
+    }
+
+    failure_response(ec, oss.str(), att);
+}
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
@@ -588,155 +701,11 @@ void Request::success_response(bool val, RequestAttributes& att)
 }
 
 /* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string Request::object_name(PoolObjectSQL::ObjectType ob)
-{
-    switch (ob)
-    {
-        case PoolObjectSQL::VM:
-            return "virtual machine";
-        case PoolObjectSQL::HOST:
-            return "host";
-        case PoolObjectSQL::NET:
-            return "virtual network";
-        case PoolObjectSQL::IMAGE:
-            return "image";
-        case PoolObjectSQL::USER:
-            return "user";
-        case PoolObjectSQL::TEMPLATE:
-            return "virtual machine template";
-        case PoolObjectSQL::GROUP:
-            return "group";
-        case PoolObjectSQL::ACL:
-            return "ACL";
-        case PoolObjectSQL::DATASTORE:
-            return "datastore";
-        case PoolObjectSQL::CLUSTER:
-            return "cluster";
-        case PoolObjectSQL::DOCUMENT:
-            return "document";
-        case PoolObjectSQL::ZONE:
-            return "zone";
-        case PoolObjectSQL::SECGROUP:
-            return "security group";
-        case PoolObjectSQL::VDC:
-            return "VDC";
-        case PoolObjectSQL::VROUTER:
-            return "virtual router";
-        default:
-            return "-";
-      }
-};
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string Request::authorization_error (const string &message,
-                                     RequestAttributes& att)
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "]" << " User [" << att.uid << "] ";
-
-    if ( message.empty() )
-    {
-        oss << "not authorized to perform action on "
-            << object_name(auth_object) << ".";
-    }
-    else
-    {
-        oss << ": " << message << ".";
-    }
-
-    return oss.str();
-}
 
 /* -------------------------------------------------------------------------- */
 
-string Request::authenticate_error()
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "]" << " User couldn't be authenticated," <<
-           " aborting call.";
-
-    return oss.str();
-}
-
 /* -------------------------------------------------------------------------- */
 
-string Request::get_error (const string &object,
-                           int id)
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "]" << " Error getting " <<
-           object;
-
-   if ( id != -1 )
-   {
-       oss << " [" << id << "].";
-   }
-   else
-   {
-      oss << " Pool.";
-   }
-
-   return oss.str();
-}
-/* -------------------------------------------------------------------------- */
-
-string Request::request_error (const string &err_desc, const string &err_detail)
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "] " << err_desc;
-
-    if (!err_detail.empty())
-    {
-        oss << ". " << err_detail;
-    }
-
-    return oss.str();
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string Request::allocate_error(PoolObjectSQL::ObjectType obj,
-                               const string&             error)
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "]" << " Error allocating a new "
-        << object_name(obj) << ".";
-
-    if (!error.empty())
-    {
-        oss << " " << error;
-    }
-
-    return oss.str();
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string Request::allocate_error (const string& error)
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "]" << " Error allocating a new "
-        << object_name(auth_object) << ".";
-
-    if (!error.empty())
-    {
-        oss << " " << error;
-    }
-
-    return oss.str();
-}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -756,7 +725,9 @@ int Request::get_info(
     {
         if (throw_error)
         {
-            failure_response(NO_EXISTS, get_error(object_name(type), id), att);
+            att.resp_obj = type;
+            att.resp_id  = id;
+            failure_response(NO_EXISTS, att);
         }
 
         return -1;
diff --git a/src/rm/RequestManagerAcl.cc b/src/rm/RequestManagerAcl.cc
index 9349d0e9e7..6cf6a4a214 100644
--- a/src/rm/RequestManagerAcl.cc
+++ b/src/rm/RequestManagerAcl.cc
@@ -18,8 +18,8 @@
 
 using namespace std;
 
-/* ------------------------------------------------------------------------- */
-/* ------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
 
 void AclAddRule::request_execute(xmlrpc_c::paramList const& paramList,
                                  RequestAttributes& att)
@@ -61,18 +61,16 @@ void AclAddRule::request_execute(xmlrpc_c::paramList const& paramList,
         zone = AclRule::INDIVIDUAL_ID | Nebula::instance().get_zone_id();
     }
 
-    string error_msg;
-
     if ( basic_authorization(-1, att) == false )
     {
         return;
     }
 
-    int rc = aclm->add_rule(user, resource, rights, zone, error_msg);
+    int rc = aclm->add_rule(user, resource, rights, zone, att.resp_msg);
 
     if ( rc < 0 )
     {
-        failure_response(INTERNAL, request_error(error_msg, ""), att);
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -81,8 +79,8 @@ void AclAddRule::request_execute(xmlrpc_c::paramList const& paramList,
     return;
 }
 
-/* ------------------------------------------------------------------------- */
-/* ------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
 
 void AclDelRule::request_execute(xmlrpc_c::paramList const& paramList,
                                  RequestAttributes& att)
@@ -95,11 +93,11 @@ void AclDelRule::request_execute(xmlrpc_c::paramList const& paramList,
         return;
     }
 
-    int rc = aclm->del_rule(oid, error_msg);
+    int rc = aclm->del_rule(oid, att.resp_msg);
 
     if ( rc < 0 )
     {
-        failure_response(INTERNAL, request_error(error_msg, ""), att);
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -108,8 +106,8 @@ void AclDelRule::request_execute(xmlrpc_c::paramList const& paramList,
     return;
 }
 
-/* ------------------------------------------------------------------------- */
-/* ------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
 
 void AclInfo::request_execute(xmlrpc_c::paramList const& paramList,
                               RequestAttributes& att)
@@ -126,7 +124,8 @@ void AclInfo::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL, request_error("Internal Error",""), att);
+        att.resp_msg = "Internal Database error";
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -135,4 +134,3 @@ void AclInfo::request_execute(xmlrpc_c::paramList const& paramList,
     return;
 }
 
-/* ------------------------------------------------------------------------- */
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 133d6ce7ad..9415047b8c 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -50,9 +50,8 @@ bool RequestManagerAllocate::allocate_authorization(
 
     if (UserPool::authorize(ar) == -1)
     {
-        failure_response(AUTHORIZATION,
-                authorization_error(ar.message, att),
-                att);
+        att.resp_msg = ar.message;
+        failure_response(AUTHORIZATION, att);
 
         return false;
     }
@@ -85,13 +84,8 @@ bool VirtualMachineAllocate::allocate_authorization(
     {
         if (ttmpl->check(aname))
         {
-            ostringstream oss;
-
-            oss << "VM Template includes a restricted attribute " << aname;
-
-            failure_response(AUTHORIZATION,
-                    authorization_error(oss.str(), att),
-                    att);
+            att.resp_msg = "VM Template includes a restricted attribute "+aname;
+            failure_response(AUTHORIZATION, att);
 
             return false;
         }
@@ -105,9 +99,8 @@ bool VirtualMachineAllocate::allocate_authorization(
 
     if (UserPool::authorize(ar) == -1)
     {
-        failure_response(AUTHORIZATION,
-                authorization_error(ar.message, att),
-                att);
+        att.resp_msg = ar.message;
+        failure_response(AUTHORIZATION, att);
 
         return false;
     }
@@ -134,7 +127,6 @@ void RequestManagerAllocate::request_execute(xmlrpc_c::paramList const& params,
 {
     Template * tmpl = 0;
 
-    string error_str;
     int    rc, id;
 
     Cluster *       cluster      = 0;
@@ -148,11 +140,11 @@ void RequestManagerAllocate::request_execute(xmlrpc_c::paramList const& params,
 
         tmpl = get_object_template();
 
-        rc   = tmpl->parse_str_or_xml(str_tmpl, error_str);
+        rc   = tmpl->parse_str_or_xml(str_tmpl, att.resp_msg);
 
         if ( rc != 0 )
         {
-            failure_response(INTERNAL, allocate_error(error_str), att);
+            failure_response(INTERNAL, att);
             delete tmpl;
 
             return;
@@ -183,11 +175,11 @@ void RequestManagerAllocate::request_execute(xmlrpc_c::paramList const& params,
         return;
     }
 
-    rc = pool_allocate(params, tmpl, id, error_str,att,cluster_id,cluster_name);
+    rc = pool_allocate(params, tmpl, id, att, cluster_id, cluster_name);
 
     if ( rc < 0 )
     {
-        failure_response(INTERNAL, allocate_error(error_str), att);
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -199,14 +191,13 @@ void RequestManagerAllocate::request_execute(xmlrpc_c::paramList const& params,
 
         if ( cluster == 0 )
         {
-            failure_response(
-                    NO_EXISTS,
-                    get_error(object_name(PoolObjectSQL::CLUSTER), cluster_id),
-                    att);
+            att.resp_obj = PoolObjectSQL::CLUSTER;
+            att.resp_id  = cluster_id;
+            failure_response(NO_EXISTS, att);
             return;
         }
 
-        rc = add_to_cluster(cluster, id, ds_type, error_str);
+        rc = add_to_cluster(cluster, id, ds_type, att.resp_msg);
 
         if ( rc < 0 )
         {
@@ -223,7 +214,7 @@ void RequestManagerAllocate::request_execute(xmlrpc_c::paramList const& params,
                 obj->unlock();
             }
 
-            failure_response(INTERNAL, allocate_error(error_str), att);
+            failure_response(INTERNAL, att);
             return;
         }
 
@@ -242,7 +233,6 @@ int VirtualMachineAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     bool on_hold = false;
@@ -258,7 +248,7 @@ int VirtualMachineAllocate::pool_allocate(
     Template tmpl_back(*tmpl);
 
     int rc = vmpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-            ttmpl, &id, error_str, on_hold);
+            ttmpl, &id, att.resp_msg, on_hold);
 
     if ( rc < 0 )
     {
@@ -276,7 +266,6 @@ int VirtualNetworkAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att,
         int                         cluster_id,
         const string&               cluster_name)
@@ -285,7 +274,7 @@ int VirtualNetworkAllocate::pool_allocate(
     VirtualNetworkTemplate * vtmpl=static_cast<VirtualNetworkTemplate *>(tmpl);
 
     return vpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,-1,
-            vtmpl, &id, cluster_id, cluster_name, error_str);
+            vtmpl, &id, cluster_id, cluster_name, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -294,7 +283,6 @@ int VirtualNetworkAllocate::pool_allocate(
 void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
                                              RequestAttributes& att)
 {
-    string error_str;
     string size_str;
 
     long long     size_mb;
@@ -332,11 +320,11 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     tmpl = new ImageTemplate;
 
-    rc = tmpl->parse_str_or_xml(str_tmpl, error_str);
+    rc = tmpl->parse_str_or_xml(str_tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL, allocate_error(error_str), att);
+        failure_response(INTERNAL, att);
 
         delete tmpl;
         return;
@@ -346,9 +334,9 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     if ((ds = dspool->get(ds_id,true)) == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::DATASTORE), ds_id),
-                att);
+        att.resp_id  = ds_id;
+        att.resp_obj = PoolObjectSQL::DATASTORE;
+        failure_response(NO_EXISTS, att);
 
         delete tmpl;
         return;
@@ -358,15 +346,12 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     if ( ds_type == Datastore::SYSTEM_DS )
     {
-        ostringstream oss;
-
         ds->unlock();
 
-        oss << "New images cannot be allocated in a system datastore.";
-        failure_response(INTERNAL, allocate_error(oss.str()), att);
+        att.resp_msg = "New images cannot be allocated in a system datastore.";
+        failure_response(ALLOCATE, att);
 
         delete tmpl;
-
         return;
     }
 
@@ -386,9 +371,9 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     if ( rc == -1 )
     {
-        failure_response(INTERNAL,
-                         request_error("Cannot determine Image SIZE", size_str),
-                         att);
+        att.resp_msg = "Cannot determine image SIZE: " + size_str;
+        failure_response(INTERNAL, att);
+
         delete tmpl;
         return;
     }
@@ -398,16 +383,17 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     if ( iss.fail() )
     {
-        failure_response(INTERNAL,
-                         request_error("Cannot parse SIZE", size_str),
-                         att);
+        att.resp_msg = "Cannot parse image SIZE: " + size_str;
+        failure_response(INTERNAL, att);
+
         delete tmpl;
         return;
     }
 
     if (ds_check && (size_mb > avail))
     {
-        failure_response(ACTION, "Not enough space in datastore", att);
+        att.resp_msg = "Not enough space in datastore";
+        failure_response(ACTION, att);
 
         delete tmpl;
         return;
@@ -433,13 +419,8 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
         {
             if (tmpl->check(aname))
             {
-                ostringstream oss;
-
-                oss << "Template includes a restricted attribute " << aname;
-
-                failure_response(AUTHORIZATION,
-                        authorization_error(oss.str(), att),
-                        att);
+                att.resp_msg = "Template includes a restricted attribute "+aname;
+                failure_response(AUTHORIZATION, att);
 
                 delete tmpl;
                 return;
@@ -455,9 +436,8 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
-                    att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             delete tmpl;
             return;
@@ -485,12 +465,12 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
                          ds_type,
                          -1,
                          &id,
-                         error_str);
+                         att.resp_msg);
     if ( rc < 0 )
     {
         quota_rollback(&img_usage, Quotas::DATASTORE, att);
 
-        failure_response(INTERNAL, allocate_error(error_str), att);
+        failure_response(ALLOCATE, att);
         return;
     }
 
@@ -515,7 +495,6 @@ int TemplateAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     VMTemplatePool * tpool = static_cast<VMTemplatePool *>(pool);
@@ -523,7 +502,7 @@ int TemplateAllocate::pool_allocate(
     VirtualMachineTemplate * ttmpl=static_cast<VirtualMachineTemplate *>(tmpl);
 
     return tpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-        ttmpl, &id, error_str);
+        ttmpl, &id, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -548,14 +527,9 @@ bool TemplateAllocate::allocate_authorization(
     // ------------ Check template for restricted attributes -------------------
     if (ttmpl->check(aname))
     {
-        ostringstream oss;
-
-        oss << "VM Template includes a restricted attribute " << aname;
-
-        failure_response(AUTHORIZATION,
-                authorization_error(oss.str(), att),
-                att);
+        att.resp_msg = "VM Template includes a restricted attribute " + aname;
 
+        failure_response(AUTHORIZATION, att);
         return false;
     }
 
@@ -569,7 +543,6 @@ int HostAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att,
         int                         cluster_id,
         const string&               cluster_name)
@@ -582,8 +555,7 @@ int HostAllocate::pool_allocate(
     HostPool * hpool = static_cast<HostPool *>(pool);
 
     return hpool->allocate(&id, host, im_mad, vmm_mad, vnm_mad,
-                           cluster_id, cluster_name, error_str);
-
+                           cluster_id, cluster_name, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -593,7 +565,6 @@ int UserAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     string uname  = xmlrpc_c::value_string(paramList.getString(1));
@@ -616,7 +587,7 @@ int UserAllocate::pool_allocate(
         driver = UserPool::CORE_AUTH;
     }
 
-    return upool->allocate(&id,ugid,uname,ugname,passwd,driver,true,error_str);
+    return upool->allocate(&id,ugid,uname,ugname,passwd,driver,true,att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -626,7 +597,6 @@ int GroupAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     int rc;
@@ -635,7 +605,7 @@ int GroupAllocate::pool_allocate(
 
     GroupPool * gpool = static_cast<GroupPool *>(pool);
 
-    rc = gpool->allocate(gname, &id, error_str);
+    rc = gpool->allocate(gname, &id, att.resp_msg);
 
     if (rc == -1)
     {
@@ -646,7 +616,7 @@ int GroupAllocate::pool_allocate(
 
     if (vdc != 0)
     {
-        rc = vdc->add_group(id, error_str);
+        rc = vdc->add_group(id, att.resp_msg);
 
         vdcpool->update(vdc);
 
@@ -663,7 +633,6 @@ int DatastoreAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att,
         int                         cluster_id,
         const string&               cluster_name)
@@ -672,7 +641,7 @@ int DatastoreAllocate::pool_allocate(
     DatastoreTemplate * ds_tmpl = static_cast<DatastoreTemplate *>(tmpl);
 
     return dspool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-            ds_tmpl, &id, cluster_id, cluster_name, error_str);
+            ds_tmpl, &id, cluster_id, cluster_name, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -682,14 +651,13 @@ int ClusterAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     string name = xmlrpc_c::value_string(paramList.getString(1));
 
     ClusterPool * clpool = static_cast<ClusterPool *>(pool);
 
-    return clpool->allocate(name, &id, error_str);
+    return clpool->allocate(name, &id, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -699,7 +667,6 @@ int DocumentAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     int type = xmlrpc_c::value_int(paramList.getInt(2));
@@ -707,7 +674,7 @@ int DocumentAllocate::pool_allocate(
     DocumentPool * docpool = static_cast<DocumentPool *>(pool);
 
     return docpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-            type, tmpl, &id, error_str);
+            type, tmpl, &id, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -718,9 +685,8 @@ void ZoneAllocate::request_execute(xmlrpc_c::paramList const& params,
 {
     if(!Nebula::instance().is_federation_master())
     {
-        failure_response(INTERNAL, allocate_error(
-                "New Zones can only be created if OpenNebula "
-                "is configured as a Federation Master."), att);
+        att.resp_msg = "New zones can only be created at federation master";
+        failure_response(ALLOCATE, att);
         return;
     }
 
@@ -734,14 +700,13 @@ int ZoneAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     string name = xmlrpc_c::value_string(paramList.getString(1));
 
     ZonePool * zonepool = static_cast<ZonePool *>(pool);
 
-    return zonepool->allocate(tmpl, &id, error_str);
+    return zonepool->allocate(tmpl, &id, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -751,13 +716,12 @@ int SecurityGroupAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     SecurityGroupPool * sgpool = static_cast<SecurityGroupPool *>(pool);
 
     return sgpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-        tmpl, &id, error_str);
+        tmpl, &id, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -767,14 +731,13 @@ int VdcAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     string name = xmlrpc_c::value_string(paramList.getString(1));
 
     VdcPool * vdcpool = static_cast<VdcPool *>(pool);
 
-    return vdcpool->allocate(tmpl, &id, error_str);
+    return vdcpool->allocate(tmpl, &id, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -784,11 +747,10 @@ int VirtualRouterAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     VirtualRouterPool * vrpool = static_cast<VirtualRouterPool *>(pool);
 
     return vrpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-        tmpl, &id, error_str);
+        tmpl, &id, att.resp_msg);
 }
diff --git a/src/rm/RequestManagerChmod.cc b/src/rm/RequestManagerChmod.cc
index 64bd352a87..09ac4b06bf 100644
--- a/src/rm/RequestManagerChmod.cc
+++ b/src/rm/RequestManagerChmod.cc
@@ -40,7 +40,6 @@ void RequestManagerChmod::request_execute(xmlrpc_c::paramList const& paramList,
     int other_a = xmlrpc_c::value_int(paramList.getInt(10));
 
     PoolObjectSQL * object;
-    string          error_str;
 
     if ( att.uid != 0 && att.gid != 0)
     {
@@ -51,9 +50,8 @@ void RequestManagerChmod::request_execute(xmlrpc_c::paramList const& paramList,
 
         if ( object == 0 )
         {
-            failure_response(NO_EXISTS,
-                             get_error(object_name(auth_object),oid),
-                             att);
+            att.resp_id = oid;
+            failure_response(NO_EXISTS, att);
             return;
         }
 
@@ -100,10 +98,8 @@ void RequestManagerChmod::request_execute(xmlrpc_c::paramList const& paramList,
 
             if ( !enable_other )
             {
-                failure_response(AUTHORIZATION,
-                         "Management of 'other' permissions is disabled in oned.conf",
-                         att);
-
+                att.resp_msg = "'other' permissions is disabled in oned.conf";
+                failure_response(AUTHORIZATION, att);
                 return;
             }
         }
@@ -114,9 +110,8 @@ void RequestManagerChmod::request_execute(xmlrpc_c::paramList const& paramList,
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             return;
         }
@@ -128,20 +123,17 @@ void RequestManagerChmod::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),oid),
-                att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
     int rc = object->set_permissions(owner_u, owner_m, owner_a, group_u,
-                        group_m, group_a, other_u, other_m, other_a, error_str);
+                    group_m, group_a, other_u, other_m, other_a, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,
-                request_error("Error updating permissions",error_str),
-                att);
+        failure_response(INTERNAL, att);
 
         object->unlock();
         return;
diff --git a/src/rm/RequestManagerChown.cc b/src/rm/RequestManagerChown.cc
index f6d9957e08..59050d5152 100644
--- a/src/rm/RequestManagerChown.cc
+++ b/src/rm/RequestManagerChown.cc
@@ -37,15 +37,12 @@ PoolObjectSQL * RequestManagerChown::get_and_quota(
     PoolObjectSQL *   object;
     Quotas::QuotaType qtype;
 
-    string error_str;
-
     object = pool->get(oid,true);
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                         get_error(object_name(auth_object), oid),
-                         att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return 0;
     }
 
@@ -70,7 +67,6 @@ PoolObjectSQL * RequestManagerChown::get_and_quota(
         unsigned int  total = vn->get_size();
 
         ostringstream oss;
-        string  tmp_error;
 
         int parent = vn->get_parent();
 
@@ -86,7 +82,7 @@ PoolObjectSQL * RequestManagerChown::get_and_quota(
             oss << " NIC = [ NETWORK_ID = " << parent << " ]" << endl;
         }
 
-        tmpl->parse_str_or_xml(oss.str(), error_str);
+        tmpl->parse_str_or_xml(oss.str(), att.resp_msg);
 
         qtype = Quotas::NETWORK;
     }
@@ -120,11 +116,9 @@ PoolObjectSQL * RequestManagerChown::get_and_quota(
     RequestAttributes att_new(new_uid, new_gid, att);
     RequestAttributes att_old(old_uid, old_gid, att);
 
-    if ( quota_authorization(tmpl, qtype, att_new, error_str) == false )
+    if ( quota_authorization(tmpl, qtype, att_new, att.resp_msg) == false )
     {
-        failure_response(AUTHORIZATION,
-                request_error(error_str, ""),
-                att);
+        failure_response(AUTHORIZATION, att);
 
         delete tmpl;
         return 0;
@@ -138,11 +132,10 @@ PoolObjectSQL * RequestManagerChown::get_and_quota(
     {
         quota_rollback(tmpl, qtype, att_new);
 
-        quota_authorization(tmpl, qtype, att_old, error_str);
+        quota_authorization(tmpl, qtype, att_old, att.resp_msg);
 
-        failure_response(NO_EXISTS,
-                         get_error(object_name(auth_object), oid),
-                         att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
     }
 
     delete tmpl;
@@ -164,10 +157,8 @@ int RequestManagerChown::check_name_unique(int oid, int noid, RequestAttributes&
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                         get_error(object_name(auth_object), oid),
-                         att);
-
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return -1;
     }
 
@@ -182,12 +173,12 @@ int RequestManagerChown::check_name_unique(int oid, int noid, RequestAttributes&
         obj_oid = object->get_oid();
         object->unlock();
 
-        oss << PoolObjectSQL::type_to_str(PoolObjectSQL::USER)
-            << " [" << noid << "] already owns "
-            << PoolObjectSQL::type_to_str(auth_object) << " ["
-            << obj_oid << "] with NAME " << name;
+        oss << object_name(PoolObjectSQL::USER) << " ["<<noid<<"] already owns "
+            << object_name(auth_object) << " ["<<obj_oid<<"] with NAME " << name;
 
-        failure_response(INTERNAL, request_error(oss.str(), ""), att);
+        att.resp_msg = oss.str();
+
+        failure_response(INTERNAL, att);
         return -1;
     }
 
@@ -268,9 +259,8 @@ void RequestManagerChown::request_execute(xmlrpc_c::paramList const& paramList,
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             return;
         }
@@ -300,9 +290,8 @@ void RequestManagerChown::request_execute(xmlrpc_c::paramList const& paramList,
 
         if ( object == 0 )
         {
-            failure_response(NO_EXISTS,
-                             get_error(object_name(auth_object), oid),
-                             att);
+            att.resp_id = oid;
+            failure_response(NO_EXISTS, att);
         }
     }
 
@@ -363,7 +352,8 @@ void UserChown::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( ngid < 0 )
     {
-        failure_response(XML_RPC_API,request_error("Wrong group ID",""), att);
+        att.resp_msg = "Wrong group ID";
+        failure_response(XML_RPC_API, att);
         return;
     }
 
@@ -385,14 +375,16 @@ void UserChown::request_execute(xmlrpc_c::paramList const& paramList,
     {
         ostringstream oss;
 
-        oss << PoolObjectSQL::type_to_str(PoolObjectSQL::USER)
-            << " [" << UserPool::ONEADMIN_ID << "] " << UserPool::oneadmin_name
+        oss << object_name(PoolObjectSQL::USER) << " ["
+            << UserPool::ONEADMIN_ID << "] " << UserPool::oneadmin_name
             << " cannot be moved outside of the "
-            << PoolObjectSQL::type_to_str(PoolObjectSQL::GROUP)
+            << object_name(PoolObjectSQL::GROUP)
             << " [" << GroupPool::ONEADMIN_ID << "] "
             << GroupPool::ONEADMIN_NAME;
 
-        failure_response(INTERNAL, request_error(oss.str(), ""), att);
+        att.resp_msg = oss.str();
+
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -405,9 +397,8 @@ void UserChown::request_execute(xmlrpc_c::paramList const& paramList,
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             return;
         }
@@ -419,9 +410,10 @@ void UserChown::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( user == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::USER),oid),
-                att);
+        att.resp_obj = PoolObjectSQL::USER;
+        att.resp_id  = oid;
+        failure_response(NO_EXISTS, att);
+
         return;
     }
 
@@ -456,9 +448,11 @@ void UserChown::request_execute(xmlrpc_c::paramList const& paramList,
 
     if( group == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::GROUP),ngid),
-                att);//TODO Rollback
+        //TODO Rollback
+        att.resp_obj = PoolObjectSQL::GROUP;
+        att.resp_id  = ngid;
+        failure_response(NO_EXISTS, att);
+
         return;
     }
 
diff --git a/src/rm/RequestManagerClone.cc b/src/rm/RequestManagerClone.cc
index 5a8dc25a17..f84b75b7ed 100644
--- a/src/rm/RequestManagerClone.cc
+++ b/src/rm/RequestManagerClone.cc
@@ -35,16 +35,12 @@ void RequestManagerClone::request_execute(
     Template *      tmpl;
     PoolObjectSQL * source_obj;
 
-    string          error_str;
-
     source_obj = pool->get(source_id, true);
 
     if ( source_obj == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object), source_id),
-                att);
-
+        att.resp_id = source_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -71,20 +67,19 @@ void RequestManagerClone::request_execute(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
-                    att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             delete tmpl;
             return;
         }
     }
 
-    rc = pool_allocate(source_id, tmpl, new_id, error_str, att);
+    rc = pool_allocate(source_id, tmpl, new_id, att);
 
     if ( rc < 0 )
     {
-        failure_response(INTERNAL, allocate_error(error_str), att);
+        failure_response(ALLOCATE, att);
         return;
     }
 
diff --git a/src/rm/RequestManagerCluster.cc b/src/rm/RequestManagerCluster.cc
index f3840d6cef..48a460b25a 100644
--- a/src/rm/RequestManagerCluster.cc
+++ b/src/rm/RequestManagerCluster.cc
@@ -38,7 +38,6 @@ void RequestManagerCluster::add_generic(
     Clusterable *   cluster_obj = 0;
     PoolObjectSQL * object = 0;
 
-
     PoolObjectAuth c_perms;
     PoolObjectAuth obj_perms;
 
@@ -82,9 +81,8 @@ void RequestManagerCluster::add_generic(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             return;
         }
@@ -95,10 +93,9 @@ void RequestManagerCluster::add_generic(
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(type), object_id),
-                att);
-
+        att.resp_obj = type;
+        att.resp_id  = object_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -127,9 +124,9 @@ void RequestManagerCluster::add_generic(
 
         if ( cluster == 0 )
         {
-            failure_response(NO_EXISTS,
-                    get_error(object_name(PoolObjectSQL::CLUSTER),cluster_id),
-                    att);
+            att.resp_obj = PoolObjectSQL::CLUSTER;
+            att.resp_id  = cluster_id;
+            failure_response(NO_EXISTS, att);
 
             // Rollback
             get(object_id, true, &object, &cluster_obj);
@@ -146,13 +143,11 @@ void RequestManagerCluster::add_generic(
             return;
         }
 
-        if ( add_object(cluster, object_id, ds_type, err_msg) < 0 )
+        if ( add_object(cluster, object_id, ds_type, att.resp_msg) < 0 )
         {
             cluster->unlock();
 
-            failure_response(INTERNAL,
-                    request_error("Cannot add object to cluster", err_msg),
-                    att);
+            failure_response(INTERNAL, att);
 
             // Rollback
             get(object_id, true, &object, &cluster_obj);
@@ -189,14 +184,11 @@ void RequestManagerCluster::add_generic(
             return;
         }
 
-        if ( del_object(cluster, object_id, err_msg) < 0 )
+        if ( del_object(cluster, object_id, att.resp_msg) < 0 )
         {
             cluster->unlock();
 
-            failure_response(INTERNAL,
-                    request_error("Cannot remove object from cluster", err_msg),
-                    att);
-
+            failure_response(INTERNAL, att);
             return;
         }
 
diff --git a/src/rm/RequestManagerDatastore.cc b/src/rm/RequestManagerDatastore.cc
index e174d06880..5882a69f31 100644
--- a/src/rm/RequestManagerDatastore.cc
+++ b/src/rm/RequestManagerDatastore.cc
@@ -29,7 +29,6 @@ void DatastoreEnable::request_execute(xmlrpc_c::paramList const& paramList,
     int     rc;
 
     Datastore * ds;
-    string  err_msg;
 
     if ( basic_authorization(id, att) == false )
     {
@@ -40,18 +39,16 @@ void DatastoreEnable::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( ds == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),id),
-                att);
-
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    rc = ds->enable(enable_flag, err_msg);
+    rc = ds->enable(enable_flag, att.resp_msg);
 
     if ( rc != 0  )
     {
-        failure_response(INTERNAL,request_error(err_msg,""), att);
+        failure_response(INTERNAL, att);
 
         ds->unlock();
         return;
diff --git a/src/rm/RequestManagerDelete.cc b/src/rm/RequestManagerDelete.cc
index e8dcec6223..f66cf57eeb 100644
--- a/src/rm/RequestManagerDelete.cc
+++ b/src/rm/RequestManagerDelete.cc
@@ -37,9 +37,8 @@ bool RequestManagerDelete::delete_authorization(
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                         get_error(object_name(auth_object),oid),
-                         att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return false;
     }
 
@@ -53,9 +52,8 @@ bool RequestManagerDelete::delete_authorization(
 
     if (UserPool::authorize(ar) == -1)
     {
-        failure_response(AUTHORIZATION,
-                authorization_error(ar.message, att),
-                att);
+        att.resp_msg = ar.message;
+        failure_response(AUTHORIZATION, att);
 
         return false;
     }
@@ -82,8 +80,8 @@ void RequestManagerDelete::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS, get_error(object_name(auth_object), oid),
-                att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -91,9 +89,8 @@ void RequestManagerDelete::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( rc != 0 )
     {
-        failure_response(ACTION,
-            request_error("Cannot delete "+object_name(auth_object),error_msg),
-            att);
+        att.resp_msg = "Cannot delete " + object_name(auth_object) + ". " +  error_msg;
+        failure_response(ACTION, att);
         return;
     }
 
diff --git a/src/rm/RequestManagerGroup.cc b/src/rm/RequestManagerGroup.cc
index dceedeb935..eca3a0a216 100644
--- a/src/rm/RequestManagerGroup.cc
+++ b/src/rm/RequestManagerGroup.cc
@@ -26,16 +26,14 @@ void GroupSetQuota::
     string  quota_str = xmlrpc_c::value_string(paramList.getString(2));
 
     Group * group;
-    string  error_str;
 
     Template quota_tmpl;
     int      rc;
 
     if ( id == GroupPool::ONEADMIN_ID )
     {
-        failure_response(ACTION,
-                       request_error("Cannot set quotas for oneadmin group",""),
-                       att);
+        att.resp_msg = "Cannot set quotas for oneadmin group";
+        failure_response(ACTION, att);
         return;
     }
 
@@ -44,11 +42,11 @@ void GroupSetQuota::
         return;
     }
 
-    rc = quota_tmpl.parse_str_or_xml(quota_str, error_str);
+    rc = quota_tmpl.parse_str_or_xml(quota_str, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION, request_error(error_str,""), att);
+        failure_response(ACTION, att);
         return;
     }
 
@@ -56,14 +54,12 @@ void GroupSetQuota::
 
     if ( group == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),id),
-                att);
-
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    group->quota.set(&quota_tmpl, error_str);
+    group->quota.set(&quota_tmpl, att.resp_msg);
 
     static_cast<GroupPool *>(pool)->update_quotas(group);
 
@@ -71,7 +67,7 @@ void GroupSetQuota::
 
     if ( rc != 0 )
     {
-        failure_response(ACTION, request_error(error_str,""), att);
+        failure_response(ACTION, att);
     }
     else
     {
@@ -117,9 +113,9 @@ void GroupEditAdmin::request_execute(
 
     if ( rc == -1 )
     {
-        failure_response(NO_EXISTS, get_error(object_name(PoolObjectSQL::USER),
-                user_id), att);
-
+        att.resp_obj = PoolObjectSQL::USER;
+        att.resp_id  = user_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -133,9 +129,8 @@ void GroupEditAdmin::request_execute(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             return;
         }
@@ -145,14 +140,12 @@ void GroupEditAdmin::request_execute(
 
     if ( group  == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),group_id),
-                att);
-
+        att.resp_id = group_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    rc = edit_admin(group, user_id, error_str);
+    rc = edit_admin(group, user_id, att.resp_msg);
 
     if (rc == 0)
     {
@@ -163,9 +156,8 @@ void GroupEditAdmin::request_execute(
 
     if (rc != 0)
     {
-        failure_response(INTERNAL,
-                request_error("Cannot edit group", error_str),
-                att);
+        att.resp_msg = "Cannot edit group. " + att.resp_msg;
+        failure_response(INTERNAL, att);
 
         return;
     }
diff --git a/src/rm/RequestManagerHost.cc b/src/rm/RequestManagerHost.cc
index 9c1b96b99c..c8267a745b 100644
--- a/src/rm/RequestManagerHost.cc
+++ b/src/rm/RequestManagerHost.cc
@@ -30,8 +30,6 @@ void HostEnable::request_execute(xmlrpc_c::paramList const& paramList,
 
     HostPool * hpool = static_cast<HostPool *>(pool);
 
-    string error_str;
-
     if ( basic_authorization(id, att) == false )
     {
         return;
@@ -41,9 +39,8 @@ void HostEnable::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( host  == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),id),
-                att);
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
 
         return;
     }
@@ -85,7 +82,8 @@ void HostMonitoring::request_execute(
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        att.resp_msg = "Internal error";
+        failure_response(INTERNAL, att);
         return;
     }
 
diff --git a/src/rm/RequestManagerImage.cc b/src/rm/RequestManagerImage.cc
index 819f65cfed..54dfc724e9 100644
--- a/src/rm/RequestManagerImage.cc
+++ b/src/rm/RequestManagerImage.cc
@@ -28,8 +28,6 @@ void ImageEnable::request_execute(xmlrpc_c::paramList const& paramList,
     bool    enable_flag = xmlrpc_c::value_boolean(paramList.getBoolean(2));
     int     rc;
 
-    string err_msg;
-
     Nebula&          nd     = Nebula::instance();
     ImageManager *   imagem = nd.get_imagem();
 
@@ -38,20 +36,20 @@ void ImageEnable::request_execute(xmlrpc_c::paramList const& paramList,
         return;
     }
 
-    rc = imagem->enable_image(id,enable_flag, err_msg);
+    rc = imagem->enable_image(id,enable_flag, att.resp_msg);
 
     if( rc < 0 )
     {
         if (enable_flag == true)
         {
-            err_msg = "Could not enable image: " + err_msg;
+            att.resp_msg = "Could not enable image: " + att.resp_msg;
         }
         else
         {
-            err_msg = "Could not disable image: " + err_msg;
+            att.resp_msg = "Could not disable image: " + att.resp_msg;
         }
 
-        failure_response(INTERNAL, request_error(err_msg,""), att);
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -69,7 +67,6 @@ void ImagePersistent::request_execute(xmlrpc_c::paramList const& paramList,
     int     rc;
 
     Image * image;
-    string  err_msg;
 
     if ( basic_authorization(id, att) == false )
     {
@@ -80,9 +77,8 @@ void ImagePersistent::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( image == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),id),
-                att);
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
 
         return;
     }
@@ -97,27 +93,26 @@ void ImagePersistent::request_execute(xmlrpc_c::paramList const& paramList,
         case Image::KERNEL:
         case Image::RAMDISK:
         case Image::CONTEXT:
-            failure_response(ACTION,
-                request_error("KERNEL, RAMDISK and CONTEXT files must be "
-                "non-persistent",""), att);
+            att.resp_msg = "KERNEL, RAMDISK and CONTEXT must be non-persistent";
+            failure_response(ACTION, att);
             image->unlock();
         return;
     }
 
-    rc = image->persistent(persistent_flag, err_msg);
+    rc = image->persistent(persistent_flag, att.resp_msg);
 
     if ( rc != 0  )
     {
         if (persistent_flag == true)
         {
-            err_msg = "Could not make image persistent: " + err_msg;
+            att.resp_msg = "Could not make image persistent: " + att.resp_msg;
         }
         else
         {
-            err_msg = "Could not make image non-persistent: " + err_msg;
+            att.resp_msg = "Could not make image non-persistent: " + att.resp_msg;
         }
 
-        failure_response(INTERNAL,request_error(err_msg,""), att);
+        failure_response(INTERNAL, att);
 
         image->unlock();
         return;
@@ -143,7 +138,6 @@ void ImageChangeType::request_execute(xmlrpc_c::paramList const& paramList,
     Image::ImageType itype;
 
     Image * image;
-    string  err_msg;
 
     if ( basic_authorization(id, att) == false )
     {
@@ -154,10 +148,8 @@ void ImageChangeType::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( image == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),id),
-                att);
-
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -168,14 +160,12 @@ void ImageChangeType::request_execute(xmlrpc_c::paramList const& paramList,
         case Image::OS:
         case Image::DATABLOCK:
         case Image::CDROM:
-            if ((itype != Image::OS) &&
-                (itype != Image::DATABLOCK)&&
-                (itype != Image::CDROM) )
+            if ((itype != Image::OS) && (itype != Image::DATABLOCK)&&
+                (itype != Image::CDROM))
             {
-                failure_response(ACTION,
-                    request_error("Cannot change image type to an incompatible"
-                        " type for the current datastore.",""),
-                    att);
+                att.resp_msg = "Cannot change image type to an incompatible type"
+                    " for the current datastore.";
+                failure_response(ACTION, att);
 
                 image->unlock();
                 return;
@@ -189,10 +179,9 @@ void ImageChangeType::request_execute(xmlrpc_c::paramList const& paramList,
                 (itype != Image::RAMDISK)&&
                 (itype != Image::CONTEXT) )
             {
-                failure_response(ACTION,
-                    request_error("Cannot change image type to an incompatible"
-                        " type for the current datastore.",""),
-                    att);
+                att.resp_msg = "Cannot change image type to an incompatible type"
+                    " for the current datastore.";
+                failure_response(ACTION, att);
 
                 image->unlock();
                 return;
@@ -200,11 +189,11 @@ void ImageChangeType::request_execute(xmlrpc_c::paramList const& paramList,
         break;
     }
 
-    rc = image->set_type(type, err_msg);
+    rc = image->set_type(type, att.resp_msg);
 
     if ( rc != 0  )
     {
-        failure_response(INTERNAL,request_error(err_msg,""), att);
+        failure_response(INTERNAL, att);
 
         image->unlock();
         return;
@@ -229,7 +218,7 @@ void ImageClone::request_execute(
 
     long long       avail, size;
     int             rc, new_id, ds_id_orig, ds_id = -1;
-    string          error_str, ds_name, ds_data, ds_mad;
+    string          ds_name, ds_data, ds_mad;
     bool            ds_check;
 
     Image::DiskType disk_type;
@@ -256,10 +245,8 @@ void ImageClone::request_execute(
 
     if ( img == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object), clone_id),
-                att);
-
+        att.resp_id = clone_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -273,9 +260,8 @@ void ImageClone::request_execute(
         case Image::KERNEL:
         case Image::RAMDISK:
         case Image::CONTEXT:
-            failure_response(ACTION,
-                allocate_error("KERNEL, RAMDISK and CONTEXT files cannot be "
-                    "cloned."), att);
+            att.resp_msg = "KERNEL, RAMDISK and CONTEXT cannot be cloned.";
+            failure_response(ACTION, att);
             img->unlock();
         return;
     }
@@ -284,8 +270,8 @@ void ImageClone::request_execute(
 
     if (snaps.size () > 0)
     {
-        failure_response(ACTION,
-                request_error("Cannot clone images with snapshots",""), att);
+        att.resp_msg = "Cannot clone images with snapshots";
+        failure_response(ACTION, att);
         img->unlock();
         return;
     }
@@ -311,9 +297,9 @@ void ImageClone::request_execute(
 
     if ( ds == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::DATASTORE), ds_id),
-                att);
+        att.resp_obj = PoolObjectSQL::DATASTORE;
+        att.resp_id  = ds_id;
+        failure_response(NO_EXISTS, att);
 
         delete tmpl;
         return;
@@ -321,8 +307,8 @@ void ImageClone::request_execute(
 
     if ( ds->get_type() != Datastore::IMAGE_DS )
     {
-        failure_response(ACTION,
-            request_error("Clone only supported for IMAGE_DS Datastores",""),att);
+        att.resp_msg = "Clone only supported for IMAGE_DS Datastores";
+        failure_response(ACTION, att);
 
         ds->unlock();
 
@@ -348,8 +334,9 @@ void ImageClone::request_execute(
 
         if (ds == 0)
         {
-            failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::DATASTORE),ds_id_orig),att);
+            att.resp_obj = PoolObjectSQL::DATASTORE;
+            att.resp_id  = ds_id_orig;
+            failure_response(NO_EXISTS, att);
 
             delete tmpl;
             return;
@@ -357,8 +344,8 @@ void ImageClone::request_execute(
 
         if (ds->get_type() != Datastore::IMAGE_DS)
         {
-            failure_response(ACTION, request_error(
-                "Clone only supported for IMAGE_DS Datastores",""), att);
+            att.resp_msg = "Clone only supported for IMAGE_DS Datastores";
+            failure_response(ACTION, att);
 
             ds->unlock();
 
@@ -368,8 +355,8 @@ void ImageClone::request_execute(
 
         if (ds->get_ds_mad() != ds_mad)
         {
-            failure_response(ACTION, request_error(
-                "Clone only supported to same DS_MAD Datastores",""), att);
+            att.resp_msg = "Clone only supported to same DS_MAD Datastores";
+            failure_response(ACTION, att);
 
             ds->unlock();
 
@@ -389,8 +376,8 @@ void ImageClone::request_execute(
 
     if (ds_check && (size > avail))
     {
-        failure_response(ACTION,
-            request_error("Not enough space in datastore",""), att);
+        att.resp_msg = "Not enough space in datastore";
+        failure_response(ACTION, att);
 
         delete tmpl;
         return;
@@ -416,9 +403,8 @@ void ImageClone::request_execute(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
-                    att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             delete tmpl;
             return;
@@ -446,12 +432,12 @@ void ImageClone::request_execute(
                          Datastore::IMAGE_DS,
                          clone_id,
                          &new_id,
-                         error_str);
+                         att.resp_msg);
     if ( rc < 0 )
     {
         quota_rollback(&img_usage, Quotas::DATASTORE, att);
 
-        failure_response(INTERNAL, allocate_error(error_str), att);
+        failure_response(ALLOCATE, att);
         return;
     }
 
@@ -486,12 +472,11 @@ void ImageSnapshotDelete::request_execute(xmlrpc_c::paramList const& paramList,
         return;
     }
 
-    string err_msg;
-    int    rc = imagem->delete_snapshot(id, snap_id, err_msg);
+    int rc = imagem->delete_snapshot(id, snap_id, att.resp_msg);
 
     if ( rc < 0 )
     {
-        failure_response(ACTION, request_error(err_msg, ""), att);
+        failure_response(ACTION, att);
         return;
     }
 
@@ -515,12 +500,11 @@ void ImageSnapshotRevert::request_execute(xmlrpc_c::paramList const& paramList,
         return;
     }
 
-    string err_msg;
-    int    rc = imagem->revert_snapshot(id, snap_id, err_msg);
+    int rc = imagem->revert_snapshot(id, snap_id, att.resp_msg);
 
     if ( rc < 0 )
     {
-        failure_response(ACTION, request_error(err_msg, ""), att);
+        failure_response(ACTION, att);
         return;
     }
 
@@ -544,12 +528,11 @@ void ImageSnapshotFlatten::request_execute(xmlrpc_c::paramList const& paramList,
         return;
     }
 
-    string err_msg;
-    int    rc = imagem->flatten_snapshot(id, snap_id, err_msg);
+    int rc = imagem->flatten_snapshot(id, snap_id, att.resp_msg);
 
     if ( rc < 0 )
     {
-        failure_response(ACTION, request_error(err_msg, ""), att);
+        failure_response(ACTION, att);
         return;
     }
 
diff --git a/src/rm/RequestManagerInfo.cc b/src/rm/RequestManagerInfo.cc
index 443e1fee3a..302a1f27b1 100644
--- a/src/rm/RequestManagerInfo.cc
+++ b/src/rm/RequestManagerInfo.cc
@@ -50,9 +50,8 @@ void RequestManagerInfo::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),oid),
-                att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -90,10 +89,8 @@ void TemplateInfo::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( vm_tmpl == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),oid),
-                att);
-
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -119,9 +116,8 @@ void TemplateInfo::request_execute(xmlrpc_c::paramList const& paramList,
     {
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
-                    att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
 
             delete extended_tmpl;
             return;
@@ -132,9 +128,8 @@ void TemplateInfo::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( vm_tmpl == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),oid),
-                att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
 
         delete extended_tmpl;
         return;
diff --git a/src/rm/RequestManagerLock.cc b/src/rm/RequestManagerLock.cc
index 7df80647b9..349f983e62 100644
--- a/src/rm/RequestManagerLock.cc
+++ b/src/rm/RequestManagerLock.cc
@@ -40,9 +40,8 @@ void RequestManagerLock::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),oid),
-                att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -78,9 +77,8 @@ void RequestManagerUnlock::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),oid),
-                att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
diff --git a/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc
index 37480d8307..96cfc9ea99 100644
--- a/src/rm/RequestManagerPoolInfoFilter.cc
+++ b/src/rm/RequestManagerPoolInfoFilter.cc
@@ -98,10 +98,8 @@ void VirtualMachinePoolInfo::request_execute(
     if (( state < VirtualMachinePoolInfo::ALL_VM ) ||
         ( state > VirtualMachine::UNDEPLOYED ))
     {
-        failure_response(XML_RPC_API,
-                         request_error("Incorrect filter_flag, state",""),
-                         att);
-
+        att.resp_msg = "Incorrect filter_flag, state";
+        failure_response(XML_RPC_API, att);
         return;
     }
 
@@ -139,9 +137,8 @@ void VirtualMachinePoolAccounting::request_execute(
 
     if ( filter_flag < MINE )
     {
-        failure_response(XML_RPC_API,
-                request_error("Incorrect filter_flag",""),
-                att);
+        att.resp_msg = "Incorrect filter_flag";
+        failure_response(XML_RPC_API, att);
         return;
     }
 
@@ -153,7 +150,8 @@ void VirtualMachinePoolAccounting::request_execute(
                                                               time_end);
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        att.resp_msg = "Internal error";
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -181,9 +179,8 @@ void VirtualMachinePoolShowback::request_execute(
 
     if ( filter_flag < MINE )
     {
-        failure_response(XML_RPC_API,
-                request_error("Incorrect filter_flag",""),
-                att);
+        att.resp_msg = "Incorrect filter_flag";
+        failure_response(XML_RPC_API, att);
         return;
     }
 
@@ -197,7 +194,8 @@ void VirtualMachinePoolShowback::request_execute(
                                                               end_year);
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        att.resp_msg = "Internal error";
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -221,9 +219,8 @@ void VirtualMachinePoolMonitoring::request_execute(
 
     if ( filter_flag < MINE )
     {
-        failure_response(XML_RPC_API,
-                request_error("Incorrect filter_flag",""),
-                att);
+        att.resp_msg = "Incorrect filter_flag";
+        failure_response(XML_RPC_API, att);
         return;
     }
 
@@ -233,7 +230,8 @@ void VirtualMachinePoolMonitoring::request_execute(
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        att.resp_msg = "Internal error";
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -269,7 +267,8 @@ void HostPoolMonitoring::request_execute(
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        att.resp_msg = "Internal error";
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -440,9 +439,8 @@ void RequestManagerPoolInfoFilter::dump(
 
     if ( filter_flag < MINE )
     {
-        failure_response(XML_RPC_API,
-                request_error("Incorrect filter_flag",""),
-                att);
+        att.resp_msg = "Incorrect filter_flag";
+        failure_response(XML_RPC_API, att);
         return;
     }
 
@@ -468,7 +466,8 @@ void RequestManagerPoolInfoFilter::dump(
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        att.resp_msg = "Internal error";
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -489,9 +488,8 @@ void VirtualNetworkPoolInfo::request_execute(
 
     if ( filter_flag < MINE )
     {
-        failure_response(XML_RPC_API,
-                request_error("Incorrect filter_flag",""),
-                att);
+        att.resp_msg = "Incorrect filter_flag";
+        failure_response(XML_RPC_API, att);
         return;
     }
 
@@ -533,7 +531,8 @@ void VirtualNetworkPoolInfo::request_execute(
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        att.resp_msg = "Internal error";
+        failure_response(INTERNAL, att);
         return;
     }
 
diff --git a/src/rm/RequestManagerProxy.cc b/src/rm/RequestManagerProxy.cc
index bf8b4e5faf..dc71a91bed 100644
--- a/src/rm/RequestManagerProxy.cc
+++ b/src/rm/RequestManagerProxy.cc
@@ -61,7 +61,8 @@ void RequestManagerProxy::request_execute(xmlrpc_c::paramList const& _paramList,
     }
     catch(exception const& e)
     {
-        failure_response(INTERNAL, request_error("Could not connect to the federation master oned", ""), att);
+        att.resp_msg = "Could not connect to the federation master oned";
+        failure_response(INTERNAL, att);
     }
 }
 
diff --git a/src/rm/RequestManagerRename.cc b/src/rm/RequestManagerRename.cc
index 27722a0ea2..89fb82fb38 100644
--- a/src/rm/RequestManagerRename.cc
+++ b/src/rm/RequestManagerRename.cc
@@ -31,15 +31,14 @@ void RequestManagerRename::request_execute(xmlrpc_c::paramList const& paramList,
 
     int    rc;
     string old_name;
-    string error_str;
 
     PoolObjectAuth  operms;
     PoolObjectSQL * object;
 
     if (test_and_set_rename(oid) == false)
     {
-        failure_response(INTERNAL,
-            request_error("Object is being renamed", ""), att);
+        att.resp_msg = "Object is being renamed";
+        failure_response(INTERNAL, att);
 
         return;
     }
@@ -70,9 +69,8 @@ void RequestManagerRename::request_execute(xmlrpc_c::paramList const& paramList,
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
             clear_rename(oid);
             return;
         }
@@ -89,13 +87,13 @@ void RequestManagerRename::request_execute(xmlrpc_c::paramList const& paramList,
 
         object->unlock();
 
-        oss << PoolObjectSQL::type_to_str(auth_object)
-            << " cannot be renamed to " << new_name
-            << " because it collides with "
-            << PoolObjectSQL::type_to_str(auth_object) << " "
+        oss << object_name(auth_object) << " cannot be renamed to " << new_name
+            << " because it collides with " << object_name(auth_object) << " "
             << id;
 
-        failure_response(ACTION, request_error(oss.str(), ""), att);
+        att.resp_msg = oss.str();
+
+        failure_response(ACTION, att);
 
         clear_rename(oid);
         return;
@@ -107,19 +105,18 @@ void RequestManagerRename::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                         get_error(object_name(auth_object), oid),
-                         att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
 
         clear_rename(oid);
         return;
     }
 
-    if ( object->set_name(new_name, error_str) != 0 )
+    if ( object->set_name(new_name, att.resp_msg) != 0 )
     {
         object->unlock();
 
-        failure_response(ACTION, request_error(error_str, ""), att);
+        failure_response(ACTION, att);
 
         clear_rename(oid);
         return;
diff --git a/src/rm/RequestManagerSystem.cc b/src/rm/RequestManagerSystem.cc
index 3e65eb9bed..d2c814a01e 100644
--- a/src/rm/RequestManagerSystem.cc
+++ b/src/rm/RequestManagerSystem.cc
@@ -43,9 +43,9 @@ void SystemConfig::request_execute(xmlrpc_c::paramList const& paramList,
 {
     if ( att.gid != GroupPool::ONEADMIN_ID )
     {
-        failure_response(AUTHORIZATION,
-            "The oned configuration can only be retrieved by users in the oneadmin group",
-            att);
+        att.resp_msg = "The oned configuration can only be retrieved by users "
+            "in the oneadmin group";
+        failure_response(AUTHORIZATION, att);
         return;
     }
 
@@ -94,25 +94,25 @@ void QuotaUpdate::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( att.gid != GroupPool::ONEADMIN_ID )
     {
-        failure_response(AUTHORIZATION,
-            "The default quotas can only be updated by users in the oneadmin group",
-            att);
+        att.resp_msg = "The default quotas can only be updated by users in the"
+            " oneadmin group";
+        failure_response(AUTHORIZATION, att);
         return;
     }
 
-    rc = quota_tmpl.parse_str_or_xml(quota_str, error_str);
+    rc = quota_tmpl.parse_str_or_xml(quota_str, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION, request_error(error_str,""), att);
+        failure_response(ACTION, att);
         return;
     }
 
-    rc = set_default_quota(&quota_tmpl, error_str);
+    rc = set_default_quota(&quota_tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION, request_error(error_str,""), att);
+        failure_response(ACTION, att);
         return;
     }
 
diff --git a/src/rm/RequestManagerUpdateTemplate.cc b/src/rm/RequestManagerUpdateTemplate.cc
index 580f03ea90..08209e006a 100644
--- a/src/rm/RequestManagerUpdateTemplate.cc
+++ b/src/rm/RequestManagerUpdateTemplate.cc
@@ -64,7 +64,6 @@ void RequestManagerUpdateTemplate::request_execute(
         RequestAttributes& att)
 {
     int    rc;
-    string error_str;
 
     int    oid  = xmlrpc_c::value_int(paramList.getInt(1));
     string tmpl = xmlrpc_c::value_string(paramList.getString(2));
@@ -85,10 +84,8 @@ void RequestManagerUpdateTemplate::request_execute(
 
     if ( update_type < 0 || update_type > 1 )
     {
-        failure_response(XML_RPC_API,
-                request_error("Wrong update type",error_str),
-                att);
-
+        att.resp_msg = "Wrong update type";
+        failure_response(XML_RPC_API, att);
         return;
     }
 
@@ -97,27 +94,24 @@ void RequestManagerUpdateTemplate::request_execute(
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),oid),
-                att);
-
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
     if (update_type == 0)
     {
-        rc = replace_template(object, tmpl, att, error_str);
+        rc = replace_template(object, tmpl, att, att.resp_msg);
     }
     else //if (update_type == 1)
     {
-        rc = append_template(object, tmpl, att, error_str);
+        rc = append_template(object, tmpl, att, att.resp_msg);
     }
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,
-                request_error("Cannot update template",error_str),
-                att);
+        att.resp_msg = "Cannot update template. " + att.resp_msg;
+        failure_response(INTERNAL, att);
         object->unlock();
 
         return;
diff --git a/src/rm/RequestManagerUser.cc b/src/rm/RequestManagerUser.cc
index 597dd6b0ad..9c8a17876e 100644
--- a/src/rm/RequestManagerUser.cc
+++ b/src/rm/RequestManagerUser.cc
@@ -35,16 +35,14 @@ void RequestManagerUser::
 
     if ( user == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),id),
-                att);
-
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    if ( user_action(id,paramList,error_str) < 0 )
+    if ( user_action(id, paramList, att.resp_msg) < 0 )
     {
-        failure_response(ACTION, request_error(error_str,""), att);
+        failure_response(ACTION, att);
         return;
     }
 
@@ -214,17 +212,15 @@ void UserEditGroup::
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
-
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
             return;
         }
     }
 
-    if ( secondary_group_action(user_id, group_id, paramList, error_str) < 0 )
+    if ( secondary_group_action(user_id, group_id, paramList, att.resp_msg) < 0 )
     {
-        failure_response(ACTION, request_error(error_str,""), att);
+        failure_response(ACTION, att);
         return;
     }
 
@@ -375,10 +371,7 @@ void UserLogin::request_execute(xmlrpc_c::paramList const& paramList,
 
         if ( user == 0 )
         {
-            failure_response(NO_EXISTS,
-                    get_error(object_name(auth_object),-1),
-                    att);
-
+            failure_response(NO_EXISTS, att);
             return;
         }
 
@@ -393,10 +386,8 @@ void UserLogin::request_execute(xmlrpc_c::paramList const& paramList,
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
-
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
             return;
         }
     }
@@ -405,10 +396,7 @@ void UserLogin::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( user == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),-1),
-                att);
-
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -424,11 +412,10 @@ void UserLogin::request_execute(xmlrpc_c::paramList const& paramList,
     }
     else
     {
-        failure_response(XML_RPC_API,
-            request_error("Wrong valid period for token",""), att);
+        att.resp_msg = "Wrong valid period for token";
+        failure_response(XML_RPC_API,  att);
 
         user->unlock();
-
         return;
     }
 
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index b448f8b13d..b474fef5fb 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -38,22 +38,29 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     // TODO: if Template has VROUTER = YES, do not allow to instantiate here
 
-    int vid = instantiate(this, att, id, name, on_hold, str_uattrs, 0);
+    int vid;
+    ErrorCode ec;
 
-    if (vid != -1)
+    ec = instantiate(id, name, on_hold, str_uattrs, 0, vid, att);
+
+    if ( ec == SUCCESS )
     {
         success_response(vid, att);
     }
+    else
+    {
+        failure_response(ec, att);
+    }
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VMTemplateInstantiate::instantiate(Request * req, RequestAttributes& att,
-    int id, string name, bool on_hold, string str_uattrs, Template* extra_attrs)
+Request::ErrorCode VMTemplateInstantiate::instantiate(int id, string name,
+        bool on_hold, string str_uattrs, Template* extra_attrs, int& vid,
+        RequestAttributes& att)
 {
-    int  rc;
-    int  vid;
+    int rc;
 
     ostringstream sid;
 
@@ -69,24 +76,18 @@ int VMTemplateInstantiate::instantiate(Request * req, RequestAttributes& att,
     VirtualMachineTemplate   uattrs;
     VMTemplate *             rtmpl;
 
-    string error_str;
     string aname;
-
     string tmpl_name;
 
     /* ---------------------------------------------------------------------- */
     /* Get, check and clone the template                                      */
     /* ---------------------------------------------------------------------- */
-
     rtmpl = tpool->get(id,true);
 
     if ( rtmpl == 0 )
     {
-        req->failure_response(Request::NO_EXISTS,
-                req->get_error(Request::object_name(PoolObjectSQL::TEMPLATE),id),
-                att);
-
-        return -1;
+        att.resp_id = id;
+        return NO_EXISTS;
     }
 
     tmpl_name = rtmpl->get_name();
@@ -99,51 +100,42 @@ int VMTemplateInstantiate::instantiate(Request * req, RequestAttributes& att,
     // Parse & merge user attributes (check if the request user is not oneadmin)
     if (!str_uattrs.empty())
     {
-        rc = uattrs.parse_str_or_xml(str_uattrs, error_str);
+        rc = uattrs.parse_str_or_xml(str_uattrs, att.resp_msg);
 
         if ( rc != 0 )
         {
-            req->failure_response(Request::INTERNAL, error_str, att);
             delete tmpl;
-            return -1;
+            return INTERNAL;
         }
 
         if (att.uid!=UserPool::ONEADMIN_ID && att.gid!=GroupPool::ONEADMIN_ID)
         {
             if (uattrs.check(aname))
             {
-                ostringstream oss;
-
-                oss << "User Template includes a restricted attribute "<< aname;
-
-                req->failure_response(Request::AUTHORIZATION,
-                        req->authorization_error(oss.str(), att),
-                        att);
+                att.resp_msg ="User Template includes a restricted attribute " + aname;
 
                 delete tmpl;
-                return -1;
+                return AUTHORIZATION;
             }
         }
 
-        rc = tmpl->merge(&uattrs, error_str);
+        rc = tmpl->merge(&uattrs, att.resp_msg);
 
         if ( rc != 0 )
         {
-            req->failure_response(Request::INTERNAL, error_str, att);
             delete tmpl;
-            return -1;
+            return INTERNAL;
         }
     }
 
     if (extra_attrs != 0)
     {
-        rc = tmpl->merge(extra_attrs, error_str);
+        rc = tmpl->merge(extra_attrs, att.resp_msg);
 
         if ( rc != 0 )
         {
-            req->failure_response(Request::INTERNAL, error_str, att);
             delete tmpl;
-            return -1;
+            return INTERNAL;
         }
     }
 
@@ -186,48 +178,43 @@ int VMTemplateInstantiate::instantiate(Request * req, RequestAttributes& att,
 
         if (UserPool::authorize(ar) == -1)
         {
-            req->failure_response(Request::AUTHORIZATION,
-                    req->authorization_error(ar.message, att),
-                    att);
+            att.resp_msg = ar.message;
 
             delete tmpl;
-            return -1;
+            return AUTHORIZATION;
         }
 
         extended_tmpl = new VirtualMachineTemplate(*tmpl);
 
         VirtualMachine::disk_extended_info(att.uid, extended_tmpl);
 
-        if ( req->quota_authorization(extended_tmpl, Quotas::VIRTUALMACHINE, att) == false )
+        if (quota_authorization(extended_tmpl, Quotas::VIRTUALMACHINE, att,
+                    att.resp_msg) == false)
         {
             delete tmpl;
             delete extended_tmpl;
-            return -1;
+            return AUTHORIZATION;
         }
     }
 
     rc = vmpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-            tmpl, &vid, error_str, on_hold);
+            tmpl, &vid, att.resp_msg, on_hold);
 
     if ( rc < 0 )
     {
-        req->failure_response(Request::INTERNAL,
-                req->allocate_error(PoolObjectSQL::VM,error_str),
-                att);
-
         if (extended_tmpl != 0)
         {
-            req->quota_rollback(extended_tmpl, Quotas::VIRTUALMACHINE, att);
+            quota_rollback(extended_tmpl, Quotas::VIRTUALMACHINE, att);
         }
 
         delete extended_tmpl;
 
-        return -1;
+        return ALLOCATE;
     }
 
     delete extended_tmpl;
 
-    return vid;
+    return SUCCESS;
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/rm/RequestManagerVdc.cc b/src/rm/RequestManagerVdc.cc
index 805cbe2d73..2df98f559d 100644
--- a/src/rm/RequestManagerVdc.cc
+++ b/src/rm/RequestManagerVdc.cc
@@ -30,7 +30,6 @@ void VdcEditGroup::request_execute(
 
     string vdc_name;
     string group_name;
-    string error_str;
 
     Vdc* vdc;
 
@@ -53,9 +52,9 @@ void VdcEditGroup::request_execute(
 
     if ( rc == -1 && check_obj_exist )
     {
-        failure_response(NO_EXISTS, get_error(object_name(PoolObjectSQL::GROUP),
-                group_id), att);
-
+        att.resp_obj = PoolObjectSQL::GROUP;
+        att.resp_id  = group_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -68,10 +67,8 @@ void VdcEditGroup::request_execute(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
-
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
             return;
         }
     }
@@ -80,14 +77,12 @@ void VdcEditGroup::request_execute(
 
     if ( vdc  == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),vdc_id),
-                att);
-
+        att.resp_id = vdc_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    rc = edit_group(vdc, group_id, error_str);
+    rc = edit_group(vdc, group_id, att.resp_msg);
 
     if (rc == 0)
     {
@@ -98,10 +93,7 @@ void VdcEditGroup::request_execute(
 
     if (rc != 0)
     {
-        failure_response(INTERNAL,
-                request_error("Cannot edit VDC", error_str),
-                att);
-
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -144,7 +136,6 @@ void VdcEditResource::request_execute(
     string vdc_name;
     string zone_name;
     string res_name;
-    string error_str;
 
     Vdc* vdc;
 
@@ -156,8 +147,7 @@ void VdcEditResource::request_execute(
     // Authorize the action
     // -------------------------------------------------------------------------
 
-    rc = get_info(pool, vdc_id, PoolObjectSQL::VDC,
-                    att, vdc_perms, vdc_name, true);
+    rc = get_info(pool, vdc_id, PoolObjectSQL::VDC, att, vdc_perms, vdc_name, true);
 
     if ( rc == -1 )
     {
@@ -165,32 +155,30 @@ void VdcEditResource::request_execute(
     }
 
     rc = get_info(zonepool, zone_id, PoolObjectSQL::ZONE, att, zone_perms,
-                    zone_name, false);
+            zone_name, false);
 
     zone_exists = (rc == 0);
 
     if ( rc == -1 && check_obj_exist )
     {
-        failure_response(NO_EXISTS, get_error(object_name(PoolObjectSQL::ZONE),
-                zone_id), att);
-
+        att.resp_obj = PoolObjectSQL::ZONE;
+        att.resp_id  = zone_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
     // TODO: resource must exist in target zone, this code only checks locally
-
     if (res_id != Vdc::ALL_RESOURCES && zone_id == local_zone_id)
     {
-        rc = get_info(respool, res_id, res_obj_type, att,
-                        res_perms, res_name, false);
+        rc = get_info(respool, res_id, res_obj_type, att, res_perms, res_name, false);
 
         res_exists = (rc == 0);
 
         if ( rc == -1 && check_obj_exist )
         {
-            failure_response(NO_EXISTS, get_error(object_name(res_obj_type),
-                    res_id), att);
-
+            att.resp_obj = res_obj_type;
+            att.resp_id  = res_id;
+            failure_response(NO_EXISTS, att);
             return;
         }
     }
@@ -213,10 +201,8 @@ void VdcEditResource::request_execute(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                             authorization_error(ar.message, att),
-                             att);
-
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
             return;
         }
     }
@@ -225,14 +211,12 @@ void VdcEditResource::request_execute(
 
     if ( vdc  == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),vdc_id),
-                att);
-
+        att.resp_id = vdc_id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    rc = edit_resource(vdc, zone_id, res_id, error_str);
+    rc = edit_resource(vdc, zone_id, res_id, att.resp_msg);
 
     if (rc == 0)
     {
@@ -243,10 +227,7 @@ void VdcEditResource::request_execute(
 
     if (rc != 0)
     {
-        failure_response(INTERNAL,
-                request_error("Error updating the VDC", error_str),
-                att);
-
+        failure_response(INTERNAL, att);
         return;
     }
 
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index 89ace04aa1..7da3701b17 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -39,9 +39,8 @@ bool RequestManagerVirtualMachine::vm_authorization(
 
     if ( object == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(auth_object),oid),
-                att);
+        att.resp_id = oid;
+        failure_response(NO_EXISTS, att);
 
         return false;
     }
@@ -89,9 +88,8 @@ bool RequestManagerVirtualMachine::vm_authorization(
 
     if (UserPool::authorize(ar) == -1)
     {
-        failure_response(AUTHORIZATION,
-                authorization_error(ar.message, att),
-                att);
+        att.resp_msg = ar.message;
+        failure_response(AUTHORIZATION, att);
 
         return false;
     }
@@ -112,10 +110,9 @@ bool RequestManagerVirtualMachine::quota_resize_authorization(
 
     if (vm == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VM),oid),
-                att);
-
+        att.resp_obj = PoolObjectSQL::VM;
+        att.resp_id  = oid;
+        failure_response(NO_EXISTS, att);
         return false;
     }
 
@@ -136,8 +133,6 @@ bool RequestManagerVirtualMachine::quota_resize_authorization(
 {
     int rc;
 
-    string   error_str;
-
     Nebula&    nd    = Nebula::instance();
     UserPool*  upool = nd.get_upool();
     GroupPool* gpool = nd.get_gpool();
@@ -151,19 +146,18 @@ bool RequestManagerVirtualMachine::quota_resize_authorization(
 
         if ( user != 0 )
         {
-            rc = user->quota.quota_update(Quotas::VM, deltas, user_dquotas, error_str);
+            rc = user->quota.quota_update(Quotas::VM, deltas, user_dquotas, att.resp_msg);
 
             if (rc == false)
             {
                 ostringstream oss;
 
-                oss << object_name(PoolObjectSQL::USER)
-                    << " [" << vm_perms.uid << "] "
-                    << error_str;
+                oss << object_name(PoolObjectSQL::USER) << " [" << vm_perms.uid << "] "
+                    << att.resp_msg;
 
-                failure_response(AUTHORIZATION,
-                        request_error(oss.str(), ""),
-                        att);
+                att.resp_msg = oss.str();
+
+                failure_response(AUTHORIZATION, att);
 
                 user->unlock();
 
@@ -182,20 +176,19 @@ bool RequestManagerVirtualMachine::quota_resize_authorization(
 
         if ( group != 0 )
         {
-            rc = group->quota.quota_update(Quotas::VM, deltas, group_dquotas, error_str);
+            rc = group->quota.quota_update(Quotas::VM, deltas, group_dquotas, att.resp_msg);
 
             if (rc == false)
             {
                 ostringstream oss;
                 RequestAttributes att_tmp(vm_perms.uid, -1, att);
 
-                oss << object_name(PoolObjectSQL::GROUP)
-                    << " [" << vm_perms.gid << "] "
-                    << error_str;
+                oss << object_name(PoolObjectSQL::GROUP) << " [" << vm_perms.gid << "] "
+                    << att.resp_msg;
 
-                failure_response(AUTHORIZATION,
-                                 request_error(oss.str(), ""),
-                                 att);
+                att.resp_msg = oss.str();
+
+                failure_response(AUTHORIZATION, att);
 
                 group->unlock();
 
@@ -241,9 +234,9 @@ int RequestManagerVirtualMachine::get_default_ds_information(
 
         if (cluster == 0)
         {
-            failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::CLUSTER), cluster_id),
-                att);
+            att.resp_obj = PoolObjectSQL::CLUSTER;
+            att.resp_id  = cluster_id;
+            failure_response(NO_EXISTS, att);
 
             return -1;
         }
@@ -258,12 +251,14 @@ int RequestManagerVirtualMachine::get_default_ds_information(
         {
             ostringstream oss;
 
-            oss << object_name(PoolObjectSQL::CLUSTER)
-                << " [" << cluster_id << "] does not have any "
-                << object_name(PoolObjectSQL::DATASTORE) << " of type "
-                << Datastore::type_to_str(Datastore::SYSTEM_DS) << ".";
+            oss << object_name(PoolObjectSQL::CLUSTER) << " [" << cluster_id
+                << "] does not have any " << object_name(PoolObjectSQL::DATASTORE)
+                << " of type " << Datastore::type_to_str(Datastore::SYSTEM_DS)
+                << ".";
 
-            failure_response(ACTION, request_error(oss.str(),""), att);
+            att.resp_msg = oss.str();
+
+            failure_response(ACTION, att);
 
             return -1;
         }
@@ -289,10 +284,9 @@ int RequestManagerVirtualMachine::get_ds_information(int ds_id,
 
     if ( ds == 0 )
     {
-        failure_response(NO_EXISTS,
-            get_error(object_name(PoolObjectSQL::DATASTORE), ds_id),
-            att);
-
+        att.resp_obj = PoolObjectSQL::DATASTORE;
+        att.resp_id  = ds_id;
+        failure_response(NO_EXISTS, att);
         return -1;
     }
 
@@ -304,7 +298,9 @@ int RequestManagerVirtualMachine::get_ds_information(int ds_id,
             << " [" << ds_id << "] to deploy the VM, but it is not of type"
             << " system datastore.";
 
-        failure_response(INTERNAL, request_error(oss.str(),""), att);
+        att.resp_msg = oss.str();
+
+        failure_response(INTERNAL, att);
 
         ds->unlock();
 
@@ -346,10 +342,9 @@ int RequestManagerVirtualMachine::get_host_information(
 
     if ( host == 0 )
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::HOST),hid),
-                att);
-
+        att.resp_obj = PoolObjectSQL::HOST;
+        att.resp_id  = hid;
+        failure_response(NO_EXISTS, att);
         return -1;
     }
 
@@ -367,10 +362,9 @@ int RequestManagerVirtualMachine::get_host_information(
 
     if (nd.get_ds_location(cluster_id, ds_location) == -1)
     {
-        failure_response(NO_EXISTS,
-            get_error(object_name(PoolObjectSQL::CLUSTER),cluster_id),
-            att);
-
+        att.resp_obj = PoolObjectSQL::CLUSTER;
+        att.resp_id  = cluster_id;
+        failure_response(NO_EXISTS, att);
         return -1;
     }
 
@@ -417,8 +411,8 @@ bool RequestManagerVirtualMachine::check_host(
         ostringstream oss;
 
         oss << object_name(PoolObjectSQL::VM) << " [" << vm->get_oid()
-            << "] does not fit in " << object_name(PoolObjectSQL::HOST)
-            << " [" << hid << "]. " << capacity_error;
+            << "] does not fit in " << object_name(PoolObjectSQL::HOST) << " ["
+            << hid << "]. " << capacity_error;
 
         error = oss.str();
     }
@@ -440,7 +434,8 @@ VirtualMachine * RequestManagerVirtualMachine::get_vm(int id,
 
     if ( vm == 0 )
     {
-        failure_response(NO_EXISTS,get_error(object_name(auth_object),id), att);
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return 0;
     }
 
@@ -472,9 +467,8 @@ int RequestManagerVirtualMachine::add_history(VirtualMachine * vm,
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,
-                request_error("Cannot update virtual machine history",""),
-                att);
+        att.resp_msg = "Cannot update virtual machine history";
+        failure_response(INTERNAL, att);
 
         return -1;
     }
@@ -543,11 +537,8 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
 
     if (vm->is_imported() && !vm->is_imported_action_supported(action))
     {
-        oss << "Action \"" << action_st << "\" is not supported for imported VMs";
-
-        failure_response(ACTION,
-                request_error(oss.str(),""),
-                att);
+        att.resp_msg = "Action \"" + action_st + "\" is not supported for imported VMs";
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
@@ -587,11 +578,8 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
 
         if (failure)
         {
-            oss << "Action \"" << action_st << "\" is not supported for Virtual Router VMs";
-
-            failure_response(ACTION,
-                    request_error(oss.str(),""),
-                    att);
+            att.resp_msg = "Action \""+action_st+"\" is not supported for Virtual Router VMs";
+            failure_response(ACTION, att);
 
             vm->unlock();
             return;
@@ -664,30 +652,25 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
             success_response(id, att);
             break;
         case -1:
-            failure_response(NO_EXISTS,
-                    get_error(object_name(auth_object),id),
-                    att);
+            att.resp_id = id;
+            failure_response(NO_EXISTS, att);
             break;
         case -2:
             oss << "Error performing action \"" << action_st << "\" on "
                 << object_name(auth_object) << " [" << id << "]";
+            att.resp_msg = oss.str();
 
-            failure_response(ACTION,
-                    request_error(oss.str(),error),
-                    att);
-             break;
+            failure_response(ACTION, att);
+            break;
         case -3:
-            oss << "Virtual machine action \"" << action_st
-                << "\" is not supported";
+            oss << "Virtual machine action \"" << action_st << "\" is not supported";
+            att.resp_msg = oss.str();
 
-            failure_response(ACTION,
-                    request_error(oss.str(),""),
-                    att);
+            failure_response(ACTION, att);
             break;
         default:
-            failure_response(INTERNAL,
-                    request_error("Internal error","Action result not defined"),
-                    att);
+            att.resp_msg = "Internal error. Action result not defined";
+            failure_response(INTERNAL, att);
     }
 
     return;
@@ -719,8 +702,6 @@ void VirtualMachineDeploy::request_execute(xmlrpc_c::paramList const& paramList,
 
     bool auth = false;
 
-    string error;
-
     // ------------------------------------------------------------------------
     // Get request parameters and information about the target host
     // ------------------------------------------------------------------------
@@ -800,11 +781,13 @@ void VirtualMachineDeploy::request_execute(xmlrpc_c::paramList const& paramList,
             {
                 ostringstream oss;
 
-                oss << object_name(PoolObjectSQL::DATASTORE)
-                    << " [" << ds_id << "] and " << object_name(PoolObjectSQL::HOST)
-                    << " [" << hid <<"] are not in the same cluster.";
+                oss << object_name(PoolObjectSQL::DATASTORE) << " [" << ds_id << "] and "
+                    << object_name(PoolObjectSQL::HOST) << " [" << hid
+                    << "] are not in the same cluster.";
 
-                failure_response(ACTION, request_error(oss.str(),""), att);
+                att.resp_msg = oss.str();
+
+                failure_response(ACTION, att);
 
                 return;
             }
@@ -821,9 +804,9 @@ void VirtualMachineDeploy::request_execute(xmlrpc_c::paramList const& paramList,
 
         if (ds == 0 )
         {
-            failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::DATASTORE), ds_id),
-                att);
+            att.resp_obj = PoolObjectSQL::DATASTORE;
+            att.resp_id  = ds_id;
+            failure_response(NO_EXISTS, att);
 
             return;
         }
@@ -862,23 +845,18 @@ void VirtualMachineDeploy::request_execute(xmlrpc_c::paramList const& paramList,
         vm->get_state() != VirtualMachine::STOPPED &&
         vm->get_state() != VirtualMachine::UNDEPLOYED)
     {
-        ostringstream oss;
-
-        oss << "Deploy action is not available for state " << vm->state_str();
-
-        failure_response(ACTION,
-                request_error(oss.str(),""),
-                att);
+        att.resp_msg = "Deploy action is not available for state " +  vm->state_str();
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
     }
 
-    if (check_host(hid, enforce, vm, error) == false)
+    if (check_host(hid, enforce, vm, att.resp_msg) == false)
     {
         vm->unlock();
 
-        failure_response(ACTION, request_error(error,""), att);
+        failure_response(ACTION, att);
         return;
     }
 
@@ -997,9 +975,9 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
 
         if (ds == 0 )
         {
-            failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::DATASTORE), ds_id),
-                att);
+            att.resp_obj = PoolObjectSQL::DATASTORE;
+            att.resp_id  = ds_id;
+            failure_response(NO_EXISTS, att);
 
             return;
         }
@@ -1043,13 +1021,9 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
          (vm->get_lcm_state() != VirtualMachine::RUNNING &&
           vm->get_lcm_state() != VirtualMachine::UNKNOWN))))
     {
-        ostringstream oss;
+        att.resp_msg = "Migrate action is not available for state " + vm->state_str();
 
-        oss << "Migrate action is not available for state " << vm->state_str();
-
-        failure_response(ACTION,
-                request_error(oss.str(),""),
-                att);
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
@@ -1066,9 +1040,8 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
 
     if (vm->is_imported() && !vm->is_imported_action_supported(action))
     {
-        failure_response(ACTION,
-                request_error("Migration is not supported for imported VMs",""),
-                att);
+        att.resp_msg = "Migration is not supported for imported VMs";
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
@@ -1076,9 +1049,8 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(action))
     {
-        failure_response(ACTION,
-                request_error("Migration is not supported for Virtual Router VMs",""),
-                att);
+        att.resp_msg = "Migration is not supported for Virtual Router VMs";
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
@@ -1095,23 +1067,22 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
     {
         ostringstream oss;
 
-        oss << "VM is already running on "
-            << object_name(PoolObjectSQL::HOST) << " [" << c_hid << "]";
+        oss << "VM is already running on " << object_name(PoolObjectSQL::HOST)
+            << " [" << c_hid << "]";
 
-        failure_response(ACTION,
-                request_error(oss.str(),""),
-                att);
+        att.resp_msg = oss.str();
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
     }
 
     // Check the host has enough capacity
-    if (check_host(hid, enforce, vm, error) == false)
+    if (check_host(hid, enforce, vm, att.resp_msg) == false)
     {
         vm->unlock();
 
-        failure_response(ACTION, request_error(error,""), att);
+        failure_response(ACTION, att);
         return;
     }
 
@@ -1122,9 +1093,9 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
 
     if (host == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::HOST), c_hid),
-                att);
+        att.resp_obj = PoolObjectSQL::HOST;
+        att.resp_id  = c_hid;
+        failure_response(NO_EXISTS, att);
     }
 
     c_cluster_id = host->get_cluster_id();
@@ -1142,18 +1113,16 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
             << c_cluster_id << "] , and new host is in "
             << object_name(PoolObjectSQL::CLUSTER) << " [" << cluster_id << "]";
 
-        failure_response(ACTION,
-                request_error(oss.str(),""),
-                att);
+        att.resp_msg = oss.str();
+        failure_response(ACTION, att);
 
         return;
     }
 
     if ( is_public_cloud || c_is_public_cloud )
     {
-        failure_response(ACTION,
-                request_error("Cannot migrate to or from a Public Cloud Host",""),
-                att);
+        att.resp_msg = "Cannot migrate to or from a Public Cloud Host";
+        failure_response(ACTION, att);
 
         return;
     }
@@ -1164,8 +1133,9 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
 
         if ( c_ds_id != ds_id && live )
         {
-            failure_response(ACTION, request_error( "A migration to a different"
-                        " system datastore cannot be performed live.",""), att);
+            att.resp_msg = "A migration to a different system datastore "
+                "cannot be performed live.";
+            failure_response(ACTION, att);
             return;
         }
 
@@ -1176,8 +1146,8 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
 
         if (!ds_migr)
         {
-            failure_response(ACTION, request_error("System datastore migration"
-                    " not supported by TM driver",""), att);
+            att.resp_msg = "System datastore migration not supported by TM driver";
+            failure_response(ACTION, att);
             return;
         }
 
@@ -1186,22 +1156,20 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
             ostringstream oss;
 
             oss << "Cannot migrate to a different cluster. VM running in a host"
-                << " in " << object_name(PoolObjectSQL::CLUSTER) << " ["
-                << c_cluster_id << "] , and new system datastore is in "
+                << " in " << object_name(PoolObjectSQL::CLUSTER)
+                << " [" << c_cluster_id << "] , and new system datastore is in "
                 << object_name(PoolObjectSQL::CLUSTER) << " [" << ds_cluster_id << "]";
 
-            failure_response(ACTION, request_error(oss.str(),""), att);
+            att.resp_msg = oss.str();
+            failure_response(ACTION, att);
 
             return;
         }
 
         if (c_tm_mad != tm_mad)
         {
-            ostringstream oss;
-
-            oss << "Cannot migrate to a system datastore with a different TM driver";
-
-            failure_response(ACTION, request_error(oss.str(),""), att);
+            att.resp_msg = "Cannot migrate to a system datastore with a different TM driver";
+            failure_response(ACTION, att);
 
             return;
         }
@@ -1305,7 +1273,6 @@ void VirtualMachineDiskSaveas::request_execute(
 
     int    rc;
     bool   rc_auth;
-    string error;
 
     // -------------------------------------------------------------------------
     // Prepare and check the VM/DISK to be saved as
@@ -1320,7 +1287,7 @@ void VirtualMachineDiskSaveas::request_execute(
         goto error_state;
     }
 
-    rc = vm->set_saveas_disk(disk_id, snap_id, iid_orig, size, error);
+    rc = vm->set_saveas_disk(disk_id, snap_id, iid_orig, size, att.resp_msg);
 
     if (rc == -1)
     {
@@ -1460,7 +1427,7 @@ void VirtualMachineDiskSaveas::request_execute(
                          Datastore::IMAGE_DS,
                          -1,
                          &iid,
-                         error);
+                         att.resp_msg);
     if (rc < 0)
     {
         goto error_allocate;
@@ -1486,8 +1453,8 @@ void VirtualMachineDiskSaveas::request_execute(
 error_state:
     vm->unlock();
 
-    failure_response(INTERNAL,request_error("VM has to be RUNNING, POWEROFF or "
-        "SUSPENDED to save disks.",""), att);
+    att.resp_msg = "VM has to be RUNNING, POWEROFF or SUSPENDED to save disks.";
+    failure_response(INTERNAL, att);
     return;
 
 error_disk:
@@ -1496,27 +1463,31 @@ error_disk:
     vm->clear_saveas_disk();
 
     vm->unlock();
-
-    failure_response(INTERNAL,request_error("Cannot use DISK", error), att);
+    att.resp_msg ="Cannot use DISK. " + att.resp_msg;
+    failure_response(INTERNAL, att);
     return;
 
 error_image:
-    failure_response(NO_EXISTS, get_error(object_name(PoolObjectSQL::IMAGE),
-        iid_orig), att);
+    att.resp_obj = PoolObjectSQL::IMAGE;
+    att.resp_id  = iid_orig;
+    failure_response(NO_EXISTS, att);
     goto error_common;
 
 error_image_type:
-    failure_response(INTERNAL, request_error("Cannot save_as image of type " +
-        Image::type_to_str(type), ""), att);
+    att.resp_msg = "Cannot save_as image of type " + Image::type_to_str(type);
+    failure_response(INTERNAL, att);
     goto error_common;
 
 error_ds:
-    failure_response(NO_EXISTS, get_error(object_name(PoolObjectSQL::DATASTORE),
-        ds_id), att);
+error_ds_removed:
+    att.resp_obj = PoolObjectSQL::DATASTORE;
+    att.resp_id  = ds_id;
+    failure_response(NO_EXISTS, att);
     goto error_common;
 
 error_size:
-    failure_response(ACTION, "Not enough space in datastore", att);
+    att.resp_msg = "Not enough space in datastore";
+    failure_response(ACTION, att);
     goto error_common;
 
 error_auth:
@@ -1525,12 +1496,7 @@ error_auth:
 
 error_allocate:
     quota_rollback(&img_usage, Quotas::DATASTORE, att);
-    failure_response(INTERNAL, allocate_error(PoolObjectSQL::IMAGE, error),att);
-    goto error_common;
-
-error_ds_removed:
-    failure_response(NO_EXISTS,get_error(object_name(PoolObjectSQL::DATASTORE),
-        ds_id), att);
+    failure_response(ALLOCATE, att);
     goto error_common;
 
 error_common:
@@ -1571,7 +1537,8 @@ void VirtualMachineMonitoring::request_execute(
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL,request_error("Internal Error",""), att);
+        att.resp_msg = "Internal error";
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -1595,7 +1562,6 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
     VirtualMachine *     vm;
 
     int    rc;
-    string error_str;
     bool   volatile_disk;
 
     int     id       = xmlrpc_c::value_int(paramList.getInt(1));
@@ -1605,11 +1571,11 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
     // Parse Disk template
     // -------------------------------------------------------------------------
 
-    rc = tmpl.parse_str_or_xml(str_tmpl, error_str);
+    rc = tmpl.parse_str_or_xml(str_tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL, error_str, att);
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -1633,9 +1599,8 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::DISK_ATTACH_ACTION))
     {
-        failure_response(ACTION,
-                request_error("Action is not supported for Virtual Router VMs",""),
-                att);
+        att.resp_msg = "Action is not supported for Virtual Router VMs";
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
@@ -1664,7 +1629,7 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
         }
     }
 
-    rc = dm->attach(id, &tmpl, error_str);
+    rc = dm->attach(id, &tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
@@ -1675,9 +1640,7 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
             quota_rollback(&tmpl, Quotas::IMAGE, att_quota);
         }
 
-        failure_response(ACTION,
-                request_error(error_str, ""),
-                att);
+        failure_response(ACTION, att);
     }
     else
     {
@@ -1719,9 +1682,8 @@ void VirtualMachineDetach::request_execute(xmlrpc_c::paramList const& paramList,
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_DETACH_ACTION))
     {
-        failure_response(ACTION,
-                request_error("Action is not supported for Virtual Router VMs",""),
-                att);
+        att.resp_msg = "Action is not supported for Virtual Router VMs";
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
@@ -1729,13 +1691,11 @@ void VirtualMachineDetach::request_execute(xmlrpc_c::paramList const& paramList,
 
     vm->unlock();
 
-    rc = dm->detach(id, disk_id, error_str);
+    rc = dm->detach(id, disk_id, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION,
-                request_error(error_str, ""),
-                att);
+        failure_response(ACTION, att);
     }
     else
     {
@@ -1764,7 +1724,6 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
     Host *     host;
 
     Template deltas;
-    string   error_str;
     bool     rc;
     int      ret;
     int      hid = -1;
@@ -1785,19 +1744,17 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
     // -------------------------------------------------------------------------
     // Parse template
     // -------------------------------------------------------------------------
-
-    rc = tmpl.parse_str_or_xml(str_tmpl, error_str);
+    rc = tmpl.parse_str_or_xml(str_tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL, error_str, att);
+        failure_response(INTERNAL, att);
         return;
     }
 
     /* ---------------------------------------------------------------------- */
     /*  Authorize the operation & restricted attributes                       */
     /* ---------------------------------------------------------------------- */
-
     if ( vm_authorization(id, 0, 0, att, 0, 0, 0, auth_op) == false )
     {
         return;
@@ -1809,13 +1766,9 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
 
         if (tmpl.check(aname))
         {
-            ostringstream oss;
+            att.resp_msg = "Template includes a restricted attribute " + aname;
+            failure_response(AUTHORIZATION, att);
 
-            oss << "Template includes a restricted attribute " << aname;
-
-            failure_response(AUTHORIZATION,
-                    authorization_error(oss.str(), att),
-                    att);
             return;
         }
     }
@@ -1832,9 +1785,8 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
 
     if (vm == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VM),id),
-                att);
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -1885,27 +1837,20 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
         case VirtualMachine::DONE:
         case VirtualMachine::SUSPENDED:
         case VirtualMachine::ACTIVE:
-            ostringstream oss;
-
-            oss << "Resize action is not available for state " << vm->state_str();
-
-            failure_response(ACTION,
-                     request_error(oss.str(),""),
-                     att);
+            att.resp_msg="Resize action is not available for state "+vm->state_str();
+            failure_response(ACTION, att);
 
             vm->unlock();
             return;
     }
 
-    ret = vm->check_resize(ncpu, nmemory, nvcpu, error_str);
+    ret = vm->check_resize(ncpu, nmemory, nvcpu, att.resp_msg);
 
     vm->unlock();
 
     if (ret != 0)
     {
-        failure_response(INTERNAL,
-                request_error("Could resize the VM", error_str),
-                att);
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -1930,29 +1875,30 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
         int dmem_host = dmemory * 1024;    //now in Kilobytes
 
         vector<Attribute *> empty_pci;
-        string error;
 
         host = hpool->get(hid, true);
 
         if (host == 0)
         {
-            failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::HOST),hid),
-                att);
+            att.resp_obj = PoolObjectSQL::HOST;
+            att.resp_id  = hid;
+            failure_response(NO_EXISTS, att);
 
             quota_rollback(&deltas, Quotas::VM, att_rollback);
 
             return;
         }
 
-        if ( enforce && host->test_capacity(dcpu_host, dmem_host, 0, empty_pci, error) == false)
+        if ( enforce && host->test_capacity(dcpu_host, dmem_host, 0,
+                    empty_pci, att.resp_msg) == false)
         {
             ostringstream oss;
 
-            oss << object_name(PoolObjectSQL::HOST)
-                << " " << hid << " does not have enough capacity.";
+            oss << object_name(PoolObjectSQL::HOST) << " " << hid
+                << " does not have enough capacity.";
 
-            failure_response(ACTION, request_error(oss.str(),""), att);
+            att.resp_msg = oss.str();
+            failure_response(ACTION, att);
 
             host->unlock();
 
@@ -1976,9 +1922,8 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
 
     if (vm == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VM),id),
-                att);
+        att.resp_msg = id;
+        failure_response(NO_EXISTS, att);
 
         quota_rollback(&deltas, Quotas::VM, att_rollback);
 
@@ -2005,15 +1950,13 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
         case VirtualMachine::HOLD:
         case VirtualMachine::POWEROFF:
         case VirtualMachine::UNDEPLOYED:
-            ret = vm->resize(ncpu, nmemory, nvcpu, error_str);
+            ret = vm->resize(ncpu, nmemory, nvcpu, att.resp_msg);
 
             if (ret != 0)
             {
                 vm->unlock();
 
-                failure_response(INTERNAL,
-                        request_error("Could not resize the VM", error_str),
-                        att);
+                failure_response(INTERNAL, att);
                 return;
             }
 
@@ -2024,13 +1967,8 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
         case VirtualMachine::DONE:
         case VirtualMachine::SUSPENDED:
         case VirtualMachine::ACTIVE:
-            ostringstream oss;
-
-            oss << "Resize action is not available for state " << vm->state_str();
-
-            failure_response(ACTION,
-                     request_error(oss.str(),""),
-                     att);
+            att.resp_msg = "Resize action is not available for state " + vm->state_str();
+            failure_response(ACTION, att);
 
             vm->unlock();
 
@@ -2068,7 +2006,6 @@ void VirtualMachineSnapshotCreate::request_execute(
 
     int     rc;
     int     snap_id;
-    string  error_str;
 
     int     id   = xmlrpc_c::value_int(paramList.getInt(1));
     string  name = xmlrpc_c::value_string(paramList.getString(2));
@@ -2082,13 +2019,11 @@ void VirtualMachineSnapshotCreate::request_execute(
         return;
     }
 
-    rc = dm->snapshot_create(id, name, snap_id, error_str);
+    rc = dm->snapshot_create(id, name, snap_id, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION,
-                request_error(error_str, ""),
-                att);
+        failure_response(ACTION, att);
     }
     else
     {
@@ -2109,7 +2044,6 @@ void VirtualMachineSnapshotRevert::request_execute(
     DispatchManager * dm = nd.get_dm();
 
     int    rc;
-    string error_str;
 
     int id      = xmlrpc_c::value_int(paramList.getInt(1));
     int snap_id = xmlrpc_c::value_int(paramList.getInt(2));
@@ -2123,13 +2057,11 @@ void VirtualMachineSnapshotRevert::request_execute(
         return;
     }
 
-    rc = dm->snapshot_revert(id, snap_id, error_str);
+    rc = dm->snapshot_revert(id, snap_id, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION,
-                request_error(error_str, ""),
-                att);
+        failure_response(ACTION, att);
     }
     else
     {
@@ -2150,7 +2082,6 @@ void VirtualMachineSnapshotDelete::request_execute(
     DispatchManager * dm = nd.get_dm();
 
     int    rc;
-    string error_str;
 
     int id      = xmlrpc_c::value_int(paramList.getInt(1));
     int snap_id = xmlrpc_c::value_int(paramList.getInt(2));
@@ -2164,13 +2095,11 @@ void VirtualMachineSnapshotDelete::request_execute(
         return;
     }
 
-    rc = dm->snapshot_delete(id, snap_id, error_str);
+    rc = dm->snapshot_delete(id, snap_id, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION,
-                request_error(error_str, ""),
-                att);
+        failure_response(ACTION, att);
     }
     else
     {
@@ -2190,7 +2119,6 @@ void VirtualMachineAttachNic::request_execute(
     VirtualMachine *        vm;
     VirtualMachineTemplate  tmpl;
 
-    string  error_str;
     int     rc;
 
     int     id       = xmlrpc_c::value_int(paramList.getInt(1));
@@ -2199,7 +2127,6 @@ void VirtualMachineAttachNic::request_execute(
     // -------------------------------------------------------------------------
     // Check if the VM is a Virtual Router
     // -------------------------------------------------------------------------
-
     if ((vm = get_vm(id, att)) == 0)
     {
         return;
@@ -2207,9 +2134,8 @@ void VirtualMachineAttachNic::request_execute(
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_ATTACH_ACTION))
     {
-        failure_response(Request::ACTION,
-                request_error("Action is not supported for Virtual Router VMs",""),
-                att);
+        att.resp_msg = "Action is not supported for Virtual Router VMs";
+        failure_response(Request::ACTION, att);
 
         vm->unlock();
         return;
@@ -2220,55 +2146,55 @@ void VirtualMachineAttachNic::request_execute(
     // -------------------------------------------------------------------------
     // Parse NIC template
     // -------------------------------------------------------------------------
-
-    rc = tmpl.parse_str_or_xml(str_tmpl, error_str);
+    rc = tmpl.parse_str_or_xml(str_tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(Request::INTERNAL, error_str, att);
+        failure_response(INTERNAL, att);
         return;
     }
 
     // -------------------------------------------------------------------------
     // Perform the attach
     // -------------------------------------------------------------------------
+    ErrorCode ec = attach(id, tmpl, att);
 
-    rc = attach(this, att, id, tmpl);
-
-    if (rc == 0)
+    if ( ec == SUCCESS )
     {
         success_response(id, att);
     }
+    else
+    {
+        failure_response(ec, att);
+    }
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualMachineAttachNic::attach(Request* req, RequestAttributes& att,
-        int id, VirtualMachineTemplate& tmpl)
+Request::ErrorCode VirtualMachineAttachNic::attach(int id, VirtualMachineTemplate& tmpl,
+        RequestAttributes& att)
 {
-    Nebula&             nd      = Nebula::instance();
-    DispatchManager *   dm      = nd.get_dm();
-    VirtualMachinePool* vmpool  = nd.get_vmpool();
+    Nebula& nd = Nebula::instance();
 
-    PoolObjectAuth       vm_perms;
-    VirtualMachine *     vm;
+    DispatchManager *   dm     = nd.get_dm();
+    VirtualMachinePool* vmpool = nd.get_vmpool();
+
+    PoolObjectAuth   vm_perms;
+    VirtualMachine * vm;
 
     int    rc;
-    string error_str;
 
     // -------------------------------------------------------------------------
     // Authorize the operation, restricted attributes & check quotas
     // -------------------------------------------------------------------------
-
     vm = vmpool->get(id, true);
 
     if ( vm == 0 )
     {
-        req->failure_response(Request::NO_EXISTS,
-                req->get_error(object_name(PoolObjectSQL::VM),id), att);
-
-        return -1;
+        att.resp_id  = id;
+        att.resp_obj = PoolObjectSQL::VM;
+        return NO_EXISTS;
     }
 
     vm->get_permissions(vm_perms);
@@ -2285,11 +2211,8 @@ int VirtualMachineAttachNic::attach(Request* req, RequestAttributes& att,
 
         if (UserPool::authorize(ar) == -1)
         {
-            req->failure_response(Request::AUTHORIZATION,
-                    req->authorization_error(ar.message, att),
-                    att);
-
-            return -1;
+            att.resp_msg = ar.message;
+            return AUTHORIZATION;
         }
     }
 
@@ -2301,52 +2224,38 @@ int VirtualMachineAttachNic::attach(Request* req, RequestAttributes& att,
 
         if (tmpl.check(aname))
         {
-            ostringstream oss;
-
-            oss << "NIC includes a restricted attribute " << aname;
-
-            req->failure_response(Request::AUTHORIZATION,
-                    req->authorization_error(oss.str(), att),
-                    att);
-
-            return -1;
+            att.resp_msg = "NIC includes a restricted attribute " + aname;
+            return AUTHORIZATION;
         }
     }
 
-    if ( req->quota_authorization(&tmpl, Quotas::NETWORK, att_quota) == false )
+    if (quota_authorization(&tmpl, Quotas::NETWORK, att_quota, att.resp_msg) == false)
     {
-        return -1;
+        return AUTHORIZATION;
     }
 
     // -------------------------------------------------------------------------
     // Perform the attach
     // -------------------------------------------------------------------------
 
-    rc = dm->attach_nic(id, &tmpl, error_str);
+    rc = dm->attach_nic(id, &tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        req->quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
-
-        req->failure_response(Request::ACTION,
-                req->request_error(error_str, ""),
-                att);
-
-        return -1;
+        quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
+        return ACTION;
     }
 
-    return 0;
+    return SUCCESS;
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
 void VirtualMachineDetachNic::request_execute(
-        xmlrpc_c::paramList const&  paramList,
-        RequestAttributes&          att)
+        xmlrpc_c::paramList const& paramList, RequestAttributes& att)
 {
     VirtualMachine * vm;
-    int              rc;
 
     int id      = xmlrpc_c::value_int(paramList.getInt(1));
     int nic_id  = xmlrpc_c::value_int(paramList.getInt(2));
@@ -2362,9 +2271,8 @@ void VirtualMachineDetachNic::request_execute(
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_DETACH_ACTION))
     {
-        failure_response(Request::ACTION,
-                request_error("Action is not supported for Virtual Router VMs",""),
-                att);
+        att.resp_msg = "Action is not supported for Virtual Router VMs";
+        failure_response(Request::ACTION, att);
 
         vm->unlock();
         return;
@@ -2375,20 +2283,23 @@ void VirtualMachineDetachNic::request_execute(
     // -------------------------------------------------------------------------
     // Perform the detach
     // -------------------------------------------------------------------------
+    ErrorCode ec = detach(id, nic_id, att);
 
-    rc = detach(this, att, id, nic_id);
-
-    if (rc == 0)
+    if ( ec == SUCCESS )
     {
         success_response(id, att);
     }
+    else
+    {
+        failure_response(ec, att);
+    }
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualMachineDetachNic::detach(
-        Request* req, RequestAttributes& att, int id, int nic_id)
+Request::ErrorCode VirtualMachineDetachNic::detach(int id, int nic_id,
+        RequestAttributes& att)
 {
     Nebula&             nd      = Nebula::instance();
     DispatchManager *   dm      = nd.get_dm();
@@ -2397,21 +2308,14 @@ int VirtualMachineDetachNic::detach(
     PoolObjectAuth      vm_perms;
     VirtualMachine *    vm;
 
-    int    rc;
-    string error_str;
-
     // -------------------------------------------------------------------------
     // Authorize the operation
     // -------------------------------------------------------------------------
-
     vm = vmpool->get(id, true);
 
     if ( vm == 0 )
     {
-        req->failure_response(Request::NO_EXISTS,
-                req->get_error(object_name(PoolObjectSQL::VM),id), att);
-
-        return -1;
+        return NO_EXISTS;
     }
 
     vm->get_permissions(vm_perms);
@@ -2426,30 +2330,20 @@ int VirtualMachineDetachNic::detach(
 
         if (UserPool::authorize(ar) == -1)
         {
-            req->failure_response(Request::AUTHORIZATION,
-                    req->authorization_error(ar.message, att),
-                    att);
-
-            return -1;
+            att.resp_msg = ar.message;
+            return AUTHORIZATION;
         }
     }
 
     // -------------------------------------------------------------------------
     // Perform the detach
     // -------------------------------------------------------------------------
-
-    rc = dm->detach_nic(id, nic_id, error_str);
-
-    if ( rc != 0 )
+    if ( dm->detach_nic(id, nic_id, att.resp_msg) != 0 )
     {
-        req->failure_response(Request::ACTION,
-                req->request_error(error_str, ""),
-                att);
-
-        return -1;
+        return ACTION;
     }
 
-    return 0;
+    return SUCCESS;
 }
 
 /* -------------------------------------------------------------------------- */
@@ -2478,13 +2372,8 @@ void VirtualMachineRecover::request_execute(
 
     if(vm->get_state() != VirtualMachine::ACTIVE)
     {
-        ostringstream oss;
-
-        oss << "Recover action is not available for state " << vm->state_str();
-
-        failure_response(ACTION,
-                request_error(oss.str(),""),
-                att);
+        att.resp_msg = "Recover action is not available for state " + vm->state_str();
+        failure_response(ACTION, att);
 
         vm->unlock();
         return;
@@ -2503,9 +2392,8 @@ void VirtualMachineRecover::request_execute(
             break;
 
         default:
-            failure_response(ACTION,
-                request_error("Wrong recovery operation code",""),
-                att);
+            att.resp_msg = "Wrong recovery operation code";
+            failure_response(ACTION, att);
 
             vm->unlock();
             return;
@@ -2533,24 +2421,20 @@ void VirtualMachinePoolCalculateShowback::request_execute(
     ostringstream oss;
     string        where;
     int           rc;
-    string        error_str;
 
     if ( att.gid != 0 )
     {
-        failure_response(AUTHORIZATION,
-                         authorization_error("Action reserved for group 0 only", att),
-                         att);
+        att.resp_msg = "Action reserved for group 0 only";
+        failure_response(AUTHORIZATION, att);
         return;
     }
 
     rc = (static_cast<VirtualMachinePool *>(pool))->calculate_showback(
-                    start_month, start_year, end_month, end_year, error_str);
+                    start_month, start_year, end_month, end_year, att.resp_msg);
 
     if (rc != 0)
     {
-        failure_response(AUTHORIZATION,
-                         request_error(error_str, ""),
-                         att);
+        failure_response(AUTHORIZATION, att);
         return;
     }
 
@@ -2581,7 +2465,6 @@ void VirtualMachineDiskSnapshotCreate::request_execute(
 
     int    rc;
     int    snap_id;
-    string error_str;
 
     int    id   = xmlrpc_c::value_int(paramList.getInt(1));
     int    did  = xmlrpc_c::value_int(paramList.getInt(2));
@@ -2599,7 +2482,8 @@ void VirtualMachineDiskSnapshotCreate::request_execute(
 
     if (disk == 0)
     {
-        failure_response(ACTION, request_error("VM disk does not exist", ""), att);
+        att.resp_msg = "VM disk does not exist";
+        failure_response(ACTION, att);
 
         vm->unlock();
 
@@ -2621,8 +2505,8 @@ void VirtualMachineDiskSnapshotCreate::request_execute(
 
     if (is_volatile)
     {
-        failure_response(ACTION, request_error("Cannot make snapshots on "
-                    "volatile disks",""), att);
+        att.resp_msg = "Cannot make snapshots on volatile disks";
+        failure_response(ACTION, att);
         return;
     }
 
@@ -2638,9 +2522,9 @@ void VirtualMachineDiskSnapshotCreate::request_execute(
 
         if (img == 0)
         {
-            failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::IMAGE),img_id),
-                att);
+            att.resp_obj = PoolObjectSQL::IMAGE;
+            att.resp_id  = img_id;
+            failure_response(NO_EXISTS, att);
 
             return;
         }
@@ -2697,7 +2581,7 @@ void VirtualMachineDiskSnapshotCreate::request_execute(
     // ------------------------------------------------------------------------
     // Do the snapshot
     // ------------------------------------------------------------------------
-    rc = dm->disk_snapshot_create(id, did, name, snap_id, error_str);
+    rc = dm->disk_snapshot_create(id, did, name, snap_id, att.resp_msg);
 
     if ( rc != 0 )
     {
@@ -2711,7 +2595,7 @@ void VirtualMachineDiskSnapshotCreate::request_execute(
             quota_rollback(&vm_deltas, Quotas::VM, vm_att_quota);
         }
 
-        failure_response(ACTION, request_error(error_str, ""), att);
+        failure_response(ACTION, att);
     }
     else
     {
@@ -2732,7 +2616,6 @@ void VirtualMachineDiskSnapshotRevert::request_execute(
     DispatchManager * dm = nd.get_dm();
 
     int    rc;
-    string error_str;
 
     int id      = xmlrpc_c::value_int(paramList.getInt(1));
     int did     = xmlrpc_c::value_int(paramList.getInt(2));
@@ -2743,13 +2626,11 @@ void VirtualMachineDiskSnapshotRevert::request_execute(
         return;
     }
 
-    rc = dm->disk_snapshot_revert(id, did, snap_id, error_str);
+    rc = dm->disk_snapshot_revert(id, did, snap_id, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION,
-                request_error(error_str, ""),
-                att);
+        failure_response(ACTION, att);
     }
     else
     {
@@ -2772,8 +2653,7 @@ void VirtualMachineDiskSnapshotDelete::request_execute(
 
     const VectorAttribute * disk;
 
-    int    rc;
-    string error_str;
+    int rc;
 
     int id      = xmlrpc_c::value_int(paramList.getInt(1));
     int did     = xmlrpc_c::value_int(paramList.getInt(2));
@@ -2788,7 +2668,8 @@ void VirtualMachineDiskSnapshotDelete::request_execute(
 
     if (disk == 0)
     {
-        failure_response(ACTION, request_error("VM disk does not exist", ""), att);
+        att.resp_msg = "VM disk does not exist";
+        failure_response(ACTION, att);
 
         vm->unlock();
 
@@ -2810,9 +2691,9 @@ void VirtualMachineDiskSnapshotDelete::request_execute(
 
         if (img == 0)
         {
-            failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::IMAGE),img_id),
-                att);
+            att.resp_obj = PoolObjectSQL::IMAGE;
+            att.resp_id  = img_id;
+            failure_response(NO_EXISTS, att);
 
             return;
         }
@@ -2831,11 +2712,11 @@ void VirtualMachineDiskSnapshotDelete::request_execute(
         return;
     }
 
-    rc = dm->disk_snapshot_delete(id, did, snap_id, error_str);
+    rc = dm->disk_snapshot_delete(id, did, snap_id, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION, request_error(error_str, ""), att);
+        failure_response(ACTION, att);
     }
     else
     {
diff --git a/src/rm/RequestManagerVirtualNetwork.cc b/src/rm/RequestManagerVirtualNetwork.cc
index 0e4436bc80..d1d776912a 100644
--- a/src/rm/RequestManagerVirtualNetwork.cc
+++ b/src/rm/RequestManagerVirtualNetwork.cc
@@ -19,14 +19,6 @@
 
 using namespace std;
 
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string RequestManagerVirtualNetwork::leases_error (const string& error)
-{
-    return request_error("Error modifying network leases", error);
-}
-
 /* ------------------------------------------------------------------------- */
 /* ------------------------------------------------------------------------- */
 
@@ -40,19 +32,18 @@ void RequestManagerVirtualNetwork::
     VirtualNetworkTemplate tmpl;
     VirtualNetwork *       vn;
 
-    string error_str;
-    int    rc;
+    int rc;
 
     if ( basic_authorization(id, att) == false )
     {
         return;
     }
 
-    rc = tmpl.parse_str_or_xml(str_tmpl, error_str);
+    rc = tmpl.parse_str_or_xml(str_tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL, leases_error(error_str), att);
+        failure_response(INTERNAL, att);
         return;
     }
 
@@ -60,17 +51,16 @@ void RequestManagerVirtualNetwork::
 
     if ( vn == 0 )
     {
-        failure_response(NO_EXISTS, get_error(object_name(auth_object),id),att);
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    rc = leases_action(vn, &tmpl, att, error_str);
+    rc = leases_action(vn, &tmpl, att, att.resp_msg);
 
     if ( rc < 0 )
     {
-        failure_response(INTERNAL,
-                request_error("Error modifying network leases",error_str),
-                att);
+        failure_response(INTERNAL, att);
 
         vn->unlock();
         return;
@@ -95,12 +85,9 @@ void VirtualNetworkRmAddressRange::
 
     VirtualNetwork * vn;
 
-    string error_str;
-
     // -------------------------------------------------------------------------
     // Authorize the operation VNET:MANAGE
     // -------------------------------------------------------------------------
-
     if (basic_authorization(id, att) == false)
     {
         return;
@@ -109,12 +96,12 @@ void VirtualNetworkRmAddressRange::
     // -------------------------------------------------------------------------
     // Get VNET and data for reservations
     // -------------------------------------------------------------------------
-
     vn = static_cast<VirtualNetwork *>(pool->get(id,true));
 
     if ( vn == 0 )
     {
-        failure_response(NO_EXISTS, get_error(object_name(auth_object),id),att);
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -131,11 +118,9 @@ void VirtualNetworkRmAddressRange::
 
     vn->get_template_attribute("MAC" , mac  , ar_id);
 
-    if ( vn->rm_ar(ar_id, error_str) < 0 )
+    if ( vn->rm_ar(ar_id, att.resp_msg) < 0 )
     {
-        failure_response(INTERNAL,
-                request_error("Error removing address range",error_str),
-                att);
+        failure_response(INTERNAL, att);
 
         vn->unlock();
 
@@ -173,7 +158,7 @@ void VirtualNetworkRmAddressRange::
                     oss << " NIC = [ NETWORK_ID = " << parent << " ]" << endl;
                 }
 
-                tmpl.parse_str_or_xml(oss.str(), error_str);
+                tmpl.parse_str_or_xml(oss.str(), att.resp_msg);
 
                 Quotas::quota_del(Quotas::NETWORK, uid, gid, &tmpl);
             }
@@ -198,21 +183,19 @@ void VirtualNetworkReserve::request_execute(
     VirtualNetwork * vn  = 0;
     VirtualNetwork * rvn = 0;
 
-    string error_str;
-    int    rc;
-    int    cluster_id;
+    int rc;
+    int cluster_id;
 
     PoolObjectAuth reserv_perms;
 
     // -------------------------------------------------------------------------
     // Process the Reservation Template
     // -------------------------------------------------------------------------
-    rc = tmpl.parse_str_or_xml(str_tmpl, error_str);
+    rc = tmpl.parse_str_or_xml(str_tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(ACTION,
-            request_error("Error in reservation request", error_str), att);
+        failure_response(ACTION, att);
         return;
     }
 
@@ -222,8 +205,8 @@ void VirtualNetworkReserve::request_execute(
 
     if ( !tmpl.get("SIZE", size) || size <= 0 )
     {
-        failure_response(ACTION, request_error("Error in reservation request",
-                "Reservation SIZE must be a greater than 0"), att);
+        att.resp_msg = "Reservation SIZE must be a greater than 0";
+        failure_response(ACTION,  att);
         return;
     }
 
@@ -238,15 +221,15 @@ void VirtualNetworkReserve::request_execute(
 
         if (rid < 0)
         {
-            failure_response(ACTION, request_error("Error in reservation request",
-                "NETWORK_ID must be equal or greater than 0"), att);
+            att.resp_msg = "NETWORK_ID must be equal or greater than 0";
+            failure_response(ACTION, att);
             return;
         }
 
         if (rid == id)
         {
-            failure_response(ACTION, request_error("Error in reservation request",
-                "Cannot add a reservation from the same network"), att);
+            att.resp_msg = "Cannot add a reservation from the same network";
+            failure_response(ACTION, att);
             return;
         }
 
@@ -254,9 +237,8 @@ void VirtualNetworkReserve::request_execute(
 
         if (rvn == 0)
         {
-            failure_response(NO_EXISTS, get_error(object_name(auth_object),rid),
-                att);
-
+            att.resp_id = rid;
+            failure_response(NO_EXISTS, att);
             return;
         }
 
@@ -264,8 +246,8 @@ void VirtualNetworkReserve::request_execute(
 
         if (parent == -1)
         {
-            failure_response(ACTION, request_error("Error in reservation request",
-                "Cannot add reservations to a non-reservation VNET"), att);
+            att.resp_msg = "Cannot add reservations to a non-reservation VNET";
+            failure_response(ACTION, att);
 
             rvn->unlock();
 
@@ -279,8 +261,8 @@ void VirtualNetworkReserve::request_execute(
             oss << "New reservations for virtual network " << rid
                 << " have to be from network " << parent;
 
-            failure_response(ACTION, request_error("Error in reservation request",
-                oss.str()), att);
+            att.resp_msg = oss.str();
+            failure_response(ACTION, att);
 
             rvn->unlock();
 
@@ -300,8 +282,8 @@ void VirtualNetworkReserve::request_execute(
 
     if (name.empty() && !on_exisiting)
     {
-        failure_response(ACTION, request_error("Error in reservation request",
-            "NAME for reservation has to be set"), att);
+        att.resp_msg = "NAME for reservation has to be set";
+        failure_response(ACTION, att);
         return;
     }
 
@@ -312,8 +294,8 @@ void VirtualNetworkReserve::request_execute(
 
     if ( with_ar_id && (ar_id < 0))
     {
-        failure_response(ACTION, request_error("Error in reservation request",
-            "AR_ID must be equal or greater than 0"), att);
+        att.resp_msg = "AR_ID must be equal or greater than 0";
+        failure_response(ACTION, att);
         return;
     }
 
@@ -325,8 +307,8 @@ void VirtualNetworkReserve::request_execute(
 
     if (!with_ar_id && (!ip.empty()||!mac.empty()))
     {
-        failure_response(ACTION, request_error("Error in reservation request",
-            "AR_ID must be specified for IP/MAC based reservations"), att);
+        att.resp_msg = "AR_ID must be specified for IP/MAC based reservations";
+        failure_response(ACTION, att);
         return;
     }
 
@@ -337,14 +319,15 @@ void VirtualNetworkReserve::request_execute(
 
     if ( vn == 0 )
     {
-        failure_response(NO_EXISTS, get_error(object_name(auth_object),id),att);
+        att.resp_msg = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
     if (vn->get_parent() != -1)
     {
-        failure_response(ACTION, request_error("Error in reservation request",
-            "Cannot reserve addresses from a reserved VNET"), att);
+        att.resp_msg = "Cannot reserve addresses from a reserved VNET";
+        failure_response(ACTION, att);
 
         vn->unlock();
 
@@ -365,8 +348,8 @@ void VirtualNetworkReserve::request_execute(
 
     if (UserPool::authorize(ar) == -1)
     {
-        failure_response(AUTHORIZATION, authorization_error(ar.message, att),
-            att);
+        att.resp_msg = ar.message;
+        failure_response(AUTHORIZATION, att);
 
         vn->unlock();
 
@@ -385,12 +368,11 @@ void VirtualNetworkReserve::request_execute(
         cluster_id = vn->get_cluster_id();
 
         rc = vnpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-                id, vtmpl, &rid, cluster_id, vn->get_cluster_name(), error_str);
+                id, vtmpl, &rid, cluster_id, vn->get_cluster_name(), att.resp_msg);
 
         if (rc < 0)
         {
-            failure_response(INTERNAL,
-                request_error("Cannot create a reservation VNET",error_str),att);
+            failure_response(INTERNAL, att);
 
             vn->unlock();
 
@@ -402,9 +384,8 @@ void VirtualNetworkReserve::request_execute(
 
     if (rvn == 0)
     {
-        failure_response(NO_EXISTS, get_error(object_name(auth_object),rid),
-            att);
-
+        att.resp_id = rid;
+        failure_response(NO_EXISTS, att);
         vn->unlock();
 
         return;
@@ -423,7 +404,7 @@ void VirtualNetworkReserve::request_execute(
         qtmpl_s << "NIC = [ NETWORK_ID = " << id << "]" << endl;
     }
 
-    qtmpl.parse_str_or_xml(qtmpl_s.str(), error_str);
+    qtmpl.parse_str_or_xml(qtmpl_s.str(), att.resp_msg);
 
     if (quota_authorization(&qtmpl, Quotas::NETWORK, reservation_att) == false)
     {
@@ -441,31 +422,31 @@ void VirtualNetworkReserve::request_execute(
     {
         if (!ip.empty())
         {
-            rc = vn->reserve_addr_by_ip(rvn, size, ar_id, ip, error_str);
+            rc = vn->reserve_addr_by_ip(rvn, size, ar_id, ip, att.resp_msg);
         }
         else if (!mac.empty())
         {
-            rc = vn->reserve_addr_by_mac(rvn, size, ar_id, mac, error_str);
+            rc = vn->reserve_addr_by_mac(rvn, size, ar_id, mac, att.resp_msg);
         }
         else
         {
-            rc = vn->reserve_addr(rvn, size, ar_id, error_str);
+            rc = vn->reserve_addr(rvn, size, ar_id, att.resp_msg);
         }
     }
     else
     {
-        rc = vn->reserve_addr(rvn, size, error_str);
+        rc = vn->reserve_addr(rvn, size, att.resp_msg);
     }
 
     if (rc != 0 )
     {
         quota_rollback(&qtmpl, Quotas::NETWORK, reservation_att);
 
-        failure_response(ACTION, request_error(error_str,""), att);
+        failure_response(ACTION, att);
 
         if (!on_exisiting)
         {
-            pool->drop(rvn, error_str);
+            pool->drop(rvn, att.resp_msg);
         }
 
         rvn->unlock();
@@ -495,7 +476,7 @@ void VirtualNetworkReserve::request_execute(
 
         if ( cluster != 0 )
         {
-            cluster->add_vnet(rid, error_str);
+            cluster->add_vnet(rid, att.resp_msg);
 
             clpool->update(cluster);
 
diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc
index ed4d528ef3..d57d24c2ef 100644
--- a/src/rm/RequestManagerVirtualRouter.cc
+++ b/src/rm/RequestManagerVirtualRouter.cc
@@ -34,42 +34,40 @@ void VirtualRouterInstantiate::request_execute(
     string str_uattrs = xmlrpc_c::value_string(paramList.getString(6));
 
     Nebula& nd = Nebula::instance();
+
     VirtualRouterPool*  vrpool = nd.get_vrouterpool();
     VirtualRouter *     vr;
     DispatchManager*    dm = nd.get_dm();
 
-    PoolObjectAuth      vr_perms;
-    Template*           extra_attrs;
-    bool                has_vmids;
-    string              errorstr;
-    string              vr_name;
-    ostringstream       oss;
+    PoolObjectAuth vr_perms;
+    Template*      extra_attrs;
+    bool           has_vmids;
+    string         error;
+    string         vr_name, tmp_name;
+    ostringstream  oss;
 
-    vector<int>             vms;
-    vector<int>::iterator   vmid;
+    vector<int>           vms;
+    vector<int>::iterator vmid;
+
+    int vid;
 
     /* ---------------------------------------------------------------------- */
     /* Get the Virtual Router NICs                                            */
     /* ---------------------------------------------------------------------- */
-
     vr = vrpool->get(vrid, true);
 
     if (vr == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
-                att);
-
+        att.resp_id = vrid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
     vr->get_permissions(vr_perms);
 
     extra_attrs = vr->get_vm_template();
-
-    has_vmids = vr->has_vmids();
-
-    vr_name = vr->get_name();
+    has_vmids   = vr->has_vmids();
+    vr_name     = vr->get_name();
 
     vr->unlock();
 
@@ -81,47 +79,40 @@ void VirtualRouterInstantiate::request_execute(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
-                    att);
-
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
             return;
         }
     }
 
     if (has_vmids)
     {
-        failure_response(ACTION,
-                request_error("Virtual Router already has VMs. Cannot instantiate new ones", ""),
-                att);
-
+        att.resp_msg = "Virtual Router already has VMs. Cannot instantiate new ones";
+        failure_response(ACTION, att);
         return;
     }
 
     if (name.empty())
     {
-        oss.str("");
-        oss << "vr-" << vr_name << "-%i";
-        name = oss.str();
+        name = "vr-" + vr_name + "-%i";
     }
 
-    for (int i=0; i<n_vms; i++)
+    for (int i=0; i<n_vms; oss.str(""), i++)
     {
-        oss.str("");
         oss << i;
 
-        string tmp_name = one_util::gsub(name, "%i", oss.str());
+        tmp_name = one_util::gsub(name, "%i", oss.str());
 
-        int vid = VMTemplateInstantiate::instantiate(
-                this, att, tmpl_id, tmp_name, true, str_uattrs, extra_attrs);
+        ErrorCode ec = VMTemplateInstantiate::instantiate(tmpl_id, tmp_name,
+                true, str_uattrs, extra_attrs, vid, att);
 
-        if (vid == -1)
+        if (ec != SUCCESS)
         {
-            string tmp_error;
+            failure_response(ec, att);
 
             for (vmid = vms.begin(); vmid != vms.end(); vmid++)
             {
-                dm->finalize(*vmid, tmp_error);
+                dm->finalize(*vmid, att.resp_msg);
             }
 
             return;
@@ -150,7 +141,7 @@ void VirtualRouterInstantiate::request_execute(
     {
         for (vmid = vms.begin(); vmid != vms.end(); vmid++)
         {
-            dm->release(*vmid, errorstr);
+            dm->release(*vmid, att.resp_msg);
         }
     }
 
@@ -171,7 +162,6 @@ void VirtualRouterAttachNic::request_execute(
     PoolObjectAuth          vr_perms;
 
     int    rc;
-    string error_str;
 
     int    vrid     = xmlrpc_c::value_int(paramList.getInt(1));
     string str_tmpl = xmlrpc_c::value_string(paramList.getString(2));
@@ -179,27 +169,23 @@ void VirtualRouterAttachNic::request_execute(
     // -------------------------------------------------------------------------
     // Parse NIC template
     // -------------------------------------------------------------------------
-
-    rc = tmpl.parse_str_or_xml(str_tmpl, error_str);
+    rc = tmpl.parse_str_or_xml(str_tmpl, att.resp_msg);
 
     if ( rc != 0 )
     {
-        failure_response(INTERNAL, error_str, att);
+        failure_response(INTERNAL, att);
         return;
     }
 
     // -------------------------------------------------------------------------
     // Authorize the operation & check quotas
     // -------------------------------------------------------------------------
-
     vr = vrpool->get(vrid, true);
 
     if (vr == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
-                att);
-
+        att.resp_id = vrid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -217,10 +203,8 @@ void VirtualRouterAttachNic::request_execute(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
-                    att);
-
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
             return;
         }
     }
@@ -235,21 +219,18 @@ void VirtualRouterAttachNic::request_execute(
     // -------------------------------------------------------------------------
     // Attach NIC to the Virtual Router
     // -------------------------------------------------------------------------
-
     vr = vrpool->get(vrid, true);
 
     if (vr == 0)
     {
         quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
 
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
-                att);
-
+        att.resp_id = vrid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    nic = vr->attach_nic(&tmpl, error_str);
+    nic = vr->attach_nic(&tmpl, att.resp_msg);
 
     set<int> vms = vr->get_vms();
 
@@ -261,28 +242,24 @@ void VirtualRouterAttachNic::request_execute(
     {
         quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
 
-        failure_response(ACTION,
-                request_error(error_str, ""),
-                att);
-
+        failure_response(ACTION, att);
         return;
     }
 
     // -------------------------------------------------------------------------
     // Attach NIC to each VM
     // -------------------------------------------------------------------------
-
     for (set<int>::iterator vmid = vms.begin(); vmid != vms.end(); vmid++)
     {
         VirtualMachineTemplate tmpl;
 
         tmpl.set(nic->clone());
 
-        rc = VirtualMachineAttachNic::attach(this, att, *vmid, tmpl);
+        ErrorCode ec = VirtualMachineAttachNic::attach(*vmid, tmpl, att);
 
-        if (rc == -1)
+        if (ec != SUCCESS) //TODO: manage individual attach error, do rollback?
         {
-            // TODO: manage individual attach error, do rollback?
+            failure_response(ACTION, att);
 
             delete nic;
             return;
@@ -304,7 +281,7 @@ void VirtualRouterDetachNic::request_execute(
     VirtualRouter *     vr;
     PoolObjectAuth      vr_perms;
 
-    int    rc;
+    int rc;
 
     int vrid    = xmlrpc_c::value_int(paramList.getInt(1));
     int nic_id  = xmlrpc_c::value_int(paramList.getInt(2));
@@ -312,15 +289,12 @@ void VirtualRouterDetachNic::request_execute(
     // -------------------------------------------------------------------------
     // Authorize the operation
     // -------------------------------------------------------------------------
-
     vr = vrpool->get(vrid, true);
 
     if (vr == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
-                att);
-
+        att.resp_id = vrid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -336,10 +310,8 @@ void VirtualRouterDetachNic::request_execute(
 
         if (UserPool::authorize(ar) == -1)
         {
-            failure_response(AUTHORIZATION,
-                    authorization_error(ar.message, att),
-                    att);
-
+            att.resp_msg = ar.message;
+            failure_response(AUTHORIZATION, att);
             return;
         }
     }
@@ -347,15 +319,12 @@ void VirtualRouterDetachNic::request_execute(
     // -------------------------------------------------------------------------
     // Detach the NIC from the Virtual Router
     // -------------------------------------------------------------------------
-
     vr = vrpool->get(vrid, true);
 
     if (vr == 0)
     {
-        failure_response(NO_EXISTS,
-                get_error(object_name(PoolObjectSQL::VROUTER),vrid),
-                att);
-
+        att.resp_id = vrid;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
@@ -371,12 +340,10 @@ void VirtualRouterDetachNic::request_execute(
     {
         ostringstream oss;
 
-        oss << "Could not detach NIC with NIC_ID " << nic_id
-            << ", it does not exist.";
+        oss << "NIC with NIC_ID " << nic_id << " does not exist.";
 
-        failure_response(Request::ACTION,
-                request_error(oss.str(), ""),
-                att);
+        att.resp_msg = oss.str();
+        failure_response(Request::ACTION, att);
 
         return;
     }
@@ -384,14 +351,13 @@ void VirtualRouterDetachNic::request_execute(
     // -------------------------------------------------------------------------
     // Detach NIC from each VM
     // -------------------------------------------------------------------------
-
     for (set<int>::iterator vmid = vms.begin(); vmid != vms.end(); vmid++)
     {
-        rc = VirtualMachineDetachNic::detach(this, att, *vmid, nic_id);
+        ErrorCode ec = VirtualMachineDetachNic::detach(*vmid, nic_id, att);
 
-        if (rc == -1)
+        if (ec != SUCCESS) //TODO: manage individual attach error, do rollback?
         {
-            // TODO: manage individual error, do rollback?
+            failure_response(Request::ACTION, att);
             return;
         }
     }
@@ -401,3 +367,4 @@ void VirtualRouterDetachNic::request_execute(
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
+

From e3a0d43946851111d6a1f91e360e6fc13d48f76a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 1 Feb 2016 12:33:02 +0100
Subject: [PATCH 147/197] Feature #4215: VR attach and detach in sunstone

---
 src/sunstone/etc/sunstone-views/admin.yaml    |   2 +
 .../etc/sunstone-views/admin_vcenter.yaml     |   2 +
 src/sunstone/etc/sunstone-views/user.yaml     |   2 +
 .../OpenNebulaJSON/VirtualRouterJSON.rb       |  12 +++
 .../public/app/opennebula/virtualrouter.js    |   8 ++
 src/sunstone/public/app/tabs/vrouters-tab.js  |   1 +
 .../public/app/tabs/vrouters-tab/actions.js   |   2 +
 .../tabs/vrouters-tab/dialogs/attach-nic.js   | 100 ++++++++++++++++++
 .../dialogs/attach-nic/dialogId.js            |  19 ++++
 .../vrouters-tab/dialogs/attach-nic/html.hbs  |  46 ++++++++
 .../app/tabs/vrouters-tab/panels/info.js      |  40 +++++++
 .../tabs/vrouters-tab/panels/info/html.hbs    |  17 ++-
 src/sunstone/public/app/utils/nics-section.js |  14 ++-
 13 files changed, 261 insertions(+), 4 deletions(-)
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/dialogId.js
 create mode 100644 src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/html.hbs

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index b6f9ec4803..231729f847 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -452,6 +452,8 @@ tabs:
             VirtualRouter.chgrp: true
             VirtualRouter.chmod: true
             VirtualRouter.delete: true
+            VirtualRouter.attachnic: true
+            VirtualRouter.detachnic: true
     marketplace-tab:
         panel_tabs:
             marketplace_info_tab: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 11b33ba05e..a30f435042 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -446,6 +446,8 @@ tabs:
             VirtualRouter.chgrp: true
             VirtualRouter.chmod: true
             VirtualRouter.delete: true
+            VirtualRouter.attachnic: true
+            VirtualRouter.detachnic: true
     marketplace-tab:
         panel_tabs:
             marketplace_info_tab: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index fda3738a5e..2b9ea50ffb 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -447,6 +447,8 @@ tabs:
             VirtualRouter.chgrp: true
             VirtualRouter.chmod: true
             VirtualRouter.delete: true
+            VirtualRouter.attachnic: true
+            VirtualRouter.detachnic: true
     marketplace-tab:
         panel_tabs:
             marketplace_info_tab: true
diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
index df4e0bd453..4056e7fd44 100644
--- a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb
@@ -49,6 +49,8 @@ module OpenNebulaJSON
                  when "chown"       then self.chown(action_hash['params'])
                  when "chmod"       then self.chmod_json(action_hash['params'])
                  when "rename"      then self.rename(action_hash['params'])
+                 when "attachnic"   then self.nic_attach(action_hash['params'])
+                 when "detachnic"   then self.nic_detach(action_hash['params'])
                  else
                      error_msg = "#{action_hash['perform']} action not " <<
                          " available for this resource"
@@ -103,5 +105,15 @@ module OpenNebulaJSON
         def rename(params=Hash.new)
             super(params['name'])
         end
+
+        def nic_attach(params=Hash.new)
+            template_json = params['nic_template']
+            template = template_to_str(template_json)
+            super(template)
+        end
+
+        def nic_detach(params=Hash.new)
+            super(params['nic_id'].to_i)
+        end
     end
 end
diff --git a/src/sunstone/public/app/opennebula/virtualrouter.js b/src/sunstone/public/app/opennebula/virtualrouter.js
index d73201e52b..8c6d39e136 100644
--- a/src/sunstone/public/app/opennebula/virtualrouter.js
+++ b/src/sunstone/public/app/opennebula/virtualrouter.js
@@ -56,6 +56,14 @@ define(function(require) {
       var action_obj = params.data.extra_param;
       OpenNebulaAction.simple_action(params, RESOURCE, "rename", action_obj);
     },
+    "attachnic" : function(params) {
+      var action_obj = {"nic_template": params.data.extra_param};
+      OpenNebulaAction.simple_action(params, RESOURCE, "attachnic", action_obj);
+    },
+    "detachnic" : function(params) {
+      var action_obj = {"nic_id": params.data.extra_param};
+      OpenNebulaAction.simple_action(params, RESOURCE, "detachnic", action_obj);
+    },
     "getName": function(id){
       return OpenNebulaAction.getName(id, RESOURCE);
     }
diff --git a/src/sunstone/public/app/tabs/vrouters-tab.js b/src/sunstone/public/app/tabs/vrouters-tab.js
index 6e83e0b4df..122e8a1a0b 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab.js
@@ -24,6 +24,7 @@ define(function(require) {
   var DATATABLE_ID = "dataTableVirtualRouters";
 
   var _dialogs = [
+    require('./vrouters-tab/dialogs/attach-nic')
   ];
 
   var _panels = [
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/actions.js b/src/sunstone/public/app/tabs/vrouters-tab/actions.js
index 5801b0ca1f..c479da52b4 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/actions.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/actions.js
@@ -40,6 +40,8 @@ define(function(require) {
     "VirtualRouter.chgrp": _commonActions.multipleAction('chgrp'),
     "VirtualRouter.chmod": _commonActions.singleAction('chmod'),
     "VirtualRouter.rename": _commonActions.singleAction('rename'),
+    "VirtualRouter.attachnic": _commonActions.singleAction('attachnic'),
+    "VirtualRouter.detachnic": _commonActions.singleAction('detachnic'),
     "VirtualRouter.update" : _commonActions.update(),
     "VirtualRouter.update_template" : _commonActions.updateTemplate(),
     "VirtualRouter.update_dialog" : _commonActions.checkAndShowUpdate(),
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js
new file mode 100644
index 0000000000..e6ca5565a4
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js
@@ -0,0 +1,100 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var BaseDialog = require('utils/dialogs/dialog');
+  var TemplateHTML = require('hbs!./attach-nic/html');
+  var Sunstone = require('sunstone');
+  var Notifier = require('utils/notifier');
+  var NicsSection = require('utils/nics-section');
+  var WizardFields = require('utils/wizard-fields');
+
+  /*
+    CONSTANTS
+   */
+
+  var DIALOG_ID = require('./attach-nic/dialogId');
+  var TAB_ID = require('../tabId')
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function Dialog() {
+    this.dialogId = DIALOG_ID;
+
+    BaseDialog.call(this);
+  }
+
+  Dialog.DIALOG_ID = DIALOG_ID;
+  Dialog.prototype = Object.create(BaseDialog.prototype);
+  Dialog.prototype.constructor = Dialog;
+  Dialog.prototype.html = _html;
+  Dialog.prototype.onShow = _onShow;
+  Dialog.prototype.setup = _setup;
+  Dialog.prototype.setElement = _setElement;
+
+  return Dialog;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _html() {
+    return TemplateHTML({
+      'dialogId': this.dialogId
+    });
+  }
+
+  function _setup(context) {
+    var that = this;
+
+    NicsSection.insert({},
+      $(".nicsContext", context),
+      {floatingIP: true, management: true, 
+        hide_add_button:true,
+        click_add_button:true
+      });
+
+    $('#' + DIALOG_ID + 'Form', context).submit(function() {
+      var templateJSON = NicsSection.retrieve($(".nicsContext", context));
+      var obj = {
+        "NIC": templateJSON
+      };
+
+      Sunstone.runAction('VirtualRouter.attachnic', that.element.ID, obj);
+
+      Sunstone.getDialog(DIALOG_ID).hide();
+      Sunstone.getDialog(DIALOG_ID).reset();
+      return false;
+    });
+
+    return false;
+  }
+
+  function _onShow(context) {
+    $("#vr_id", context).val(this.element.ID);
+    return false;
+  }
+
+  function _setElement(element) {
+    this.element = element;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/dialogId.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/dialogId.js
new file mode 100644
index 0000000000..334e377274
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/dialogId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  return 'attachNICVirtualRouterDialog';
+});
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/html.hbs
new file mode 100644
index 0000000000..15b8839419
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/html.hbs
@@ -0,0 +1,46 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<div id="{{dialogId}}" class="reveal-modal large" role="dialog" data-reveal >
+  <div class="row">
+    <div class="large-12 columns">
+      <h3 class="subheader" id="">{{tr "Attach new nic"}}</h3>
+    </div>
+  </div>
+  <div class="reveal-body">
+    <form id="{{dialogId}}Form" action="">
+      <div class="row">
+        <div class="large-6 columns">
+          <label for="vr_id">{{tr "Virtual Router ID"}}</label>
+          <input style="border-style: inset; background-color: lightgrey" type="text" name="vr_id" id="vr_id" disabled/>
+        </div>
+      </div>
+      <div class="row">
+        <div class="large-12 columns nicsContext">
+          <div class="provision_network_selector">
+          </div>
+          <br>
+        </div>
+      </div>
+      <div class="reveal-footer">
+        <div class="form_buttons">
+          <button class="button radius right success" id="attach_nic_button" type="submit" value="VirtualRouter.attachdisk">{{tr "Attach"}}</button>
+        </div>
+      </div>
+      <a class="close-reveal-modal">&#215;</a>
+    </form>
+  </div>
+</div>
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
index 117b9a7b7d..476755eb72 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js
@@ -21,6 +21,8 @@ define(function(require) {
 
   var TemplateInfo = require('hbs!./info/html');
   var Locale = require('utils/locale');
+  var Config = require('sunstone-config');
+  var Sunstone = require('sunstone');
   var PermissionsTable = require('utils/panel/permissions-table');
   var RenameTr = require('utils/panel/rename-tr');
   var OpenNebulaVirtualRouter = require('opennebula/virtualrouter');
@@ -40,6 +42,9 @@ define(function(require) {
   var RESOURCE = "VirtualRouter";
   var XML_ROOT = "VROUTER";
 
+  var ATTACH_NIC_DIALOG_ID = require('../dialogs/attach-nic/dialogId');
+  var CONFIRM_DIALOG_ID = require('utils/dialogs/generic-confirm/dialogId');
+
   /*
     CONSTRUCTOR
    */
@@ -94,9 +99,44 @@ define(function(require) {
   }
 
   function _setup(context) {
+    var that = this;
+
     RenameTr.setup(TAB_ID, RESOURCE, this.element.ID, context);
     PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
 
+
+    if (Config.isTabActionEnabled(TAB_ID, "VirtualRouter.attachnic")) {
+      context.off('click', '.attach_nic');
+      context.on('click', '.attach_nic', function() {
+        var dialog = Sunstone.getDialog(ATTACH_NIC_DIALOG_ID);
+        dialog.setElement(that.element);
+        dialog.show();
+        return false;
+      });
+    }
+
+    if (Config.isTabActionEnabled(TAB_ID, "VirtualRouter.detachnic")) {
+      context.off('click', '.detachnic');
+      context.on('click', '.detachnic', function() {
+        var nic_id = $(".nic_id", $(this).parents('tr')).attr('nic_id');
+
+        Sunstone.getDialog(CONFIRM_DIALOG_ID).setParams({
+          //header :
+          body : Locale.tr("This will detach the nic inmediately"),
+          //question :
+          submit : function(){
+            Sunstone.runAction('VirtualRouter.detachnic', that.element.ID, nic_id);
+            return false;
+          }
+        });
+
+        Sunstone.getDialog(CONFIRM_DIALOG_ID).reset();
+        Sunstone.getDialog(CONFIRM_DIALOG_ID).show();
+
+        return false;
+      });
+    }
+
     // TODO: simplify interface?
     var strippedTemplate = $.extend({}, this.element.TEMPLATE);
     delete strippedTemplate["NIC"];
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
index d5067751a9..1b09c2edeb 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -46,17 +46,32 @@
           <th>{{tr "Floating IPv6 ULA"}}</th>
           <th>{{tr "Floating IPv6 Global"}}</th>
           <th>{{tr "Management Interface"}}</th>
+          <th>{{tr "Actions"}}</th>
+          <th>
+            {{#isTabActionEnabled "vrouters-tab" "VirtualRouter.attachnic"}}
+            <button class="attach_nic button tiny success right radius" >
+              {{tr "Attach nic"}}
+            </button>
+            {{/isTabActionEnabled}}
+          </th>
         </tr>
       </thead>
       <tbody>
         {{#each nics}}
         <tr>
-          <td>{{NIC_ID}}</td>
+          <td class="nic_id" nic_id="{{NIC_ID}}">{{NIC_ID}}</td>
           <td>{{NETWORK}}</td>
           <td>{{valOrDefault IP "--"}}</td>
           <td>{{valOrDefault IP6_ULA "--"}}</td>
           <td>{{valOrDefault IP6_GLOBAL "--"}}</td>
           <td>{{valOrDefault VROUTER_MANAGEMENT "--"}}</td>
+          <td>
+            {{#isTabActionEnabled "vrouters-tab" "VirtualRouter.detachnic"}}
+            <a href="VirtualRouter.detachnic" class="detachnic" ><i class="fa fa-times"/>
+              {{tr "Detach"}}
+            </a>
+            {{/isTabActionEnabled}}
+          </td>
         </tr>
         {{/each}}
       </tbody>
diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js
index 76a07e40d1..786c45639a 100644
--- a/src/sunstone/public/app/utils/nics-section.js
+++ b/src/sunstone/public/app/utils/nics-section.js
@@ -36,6 +36,7 @@ define(function(require) {
    * @param  {object} context       JQuery selector
    * @param  {object} options       Options
    *                                - hide_add_button {bool}
+   *                                - click_add_button {bool}
    *                                - floatingIP {bool}: true to show the
    *                                floating IP checkbox
    *                                - management {bool}: true to show the
@@ -114,7 +115,6 @@ define(function(require) {
    * @param  {object} options       Options
    *                                - nic {object}
    *                                - vnet_attr {object}
-   *                                - hide_add_button {bool}
    *                                - floatingIP {bool}: true to show the
    *                                floating IP checkbox
    *                                - management {bool}: true to show the
@@ -340,7 +340,11 @@ define(function(require) {
    * @param  {object} context       JQuery selector
    * @param  {object} options       Options
    *                                - hide_add_button {bool}
-   *                                - floatingIP {bool}
+   *                                - click_add_button {bool}
+   *                                - floatingIP {bool}: true to show the
+   *                                floating IP checkbox
+   *                                - management {bool}: true to show the
+   *                                management checkbox
    */
   function _generate_provision_network_accordion(context, options) {
     context.off();
@@ -373,7 +377,11 @@ define(function(require) {
 
     $(".provision_add_network_interface", context).on("click", function() {
       _generate_provision_network_table($(".accordion", context), options);
-    })
+    });
+
+    if (options.click_add_button == true){
+      $(".provision_add_network_interface", context).click();
+    }
 
     $(document).foundation();
   }

From cfdfacf25944071436e96ec52fe941fbc7f8c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 1 Feb 2016 12:59:46 +0100
Subject: [PATCH 148/197] Feature #4215: Downgrade local_db_version to 4.13.85

---
 include/Nebula.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/Nebula.h b/include/Nebula.h
index 415a81c00d..c3a1f2cae5 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -408,7 +408,7 @@ public:
      */
     static string local_db_version()
     {
-        return "4.90.0";
+        return "4.13.85";
     }
 
     /**

From e35e097469c4faacc2a4cfcb4b1c6128e18480ca Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 28 Jan 2016 11:02:28 +0100
Subject: [PATCH 149/197] Feature #4217: Revert "Feature #4217: Remove
 unnecessary line"

That line is necessary
---
 src/market_mad/one_market.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index 25dcb4856b..fdcbf3536d 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -47,7 +47,8 @@ class MarketPlaceDriver < OpenNebulaDriver
         :import  => "IMPORT",
         :delete  => "DELETE",
         :log     => "LOG",
-        :monitor => "MONITOR"
+        :monitor => "MONITOR",
+        :export  => "EXPORT"  #For Datastore export action
     }
 
     # XPATHs for driver messages

From aecd441bcee3915879ea70df429ebbe2e96dc6a2 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 28 Jan 2016 11:23:33 +0100
Subject: [PATCH 150/197] Feature #4217: don't try to delete images from s3
 that don't have a source

---
 src/market_mad/remotes/s3/delete | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/market_mad/remotes/s3/delete b/src/market_mad/remotes/s3/delete
index a45709d96f..347773ab58 100755
--- a/src/market_mad/remotes/s3/delete
+++ b/src/market_mad/remotes/s3/delete
@@ -59,6 +59,11 @@ region            = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
 
 name = File.basename(source)
 
+if name.empty?
+    STDERR.puts "Empty SOURCE."
+    exit 1
+end
+
 s3 = S3.new(
     :name              => name,
     :bucket            => bucket,

From 87e7a9962edf275b732d36a8c70d646721fe7b0e Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 28 Jan 2016 11:24:07 +0100
Subject: [PATCH 151/197] Feature #4217: minor changes

---
 src/datastore_mad/remotes/downloader.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/datastore_mad/remotes/downloader.sh b/src/datastore_mad/remotes/downloader.sh
index 5d242a85f3..f0a8a86828 100755
--- a/src/datastore_mad/remotes/downloader.sh
+++ b/src/datastore_mad/remotes/downloader.sh
@@ -136,8 +136,6 @@ function s3_request
          " https://${BUCKET}.s3.amazonaws.com/${OBJECT}"
 }
 
-
-
 TEMP=`getopt -o m:s:l:n -l md5:,sha1:,limit:,nodecomp -- "$@"`
 
 if [ $? != 0 ] ; then
@@ -200,8 +198,8 @@ http://*|https://*)
 ssh://*)
     # pseudo-url for ssh transfers ssh://user@host:path
     # -l to limit the bw
-    ssh_src=$(echo $FROM | grep -Po '(?<=ssh://).+')
-    ssh_arg=(${ssh_src//:/ })
+    ssh_src=${FROM#ssh://}
+    ssh_arg=(${ssh_src/:/ })
 
     rmt_cmd="'cat ${ssh_arg[1]}'"
 

From da39b2f424ec4c5ada125d9ff34d69dadd2363af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 1 Feb 2016 17:03:30 +0100
Subject: [PATCH 152/197] Feature #4215: Reverse NETWORK and NETWORK_ID
 priority in auth

For consistency with commit:7410c78
---
 src/image/ImagePool.cc        | 20 ++++++++++----------
 src/vnm/VirtualNetworkPool.cc | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc
index c79584f4cd..3e2dd72426 100644
--- a/src/image/ImagePool.cc
+++ b/src/image/ImagePool.cc
@@ -494,16 +494,7 @@ void ImagePool::disk_attribute(
     Nebula&         nd      = Nebula::instance();
     DatastorePool * ds_pool = nd.get_dspool();
 
-    if (!(source = disk->vector_value("IMAGE")).empty())
-    {
-        int uiid = get_disk_uid(disk,uid);
-
-        if ( uiid != -1)
-        {
-            img = get(source, uiid, true);
-        }
-    }
-    else if (!(source = disk->vector_value("IMAGE_ID")).empty())
+    if (!(source = disk->vector_value("IMAGE_ID")).empty())
     {
         int iid = get_disk_id(source);
 
@@ -512,6 +503,15 @@ void ImagePool::disk_attribute(
             img = get(iid, true);
         }
     }
+    else if (!(source = disk->vector_value("IMAGE")).empty())
+    {
+        int uiid = get_disk_uid(disk,uid);
+
+        if ( uiid != -1)
+        {
+            img = get(source, uiid, true);
+        }
+    }
 
     if ( img != 0 )
     {
diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc
index 6746925803..4441a8bd27 100644
--- a/src/vnm/VirtualNetworkPool.cc
+++ b/src/vnm/VirtualNetworkPool.cc
@@ -310,7 +310,11 @@ void VirtualNetworkPool::authorize_nic(VectorAttribute * nic,
     PoolObjectAuth   perm;
     string           error;
 
-    if (!(network = nic->vector_value("NETWORK")).empty())
+    if (!(network = nic->vector_value("NETWORK_ID")).empty())
+    {
+        vnet = get_nic_by_id(network, error);
+    }
+    else if (!(network = nic->vector_value("NETWORK")).empty())
     {
         vnet = get_nic_by_name (nic, network, uid, error);
 
@@ -319,10 +323,6 @@ void VirtualNetworkPool::authorize_nic(VectorAttribute * nic,
             nic->replace("NETWORK_ID", vnet->get_oid());
         }
     }
-    else if (!(network = nic->vector_value("NETWORK_ID")).empty())
-    {
-        vnet = get_nic_by_id(network, error);
-    }
     else //Not using a pre-defined network
     {
         return;

From 68a0184ed27ada2a00618f20bc439d3daf117338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 1 Feb 2016 17:07:04 +0100
Subject: [PATCH 153/197] Feature #4215: Implement auth & quotas for all VR
 actions

---
 include/Quota.h                       |  4 +--
 include/QuotaNetwork.h                |  8 ++++--
 include/Quotas.h                      | 14 ++--------
 include/RequestManagerAllocate.h      |  4 +++
 include/VirtualNetworkPool.h          |  6 +++-
 include/VirtualRouter.h               | 16 +++++++++++
 src/rm/RequestManagerAllocate.cc      | 40 +++++++++++++++++++++++++++
 src/rm/RequestManagerVirtualRouter.cc |  8 +++---
 src/um/QuotaNetwork.cc                | 28 ++++++++++++++++---
 src/um/Quotas.cc                      | 22 +++++++++++----
 src/vm/VirtualMachine.cc              |  2 +-
 src/vnm/VirtualNetworkPool.cc         | 17 +++++++++---
 src/vrouter/VirtualRouter.cc          | 33 ++++++++++++++++++++++
 13 files changed, 166 insertions(+), 36 deletions(-)

diff --git a/include/Quota.h b/include/Quota.h
index e1b79e9c77..10d0b426e4 100644
--- a/include/Quota.h
+++ b/include/Quota.h
@@ -49,7 +49,7 @@ public:
      *    @param error string
      *    @return true if the operation can be performed
      */
-    virtual bool check(Template* tmpl, Quotas& default_quotas, string& error) = 0;
+    //virtual bool check(Template* tmpl, Quotas& default_quotas, string& error) = 0;
 
     /**
      *  Check if a resource update in usage counters will exceed the
@@ -69,7 +69,7 @@ public:
      *  Decrement usage counters when deallocating image
      *    @param tmpl template for the resource
      */
-    virtual void del(Template* tmpl) = 0;
+    //virtual void del(Template* tmpl) = 0;
 
     /**
      * Returns the name that identifies the quota in a template
diff --git a/include/QuotaNetwork.h b/include/QuotaNetwork.h
index ff18a2bd83..1d3087f213 100644
--- a/include/QuotaNetwork.h
+++ b/include/QuotaNetwork.h
@@ -18,6 +18,7 @@
 #define QUOTA_NETWORK_H_
 
 #include "Quota.h"
+#include "PoolObjectSQL.h"
 
 /**
  *  DataStore Quotas, defined as:
@@ -47,18 +48,21 @@ public:
     /**
      *  Check if the resource allocation will exceed the quota limits. If not
      *  the usage counters are updated
+     *    @param otype object type, VM or VRouter
      *    @param tmpl template for the resource
      *    @param default_quotas Quotas that contain the default limits
      *    @param error string
      *    @return true if the operation can be performed
      */
-    bool check(Template* tmpl, Quotas& default_quotas, string& error);
+    bool check(PoolObjectSQL::ObjectType otype, Template* tmpl,
+            Quotas& default_quotas, string& error);
 
     /**
      *  Decrement usage counters when deallocating image
+     *    @param otype object type, VM or VRouter
      *    @param tmpl template for the resource
      */
-    void del(Template* tmpl);
+    void del(PoolObjectSQL::ObjectType otype, Template* tmpl);
 
 protected:
 
diff --git a/include/Quotas.h b/include/Quotas.h
index bbcd348658..93261ae39b 100644
--- a/include/Quotas.h
+++ b/include/Quotas.h
@@ -35,7 +35,8 @@ public:
         VM,             /**< Checks VM usage (MEMORY, CPU and VMS) */
         NETWORK,        /**< Checks Network usage (leases) */
         IMAGE,          /**< Checks Image usage (RVMs using it) */
-        VIRTUALMACHINE  /**< Checks all VM associated resources VM, NETWORK, IMAGE */
+        VIRTUALMACHINE, /**< Checks all VM associated resources VM, NETWORK, IMAGE */
+        VIRTUALROUTER   /**< Checks the Virtual Router NETWORK usage (leases) */
     };
 
     /**
@@ -69,17 +70,6 @@ public:
          return datastore_quota.get_quota(id, va);
      }
 
-    /**
-     *  Delete VM related usage (network, image and compute) from quota counters.
-     *    @param tmpl template for the image, with usage
-     */
-     void vm_del(Template * tmpl)
-     {
-        network_quota.del(tmpl);
-        vm_quota.del(tmpl);
-        image_quota.del(tmpl);
-     }
-
      /**
       * Gets a VM quota identified by its ID.
       *
diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h
index 7409ab2ab2..37449aeb05 100644
--- a/include/RequestManagerAllocate.h
+++ b/include/RequestManagerAllocate.h
@@ -601,6 +601,10 @@ public:
                       Template * tmpl,
                       int& id,
                       RequestAttributes& att);
+
+    bool allocate_authorization(Template *          obj_template,
+                                RequestAttributes&  att,
+                                PoolObjectAuth *    cluster_perms);
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/VirtualNetworkPool.h b/include/VirtualNetworkPool.h
index 79afc1b9f3..c4142e48e5 100644
--- a/include/VirtualNetworkPool.h
+++ b/include/VirtualNetworkPool.h
@@ -125,7 +125,11 @@ public:
      *    @param nic the nic to be authorized
      *    @param ar the AuthRequest
      */
-    void authorize_nic(VectorAttribute * nic, int uid, AuthRequest * ar);
+    void authorize_nic(
+            PoolObjectSQL::ObjectType   ot,
+            VectorAttribute *           nic,
+            int                         uid,
+            AuthRequest *               ar);
 
     /**
      *  Bootstraps the database table(s) associated to the VirtualNetwork pool
diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index 679eb1ef25..c4be7d524c 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -21,6 +21,7 @@
 #include "Template.h"
 #include "ObjectCollection.h"
 #include "VirtualMachineTemplate.h"
+#include "AuthRequest.h"
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -94,6 +95,21 @@ public:
      */
     int detach_nic(int nic_id);
 
+    // ------------------------------------------------------------------------
+    // Authorization related functions
+    // ------------------------------------------------------------------------
+
+    /**
+     *  Sets an authorization request for a Virtual Router template based on
+     *  the networks used
+     *    @param  uid for template owner
+     *    @param  ar the AuthRequest object
+     *    @param  tmpl the virtual router template
+     */
+    static void set_auth_request(int uid,
+                                 AuthRequest& ar,
+                                 Template *tmpl);
+
 private:
     // -------------------------------------------------------------------------
     // Friends
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 9415047b8c..f4950e3762 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -754,3 +754,43 @@ int VirtualRouterAllocate::pool_allocate(
     return vrpool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
         tmpl, &id, att.resp_msg);
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+bool VirtualRouterAllocate::allocate_authorization(
+        Template *          tmpl,
+        RequestAttributes&  att,
+        PoolObjectAuth *    cluster_perms)
+{
+    if ( att.uid == 0 )
+    {
+        return true;
+    }
+
+    AuthRequest ar(att.uid, att.group_ids);
+    string      tmpl_str;
+
+    // ------------------ Authorize create operation ------------------------
+
+    ar.add_create_auth(att.uid, att.gid, auth_object, tmpl->to_xml(tmpl_str));
+
+    VirtualRouter::set_auth_request(att.uid, ar, tmpl);
+
+    if (UserPool::authorize(ar) == -1)
+    {
+        att.resp_msg = ar.message;
+        failure_response(AUTHORIZATION, att);
+
+        return false;
+    }
+
+    // -------------------------- Check Quotas  ----------------------------
+
+    if (quota_authorization(tmpl, Quotas::VIRTUALROUTER, att, att.resp_msg) == false)
+    {
+        return AUTHORIZATION;
+    }
+
+    return true;
+}
diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc
index d57d24c2ef..13ecda56af 100644
--- a/src/rm/RequestManagerVirtualRouter.cc
+++ b/src/rm/RequestManagerVirtualRouter.cc
@@ -199,7 +199,7 @@ void VirtualRouterAttachNic::request_execute(
 
         ar.add_auth(AuthRequest::MANAGE, vr_perms); // MANAGE VROUTER
 
-        VirtualMachine::set_auth_request(att.uid, ar, &tmpl); // USE VNET
+        VirtualRouter::set_auth_request(att.uid, ar, &tmpl); // USE VNET
 
         if (UserPool::authorize(ar) == -1)
         {
@@ -211,7 +211,7 @@ void VirtualRouterAttachNic::request_execute(
 
     RequestAttributes att_quota(vr_perms.uid, vr_perms.gid, att);
 
-    if ( quota_authorization(&tmpl, Quotas::NETWORK, att_quota) == false )
+    if ( quota_authorization(&tmpl, Quotas::VIRTUALROUTER, att_quota) == false )
     {
         return;
     }
@@ -223,7 +223,7 @@ void VirtualRouterAttachNic::request_execute(
 
     if (vr == 0)
     {
-        quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
+        quota_rollback(&tmpl, Quotas::VIRTUALROUTER, att_quota);
 
         att.resp_id = vrid;
         failure_response(NO_EXISTS, att);
@@ -240,7 +240,7 @@ void VirtualRouterAttachNic::request_execute(
 
     if (nic == 0)
     {
-        quota_rollback(&tmpl, Quotas::NETWORK, att_quota);
+        quota_rollback(&tmpl, Quotas::VIRTUALROUTER, att_quota);
 
         failure_response(ACTION, att);
         return;
diff --git a/src/um/QuotaNetwork.cc b/src/um/QuotaNetwork.cc
index 94fa1a2400..2944e4a0ec 100644
--- a/src/um/QuotaNetwork.cc
+++ b/src/um/QuotaNetwork.cc
@@ -27,13 +27,15 @@ const int QuotaNetwork::NUM_NET_METRICS  = 1;
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-bool QuotaNetwork::check(Template * tmpl, Quotas& default_quotas, string& error)
+bool QuotaNetwork::check(PoolObjectSQL::ObjectType otype, Template * tmpl,
+        Quotas& default_quotas, string& error)
 {
     vector<Attribute*> nics;
     VectorAttribute *  nic;
 
     string net_id;
     int num;
+    bool uses_lease;
 
     map<string, float> net_request;
 
@@ -52,7 +54,14 @@ bool QuotaNetwork::check(Template * tmpl, Quotas& default_quotas, string& error)
 
         net_id = nic->vector_value("NETWORK_ID");
 
-        if ( !net_id.empty() )
+        uses_lease = true;
+
+        if ( otype == PoolObjectSQL::VROUTER )
+        {
+            nic->vector_value("FLOATING_IP", uses_lease);
+        }
+
+        if ( !net_id.empty() && uses_lease )
         {
             if ( !check_quota(net_id, net_request, default_quotas, error) )
             {
@@ -67,7 +76,7 @@ bool QuotaNetwork::check(Template * tmpl, Quotas& default_quotas, string& error)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void QuotaNetwork::del(Template * tmpl)
+void QuotaNetwork::del(PoolObjectSQL::ObjectType otype, Template * tmpl)
 {
 
     vector<Attribute*> nics;
@@ -75,6 +84,7 @@ void QuotaNetwork::del(Template * tmpl)
 
     string net_id;
     int num;
+    bool uses_lease;
 
     map<string, float> net_request;
 
@@ -93,7 +103,17 @@ void QuotaNetwork::del(Template * tmpl)
 
         net_id = nic->vector_value("NETWORK_ID");
 
-        del_quota(net_id, net_request);
+        uses_lease = true;
+
+        if ( otype == PoolObjectSQL::VROUTER )
+        {
+            nic->vector_value("FLOATING_IP", uses_lease);
+        }
+
+        if (uses_lease)
+        {
+            del_quota(net_id, net_request);
+        }
     }
 }
 
diff --git a/src/um/Quotas.cc b/src/um/Quotas.cc
index d86f877ab5..d661db5647 100644
--- a/src/um/Quotas.cc
+++ b/src/um/Quotas.cc
@@ -150,7 +150,7 @@ void Quotas::quota_del(QuotaType type, Template *tmpl)
         break;
 
         case NETWORK:
-            network_quota.del(tmpl);
+            network_quota.del(PoolObjectSQL::VM, tmpl);
         break;
 
         case IMAGE:
@@ -162,10 +162,14 @@ void Quotas::quota_del(QuotaType type, Template *tmpl)
         break;
 
         case VIRTUALMACHINE:
-            network_quota.del(tmpl);
+            network_quota.del(PoolObjectSQL::VM, tmpl);
             vm_quota.del(tmpl);
             image_quota.del(tmpl);
         break;
+
+        case VIRTUALROUTER:
+            network_quota.del(PoolObjectSQL::VROUTER, tmpl);
+        break;
     }
 }
 
@@ -183,7 +187,7 @@ bool Quotas::quota_check(QuotaType  type,
             return datastore_quota.check(tmpl, default_quotas, error_str);
 
         case NETWORK:
-            return network_quota.check(tmpl, default_quotas, error_str);
+            return network_quota.check(PoolObjectSQL::VM, tmpl, default_quotas, error_str);
 
         case IMAGE:
             return image_quota.check(tmpl, default_quotas, error_str);
@@ -192,25 +196,30 @@ bool Quotas::quota_check(QuotaType  type,
             return vm_quota.check(tmpl, default_quotas, error_str);
 
         case VIRTUALMACHINE:
-            if ( network_quota.check(tmpl, default_quotas, error_str) == false )
+            if ( network_quota.check(PoolObjectSQL::VM,
+                    tmpl, default_quotas, error_str) == false )
             {
                 return false;
             }
 
             if ( vm_quota.check(tmpl, default_quotas, error_str) == false )
             {
-                network_quota.del(tmpl);
+                network_quota.del(PoolObjectSQL::VM, tmpl);
                 return false;
             }
 
             if ( image_quota.check(tmpl, default_quotas, error_str) == false )
             {
-                network_quota.del(tmpl);
+                network_quota.del(PoolObjectSQL::VM, tmpl);
                 vm_quota.del(tmpl);
                 return false;
             }
 
             return true;
+
+        case VIRTUALROUTER:
+            return network_quota.check(PoolObjectSQL::VROUTER,
+                    tmpl, default_quotas, error_str);
     }
 
     return false;
@@ -231,6 +240,7 @@ bool Quotas::quota_update(QuotaType  type,
         case NETWORK:
         case IMAGE:
         case VIRTUALMACHINE:
+        case VIRTUALROUTER:
             error_str = "Cannot update quota. Not implemented";
             return false;
 
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 19f183fa74..077e45bcb2 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -3991,7 +3991,7 @@ void VirtualMachine::set_auth_request(int uid,
             continue;
         }
 
-        vnpool->authorize_nic(vector,uid,&ar);
+        vnpool->authorize_nic(PoolObjectSQL::VM, vector, uid, &ar);
 
         get_security_groups(vector, sgroups);
 
diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc
index 4441a8bd27..0f698f07df 100644
--- a/src/vnm/VirtualNetworkPool.cc
+++ b/src/vnm/VirtualNetworkPool.cc
@@ -301,9 +301,11 @@ int VirtualNetworkPool::nic_attribute(
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void VirtualNetworkPool::authorize_nic(VectorAttribute * nic,
-                                       int uid,
-                                       AuthRequest * ar)
+void VirtualNetworkPool::authorize_nic(
+        PoolObjectSQL::ObjectType   ot,
+        VectorAttribute *           nic,
+        int                         uid,
+        AuthRequest *               ar)
 {
     string           network;
     VirtualNetwork * vnet = 0;
@@ -337,5 +339,12 @@ void VirtualNetworkPool::authorize_nic(VectorAttribute * nic,
 
     vnet->unlock();
 
-    ar->add_auth(AuthRequest::USE, perm);
+    if (ot == PoolObjectSQL::VM)
+    {
+        ar->add_auth(AuthRequest::USE, perm);
+    }
+    else // (ot == PoolObjectSQL::VROUTER)
+    {
+        ar->add_auth(AuthRequest::MANAGE, perm);
+    }
 }
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index 280f460160..b50e806f7d 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -129,6 +129,8 @@ int VirtualRouter::drop(SqlDB * db)
         release_network_leases();
 
         shutdown_vms();
+
+        Quotas::quota_del(Quotas::VIRTUALROUTER, uid, gid, obj_template);
     }
 
     return rc;
@@ -610,6 +612,8 @@ VectorAttribute * VirtualRouter::attach_nic(
 
 int VirtualRouter::detach_nic(int nic_id)
 {
+    Template tmpl;
+
     VectorAttribute * nic = get_nic(nic_id);
 
     if (nic == 0)
@@ -619,6 +623,13 @@ int VirtualRouter::detach_nic(int nic_id)
 
     obj_template->remove(nic);
 
+    release_network_leases(nic);
+
+    // Update quotas
+    tmpl.set(nic);
+
+    Quotas::quota_del(Quotas::VIRTUALROUTER, uid, gid, &tmpl);
+
     return 0;
 }
 
@@ -646,3 +657,25 @@ VectorAttribute* VirtualRouter::get_nic(int nic_id) const
 
     return 0;
 }
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+void VirtualRouter::set_auth_request(int uid,
+                                     AuthRequest& ar,
+                                     Template *tmpl)
+{
+    vector<VectorAttribute* > nics;
+    vector<VectorAttribute* >::const_iterator nics_it;
+
+    Nebula& nd = Nebula::instance();
+
+    VirtualNetworkPool * vnpool = nd.get_vnpool();
+
+    tmpl->get("NIC", nics);
+
+    for (nics_it = nics.begin(); nics_it != nics.end(); nics_it++)
+    {
+        vnpool->authorize_nic(PoolObjectSQL::VROUTER, *nics_it, uid, &ar);
+    }
+}

From d3e0fd128b7c7486f0fbf9533f0ed78c1fee5edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 1 Feb 2016 17:54:12 +0100
Subject: [PATCH 154/197] Feature #4215: Remove epilog command from vmm
 attachnic

---
 src/vmm/VirtualMachineManager.cc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index 265e5e1843..31e2c35636 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -2385,7 +2385,6 @@ void VirtualMachineManager::attach_nic_action(
     string  vm_tm_mad;
     string  opennebula_hostname;
     string  prolog_cmd;
-    string  epilog_cmd;
     string  disk_path;
     string  token_password;
 
@@ -2456,12 +2455,6 @@ void VirtualMachineManager::attach_nic_action(
 
         os.str("");
 
-        tm->epilog_transfer_command(vm, disk, os);
-
-        epilog_cmd = os.str();
-
-        os.str("");
-
         disk->vector_value("DISK_ID", disk_id);
 
         os << vm->get_remote_system_dir() << "/disk." << disk_id;
@@ -2480,7 +2473,7 @@ void VirtualMachineManager::attach_nic_action(
         "",
         "",
         prolog_cmd,
-        epilog_cmd,
+        "",
         disk_path,
         vm->to_xml(vm_tmpl),
         vm->get_ds_id());

From 9044352dfb1fa791a3620e9410e39c17f6906ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 1 Feb 2016 18:52:56 +0100
Subject: [PATCH 155/197] Feature #4215: Add vrouter leases to onedb fsck

---
 src/onedb/fsck.rb | 155 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 141 insertions(+), 14 deletions(-)

diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb
index 69e4582924..715008c6ca 100644
--- a/src/onedb/fsck.rb
+++ b/src/onedb/fsck.rb
@@ -31,7 +31,7 @@ require 'nokogiri'
 
 module OneDBFsck
     VERSION = "4.11.80"
-    LOCAL_VERSION = "4.13.85"
+    LOCAL_VERSION = "4.90.0"
 
     def check_db_version()
         db_version = read_db_version()
@@ -59,9 +59,10 @@ EOT
 
     IMAGE_STATES=%w{INIT READY USED DISABLED LOCKED ERROR CLONE DELETE USED_PERS}
 
-    VM_BIN  = 0x0000001000000000
-    NET_BIN = 0x0000004000000000
-    HOLD    = 0xFFFFFFFF
+    VM_BIN      = 0x0000001000000000
+    NET_BIN     = 0x0000004000000000
+    VROUTER_BIN = 0x0004000000000000
+    HOLD        = 0xFFFFFFFF
 
     def fsck
 
@@ -825,7 +826,7 @@ EOT
 
                         if ar_id_e.nil?
                             if !counters[:vnet][net_id][:no_ar_leases][mac_s_to_i(mac)].nil?
-                                log_error("VNet has more than one VM with the same MAC address (#{mac}). "<<
+                                log_error("VNet #{net_id} has more than one lease with the same MAC address (#{mac}). "<<
                                     "FSCK can't handle this, and consistency is not guaranteed", false)
                             end
 
@@ -836,7 +837,8 @@ EOT
                                 :ip6_ula    => nic.at_xpath("IP6_ULA").nil? ? nil : nic.at_xpath("IP6_ULA").text,
                                 :mac        => mac,
                                 :vm         => row[:oid],
-                                :vnet       => nil
+                                :vnet       => nil,
+                                :vrouter    => nil
                             }
                         else
                             ar_id = ar_id_e.text.to_i
@@ -852,7 +854,8 @@ EOT
                                     :ip6_ula    => nic.at_xpath("IP6_ULA").nil? ? nil : nic.at_xpath("IP6_ULA").text,
                                     :mac        => mac,
                                     :vm         => row[:oid],
-                                    :vnet       => nil
+                                    :vnet       => nil,
+                                    :vrouter    => nil
                                 }
                             end
                         end
@@ -969,6 +972,87 @@ EOT
 
         log_time()
 
+        ########################################################################
+        # Virtual Routers
+        #
+        ########################################################################
+
+        vrouters_fix = {}
+
+        # Aggregate information of the RUNNING vms
+        @db.fetch("SELECT oid,body FROM vrouter_pool") do |row|
+            vrouter_doc = Nokogiri::XML(row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks}
+
+            # VNets used by this Virtual Router
+            vrouter_doc.root.xpath("TEMPLATE/NIC").each do |nic|
+                net_id = nil
+                nic.xpath("NETWORK_ID").each do |nid|
+                    net_id = nid.text.to_i
+                end
+
+                floating = false
+
+                nic.xpath("FLOATING_IP").each do |floating_e|
+                    floating = (floating_e.text.upcase == "YES")
+                end
+
+                if !net_id.nil? && floating
+                    if counters[:vnet][net_id].nil?
+                        log_error("VRouter #{row[:oid]} is using VNet #{net_id}, "<<
+                            "but it does not exist", false)
+                    else
+                        mac = nic.at_xpath("MAC").nil? ? nil : nic.at_xpath("MAC").text
+
+                        ar_id_e = nic.at_xpath('AR_ID')
+
+                        if ar_id_e.nil?
+                            if !counters[:vnet][net_id][:no_ar_leases][mac_s_to_i(mac)].nil?
+                                log_error("VNet #{net_id} has more than one lease with the same MAC address (#{mac}). "<<
+                                    "FSCK can't handle this, and consistency is not guaranteed", false)
+                            end
+
+                            counters[:vnet][net_id][:no_ar_leases][mac_s_to_i(mac)] = {
+                                :ip         => nic.at_xpath("IP").nil? ? nil : nic.at_xpath("IP").text,
+                                :ip6_global => nic.at_xpath("IP6_GLOBAL").nil? ? nil : nic.at_xpath("IP6_GLOBAL").text,
+                                :ip6_link   => nic.at_xpath("IP6_LINK").nil? ? nil : nic.at_xpath("IP6_LINK").text,
+                                :ip6_ula    => nic.at_xpath("IP6_ULA").nil? ? nil : nic.at_xpath("IP6_ULA").text,
+                                :mac        => mac,
+                                :vm         => nil,
+                                :vnet       => nil,
+                                :vrouter    => row[:oid],
+                            }
+                        else
+                            ar_id = ar_id_e.text.to_i
+
+                            if counters[:vnet][net_id][:ar_leases][ar_id].nil?
+                                log_error("VRouter #{row[:oid]} is using VNet #{net_id}, AR #{ar_id}, "<<
+                                    "but the AR does not exist", false)
+                            else
+                                counters[:vnet][net_id][:ar_leases][ar_id][mac_s_to_i(mac)] = {
+                                    :ip         => nic.at_xpath("IP").nil? ? nil : nic.at_xpath("IP").text,
+                                    :ip6_global => nic.at_xpath("IP6_GLOBAL").nil? ? nil : nic.at_xpath("IP6_GLOBAL").text,
+                                    :ip6_link   => nic.at_xpath("IP6_LINK").nil? ? nil : nic.at_xpath("IP6_LINK").text,
+                                    :ip6_ula    => nic.at_xpath("IP6_ULA").nil? ? nil : nic.at_xpath("IP6_ULA").text,
+                                    :mac        => mac,
+                                    :vm         => nil,
+                                    :vnet       => nil,
+                                    :vrouter    => row[:oid],
+                                }
+                            end
+                        end
+                    end
+                end
+            end
+        end
+
+        @db.transaction do
+            vrouters_fix.each do |id, body|
+                @db[:vrouter_pool].where(:oid => id).update(:body => body)
+            end
+        end
+
+        log_time()
+
         ########################################################################
         # Hosts
         #
@@ -1278,7 +1362,8 @@ EOT
                             :ip6_ula    => nil,
                             :mac        => nil,
                             :vm         => nil,
-                            :vnet       => row[:oid]
+                            :vnet       => row[:oid],
+                            :vrouter    => nil
                         }
 
                         #MAC
@@ -1389,7 +1474,8 @@ EOT
                         :ip6_ula    => nil,
                         :mac        => nil,
                         :vm         => nil,
-                        :vnet       => nil
+                        :vnet       => nil,
+                        :vrouter    => nil
                     }
 
                     # MAC
@@ -1432,9 +1518,12 @@ EOT
                     if (binary_magic & VM_BIN != 0)
                         lease[:vm] = lease_oid
                         lease_obj = "VM"
-                    else # binary_magic & NET_BIN != 0
+                    elsif (binary_magic & NET_BIN != 0)
                         lease[:vnet] = lease_oid
                         lease_obj = "VNet"
+                    else #(binary_magic & VROUTER_BIN != 0) 
+                        lease[:vrouter] = lease_oid
+                        lease_obj = "VRouter"
                     end
 
                     counter_lease = counter_ar[mac]
@@ -1457,8 +1546,9 @@ EOT
                         if counter_lease != lease
 
                             # Things that can be fixed
-                            if (counter_lease[:vm] != lease[:vm] ||
-                                counter_lease[:vnet] != lease[:vnet])
+                            if (counter_lease[:vm]      != lease[:vm] ||
+                                counter_lease[:vnet]    != lease[:vnet] ||
+                                counter_lease[:vrouter] != lease[:vrouter])
 
                                 new_lease_obj = ""
                                 new_lease_oid = 0
@@ -1470,12 +1560,18 @@ EOT
 
                                     new_binary_magic = (VM_BIN |
                                         (new_lease_oid & 0xFFFFFFFF))
-                                else
+                                elsif !counter_lease[:vnet].nil?
                                     new_lease_obj = "VNet"
                                     new_lease_oid = counter_lease[:vnet].to_i
 
                                     new_binary_magic = (NET_BIN |
                                         (new_lease_oid & 0xFFFFFFFF))
+                                else #if !counter_lease[:vrouter].nil?
+                                    new_lease_obj = "VRouter"
+                                    new_lease_oid = counter_lease[:vrouter].to_i
+
+                                    new_binary_magic = (VROUTER_BIN |
+                                        (new_lease_oid & 0xFFFFFFFF))
                                 end
 
                                 if (lease[:vm] == HOLD)
@@ -1527,12 +1623,18 @@ EOT
 
                         new_binary_magic = (VM_BIN |
                             (new_lease_oid & 0xFFFFFFFF))
-                    else
+                    elsif !counter_lease[:vnet].nil?
                         new_lease_obj = "VNet"
                         new_lease_oid = counter_lease[:vnet].to_i
 
                         new_binary_magic = (NET_BIN |
                             (new_lease_oid & 0xFFFFFFFF))
+                    else #if !counter_lease[:vrouter].nil?
+                        new_lease_obj = "VRouter"
+                        new_lease_oid = counter_lease[:vrouter].to_i
+
+                        new_binary_magic = (VROUTER_BIN |
+                            (new_lease_oid & 0xFFFFFFFF))
                     end
 
                     log_error("VNet #{oid} AR #{ar_id} does not have a lease "<<
@@ -1799,6 +1901,31 @@ EOT
         end
 
 
+        @db.fetch("SELECT body FROM vrouter_pool WHERE #{where_filter}") do |vrouter_row|
+            vrouter_doc = Nokogiri::XML(vrouter_row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks}
+
+            # VNet quotas
+            vrouter_doc.root.xpath("TEMPLATE/NIC").each { |nic|
+                net_id = nil
+                nic.xpath("NETWORK_ID").each do |nid|
+                    net_id = nid.text
+                end
+
+                floating = false
+
+                nic.xpath("FLOATING_IP").each do |floating_e|
+                    floating = (floating_e.text.upcase == "YES")
+                end
+
+                if !net_id.nil? && floating
+                    vnet_usage[net_id] = 0 if vnet_usage[net_id].nil?
+
+                    vnet_usage[net_id] += 1
+                end
+            }
+
+        end
+
         # VM quotas
 
         vm_elem = nil

From 7396a8f68ebeac7a8b7fa7ab2f72c70cad578fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 2 Feb 2016 11:54:09 +0100
Subject: [PATCH 156/197] Feature #4215: Add vrouter/vms/id to fsck

---
 src/onedb/fsck.rb | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb
index 715008c6ca..65b0c0c3bc 100644
--- a/src/onedb/fsck.rb
+++ b/src/onedb/fsck.rb
@@ -729,6 +729,7 @@ EOT
         counters[:host]  = {}
         counters[:image] = {}
         counters[:vnet]  = {}
+        counters[:vrouter]  = {}
 
         # Initialize all the host counters to 0
         @db.fetch("SELECT oid, name FROM host_pool") do |row|
@@ -787,6 +788,15 @@ EOT
 
         log_time()
 
+        # Initialize all the vrouter counters to 0
+        @db.fetch("SELECT oid FROM vrouter_pool") do |row|
+            counters[:vrouter][row[:oid]] = {
+                :vms   => Set.new
+            }
+        end
+
+        log_time()
+
         vms_fix = {}
 
         # Aggregate information of the RUNNING vms
@@ -863,6 +873,21 @@ EOT
                 end
             end
 
+            # See if it's part of a Virtual Router
+            vrouter_e = vm_doc.root.at_xpath("TEMPLATE/VROUTER_ID")
+
+            if !vrouter_e.nil?
+                vr_id = vrouter_e.text.to_i
+                counters_vrouter = counters[:vrouter][vr_id]
+
+                if counters_vrouter.nil?
+                    log_error("VM #{row[:oid]} is part of VRouter #{vr_id}, but "<<
+                        "it does not exist", false)
+                else
+                    counters_vrouter[:vms].add(row[:oid])
+                end
+            end
+
             # Host resources
 
             # Only states that add to Host resources consumption are
@@ -975,6 +1000,7 @@ EOT
         ########################################################################
         # Virtual Routers
         #
+        # VROUTER/VMS/ID
         ########################################################################
 
         vrouters_fix = {}
@@ -1043,6 +1069,43 @@ EOT
                     end
                 end
             end
+
+            # re-do list of VM IDs
+            error = false
+
+            counters_vrouter = counters[:vrouter][row[:oid]]
+
+            vms_elem = vrouter_doc.root.at_xpath("VMS").remove
+
+            vms_new_elem = vrouter_doc.create_element("VMS")
+            vrouter_doc.root.add_child(vms_new_elem)
+
+            counters_vrouter[:vms].each do |id|
+                id_elem = vms_elem.at_xpath("ID[.=#{id}]")
+
+                if id_elem.nil?
+                    log_error(
+                        "VM #{id} is missing from VRouter #{row[:oid]} VM id list")
+
+                    error = true
+                else
+                    id_elem.remove
+                end
+
+                vms_new_elem.add_child(vrouter_doc.create_element("ID")).content = id.to_s
+            end
+
+            vms_elem.xpath("ID").each do |id_elem|
+                log_error(
+                    "VM #{id_elem.text} is in VRouter #{row[:oid]} VM id list, "<<
+                    "but it should not")
+
+                error = true
+            end
+
+            if (error)
+                vrouters_fix[row[:oid]] = vrouter_doc.root.to_s
+            end
         end
 
         @db.transaction do

From a4c29cc34e80d9848c791f0f5f282b016c8ee4bb Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Tue, 2 Feb 2016 14:26:01 +0100
Subject: [PATCH 157/197] feature #4217: Update Marketplace RM methods
 according to changes in #4215

---
 include/RequestManagerAllocate.h       |   1 -
 src/nebula/Nebula.cc                   |   1 -
 src/rm/Request.cc                      | 118 -------------------------
 src/rm/RequestManagerAllocate.cc       |   9 +-
 src/rm/RequestManagerMarketPlaceApp.cc |   8 +-
 src/rm/SConstruct                      |   4 +-
 6 files changed, 10 insertions(+), 131 deletions(-)

diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h
index 7bfb33108c..c96f04d2ee 100644
--- a/include/RequestManagerAllocate.h
+++ b/include/RequestManagerAllocate.h
@@ -636,7 +636,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template *                 tmpl,
                       int&                       id,
-                      string&                    error_str,
                       RequestAttributes&         att);
 };
 
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 45eb223e84..63825bdc75 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -496,7 +496,6 @@ void Nebula::start(bool bootstrap_only)
         zonepool= new ZonePool(db, is_federation_slave());
         vdcpool = new VdcPool(db, is_federation_slave());
 
-        vrouterpool = new VirtualRouterPool(db);
         marketpool  = new MarketPlacePool(db);
         apppool     = new MarketPlaceAppPool(db);
 
diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index 389b8f8b2a..755724fae3 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -703,124 +703,6 @@ void Request::success_response(bool val, RequestAttributes& att)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-string Request::object_name(PoolObjectSQL::ObjectType ob)
-{
-    switch (ob)
-    {
-        case PoolObjectSQL::VM:
-            return "virtual machine";
-        case PoolObjectSQL::HOST:
-            return "host";
-        case PoolObjectSQL::NET:
-            return "virtual network";
-        case PoolObjectSQL::IMAGE:
-            return "image";
-        case PoolObjectSQL::USER:
-            return "user";
-        case PoolObjectSQL::TEMPLATE:
-            return "virtual machine template";
-        case PoolObjectSQL::GROUP:
-            return "group";
-        case PoolObjectSQL::ACL:
-            return "ACL";
-        case PoolObjectSQL::DATASTORE:
-            return "datastore";
-        case PoolObjectSQL::CLUSTER:
-            return "cluster";
-        case PoolObjectSQL::DOCUMENT:
-            return "document";
-        case PoolObjectSQL::ZONE:
-            return "zone";
-        case PoolObjectSQL::SECGROUP:
-            return "security group";
-        case PoolObjectSQL::VDC:
-            return "VDC";
-        case PoolObjectSQL::VROUTER:
-            return "virtual router";
-        case PoolObjectSQL::MARKETPLACE:
-            return "marketplace";
-        case PoolObjectSQL::MARKETPLACEAPP:
-            return "marketplaceapp";
-      }
-
-    return "unknown";
-};
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string Request::authorization_error (const string &message,
-                                     RequestAttributes& att)
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "]" << " User [" << att.uid << "] ";
-
-    if ( message.empty() )
-    {
-        oss << "not authorized to perform action on "
-            << object_name(auth_object) << ".";
-    }
-    else
-    {
-        oss << ": " << message << ".";
-    }
-
-    return oss.str();
-}
-
-/* -------------------------------------------------------------------------- */
-
-string Request::authenticate_error()
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "]" << " User couldn't be authenticated," <<
-           " aborting call.";
-
-    return oss.str();
-}
-
-/* -------------------------------------------------------------------------- */
-
-string Request::get_error (const string &object,
-                           int id)
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "]" << " Error getting " <<
-           object;
-
-   if ( id != -1 )
-   {
-       oss << " [" << id << "].";
-   }
-   else
-   {
-      oss << " Pool.";
-   }
-
-   return oss.str();
-}
-/* -------------------------------------------------------------------------- */
-
-string Request::request_error (const string &err_desc, const string &err_detail)
-{
-    ostringstream oss;
-
-    oss << "[" << method_name << "] " << err_desc;
-
-    if (!err_detail.empty())
-    {
-        oss << ". " << err_detail;
-    }
-
-    return oss.str();
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
 int Request::get_info(
         PoolSQL *                 pool,
         int                       id,
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 0ffa7c23c5..a5b25b8cb0 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -434,9 +434,9 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
         if ( iss.fail() )
         {
-            failure_response(INTERNAL,
-                             request_error("Cannot parse SIZE", size_str),
-                             att);
+            att.resp_msg = "Cannot parse image SIZE: " + size_str;
+            failure_response(INTERNAL, att);
+
             delete tmpl;
             return;
         }
@@ -856,14 +856,13 @@ int MarketPlaceAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     MarketPlacePool *     mppool = static_cast<MarketPlacePool *>(pool);
     MarketPlaceTemplate * ttmpl  = static_cast<MarketPlaceTemplate *>(tmpl);
 
     return mppool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-        ttmpl, &id, error_str);
+        ttmpl, &id, att.resp_msg);
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/rm/RequestManagerMarketPlaceApp.cc b/src/rm/RequestManagerMarketPlaceApp.cc
index e9532103ab..7778860482 100644
--- a/src/rm/RequestManagerMarketPlaceApp.cc
+++ b/src/rm/RequestManagerMarketPlaceApp.cc
@@ -27,7 +27,6 @@ void MarketPlaceAppEnable::request_execute(xmlrpc_c::paramList const& paramList,
     int  rc;
 
     MarketPlaceApp * app;
-	std::string  err_msg;
 
     if ( basic_authorization(id, att) == false )
     {
@@ -38,15 +37,16 @@ void MarketPlaceAppEnable::request_execute(xmlrpc_c::paramList const& paramList,
 
     if ( app == 0 )
     {
-        failure_response(NO_EXISTS,get_error(object_name(auth_object),id),att);
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
         return;
     }
 
-    rc = app->enable(enable_flag, err_msg);
+    rc = app->enable(enable_flag, att.resp_msg);
 
     if ( rc != 0  )
     {
-        failure_response(INTERNAL, request_error(err_msg,""), att);
+        failure_response(INTERNAL, att);
 
         app->unlock();
         return;
diff --git a/src/rm/SConstruct b/src/rm/SConstruct
index 2327c10e45..5b1f32c3a2 100644
--- a/src/rm/SConstruct
+++ b/src/rm/SConstruct
@@ -47,8 +47,8 @@ source_files=[
     'RequestManagerVdc.cc',
     'RequestManagerDatastore.cc',
     'RequestManagerLock.cc',
-    'RequestManagerMarketPlaceApp.cc'
-    'RequestManagerVirtualRouter.cc',
+    'RequestManagerMarketPlaceApp.cc',
+    'RequestManagerVirtualRouter.cc'
 ]
 
 # Build library

From bdda84262f2447c9f6bfe946bfdf1ad42785aa44 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 2 Feb 2016 15:27:58 +0100
Subject: [PATCH 158/197] Feature #4217: Add ceph/export and rbd handling in
 downloader.sh

---
 install.sh                              |   1 +
 src/datastore_mad/remotes/ceph/export   | 141 ++++++++++++++++++++++++
 src/datastore_mad/remotes/downloader.sh |  58 +++++++++-
 src/datastore_mad/remotes/url.rb        |  58 ++++++++++
 4 files changed, 257 insertions(+), 1 deletion(-)
 create mode 100755 src/datastore_mad/remotes/ceph/export
 create mode 100755 src/datastore_mad/remotes/url.rb

diff --git a/install.sh b/install.sh
index 0cb90ecdc8..c6f2b61f61 100755
--- a/install.sh
+++ b/install.sh
@@ -1160,6 +1160,7 @@ TM_ISCSI_FILES="src/tm_mad/iscsi/clone \
 
 DATASTORE_DRIVER_COMMON_SCRIPTS="src/datastore_mad/remotes/xpath.rb \
                              src/datastore_mad/remotes/downloader.sh \
+                             src/datastore_mad/remotes/url.rb \
                              src/datastore_mad/remotes/libfs.sh"
 
 DATASTORE_DRIVER_DUMMY_SCRIPTS="src/datastore_mad/remotes/dummy/cp \
diff --git a/src/datastore_mad/remotes/ceph/export b/src/datastore_mad/remotes/ceph/export
new file mode 100755
index 0000000000..6466b0c52f
--- /dev/null
+++ b/src/datastore_mad/remotes/ceph/export
@@ -0,0 +1,141 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+###############################################################################
+# This script is used to export an image to qcow2 file
+###############################################################################
+
+# ------------ Set up the environment to source common tools ------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+    LIB_LOCATION=/usr/lib/one
+else
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+
+DRIVER_PATH=$(dirname $0)
+source ${DRIVER_PATH}/../libfs.sh
+source ${DRIVER_PATH}/ceph.conf
+
+# -------- Get rm and datastore arguments from OpenNebula core ------------
+
+DRV_ACTION=$1
+ID=$2
+
+XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
+
+unset i XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+    XPATH_ELEMENTS[i++]="$element"
+done < <($XPATH     /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
+                    /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
+                    /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
+                    /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
+                    /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/FORMAT \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_CONF)
+
+unset i
+
+SRC="${XPATH_ELEMENTS[i++]}"
+SIZE="${XPATH_ELEMENTS[i++]}"
+MD5="${XPATH_ELEMENTS[i++]}"
+SHA1="${XPATH_ELEMENTS[i++]}"
+FORMAT="${XPATH_ELEMENTS[i++]:-raw}"
+BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
+POOL_NAME="${XPATH_ELEMENTS[i++]:-$POOL_NAME}"
+CEPH_USER="${XPATH_ELEMENTS[i++]}"
+CEPH_CONF="${XPATH_ELEMENTS[i++]}"
+
+DST_HOST=`get_destination_host $ID`
+
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'BRIDGE_LIST' attribute."
+    exit -1
+fi
+
+IMPORT_SOURCE="rbd://$DST_HOST/$SRC"
+
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+    IMPORT_SOURCE="${IMPORT_SOURCE}?CEPH_USER=${CEPH_USER}"
+fi
+
+if [ -n "$CEPH_CONF" ]; then
+    RBD="$RBD --conf ${CEPH_CONF}"
+
+    if [ -n "$CEPH_USER" ]; then
+        IMPORT_SOURCE="${IMPORT_SOURCE}&"
+    else
+        IMPORT_SOURCE="${IMPORT_SOURCE}?"
+    fi
+
+    IMPORT_SOURCE="${IMPORT_SOURCE}CEPH_CONF=${CEPH_CONF}"
+fi
+
+#-------------------------------------------------------------------------------
+# Output image source and format
+#-------------------------------------------------------------------------------
+
+INFO_SCRIPT=$(cat <<EOF
+if [ -z "$MD5" ]; then
+    CHECKSUM=\$(
+        $RBD export ${SRC} - | ${MD5SUM} | cut -f1 -d' '
+        ps=\$PIPESTATUS
+
+        if [ "\$ps" != "0" ]; then
+            exit \$ps
+        fi
+    )
+
+    status=\$?
+
+    [ "\$status" != "0" ] && exit \$status
+else
+    CHECKSUM="$MD5"
+fi
+
+cat <<EOT
+<MD5>\$CHECKSUM</MD5>
+<SIZE>$SIZE</SIZE>
+<FORMAT>${FORMAT}</FORMAT>
+EOT
+EOF
+)
+
+INFO=$(ssh_monitor_and_log "$DST_HOST" "$INFO_SCRIPT" "Image info script" 2>&1)
+INFO_STATUS=$?
+
+if [ "$INFO_STATUS" != "0" ]; then
+    echo "$INFO"
+    exit $INFO_STATUS
+fi
+
+cat <<EOF
+<IMPORT_INFO>
+    <IMPORT_SOURCE>$IMPORT_SOURCE</IMPORT_SOURCE>
+    $INFO
+    <DISPOSE>NO</DISPOSE>
+</IMPORT_INFO>"
+EOF
+
diff --git a/src/datastore_mad/remotes/downloader.sh b/src/datastore_mad/remotes/downloader.sh
index f0a8a86828..e365a2beee 100755
--- a/src/datastore_mad/remotes/downloader.sh
+++ b/src/datastore_mad/remotes/downloader.sh
@@ -16,6 +16,16 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+if [ -z "${ONE_LOCATION}" ]; then
+    LIB_LOCATION=/usr/lib/one
+else
+    LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+
+DRIVER_PATH=$(dirname $0)
+
 # Execute a command (first parameter) and use the first kb of stdout
 # to determine the file type
 function get_type
@@ -136,6 +146,49 @@ function s3_request
          " https://${BUCKET}.s3.amazonaws.com/${OBJECT}"
 }
 
+function get_rbd_cmd
+{
+    local i j URL_ELEMENTS
+
+    FROM="$1"
+
+    URL_RB="$DRIVER_PATH/url.rb"
+
+    while IFS= read -r -d '' element; do
+        URL_ELEMENTS[i++]="$element"
+    done < <($URL_RB    $FROM \
+                        USER \
+                        HOST \
+                        SOURCE \
+                        PARAM_DS \
+                        PARAM_CEPH_USER \
+                        PARAM_CEPH_CONF)
+
+    USER="${URL_ELEMENTS[j++]}"
+    DST_HOST="${URL_ELEMENTS[j++]}"
+    SOURCE="${URL_ELEMENTS[j++]}"
+    DS="${URL_ELEMENTS[j++]}"
+    CEPH_USER="${URL_ELEMENTS[j++]}"
+    CEPH_CONF="${URL_ELEMENTS[j++]}"
+
+    # Remove leading '/'
+    SOURCE="${SOURCE#/}"
+
+    if [ -n "$USER" ]; then
+        DST_HOST="$USER@$DST_HOST"
+    fi
+
+    if [ -n "$CEPH_USER" ]; then
+        RBD="$RBD --id ${CEPH_USER}"
+    fi
+
+    if [ -n "$CEPH_CONF" ]; then
+        RBD="$RBD --conf ${CEPH_CONF}"
+    fi
+
+    echo "ssh $DST_HOST $RBD export $SOURCE -"
+}
+
 TEMP=`getopt -o m:s:l:n -l md5:,sha1:,limit:,nodecomp -- "$@"`
 
 if [ $? != 0 ] ; then
@@ -214,6 +267,9 @@ s3://*)
     curl_args="$(s3_request $FROM)"
     command="curl $curl_args"
     ;;
+rbd://*)
+    command="$(get_rbd_cmd $FROM)"
+    ;;
 *)
     if [ ! -r $FROM ]; then
         echo "Cannot read from $FROM" >&2
@@ -228,7 +284,7 @@ decompressor=$(get_decompressor "$file_type")
 
 eval "$command" | tee >( hasher $HASH_TYPE) | decompress "$decompressor" "$TO"
 
-if [ "$?" != "0" ]; then
+if [ "$?" != "0" -o "$PIPESTATUS" != "0" ]; then
     echo "Error copying" >&2
     exit -1
 fi
diff --git a/src/datastore_mad/remotes/url.rb b/src/datastore_mad/remotes/url.rb
new file mode 100755
index 0000000000..dc193aa564
--- /dev/null
+++ b/src/datastore_mad/remotes/url.rb
@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- */
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# 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.                                             */
+# -------------------------------------------------------------------------- */
+
+#
+# Simple command to parse an URLs more elements (refer by keywords or params)
+#
+
+require 'uri'
+require 'cgi'
+require 'pp'
+
+url = ARGV.shift
+
+u = URI.parse(url)
+
+SPECIAL_KEYS = {
+    "PROTOCOL" => u.scheme,
+    "USER"     => u.user,
+    "PASSWORD" => u.password,
+    "HOST"     => u.host,
+    "PORT"     => u.port,
+    "SOURCE"   => u.path
+}
+
+PARAMS = CGI.parse(u.query)
+
+values = ""
+ARGV.each do |key|
+    key = key.to_s
+    if key.downcase.start_with?("param_")
+        param = key.gsub(/^param_/i,"")
+        value = PARAMS[param]
+        value = [value].flatten.first || ""
+        values << value
+    else
+        value = SPECIAL_KEYS[key] || ""
+        values << value
+    end
+    values << "\0"
+end
+
+puts values
+
+exit 0

From 4ef0e947a3acbbd70c121d726c8f58e6bed2e644 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 2 Feb 2016 15:28:20 +0100
Subject: [PATCH 159/197] Feature #4217: fixes bug that forces conversion to
 raw even for raw images

---
 src/datastore_mad/remotes/ceph/cp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp
index 4918e88dc1..2bb90bf88e 100755
--- a/src/datastore_mad/remotes/ceph/cp
+++ b/src/datastore_mad/remotes/ceph/cp
@@ -139,7 +139,7 @@ fi
 REGISTER_CMD=$(cat <<EOF
     set -e
 
-    FORMAT=\$($QEMU_IMG info $TMP_DST | grep "^file format:" | awk '{print $3}')
+    FORMAT=\$($QEMU_IMG info $TMP_DST | grep "^file format:" | awk '{print \$3}')
 
     if [ "\$FORMAT" != "raw" ]; then
         $QEMU_IMG convert -O raw $TMP_DST $TMP_DST.raw

From eeb4de945cff38b36d3f4ba7fc0607d356538f45 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 2 Feb 2016 17:46:56 +0100
Subject: [PATCH 160/197] feature #4217: Remove deprecated Marketplace tab

---
 src/sunstone/etc/sunstone-views/admin.yaml    |  16 -
 .../etc/sunstone-views/admin_vcenter.yaml     |  16 -
 src/sunstone/etc/sunstone-views/user.yaml     |  16 -
 src/sunstone/models/SunstoneMarketplace.rb    |  55 ----
 src/sunstone/models/SunstoneServer.rb         |   4 -
 src/sunstone/public/app/main.js               |   1 -
 .../public/app/tabs/marketplace-tab.js        |  63 ----
 .../app/tabs/marketplace-tab/actions.js       |  82 -----
 .../app/tabs/marketplace-tab/buttons.js       |  34 --
 .../app/tabs/marketplace-tab/datatable.js     | 126 --------
 .../tabs/marketplace-tab/dialogs/import.js    | 295 ------------------
 .../dialogs/import/content.hbs                |  81 -----
 .../dialogs/import/dialogId.js                |  19 --
 .../marketplace-tab/dialogs/import/html.hbs   |  31 --
 .../app/tabs/marketplace-tab/hooks/header.js  |  43 ---
 .../app/tabs/marketplace-tab/panels/info.js   |  77 -----
 .../tabs/marketplace-tab/panels/info/html.hbs | 154 ---------
 .../marketplace-tab/panels/info/panelId.js    |  19 --
 .../public/app/tabs/marketplace-tab/tabId.js  |  19 --
 src/sunstone/sunstone-server.rb               |  11 -
 20 files changed, 1162 deletions(-)
 delete mode 100644 src/sunstone/models/SunstoneMarketplace.rb
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/actions.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/buttons.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/datatable.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/content.hbs
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/dialogId.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/html.hbs
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/hooks/header.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/panels/info.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/panels/info/html.hbs
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/panels/info/panelId.js
 delete mode 100644 src/sunstone/public/app/tabs/marketplace-tab/tabId.js

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 83cd9bd4ae..6c86a4eab0 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -21,7 +21,6 @@ enabled_tabs:
     - secgroups-tab
     - vrouters-tab
     - zones-tab
-    - marketplace-tab
     - oneflow-dashboard
     - oneflow-services-tab
     - oneflow-templates-tab
@@ -468,21 +467,6 @@ tabs:
             VirtualRouter.delete: true
             VirtualRouter.attachnic: true
             VirtualRouter.detachnic: true
-    marketplace-tab:
-        panel_tabs:
-            marketplace_info_tab: true
-        table_columns:
-            - 0         # Checkbox
-            #- 1         # ID
-            - 2         # Name
-            - 3         # Publisher
-            - 4         # Hypervisor
-            - 5         # Arch
-            - 6         # Format
-            #- 7         # Tags
-        actions:
-            Marketplace.refresh: true
-            Marketplace.import: true
     oneflow-dashboard:
         panel_tabs:
         table_columns:
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 12c331fa2e..424ed9d84f 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -20,7 +20,6 @@ enabled_tabs:
     #- secgroups-tab
     - vrouters-tab
     - zones-tab
-    #- marketplace-tab
     - oneflow-dashboard
     - oneflow-services-tab
     - oneflow-templates-tab
@@ -462,21 +461,6 @@ tabs:
             VirtualRouter.delete: true
             VirtualRouter.attachnic: true
             VirtualRouter.detachnic: true
-    marketplace-tab:
-        panel_tabs:
-            marketplace_info_tab: true
-        table_columns:
-            - 0         # Checkbox
-            #- 1         # ID
-            - 2         # Name
-            - 3         # Publisher
-            - 4         # Hypervisor
-            - 5         # Arch
-            - 6         # Format
-            #- 7         # Tags
-        actions:
-            Marketplace.refresh: true
-            Marketplace.import: true
     oneflow-dashboard:
         panel_tabs:
         table_columns:
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index fe51f38cd7..3c04a2f77a 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -20,7 +20,6 @@ enabled_tabs:
     - secgroups-tab
     - vrouters-tab
     #- zones-tab
-    - marketplace-tab
     - oneflow-dashboard
     - oneflow-services-tab
     - oneflow-templates-tab
@@ -463,21 +462,6 @@ tabs:
             VirtualRouter.delete: true
             VirtualRouter.attachnic: true
             VirtualRouter.detachnic: true
-    marketplace-tab:
-        panel_tabs:
-            marketplace_info_tab: true
-        table_columns:
-            - 0         # Checkbox
-            #- 1         # ID
-            - 2         # Name
-            - 3         # Publisher
-            - 4         # Hypervisor
-            - 5         # Arch
-            - 6         # Format
-            #- 7         # Tags
-        actions:
-            Marketplace.refresh: true
-            Marketplace.import: true
     oneflow-dashboard:
         panel_tabs:
         table_columns:
diff --git a/src/sunstone/models/SunstoneMarketplace.rb b/src/sunstone/models/SunstoneMarketplace.rb
deleted file mode 100644
index 9ea1aa2a4f..0000000000
--- a/src/sunstone/models/SunstoneMarketplace.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# ---------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                  #
-#                                                                              #
-# 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 'marketplace/marketplace_client'
-
-module SunstoneMarketplace
-    USER_AGENT = "Sunstone"
-
-    def get_appliance_pool
-        client = Market::ApplianceClient.new(
-                    @config[:marketplace_username],
-                    @config[:marketplace_password],
-                    @config[:marketplace_url],
-                    USER_AGENT)
-
-        response = client.list
-
-        if CloudClient::is_error?(response)
-            error = Error.new(response.to_s)
-            return [response.code.to_i, error.to_json]
-        end
-
-        [200, response.body]
-    end
-
-    def get_appliance(app_id)
-        client = Market::ApplianceClient.new(
-                    @config[:marketplace_username],
-                    @config[:marketplace_password],
-                    @config[:marketplace_url],
-                    USER_AGENT)
-
-        response = client.show(app_id)
-
-        if CloudClient::is_error?(response)
-            error = Error.new(response.to_s)
-            return [response.code.to_i, error.to_json]
-        end
-
-        [200, response.body]
-    end
-end
diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
index f10bb25545..ee1ffab66d 100644
--- a/src/sunstone/models/SunstoneServer.rb
+++ b/src/sunstone/models/SunstoneServer.rb
@@ -23,8 +23,6 @@ require 'OpenNebulaVNC'
 require 'OpenNebulaJSON/JSONUtils'
 #include JSONUtils
 
-require 'SunstoneMarketplace'
-
 class SunstoneServer < CloudServer
     # FLAG that will filter the elements retrieved from the Pools
     POOL_FILTER = Pool::INFO_ALL
@@ -32,8 +30,6 @@ class SunstoneServer < CloudServer
     # Secs to sleep between checks to see if image upload to repo is finished
     IMAGE_POLL_SLEEP_TIME = 5
 
-    include SunstoneMarketplace
-
     def initialize(client, config, logger)
         super(config, logger)
         @client = client
diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js
index a415f40c5b..6ec3eb46fa 100644
--- a/src/sunstone/public/app/main.js
+++ b/src/sunstone/public/app/main.js
@@ -139,7 +139,6 @@ require.config({
         'tabs/secgroups-tab',
         'tabs/vrouters-tab',
         'tabs/zones-tab',
-        'tabs/marketplace-tab',
         'tabs/oneflow-dashboard',
         'tabs/oneflow-services-tab',
         'tabs/oneflow-templates-tab',
diff --git a/src/sunstone/public/app/tabs/marketplace-tab.js b/src/sunstone/public/app/tabs/marketplace-tab.js
deleted file mode 100644
index dc7b69a1c8..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require) {
-  var Locale = require('utils/locale');
-  var Buttons = require('./marketplace-tab/buttons');
-  var Actions = require('./marketplace-tab/actions');
-  var Table = require('./marketplace-tab/datatable');
-
-  var TAB_ID = require('./marketplace-tab/tabId');
-  var DATATABLE_ID = "dataTableMarketplace";
-
-  var _dialogs = [
-    require('./marketplace-tab/dialogs/import')
-  ];
-
-  var _panels = [
-    require('./marketplace-tab/panels/info')
-  ];
-
-  var _panelsHooks = [
-    require('./marketplace-tab/hooks/header')
-  ];
-
-  var _formPanels = [
-  ];
-
-  var Tab = {
-    tabId: TAB_ID,
-    title: '<i class="fa fa-lg fa-fw fa-shopping-cart"></i>&emsp;' + Locale.tr("Marketplace"),
-    listHeader: '<i class="fa fa-fw fa-shopping-cart"></i>&emsp;'+Locale.tr("OpenNebula Marketplace"),
-    infoHeader: '<i class="fa fa-fw fa-shopping-cart"></i>&emsp;'+Locale.tr("Appliance"),
-    subheader: '<span/> <small></small>&emsp;',
-    resource: 'Marketplace',
-    content: '<div class="row marketplace_error_message" hidden>\
-        <div class="small-6 columns small-centered text-center">\
-            <div class="alert-box alert radius">'+Locale.tr("Cannot connect to OpenNebula Marketplace")+'</div>\
-        </div>\
-    </div>',
-    buttons: Buttons,
-    actions: Actions,
-    dataTable: new Table(DATATABLE_ID, {actions: true, info: true, oneSelection: true}),
-    panels: _panels,
-    panelsHooks: _panelsHooks,
-    formPanels: _formPanels,
-    dialogs: _dialogs
-  };
-
-  return Tab;
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/actions.js b/src/sunstone/public/app/tabs/marketplace-tab/actions.js
deleted file mode 100644
index f6f6c62583..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/actions.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require) {
-  var Sunstone = require('sunstone');
-  var Notifier = require('utils/notifier');
-  var Locale = require('utils/locale');
-  var DataTable = require('./datatable');
-  var OpenNebulaResource = require('opennebula/marketplace');
-
-  var RESOURCE = "Marketplace";
-  var TAB_ID = require('./tabId');
-  var IMPORT_DIALOG_ID = require('./dialogs/import/dialogId');
-
-  var _actions = {
-    "Marketplace.list" : {
-      type: "list",
-      call: OpenNebulaResource.list,
-      callback: function(request, response) {
-        Sunstone.getDataTable(TAB_ID).updateView(request, response.appliances);
-      }
-    },
-
-    "Marketplace.refresh" : {
-      type: "custom",
-      call: function() {
-        var tab = $('#' + TAB_ID);
-        if (Sunstone.rightInfoVisible(tab)) {
-          Sunstone.runAction(RESOURCE+".show", Sunstone.rightInfoResourceId(tab));
-        } else {
-          Sunstone.getDataTable(TAB_ID).waitingNodes();
-          Sunstone.runAction(RESOURCE+".list", {force: true});
-        }
-      },
-    },
-
-    "Marketplace.import" : {
-      type: "multiple",
-      call: OpenNebulaResource.show,
-      callback: function(request, response) {
-        if (response['status'] && response['status'] != 'ready') {
-            Notifier.notifyError(Locale.tr("The appliance is not ready"));
-            return;
-        }
-
-        Sunstone.getDialog(IMPORT_DIALOG_ID).setParams({element: response});
-        Sunstone.getDialog(IMPORT_DIALOG_ID).reset();
-        Sunstone.getDialog(IMPORT_DIALOG_ID).show();
-      },
-      elements: function() {
-        return Sunstone.getDataTable(TAB_ID).elements();
-      },
-      error: Notifier.onError
-    },
-
-    "Marketplace.show" : {
-      type: "single",
-      call: OpenNebulaResource.show,
-      callback: function(request, response) {
-        if (Sunstone.rightInfoVisible($('#'+TAB_ID))) {
-          Sunstone.insertPanels(TAB_ID, response);
-        }
-      },
-      error: Notifier.onError
-    }
-  };
-
-  return _actions;
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/buttons.js b/src/sunstone/public/app/tabs/marketplace-tab/buttons.js
deleted file mode 100644
index 52ff943fa4..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/buttons.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require) {
-  var Locale = require('utils/locale');
-
-  var Buttons = {
-    "Marketplace.refresh" : {
-      type: "action",
-      layout: "refresh",
-      alwaysActive: true
-    },
-    "Marketplace.import" : {
-      type: "action",
-      layout: "main",
-      text: Locale.tr('Import')
-    }
-  };
-
-  return Buttons;
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/datatable.js b/src/sunstone/public/app/tabs/marketplace-tab/datatable.js
deleted file mode 100644
index 79396ed7cd..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/datatable.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require) {
-  /*
-    DEPENDENCIES
-   */
-
-  var TabDataTable = require('utils/tab-datatable');
-  var SunstoneConfig = require('sunstone-config');
-  var Locale = require('utils/locale');
-
-  /*
-    CONSTANTS
-   */
-
-  var RESOURCE = "Marketplace";
-  //var XML_ROOT = "";
-  var TAB_NAME = require('./tabId');
-
-  /*
-    CONSTRUCTOR
-   */
-
-  function Table(dataTableId, conf) {
-    this.conf = conf || {};
-    this.tabId = TAB_NAME;
-    this.dataTableId = dataTableId;
-    this.resource = RESOURCE;
-    //this.xmlRoot = XML_ROOT;
-
-    this.dataTableOptions = {
-      "bAutoWidth": false,
-      "bSortClasses" : false,
-      "bDeferRender": true,
-      "aoColumnDefs": [
-          {"bSortable": false, "aTargets": ["check"]},
-          {"sWidth": "35px", "aTargets": [0]},
-          {"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)},
-          {"bVisible": false, "aTargets": ['_all']}
-      ]
-    };
-
-    this.columns = [
-      Locale.tr("ID"),
-      Locale.tr("Name"),
-      Locale.tr("Publisher"),
-      Locale.tr("Hypervisor"),
-      Locale.tr("Arch"),
-      Locale.tr("Format"),
-      Locale.tr("Tags")
-    ];
-    /*
-    this.selectOptions = {
-    };
-    */
-    TabDataTable.call(this);
-  }
-
-  Table.prototype = Object.create(TabDataTable.prototype);
-  Table.prototype.constructor = Table;
-  Table.prototype.elementArray = _elementArray;
-
-  return Table;
-
-  /*
-    FUNCTION DEFINITIONS
-   */
-
-  function _elementArray(element) {
-    var publisher   = '-';
-    var hypervisor  = '-';
-    var arch        = '-';
-    var format      = '-';
-    var tags        = '-';
-
-    if(element.publisher != undefined){
-      publisher = element.publisher;
-    }
-
-    if(element.files != undefined && element.files.length > 0){
-      if(element.files[0]["hypervisor"] != undefined){
-        hypervisor = element.files[0]["hypervisor"];
-      }
-
-      if(element.files[0]["os-arch"] != undefined){
-        arch = element.files[0]["os-arch"];
-      }
-
-      if(element.files[0]["format"] != undefined){
-        format = element.files[0]["format"];
-      }
-    }
-
-    if(element.tags != undefined){
-      tags = element.tags;
-    }
-
-    return [
-        '<input class="check_item" type="checkbox" id="'+
-                    RESOURCE.toLowerCase()+'_' +
-                    element._id.$oid + '" name="selected_items" value="' +
-                    element._id.$oid + '"/>',
-        element._id.$oid,
-        element.name,
-        publisher,
-        hypervisor,
-        arch,
-        format,
-        tags
-    ];
-  }
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js b/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js
deleted file mode 100644
index af342220bd..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js
+++ /dev/null
@@ -1,295 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require) {
-  /*
-    DEPENDENCIES
-   */
-
-  var BaseDialog = require('utils/dialogs/dialog');
-  var TemplateHTML = require('hbs!./import/html');
-  var ContentHTML = require('hbs!./import/content');
-  var Sunstone = require('sunstone');
-  var Notifier = require('utils/notifier');
-  var Locale = require('utils/locale');
-  var ResourceSelect = require('utils/resource-select');
-  var OpenNebulaDatastore = require('opennebula/datastore');
-  var OpenNebulaImage = require('opennebula/image');
-  var OpenNebulaTemplate = require('opennebula/template');
-  var TemplateUtils = require('utils/template-utils');
-
-  /*
-    CONSTANTS
-   */
-
-  var DIALOG_ID = require('./import/dialogId');
-  var TAB_ID = require('../tabId');
-
-  /*
-    CONSTRUCTOR
-   */
-
-  function Dialog() {
-    this.dialogId = DIALOG_ID;
-
-    BaseDialog.call(this);
-  }
-
-  Dialog.DIALOG_ID = DIALOG_ID;
-  Dialog.prototype = Object.create(BaseDialog.prototype);
-  Dialog.prototype.constructor = Dialog;
-  Dialog.prototype.html = _html;
-  Dialog.prototype.onShow = _onShow;
-  Dialog.prototype.setup = _setup;
-  Dialog.prototype.setParams = _setParams;
-  Dialog.prototype.try_to_create_template = _try_to_create_template;
-
-  return Dialog;
-
-  /*
-    FUNCTION DEFINITIONS
-   */
-
-  function _html() {
-    return TemplateHTML({
-      'dialogId': this.dialogId
-    });
-  }
-
-  function _setup(context) {
-    var that = this;
-
-    context.foundation('abide', 'reflow');
-    $("#market_import_dialog_content", context).html(
-      ContentHTML({'element': this.element})
-    );
-
-    ResourceSelect.insert({
-        context: $('#market_img_datastore', context),
-        resourceName: 'Datastore',
-        filterKey: 'TYPE',
-        filterValue: '' + OpenNebulaDatastore.TYPES.IMAGE_DS
-      });
-
-    context.off('invalid.fndtn.abide', '#' + DIALOG_ID + 'Form');
-    context.off('valid.fndtn.abide', '#' + DIALOG_ID + 'Form');
-
-    context.on('invalid.fndtn.abide', '#' + DIALOG_ID + 'Form', function(e) {
-      Notifier.notifyError(Locale.tr("One or more required fields are missing or malformed."));
-    }).on('valid.fndtn.abide', '#' + DIALOG_ID + 'Form', function(e) {
-      that.number_of_files = that.element['files'].length;
-      that.template_created = false;
-      that.images_information = [];
-
-
-      $("input, button", context).attr("disabled", "disabled");
-      $(".market_image_result:not(.success)",  context).html(
-        '<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
-          '<i class="fa fa-cloud fa-stack-2x"></i>'+
-          '<i class="fa  fa-spinner fa-spin fa-stack-1x fa-inverse"></i>'+
-        '</span>');
-      $(".market_template_result",  context).html(
-        '<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
-          '<i class="fa fa-cloud fa-stack-2x"></i>'+
-          '<i class="fa  fa-spinner fa-spin fa-stack-1x fa-inverse"></i>'+
-        '</span>');
-
-      var template_context = $("#market_import_file_template", context);
-
-      $.each(that.element['files'], function(index, value){
-        var local_context = $("#market_import_file_"+index,  context);
-
-        if ($(".market_image_result:not(.success)", local_context).length > 0) {
-          img_obj = {
-            "image" : {
-              "NAME": $("input.name",local_context).val(),
-              "PATH": that.element['links']['download']['href']+'/'+index,
-              "TYPE": value['type'],
-              "MD5": value['md5'],
-              "SHA1": value['sha1'],
-              "DRIVER": value['driver'],
-              "DEV_PREFIX": value['dev_prefix'],
-              "FROM_APP": that.element['_id']["$oid"],
-              "FROM_APP_NAME": that.element['name'],
-              "FROM_APP_FILE": index
-            },
-            "ds_id" : $("#market_img_datastore select", context).val()
-          };
-
-          OpenNebulaImage.create({
-            timeout: true,
-            data: img_obj,
-            success: function (file_index, file_context){
-              return function(request, response) {
-                $(".market_image_result", file_context).addClass("success").html(
-                  '<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
-                    '<i class="fa fa-cloud fa-stack-2x"></i>'+
-                    '<i class="fa  fa-check fa-stack-1x fa-inverse"></i>'+
-                  '</span>');
-
-                $(".market_image_response", file_context).html(
-                  '<p style="font-size:12px" class="running-color">'+
-                  Locale.tr("Image created successfully")+' ID:'+response.IMAGE.ID+
-                  '</p>');
-
-                that.images_information[file_index] = response;
-
-                that.try_to_create_template(context);
-              };
-            }(index, local_context),
-            error: function (request, error_json){
-              $(".market_template_result", template_context).html('');
-
-              $(".market_image_result", local_context).html(
-                '<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
-                  '<i class="fa fa-cloud fa-stack-2x"></i>'+
-                  '<i class="fa  fa-warning fa-stack-1x fa-inverse"></i>'+
-                '</span>');
-
-              $(".market_image_response", local_context).html(
-                '<p style="font-size:12px" class="error-color">'+
-                (error_json.error.message || Locale.tr("Cannot contact server: is it running and reachable?"))+
-                '</p>');
-
-              $("input", template_context).removeAttr("disabled");
-              $("input", local_context).removeAttr("disabled");
-              $("button", context).removeAttr("disabled");
-            }
-          });
-        }
-      });
-
-      that.try_to_create_template(context);
-
-      return false;
-    });
-
-    return false;
-  }
-
-  function _onShow(context) {
-
-    return false;
-  }
-
-  /**
-   * @param {object} params
-   *        - params.element : Marketplace appliance as returned by a .show call
-   */
-  function _setParams(params) {
-    this.element = params.element;
-  }
-
-
-  function _try_to_create_template(context){
-    var that = this;
-
-    var template_context = $("#market_import_file_template",  context);
-
-    var images_created = $(".market_image_result.success", context).length;
-
-    if ((images_created == this.number_of_files) && !that.template_created) {
-      that.template_created = true;
-
-      if (that.element['opennebula_template'] && that.element['opennebula_template'] !== "CPU=1") {
-        var vm_template;
-        try {
-          vm_template = JSON.parse( TemplateUtils.htmlDecode(that.element['opennebula_template']) );
-        } catch (error) {
-          $(".market_template_result", template_context).html(
-            '<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
-              '<i class="fa fa-cloud fa-stack-2x"></i>'+
-              '<i class="fa  fa-warning fa-stack-1x fa-inverse"></i>'+
-            '</span>');
-
-          $(".market_template_response", template_context).html(
-            '<p style="font-size:12px" class="error-color">'+
-            (error.message || Locale.tr("Cannot contact server: is it running and reachable?"))+
-            '</p>');
-
-          $("input", template_context).removeAttr("disabled");
-          $("button", context).removeAttr("disabled");
-          that.template_created = false;
-          return;
-        }
-
-        if ($.isEmptyObject(vm_template.DISK)){
-          vm_template.DISK = [];
-        } else if (!$.isArray(vm_template.DISK)){
-          vm_template.DISK = [vm_template.DISK];
-        }
-
-        vm_template.NAME = $("input", template_context).val();
-        if (!vm_template.CPU){
-          vm_template.CPU = "1";
-        }
-        if (!vm_template.MEMORY){
-          vm_template.MEMORY = "1024";
-        }
-
-        $.each(that.images_information, function(image_index, image_info){
-          if (!vm_template.DISK[image_index]) {
-            vm_template.DISK[image_index] = {};
-          }
-
-          vm_template.DISK[image_index].IMAGE = image_info.IMAGE.NAME;
-          vm_template.DISK[image_index].IMAGE_UNAME = image_info.IMAGE.UNAME;
-        });
-
-        vm_template.FROM_APP = that.element['_id']["$oid"];
-        vm_template.FROM_APP_NAME = that.element['name'];
-
-        OpenNebulaTemplate.create({
-          timeout: true,
-          data: {vmtemplate: vm_template},
-          success: function (request, response){
-            $(".market_template_result", template_context).addClass("success").html(
-              '<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
-                '<i class="fa fa-cloud fa-stack-2x"></i>'+
-                '<i class="fa  fa-check fa-stack-1x fa-inverse"></i>'+
-              '</span>');
-
-            $(".market_template_response", template_context).html(
-              '<p style="font-size:12px" class="running-color">'+
-              Locale.tr("Template created successfully")+' ID:'+response.VMTEMPLATE.ID+
-              '</p>');
-
-            $("button", context).hide();
-          },
-          error: function (request, error_json){
-            $(".market_template_result", template_context).html(
-              '<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
-                '<i class="fa fa-cloud fa-stack-2x"></i>'+
-                '<i class="fa  fa-warning fa-stack-1x fa-inverse"></i>'+
-              '</span>');
-
-            $(".market_template_response", template_context).html(
-              '<p style="font-size:12px" class="error-color">'+
-              (error_json.error.message || Locale.tr("Cannot contact server: is it running and reachable?"))+
-              '</p>');
-
-            $("input", template_context).removeAttr("disabled");
-            $("button", context).removeAttr("disabled");
-            that.template_created = false;
-          }
-        });
-      } else {
-        $("button", context).hide();
-      }
-    }
-  }
-
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/content.hbs b/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/content.hbs
deleted file mode 100644
index 8f652a06b2..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/content.hbs
+++ /dev/null
@@ -1,81 +0,0 @@
-{{! -------------------------------------------------------------------------- }}
-{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
-{{!                                                                            }}
-{{! 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.                                             }}
-{{! -------------------------------------------------------------------------- }}
-
-<div class="row">
-  <div class="large-12 columns">
-    <p style="font-size:14px">{{tr "The following images will be created in OpenNebula."}} {{tr "If you want to edit parameters of the image you can do it later in the images tab"}} </p>
-  </div>
-</div>
-<div class="row">
-  <div class="large-10 large-centered columns">
-    <div class="large-10 columns">
-      <label for="market_img_datastore">{{tr "Select the datastore for the images"}}
-      </label>
-      <div id="market_img_datastore" name="market_img_datastore">
-      </div>
-    </div>
-    <div class="large-2 columns">
-    </div>
-  </div>
-</div>
-{{#each element.files}}
-<div class="row" id="market_import_file_{{@index}}">
-  <div class="large-10 large-centered columns">
-    <div class="large-10 columns">
-      <label>
-        <i class="fa fa-fw fa-download"/>
-        &emsp;{{@index}} - {{tr "Image Name"}}
-        <span class="right">{{humanizeSize "B" size}}</span>
-      </label>
-      {{#if name}}
-      <input type="text" class="name" value="{{name}}"/>
-      {{else}}
-      <input type="text" class="name" value="{{element.name}}"/>
-      {{/if}}
-    </div>
-    <div class="large-2 columns market_image_result">
-    </div>
-  </div>
-  <div class="large-10 columns market_image_response">
-  </div>
-</div>
-{{/each}}
-{{#if element.opennebula_template}}
-<br>
-<div class="row">
-  <div class="large-12 columns">
-    <p style="font-size:14px">{{tr "The following template will be created in OpenNebula and the previous images will be referenced in the disks"}} {{tr "If you want to edit parameters of the template you can do it later in the templates tab"}} </p>
-  </div>
-</div>
-<div class="row" id="market_import_file_template">
-  <div class="large-10 large-centered columns">
-    <div class="large-10 columns">
-      <label>
-        <i class="fa fa-fw fa-file-text-o"/>&emsp;{{tr "Template Name"}}
-      </label>
-      {{#if NAME}}
-      <input type="text" class="name" value="NAME"/>
-      {{else}}
-      <input type="text" class="name" value="{{element.name}}"/>
-      {{/if}}
-    </div>
-    <div class="large-2 columns market_template_result">
-    </div>
-  </div>
-  <div class="large-10 columns market_template_response">
-  </div>
-</div>
-{{/if}}
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/dialogId.js b/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/dialogId.js
deleted file mode 100644
index 04947a6055..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/dialogId.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require){
-  return 'importMarketplaceDialog';
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/html.hbs b/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/html.hbs
deleted file mode 100644
index 25315e0511..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import/html.hbs
+++ /dev/null
@@ -1,31 +0,0 @@
-{{! -------------------------------------------------------------------------- }}
-{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
-{{!                                                                            }}
-{{! 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.                                             }}
-{{! -------------------------------------------------------------------------- }}
-
-<div id="{{dialogId}}" class="reveal-modal medium" role="dialog" data-reveal >
-  <div class="row">
-    <h3 class="subheader">{{tr "Import Appliance"}}</h3>
-  </div>
-  <form data-abide="ajax" id="{{dialogId}}Form">
-    <div id="market_import_dialog_content">
-    </div>
-    <div class="form_buttons row">
-      <button type="submit" class="button radius right">
-        {{tr "Import"}}
-      </button>
-    </div>
-    <a class="close-reveal-modal">&#215;</a>
-  </form>
-</div>
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/hooks/header.js b/src/sunstone/public/app/tabs/marketplace-tab/hooks/header.js
deleted file mode 100644
index 334b1caefb..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/hooks/header.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require) {
-
-  /*
-    CONSTANTS
-   */
-
-  var TAB_ID = require('../tabId');
-
-  /*
-    FUNCTION DEFINITIONS
-   */
-
-  function _pre(info, contextTabId) {
-    var element = info;
-
-    $('.resource-id', '#' + TAB_ID).hide();
-    $('.resource-info-header', '#' + TAB_ID).text(element.name);
-  }
-
-  function _post(info, contextTabId) {
-  }
-
-  return {
-    'pre': _pre,
-    'post': _post
-  };
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js b/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js
deleted file mode 100644
index f32d8a35b5..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require) {
-  /*
-    DEPENDENCIES
-   */
-
-  var TemplateInfo = require('hbs!./info/html');
-  var Locale = require('utils/locale');
-  var Humanize = require('utils/humanize');
-  var TemplateUtils = require('utils/template-utils');
-
-  /*
-    TEMPLATES
-   */
-
-  var TemplateTable = require('utils/panel/template-table');
-
-  /*
-    CONSTANTS
-   */
-
-  var PANEL_ID = require('./info/panelId');
-  var RESOURCE = "Marketplace";
-  var TAB_ID = require('../tabId');
-
-  /*
-    CONSTRUCTOR
-   */
-
-  function Panel(info) {
-    this.title = Locale.tr("Info");
-    this.icon = "fa-info-circle";
-
-    this.element = info;
-
-    return this;
-  }
-
-  Panel.PANEL_ID = PANEL_ID;
-  Panel.prototype.html = _html;
-  Panel.prototype.setup = _setup;
-
-  return Panel;
-
-  /*
-    FUNCTION DEFINITIONS
-   */
-
-  function _html() {
-    var url = this.element.links.download.href;
-    url = url.replace(/\/download$/, '');
-
-    return TemplateInfo({
-      'element': this.element,
-      'url': url
-    });
-  }
-
-  function _setup(context) {
-    return false;
-  }
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/marketplace-tab/panels/info/html.hbs
deleted file mode 100644
index 38a114c697..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/panels/info/html.hbs
+++ /dev/null
@@ -1,154 +0,0 @@
-{{! -------------------------------------------------------------------------- }}
-{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
-{{!                                                                            }}
-{{! 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.                                             }}
-{{! -------------------------------------------------------------------------- }}
-
-<div class="row">
-  <div class="large-6 columns">
-    <table class="dataTable">
-      <thead>
-        <tr><th colspan="2">{{tr "Information"}}</th></tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td class="key_td">{{tr "ID"}}</td>
-          <td class="value_td">{{element._id.$oid}}</td>
-        </tr>
-        <tr>
-          <td class="key_td">{{tr "Name"}}</td>
-          <td class="value_td">{{htmlDecode element.name}}</td>
-        </tr>
-        <tr>
-          <td class="key_td">{{tr "URL"}}</td>
-          <td class="value_td">
-            <a href="{{url}}" target="_blank">{{tr "link"}}</a>
-          </td>
-        </tr>
-        <tr>
-          <td class="key_td">{{tr "Publisher"}}</td>
-          <td class="value_td">{{htmlDecode element.publisher}}</td>
-        </tr>
-        <tr>
-          <td class="key_td">{{tr "Downloads"}}</td>
-          <td class="value_td">{{htmlDecode element.downloads}}</td>
-        </tr>
-        {{#if element.status}}
-        <tr>
-          <td class="key_td">{{tr "Status"}}</td>
-          <td class="value_td">{{htmlDecode element.status}}</td>
-        </tr>
-        {{/if}}
-        {{#if element.tags}}
-        <tr>
-          <td class="key_td">{{tr "Tags"}}</td>
-          <td class="value_td">{{htmlDecode element.tags}}</td>
-        </tr>
-        {{/if}}
-        {{#if element.catalog}}
-        <tr>
-          <td class="key_td">{{tr "Catalog"}}</td>
-          <td class="value_td">{{htmlDecode element.catalog}}</td>
-        </tr>
-        {{/if}}
-        <tr>
-          <td class="key_td">{{tr "OS"}}</td>
-          <td class="value_td">{{htmlDecode element.os-id}} {{htmlDecode element.os-release}}</td>
-        </tr>
-        <tr>
-          <td class="key_td">{{tr "Arch"}}</td>
-          <td class="value_td">{{htmlDecode element.os-arch}}</td>
-        </tr>
-        {{#if element.files}}
-        <tr>
-          <td class="key_td">{{tr "Size"}}</td>
-          <td class="value_td">{{humanizeSize "B" element.files.[0].size}}</td>
-        </tr>
-        {{/if}}
-        <tr>
-          <td class="key_td">{{tr "Hypervisor"}}</td>
-          <td class="value_td">{{htmlDecode element.hypervisor}}</td>
-        </tr>
-        <tr>
-          <td class="key_td">{{tr "Format"}}</td>
-          <td class="value_td">{{htmlDecode element.format}}</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-  <div class="large-6 columns">
-    {{#if element.short_description}}
-    <table class="dataTable">
-      <thead>
-        <tr>
-          <th colspan="2">{{tr "Short Description"}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td class="value_td" style="white-space: pre-wrap;">
-            {{~htmlDecode element.short_description~}}
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    {{/if}}
-    <table class="dataTable">
-      <thead>
-        <tr>
-          <th colspan="2">{{tr "Description"}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td class="value_td" style="white-space: pre-wrap;">
-            {{~htmlDecode element.description~}}
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <table class="dataTable">
-      <thead>
-        <tr>
-          <th colspan="2">{{tr "Images"}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        {{#each element.files}}
-        <tr>
-          <td class="value_td">{{htmlDecode name}}</td>
-          <td class="value_td">{{humanizeSize "B" size}}</td>
-        </tr>
-        {{else}}
-        <tr>
-          <td colspan="2" class="value_td">{{tr "No Images defined"}}</td>
-        </tr>
-        {{/each}}
-      </tbody>
-    </table>
-    {{#if element.opennebula_template}}
-    <table class="dataTable">
-      <thead>
-        <tr>
-          <th colspan="2">{{tr "OpenNebula Template"}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td class="value_td"><pre>{{htmlDecode element.opennebula_template}}</pre></td>
-        </tr>
-      </tbody>
-    </table>
-    {{/if}}
-  </div>
-</div>
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/marketplace-tab/panels/info/panelId.js
deleted file mode 100644
index 4ea290399b..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/panels/info/panelId.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require){
-  return 'marketplace_info_tab';
-});
diff --git a/src/sunstone/public/app/tabs/marketplace-tab/tabId.js b/src/sunstone/public/app/tabs/marketplace-tab/tabId.js
deleted file mode 100644
index 1a71ef113b..0000000000
--- a/src/sunstone/public/app/tabs/marketplace-tab/tabId.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -------------------------------------------------------------------------- */
-/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
-/*                                                                            */
-/* 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.                                             */
-/* -------------------------------------------------------------------------- */
-
-define(function(require){
-  return 'marketplace-tab';
-});
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index 42716690c8..af8065cb38 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -587,17 +587,6 @@ get '/vm/showback' do
     @SunstoneServer.get_vm_showback(params)
 end
 
-##############################################################################
-# Marketplace
-##############################################################################
-get '/marketplace' do
-    @SunstoneServer.get_appliance_pool
-end
-
-get '/marketplace/:id' do
-    @SunstoneServer.get_appliance(params[:id])
-end
-
 ##############################################################################
 # GET Pool information
 ##############################################################################

From 4663171472c5c03132aa8539e1e0d89ea73d194f Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 3 Feb 2016 12:38:00 +0100
Subject: [PATCH 161/197] Feature #4217: Fix problem with merge

---
 include/RequestManagerAllocate.h | 1 -
 src/rm/Request.cc                | 4 ++++
 src/rm/RequestManagerAllocate.cc | 5 ++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h
index c96f04d2ee..d78d6ccd5d 100644
--- a/include/RequestManagerAllocate.h
+++ b/include/RequestManagerAllocate.h
@@ -669,7 +669,6 @@ public:
     int pool_allocate(xmlrpc_c::paramList const& _paramList,
                       Template *                 tmpl,
                       int&                       id,
-                      string&                    error_str,
                       RequestAttributes&         att);
 private:
     MarketPlacePool * mppool;
diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index 755724fae3..e3a9accb90 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -59,6 +59,10 @@ string Request::object_name(PoolObjectSQL::ObjectType ob)
             return "VDC";
         case PoolObjectSQL::VROUTER:
             return "virtual router";
+        case PoolObjectSQL::MARKETPLACE:
+            return "marketplace";
+        case PoolObjectSQL::MARKETPLACEAPP:
+            return "marketplaceapp";
         default:
             return "-";
       }
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index ba1e1f3ebc..44454fad46 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -891,7 +891,6 @@ int MarketPlaceAppAllocate::pool_allocate(
         xmlrpc_c::paramList const&  paramList,
         Template *                  tmpl,
         int&                        id,
-        string&                     error_str,
         RequestAttributes&          att)
 {
     MarketPlaceAppPool *     appool = static_cast<MarketPlaceAppPool *>(pool);
@@ -903,7 +902,7 @@ int MarketPlaceAppAllocate::pool_allocate(
 
     if ( mp == 0 )
     {
-        error_str = "Cannot find associated MARKETPLACE";
+        att.resp_msg = "Cannot find associated MARKETPLACE";
         return -1;
     }
 
@@ -915,7 +914,7 @@ int MarketPlaceAppAllocate::pool_allocate(
     mp->unlock();
 
     int rc = appool->allocate(att.uid, att.gid, att.uname, att.gname, att.umask,
-        ttmpl, mp_id, mp_name, mp_data, &id, error_str);
+        ttmpl, mp_id, mp_name, mp_data, &id, att.resp_msg);
 
 	if (rc < 0)
 	{

From 880d31bc78f74754a01d9bb55e5d4228e62b513d Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 3 Feb 2016 13:50:41 +0100
Subject: [PATCH 162/197] Feature #4217: Extend s3 drivers to support ceph/s3

---
 src/datastore_mad/remotes/downloader.sh | 11 +++--
 src/datastore_mad/remotes/fs/cp         |  5 ++-
 src/market_mad/remotes/s3/S3.rb         | 56 ++++++++++++++-----------
 src/market_mad/remotes/s3/delete        | 22 +++++++---
 src/market_mad/remotes/s3/import        | 23 +++++++---
 src/market_mad/remotes/s3/monitor       | 20 +++++++--
 6 files changed, 92 insertions(+), 45 deletions(-)

diff --git a/src/datastore_mad/remotes/downloader.sh b/src/datastore_mad/remotes/downloader.sh
index e365a2beee..c4ff24d9b1 100755
--- a/src/datastore_mad/remotes/downloader.sh
+++ b/src/datastore_mad/remotes/downloader.sh
@@ -131,10 +131,11 @@ function s3_request
 {
     FROM="$1"
 
+    ENDPOINT=${S3_ENDPOINT:-https://s3.amazonaws.com}
     OBJECT=$(basename $FROM)
     BUCKET=$(basename $(dirname $FROM))
 
-    DATE="`date +'%a, %d %b %Y %H:%M:%S %z'`"
+    DATE="`date -u +'%a, %d %b %Y %H:%M:%S GMT'`"
     AUTH_STRING="GET\n\n\n${DATE}\n/${BUCKET}/${OBJECT}"
 
     SIGNED_AUTH_STRING=`echo -en "$AUTH_STRING" | \
@@ -143,7 +144,7 @@ function s3_request
 
     echo " -H \"Date: ${DATE}\"" \
          " -H \"Authorization: AWS ${S3_ACCESS_KEY_ID}:${SIGNED_AUTH_STRING}\"" \
-         " https://${BUCKET}.s3.amazonaws.com/${OBJECT}"
+         " ${ENDPOINT}/${BUCKET}/${OBJECT}"
 }
 
 function get_rbd_cmd
@@ -234,13 +235,15 @@ TO="$2"
 # File used by the hasher function to store the resulting hash
 export HASH_FILE="/tmp/downloader.hash.$$"
 
+GLOBAL_CURL_ARGS="--fail -sS -k -L"
+
 case "$FROM" in
 http://*|https://*)
     # -k  so it does not check the certificate
     # -L  to follow redirects
     # -sS to hide output except on failure
     # --limit_rate to limit the bw
-    curl_args="-sS -k -L $FROM"
+    curl_args="$GLOBAL_CURL_ARGS $FROM"
 
     if [ -n "$LIMIT_RATE" ]; then
         curl_args="--limit-rate $LIMIT_RATE $curl_args"
@@ -265,7 +268,7 @@ s3://*)
     fi
 
     curl_args="$(s3_request $FROM)"
-    command="curl $curl_args"
+    command="curl $GLOBAL_CURL_ARGS $curl_args"
     ;;
 rbd://*)
     command="$(get_rbd_cmd $FROM)"
diff --git a/src/datastore_mad/remotes/fs/cp b/src/datastore_mad/remotes/fs/cp
index 3f779d5853..987d39f3c7 100755
--- a/src/datastore_mad/remotes/fs/cp
+++ b/src/datastore_mad/remotes/fs/cp
@@ -59,7 +59,8 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW \
                     /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ACCESS_KEY_ID \
-                    /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY)
+                    /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY \
+                    /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ENDPOINT)
 
 unset i
 
@@ -76,10 +77,12 @@ NO_DECOMPRESS="${XPATH_ELEMENTS[i++]}"
 LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[i++]}"
 S3_ACCESS_KEY_ID="${XPATH_ELEMENTS[i++]}"
 S3_SECRET_ACCESS_KEY="${XPATH_ELEMENTS[i++]}"
+S3_ENDPOINT="${XPATH_ELEMENTS[i++]}"
 
 # Must be made available to downloader.sh
 export S3_ACCESS_KEY_ID
 export S3_SECRET_ACCESS_KEY
+export S3_ENDPOINT
 
 DST=`generate_image_path`
 IMAGE_HASH=`basename $DST`
diff --git a/src/market_mad/remotes/s3/S3.rb b/src/market_mad/remotes/s3/S3.rb
index 4ea8165c65..59510898a8 100644
--- a/src/market_mad/remotes/s3/S3.rb
+++ b/src/market_mad/remotes/s3/S3.rb
@@ -14,34 +14,40 @@
 # limitations under the License.                                             #
 # -------------------------------------------------------------------------- #
 
-# This class is a generic wrapper to the s3 upload and delete facilities.
+require 'aws-sdk'
+
+# This class is a generic wrapper to the s3 gem.
 # It can either handle simple or multipart uploads, but the logic to decide
 # which uploader to use is not included in this class.
 class S3
+    attr_accessor :name, :client
+
     def initialize(h)
-        @name = h[:name]
+        @client = Aws::S3::Client.new(h)
+    end
 
-        @config = {
-            :bucket            => h[:bucket],
-            :md5               => h[:md5],
-            :region            => h[:region],
-            :access_key_id     => h[:access_key_id],
-            :secret_access_key => h[:secret_access_key]
-        }
+    def bucket=(bucket)
+        @bucket = bucket
 
-        @client = Aws::S3::Client.new({
-            :region            => @config[:region],
-            :access_key_id     => @config[:access_key_id],
-            :secret_access_key => @config[:secret_access_key]
-        })
-
-        @parts = []
-        @part_number = 1
+        # Implicit creation of the bucket
+        begin
+            @client.head_bucket({
+                :bucket => @bucket
+            })
+        rescue Aws::S3::Errors::NotFound
+            puts "create"
+            @client.create_bucket({
+                :bucket => @bucket
+            })
+        end
     end
 
     def create_multipart_upload
+        @parts = []
+        @part_number = 1
+
         resp = @client.create_multipart_upload({
-            :bucket => @config[:bucket],
+            :bucket => @bucket,
             :key    => @name
         })
 
@@ -50,7 +56,7 @@ class S3
 
     def complete_multipart_upload
         @client.complete_multipart_upload({
-          :bucket           => @config[:bucket],
+          :bucket           => @bucket,
           :key              => @name,
           :upload_id        => @upload_id,
           :multipart_upload => {:parts => @parts}
@@ -61,7 +67,7 @@ class S3
         @client.abort_multipart_upload({
             :upload_id   => @upload_id,
             :key         => @name,
-            :bucket      => @config[:bucket]
+            :bucket      => @bucket
         })
     end
 
@@ -71,7 +77,7 @@ class S3
             :upload_id   => @upload_id,
             :part_number => @part_number,
             :key         => @name,
-            :bucket      => @config[:bucket]
+            :bucket      => @bucket
         })
 
         @parts << {
@@ -85,14 +91,14 @@ class S3
     def put_object(body)
         @client.put_object({
             :body   => body,
-            :bucket => @config[:bucket],
+            :bucket => @bucket,
             :key    => @name
         })
     end
 
     def delete_object
         @client.delete_object({
-            :bucket => @config[:bucket],
+            :bucket => @bucket,
             :key    => @name
         })
     end
@@ -100,7 +106,7 @@ class S3
     def exists?
         begin
             !!@client.head_object({
-                :bucket => @config[:bucket],
+                :bucket => @bucket,
                 :key    => @name
             })
         rescue Aws::S3::Errors::NotFound
@@ -110,7 +116,7 @@ class S3
 
     def get_bucket_size
         resp = @client.list_objects({
-            bucket: @config[:bucket]
+            bucket: @bucket
         })
 
         size = 0
diff --git a/src/market_mad/remotes/s3/delete b/src/market_mad/remotes/s3/delete
index 347773ab58..844018f11f 100755
--- a/src/market_mad/remotes/s3/delete
+++ b/src/market_mad/remotes/s3/delete
@@ -39,7 +39,6 @@ $: << File.dirname(__FILE__)
 require 'base64'
 require 'rexml/document'
 require 'getoptlong'
-require 'aws-sdk'
 require 'pp'
 
 require 'S3'
@@ -52,11 +51,17 @@ xml = REXML::Document.new(Base64::decode64(ARGV[0])).root
 
 source = xpath(xml, 'MARKETPLACEAPP/SOURCE')
 
+# required
 access_key_id     = xpath(xml, 'MARKETPLACE/TEMPLATE/ACCESS_KEY_ID')
 secret_access_key = xpath(xml, 'MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY')
 bucket            = xpath(xml, 'MARKETPLACE/TEMPLATE/BUCKET')
 region            = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
 
+# optional
+signature_version = xpath(xml, 'MARKETPLACE/TEMPLATE/SIGNATURE_VERSION')
+endpoint          = xpath(xml, 'MARKETPLACE/TEMPLATE/ENDPOINT')
+force_path_style  = xpath(xml, 'MARKETPLACE/TEMPLATE/FORCE_PATH_STYLE')
+
 name = File.basename(source)
 
 if name.empty?
@@ -64,13 +69,20 @@ if name.empty?
     exit 1
 end
 
-s3 = S3.new(
-    :name              => name,
-    :bucket            => bucket,
+s3_config = {
     :region            => region,
     :access_key_id     => access_key_id,
     :secret_access_key => secret_access_key
-)
+}
+
+s3_config[:signature_version] = signature_version if !signature_version.to_s.empty?
+s3_config[:endpoint]          = endpoint if !endpoint.to_s.empty?
+s3_config[:force_path_style]  = true if force_path_style.to_s.downcase == "yes"
+
+s3 = S3.new(s3_config)
+
+s3.name   = name
+s3.bucket = bucket
 
 if !s3.exists?
     STDERR.puts "Object '#{name}' does not exist."
diff --git a/src/market_mad/remotes/s3/import b/src/market_mad/remotes/s3/import
index 47e2a48057..2f1da80db5 100755
--- a/src/market_mad/remotes/s3/import
+++ b/src/market_mad/remotes/s3/import
@@ -39,7 +39,6 @@ $: << File.dirname(__FILE__)
 require 'base64'
 require 'rexml/document'
 require 'getoptlong'
-require 'aws-sdk'
 require 'open3'
 require 'pp'
 
@@ -59,11 +58,17 @@ md5           = xpath(xml, 'MD5')
 
 id = xpath(xml, 'MARKETPLACEAPP/ID')
 
+# required
 access_key_id     = xpath(xml, 'MARKETPLACE/TEMPLATE/ACCESS_KEY_ID')
 secret_access_key = xpath(xml, 'MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY')
 bucket            = xpath(xml, 'MARKETPLACE/TEMPLATE/BUCKET')
 region            = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
 
+# optional
+signature_version = xpath(xml, 'MARKETPLACE/TEMPLATE/SIGNATURE_VERSION')
+endpoint          = xpath(xml, 'MARKETPLACE/TEMPLATE/ENDPOINT')
+force_path_style  = xpath(xml, 'MARKETPLACE/TEMPLATE/FORCE_PATH_STYLE')
+
 name   = "marketapp-#{id}"
 source = "s3://#{bucket}/#{name}"
 
@@ -71,14 +76,20 @@ source = "s3://#{bucket}/#{name}"
 
 READ_LENGTH = 10*1024*1024 # Read in chunks of 10MB
 
-s3 = S3.new(
-    :name              => name,
-    :md5               => md5,
-    :bucket            => bucket,
+s3_config = {
     :region            => region,
     :access_key_id     => access_key_id,
     :secret_access_key => secret_access_key
-)
+}
+
+s3_config[:signature_version] = signature_version if !signature_version.to_s.empty?
+s3_config[:endpoint]          = endpoint if !endpoint.to_s.empty?
+s3_config[:force_path_style]  = true if force_path_style.to_s.downcase == "yes"
+
+s3 = S3.new(s3_config)
+
+s3.name   = name
+s3.bucket = bucket
 
 if s3.exists?
     STDERR.puts "Object '#{name}' already exists."
diff --git a/src/market_mad/remotes/s3/monitor b/src/market_mad/remotes/s3/monitor
index 1677b700f7..181ffb950d 100755
--- a/src/market_mad/remotes/s3/monitor
+++ b/src/market_mad/remotes/s3/monitor
@@ -41,7 +41,6 @@ TOTAL_MB_DEFAULT = 1048576 # Default maximum 1TB
 require 'base64'
 require 'rexml/document'
 require 'getoptlong'
-require 'aws-sdk'
 require 'pp'
 
 require 'S3'
@@ -52,18 +51,31 @@ end
 
 xml = REXML::Document.new(Base64::decode64(ARGV[0])).root
 
+# required
 access_key_id     = xpath(xml, 'MARKETPLACE/TEMPLATE/ACCESS_KEY_ID')
 secret_access_key = xpath(xml, 'MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY')
 bucket            = xpath(xml, 'MARKETPLACE/TEMPLATE/BUCKET')
 region            = xpath(xml, 'MARKETPLACE/TEMPLATE/REGION')
 total_mb          = xpath(xml, 'MARKETPLACE/TEMPLATE/TOTAL_MB') || TOTAL_MB_DEFAULT
 
-s3 = S3.new(
-    :bucket            => bucket,
+# optional
+signature_version = xpath(xml, 'MARKETPLACE/TEMPLATE/SIGNATURE_VERSION')
+endpoint          = xpath(xml, 'MARKETPLACE/TEMPLATE/ENDPOINT')
+force_path_style  = xpath(xml, 'MARKETPLACE/TEMPLATE/FORCE_PATH_STYLE')
+
+s3_config = {
     :region            => region,
     :access_key_id     => access_key_id,
     :secret_access_key => secret_access_key
-)
+}
+
+s3_config[:signature_version] = signature_version if !signature_version.to_s.empty?
+s3_config[:endpoint]          = endpoint if !endpoint.to_s.empty?
+s3_config[:force_path_style]  = true if force_path_style.to_s.downcase == "yes"
+
+s3 = S3.new(s3_config)
+
+s3.bucket = bucket
 
 used_mb = (s3.get_bucket_size.to_f/1024/1024).ceil
 free_mb = total_mb - used_mb

From ac9990ddc151fb556a0f3c90830437b4915e61a4 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 3 Feb 2016 15:24:00 +0100
Subject: [PATCH 163/197] Feature #4217: Refactor the code remove market
 specific code from the ds/cp action and move it to the downloader.sh

---
 src/datastore_mad/remotes/ceph/cp       |  2 ++
 src/datastore_mad/remotes/dev/cp        |  2 ++
 src/datastore_mad/remotes/downloader.sh | 26 +++++++++++++++++++++++--
 src/datastore_mad/remotes/fs/cp         | 15 +++-----------
 src/datastore_mad/remotes/lvm/cp        |  2 ++
 src/datastore_mad/remotes/vmfs/cp       |  2 ++
 6 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp
index 2bb90bf88e..b1bb0e14ca 100755
--- a/src/datastore_mad/remotes/ceph/cp
+++ b/src/datastore_mad/remotes/ceph/cp
@@ -40,6 +40,8 @@ source ${DRIVER_PATH}/ceph.conf
 DRV_ACTION=$1
 ID=$2
 
+export DRV_ACTION
+
 UTILS_PATH="${DRIVER_PATH}/.."
 
 XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"
diff --git a/src/datastore_mad/remotes/dev/cp b/src/datastore_mad/remotes/dev/cp
index 7e133e18ad..f48310f39d 100755
--- a/src/datastore_mad/remotes/dev/cp
+++ b/src/datastore_mad/remotes/dev/cp
@@ -39,6 +39,8 @@ source ${DRIVER_PATH}/../libfs.sh
 DRV_ACTION=$1
 ID=$2
 
+export DRV_ACTION
+
 UTILS_PATH="${DRIVER_PATH}/.."
 
 XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"
diff --git a/src/datastore_mad/remotes/downloader.sh b/src/datastore_mad/remotes/downloader.sh
index c4ff24d9b1..33a52e50ff 100755
--- a/src/datastore_mad/remotes/downloader.sh
+++ b/src/datastore_mad/remotes/downloader.sh
@@ -127,7 +127,24 @@ function unarchive
     fi
 }
 
-function s3_request
+function s3_env
+{
+    XPATH="$DRIVER_PATH/xpath.rb -b $DRV_ACTION"
+
+    unset i j XPATH_ELEMENTS
+
+    while IFS= read -r -d '' element; do
+        XPATH_ELEMENTS[i++]="$element"
+    done < <($XPATH     /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ACCESS_KEY_ID \
+                        /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY \
+                        /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ENDPOINT)
+
+    S3_ACCESS_KEY_ID="${XPATH_ELEMENTS[j++]}"
+    S3_SECRET_ACCESS_KEY="${XPATH_ELEMENTS[j++]}"
+    S3_ENDPOINT="${XPATH_ELEMENTS[j++]}"
+}
+
+function s3_curl_args
 {
     FROM="$1"
 
@@ -262,12 +279,17 @@ ssh://*)
     command="ssh ${ssh_arg[0]} $rmt_cmd"
     ;;
 s3://*)
+
+    # Read s3 environment
+    s3_env
+
     if [ -z "$S3_ACCESS_KEY_ID" -o -z "$S3_SECRET_ACCESS_KEY" ]; then
         echo "S3_ACCESS_KEY_ID and S3_SECRET_ACCESS_KEY are required" >&2
         exit -1
     fi
 
-    curl_args="$(s3_request $FROM)"
+    curl_args="$(s3_curl_args $FROM)"
+
     command="curl $GLOBAL_CURL_ARGS $curl_args"
     ;;
 rbd://*)
diff --git a/src/datastore_mad/remotes/fs/cp b/src/datastore_mad/remotes/fs/cp
index 987d39f3c7..258cfa97f7 100755
--- a/src/datastore_mad/remotes/fs/cp
+++ b/src/datastore_mad/remotes/fs/cp
@@ -39,6 +39,8 @@ source ${DRIVER_PATH}/../libfs.sh
 DRV_ACTION=$1
 ID=$2
 
+export DRV_ACTION
+
 UTILS_PATH="${DRIVER_PATH}/.."
 
 XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"
@@ -57,10 +59,7 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW \
-                    /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ACCESS_KEY_ID \
-                    /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/SECRET_ACCESS_KEY \
-                    /DS_DRIVER_ACTION_DATA/MARKETPLACE/TEMPLATE/ENDPOINT)
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW)
 
 unset i
 
@@ -75,14 +74,6 @@ MD5="${XPATH_ELEMENTS[i++]}"
 SHA1="${XPATH_ELEMENTS[i++]}"
 NO_DECOMPRESS="${XPATH_ELEMENTS[i++]}"
 LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[i++]}"
-S3_ACCESS_KEY_ID="${XPATH_ELEMENTS[i++]}"
-S3_SECRET_ACCESS_KEY="${XPATH_ELEMENTS[i++]}"
-S3_ENDPOINT="${XPATH_ELEMENTS[i++]}"
-
-# Must be made available to downloader.sh
-export S3_ACCESS_KEY_ID
-export S3_SECRET_ACCESS_KEY
-export S3_ENDPOINT
 
 DST=`generate_image_path`
 IMAGE_HASH=`basename $DST`
diff --git a/src/datastore_mad/remotes/lvm/cp b/src/datastore_mad/remotes/lvm/cp
index c7d02d086b..a1c8a5c4d7 100755
--- a/src/datastore_mad/remotes/lvm/cp
+++ b/src/datastore_mad/remotes/lvm/cp
@@ -40,6 +40,8 @@ source ${DRIVER_PATH}/lvm.conf
 DRV_ACTION=$1
 ID=$2
 
+export DRV_ACTION
+
 UTILS_PATH="${DRIVER_PATH}/.."
 
 XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"
diff --git a/src/datastore_mad/remotes/vmfs/cp b/src/datastore_mad/remotes/vmfs/cp
index 384319548e..1aed20504f 100755
--- a/src/datastore_mad/remotes/vmfs/cp
+++ b/src/datastore_mad/remotes/vmfs/cp
@@ -43,6 +43,8 @@ source ${DRIVER_PATH}/vmfs.conf
 DRV_ACTION=$1
 ID=$2
 
+export DRV_ACTION
+
 UTILS_PATH="${DRIVER_PATH}/.."
 
 XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION"

From a85da12036c2d307992091b48159e3f19075c8f8 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 3 Feb 2016 16:03:22 +0100
Subject: [PATCH 164/197] Feature #4217: Define required attrs for Market
 templates

---
 include/MarketPlace.h        |  6 ++++
 include/Nebula.h             | 25 +++++++++++++
 include/NebulaTemplate.h     |  5 +++
 share/etc/oned.conf          | 21 +++++++++++
 src/market/MarketPlace.cc    | 68 ++++++++++++++++++++++++++++++++++++
 src/nebula/Nebula.cc         | 67 ++++++++++++++---------------------
 src/nebula/NebulaTemplate.cc | 55 ++++++++++++++++++++++-------
 7 files changed, 194 insertions(+), 53 deletions(-)

diff --git a/include/MarketPlace.h b/include/MarketPlace.h
index 29b8aba7e8..a004aeeb88 100644
--- a/include/MarketPlace.h
+++ b/include/MarketPlace.h
@@ -183,6 +183,12 @@ private:
         return new MarketPlaceTemplate;
     }
 
+    /**
+     *  Verify the proper definition of the Market by checking the
+     *  attributes of the MARKET_MAD_CONF parameter
+     */
+    int set_market_mad(string &tm_mad, string &error_str);
+
     /**
      * Child classes can process the new template set with replace_template or
      * append_template with this method
diff --git a/include/Nebula.h b/include/Nebula.h
index 311c683a1a..8f25dcc54e 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -459,6 +459,13 @@ public:
         const string& tm_name,
         const VectorAttribute* &value) const;
 
+    /**
+     *  Gets a Market configuration attribute
+     */
+    int get_market_conf_attribute(
+        const string& tm_name,
+        const VectorAttribute* &value) const;
+
     /**
      *  Gets an XML document with all of the configuration attributes
      *    @return the XML
@@ -747,6 +754,24 @@ private:
     // ---------------------------------------------------------------
 
     friend void nebula_signal_handler (int sig);
+
+    // ---------------------------------------------------------------
+    // Helper functions
+    // ---------------------------------------------------------------
+
+    /**
+     *  Gets a Generic configuration attribute
+     *  @param key String that identifies the configuration parameter group name
+     *  @param name Name of the specific configuration parameter
+     *  @param value Value of the specific configuration parameter
+     *  @return a reference to the generated string
+     */
+
+    int get_conf_attribute(
+        const std::string& key,
+        const std::string& name,
+        const VectorAttribute* &value) const;
+
 };
 
 #endif /*NEBULA_H_*/
diff --git a/include/NebulaTemplate.h b/include/NebulaTemplate.h
index 62dcef7a7e..4dc9c29b44 100644
--- a/include/NebulaTemplate.h
+++ b/include/NebulaTemplate.h
@@ -214,6 +214,11 @@ private:
                      const std::string& shared,
                      const std::string& ds_migrate);
 
+    /**
+     *  Sets a the defaults for a Market
+     */
+    void set_conf_market(const std::string& name,
+                         const std::string& required_attrs);
 };
 
 
diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index a4b9fcc652..6d96e76c2e 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -1068,3 +1068,24 @@ DS_MAD_CONF = [
 DS_MAD_CONF = [
     NAME = "vmfs", REQUIRED_ATTRS = "BRIDGE_LIST", PERSISTENT_ONLY = "NO"
 ]
+
+#*******************************************************************************
+# MarketPlace Driver Behavior Configuration
+#*******************************************************************************
+# The  configuration for each driver is defined in MARKET_MAD_CONF. These
+# values are used when creating a new marketplaces and should not be modified
+# since they define the marketplace behavior.
+#   name      : name of the market driver
+#   required_attrs : comma separated list of required attributes in the Market
+#                    template
+#*******************************************************************************
+
+MARKET_MAD_CONF = [
+    NAME = "http",
+    REQUIRED_ATTRS = "BASE_URL,PUBLIC_DIR"
+]
+
+MARKET_MAD_CONF = [
+    NAME = "s3",
+    REQUIRED_ATTRS = "ACCESS_KEY_ID,SECRET_ACCESS_KEY,REGION,BUCKET"
+]
diff --git a/src/market/MarketPlace.cc b/src/market/MarketPlace.cc
index be24de452d..830e0eba6f 100644
--- a/src/market/MarketPlace.cc
+++ b/src/market/MarketPlace.cc
@@ -18,6 +18,7 @@
 #include "MarketPlace.h"
 #include "NebulaLog.h"
 #include "NebulaUtil.h"
+#include "Nebula.h"
 
 /* ************************************************************************ */
 /* MarketPlace:: Database Definition                                        */
@@ -72,6 +73,68 @@ MarketPlace::~MarketPlace()
 /* MartketPlace :: Database Access Functions                                   */
 /* *************************************************************************** */
 
+/* -------------------------------------------------------------------------- */
+
+int MarketPlace::set_market_mad(std::string &mad, std::string &error_str)
+{
+    const VectorAttribute* vatt;
+    std::vector <std::string> vrequired_attrs;
+
+    int    rc;
+    std::string required_attrs, required_attr, value;
+
+    std::ostringstream oss;
+
+    rc = Nebula::instance().get_market_conf_attribute(mad, vatt);
+
+    if ( rc != 0 )
+    {
+        goto error_conf;
+    }
+
+    rc = vatt->vector_value("REQUIRED_ATTRS", required_attrs);
+
+    if ( rc == -1 ) //No required attributes
+    {
+        return 0;
+    }
+
+    vrequired_attrs = one_util::split(required_attrs, ',');
+
+    for ( std::vector<std::string>::const_iterator it = vrequired_attrs.begin();
+         it != vrequired_attrs.end(); it++ )
+    {
+        required_attr = *it;
+
+        required_attr = one_util::trim(required_attr);
+        one_util::toupper(required_attr);
+
+        get_template_attribute(required_attr.c_str(), value);
+
+        if ( value.empty() )
+        {
+            goto error_required;
+        }
+    }
+
+    return 0;
+
+error_conf:
+    oss << "MARKET_MAD_CONF named \"" << mad << "\" is not defined in oned.conf";
+    goto error_common;
+
+error_required:
+    oss << "MarketPlace template is missing the \"" << required_attr
+        << "\" attribute or it's empty.";
+
+error_common:
+    error_str = oss.str();
+    return -1;
+}
+
+/* --------------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------- */
+
 int MarketPlace::insert(SqlDB *db, string& error_str)
 {
     std::ostringstream oss;
@@ -90,6 +153,11 @@ int MarketPlace::insert(SqlDB *db, string& error_str)
         goto error_mad;
     }
 
+    if (set_market_mad(market_mad, error_str) != 0)
+    {
+        goto error_common;
+    }
+
     //--------------------------------------------------------------------------
 
     return insert_replace(db, false, error_str);
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 782ec5f4a6..13c61649f9 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -1104,16 +1104,17 @@ string Nebula::get_vm_log_filename(int oid)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int Nebula::get_ds_conf_attribute(
-    const std::string& ds_name,
+int Nebula::get_conf_attribute(
+    const std::string& key,
+    const std::string& name,
     const VectorAttribute* &value) const
 {
     std::vector<const Attribute*>::const_iterator it;
     std::vector<const Attribute*> values;
-    std::string template_ds_name;
-    std::string ds_name_upper;
+    std::string template_name;
+    std::string name_upper;
 
-    nebula_configuration->Template::get("DS_MAD_CONF", values);
+    nebula_configuration->Template::get(key, values);
 
     for (it = values.begin(); it != values.end(); it ++)
     {
@@ -1124,13 +1125,13 @@ int Nebula::get_ds_conf_attribute(
             continue;
         }
 
-        template_ds_name = value->vector_value("NAME");
-        ds_name_upper = ds_name;
+        template_name = value->vector_value("NAME");
+        name_upper    = name;
 
-        one_util::toupper(ds_name_upper);
-        one_util::toupper(template_ds_name);
+        one_util::toupper(name_upper);
+        one_util::toupper(template_name);
 
-        if ( template_ds_name == ds_name_upper)
+        if ( template_name == name_upper)
         {
             return 0;
         }
@@ -1140,39 +1141,23 @@ int Nebula::get_ds_conf_attribute(
     return -1;
 };
 
+int Nebula::get_ds_conf_attribute(
+    const std::string& name,
+    const VectorAttribute* &value) const
+{
+    return get_conf_attribute("DS_MAD_CONF", name, value);
+};
+
 int Nebula::get_tm_conf_attribute(
-    const string& tm_name,
+    const std::string& name,
     const VectorAttribute* &value) const
 {
-    vector<const Attribute*>::const_iterator it;
-    vector<const Attribute*> values;
-    std::string template_tm_name;
-    std::string tm_name_upper;
-
-    nebula_configuration->Template::get("TM_MAD_CONF", values);
-
-    for (it = values.begin(); it != values.end(); it ++)
-    {
-        value = dynamic_cast<const VectorAttribute*>(*it);
-
-        if (value == 0)
-        {
-            continue;
-        }
-
-        template_tm_name = value->vector_value("NAME");
-        tm_name_upper = tm_name;
-
-        one_util::toupper(tm_name_upper);
-        one_util::toupper(template_tm_name);
-
-        if ( tm_name_upper == template_tm_name)
-        {
-            return 0;
-        }
-    }
-
-    value = 0;
-    return -1;
+    return get_conf_attribute("TM_MAD_CONF", name, value);
 };
 
+int Nebula::get_market_conf_attribute(
+    const std::string& name,
+    const VectorAttribute* &value) const
+{
+    return get_conf_attribute("MARKET_MAD_CONF", name, value);
+};
diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc
index 8bdc54a285..1d677c79f9 100644
--- a/src/nebula/NebulaTemplate.cc
+++ b/src/nebula/NebulaTemplate.cc
@@ -132,19 +132,34 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 #******
 */
 
-        set_conf_ds("dev",    "DISK_TYPE",            "YES");
-        set_conf_ds("iscsi",  "DISK_TYPE,ISCSI_HOST", "YES");
-        set_conf_ds("dummy",  "",                     "NO");
-        set_conf_ds("fs",     "",                     "NO");
-        set_conf_ds("lvm",    "DISK_TYPE",            "NO");
-        set_conf_ds("shared", "",                     "NO");
-        set_conf_ds("ssh",    "",                     "NO");
-        set_conf_ds("vmfs",   "BRIDGE_LIST",          "NO");
-        set_conf_ds("ceph",
-                    "DISK_TYPE,BRIDGE_LIST,CEPH_HOST,CEPH_USER,CEPH_SECRET",
-                    "NO");
+    set_conf_ds("dev",    "DISK_TYPE",            "YES");
+    set_conf_ds("iscsi",  "DISK_TYPE,ISCSI_HOST", "YES");
+    set_conf_ds("dummy",  "",                     "NO");
+    set_conf_ds("fs",     "",                     "NO");
+    set_conf_ds("lvm",    "DISK_TYPE",            "NO");
+    set_conf_ds("shared", "",                     "NO");
+    set_conf_ds("ssh",    "",                     "NO");
+    set_conf_ds("vmfs",   "BRIDGE_LIST",          "NO");
+    set_conf_ds("ceph",
+                "DISK_TYPE,BRIDGE_LIST,CEPH_HOST,CEPH_USER,CEPH_SECRET",
+                "NO");
 
-        register_multiple_conf_default("DS_MAD_CONF");
+    register_multiple_conf_default("DS_MAD_CONF");
+
+
+/*
+#*******************************************************************************
+# Marketplace Manager Configuration
+#*******************************************************************************
+# http
+# s3
+#******
+*/
+
+    set_conf_market("http", "BASE_URL,PUBLIC_DIR");
+    set_conf_market("s3", "ACCESS_KEY_ID,SECRET_ACCESS_KEY,REGION,BUCKET");
+
+    register_multiple_conf_default("MARKET_MAD_CONF");
 }
 
 /* -------------------------------------------------------------------------- */
@@ -278,6 +293,22 @@ void OpenNebulaTemplate::set_conf_tm(const std::string& name,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+void OpenNebulaTemplate::set_conf_market(const std::string& name,
+                                         const std::string& required_attrs)
+{
+    VectorAttribute *   vattribute;
+    std::map<std::string,std::string>  vvalue;
+
+    vvalue.insert(make_pair("NAME", name));
+    vvalue.insert(make_pair("REQUIRED_ATTRS", required_attrs));
+
+    vattribute = new VectorAttribute("MARKET_MAD_CONF", vvalue);
+    conf_default.insert(make_pair(vattribute->name(), vattribute));
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 void OpenNebulaTemplate::set_conf_default()
 {
     VectorAttribute *   vattribute;

From d222569fd0c671674c61948aae181e73270c937f Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 3 Feb 2016 17:30:27 +0100
Subject: [PATCH 165/197] Feature #4217: Add missing s3 directory to install.sh

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

diff --git a/install.sh b/install.sh
index c6f2b61f61..86a9d3f0b8 100755
--- a/install.sh
+++ b/install.sh
@@ -298,6 +298,7 @@ VAR_DIRS="$VAR_LOCATION/remotes \
           $VAR_LOCATION/remotes/market \
           $VAR_LOCATION/remotes/market/http \
           $VAR_LOCATION/remotes/market/one \
+          $VAR_LOCATION/remotes/market/s3 \
           $VAR_LOCATION/remotes/datastore/iscsi \
           $VAR_LOCATION/remotes/auth \
           $VAR_LOCATION/remotes/auth/plain \

From 1428a84fbb312ba2fa426a52778b810957832d3b Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 3 Feb 2016 16:52:04 +0100
Subject: [PATCH 166/197] feature #4217: Remove old marketplace folder from
 install.sh

---
 install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install.sh b/install.sh
index 86a9d3f0b8..6bf2765ffe 100755
--- a/install.sh
+++ b/install.sh
@@ -227,7 +227,6 @@ LIB_DIRS="$LIB_LOCATION/ruby \
           $LIB_LOCATION/ruby/cloud/ \
           $LIB_LOCATION/ruby/cloud/econe \
           $LIB_LOCATION/ruby/cloud/econe/views \
-          $LIB_LOCATION/ruby/cloud/marketplace \
           $LIB_LOCATION/ruby/cloud/CloudAuth \
           $LIB_LOCATION/ruby/onedb \
           $LIB_LOCATION/ruby/onedb/shared \

From a097e183b2ae050aaa330e15088ce728f239245d Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 3 Feb 2016 16:53:01 +0100
Subject: [PATCH 167/197] feature #4217: Add Marketplace and MarketplaceApp
 JSON resources and pools

---
 install.sh                                    |  4 +-
 src/sunstone/models/OpenNebulaJSON.rb         |  2 +
 .../OpenNebulaJSON/MarketPlaceAppJSON.rb      | 79 +++++++++++++++++
 .../models/OpenNebulaJSON/MarketPlaceJSON.rb  |  6 +-
 .../models/OpenNebulaJSON/PoolJSON.rb         |  2 +
 src/sunstone/models/SunstoneServer.rb         | 84 ++++++++++---------
 6 files changed, 134 insertions(+), 43 deletions(-)
 create mode 100644 src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb

diff --git a/install.sh b/install.sh
index 6bf2765ffe..0536cd16cf 100755
--- a/install.sh
+++ b/install.sh
@@ -1664,7 +1664,9 @@ SUNSTONE_MODELS_JSON_FILES="src/sunstone/models/OpenNebulaJSON/HostJSON.rb \
                     src/sunstone/models/OpenNebulaJSON/ZoneJSON.rb \
                     src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb \
                     src/sunstone/models/OpenNebulaJSON/VdcJSON.rb \
-                    src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb"
+                    src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb \
+                    src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb \
+                    src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb"
 
 SUNSTONE_VIEWS_FILES="src/sunstone/views/index.erb \
                       src/sunstone/views/login.erb \
diff --git a/src/sunstone/models/OpenNebulaJSON.rb b/src/sunstone/models/OpenNebulaJSON.rb
index 4b84b7c2be..7fbd92247a 100644
--- a/src/sunstone/models/OpenNebulaJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON.rb
@@ -33,6 +33,8 @@ require 'OpenNebulaJSON/ZoneJSON'
 require 'OpenNebulaJSON/SecurityGroupJSON'
 require 'OpenNebulaJSON/VdcJSON'
 require 'OpenNebulaJSON/VirtualRouterJSON'
+require 'OpenNebulaJSON/MarketPlaceJSON'
+require 'OpenNebulaJSON/MarketPlaceAppJSON'
 
 module OpenNebula
     class Error
diff --git a/src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb b/src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb
new file mode 100644
index 0000000000..d5fdb043dc
--- /dev/null
+++ b/src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb
@@ -0,0 +1,79 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# 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 'OpenNebulaJSON/JSONUtils'
+
+module OpenNebulaJSON
+    class MarketPlaceAppJSON < OpenNebula::MarketPlaceApp
+        include JSONUtils
+
+        def create(template_json)
+            mp_hash = parse_json(template_json, 'marketplaceapp')
+            if OpenNebula.is_error?(mp_hash)
+                return mp_hash
+            end
+
+            mp_id = parse_json(template_json, 'mp_id')
+            if OpenNebula.is_error?(mp_id)
+                return mp_id
+            end
+
+            if mp_hash['marketplaceapp_raw']
+                template = mp_hash['marketplaceapp_raw']
+            else
+                template = template_to_str(mp_hash)
+            end
+
+            self.allocate(template)
+        end
+
+        def perform_action(template_json)
+            action_hash = parse_json(template_json, 'action')
+            if OpenNebula.is_error?(action_hash)
+                return action_hash
+            end
+
+            rc = case action_hash['perform']
+                 when "update"        then self.update(action_hash['params'])
+                 when "chown"         then self.chown(action_hash['params'])
+                 when "chmod"         then self.chmod_octet(action_hash['params'])
+                 when "rename"        then self.rename(action_hash['params'])
+                 when "disable"       then self.disable
+                 when "enable"        then self.enable
+                 else
+                     error_msg = "#{action_hash['perform']} action not " <<
+                         " available for this resource"
+                     OpenNebula::Error.new(error_msg)
+                 end
+        end
+
+        def update(params=Hash.new)
+            super(params['template_raw'])
+        end
+
+        def chown(params=Hash.new)
+            super(params['owner_id'].to_i,params['group_id'].to_i)
+        end
+
+        def chmod_octet(params=Hash.new)
+            super(params['octet'])
+        end
+
+        def rename(params=Hash.new)
+            super(params['name'])
+        end
+    end
+end
diff --git a/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb b/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb
index c615b8c24d..0df5f3a44e 100644
--- a/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb
@@ -26,10 +26,10 @@ module OpenNebulaJSON
                 return mp_hash
             end
 
-            if ds_hash['marketplace_raw']
-                template = ds_hash['marketplace_raw']
+            if mp_hash['marketplace_raw']
+                template = mp_hash['marketplace_raw']
             else
-                template = template_to_str(ds_hash)
+                template = template_to_str(mp_hash)
             end
 
             self.allocate(template)
diff --git a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb
index f10384a220..c19bc97d70 100644
--- a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb
@@ -31,4 +31,6 @@ module OpenNebulaJSON
     class SecurityGroupPoolJSON < OpenNebula::SecurityGroupPool; include JSONUtils; end
     class VdcPoolJSON < OpenNebula::VdcPool; include JSONUtils; end
     class VirtualRouterPoolJSON < OpenNebula::VirtualRouterPool; include JSONUtils; end
+    class MarketPlacePoolJSON < OpenNebula::MarketPlacePool; include JSONUtils; end
+    class MarketpPlaceAppPoolJSON < OpenNebula::MarketPlaceAppPool; include JSONUtils; end
 end
diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
index ee1ffab66d..99d315f4a7 100644
--- a/src/sunstone/models/SunstoneServer.rb
+++ b/src/sunstone/models/SunstoneServer.rb
@@ -48,20 +48,22 @@ class SunstoneServer < CloudServer
         end
 
         pool = case kind
-            when "group"      then GroupPoolJSON.new(client)
-            when "cluster"    then ClusterPoolJSON.new(client)
-            when "host"       then HostPoolJSON.new(client)
-            when "image"      then ImagePoolJSON.new(client, user_flag)
-            when "vmtemplate" then TemplatePoolJSON.new(client, user_flag)
-            when "vm"         then VirtualMachinePoolJSON.new(client, user_flag)
-            when "vnet"       then VirtualNetworkPoolJSON.new(client, user_flag)
-            when "user"       then UserPoolJSON.new(client)
-            when "acl"        then AclPoolJSON.new(client)
-            when "datastore"  then DatastorePoolJSON.new(client)
-            when "zone"       then ZonePoolJSON.new(client)
+            when "group"            then GroupPoolJSON.new(client)
+            when "cluster"          then ClusterPoolJSON.new(client)
+            when "host"             then HostPoolJSON.new(client)
+            when "image"            then ImagePoolJSON.new(client, user_flag)
+            when "vmtemplate"       then TemplatePoolJSON.new(client, user_flag)
+            when "vm"               then VirtualMachinePoolJSON.new(client, user_flag)
+            when "vnet"             then VirtualNetworkPoolJSON.new(client, user_flag)
+            when "user"             then UserPoolJSON.new(client)
+            when "acl"              then AclPoolJSON.new(client)
+            when "datastore"        then DatastorePoolJSON.new(client)
+            when "zone"             then ZonePoolJSON.new(client)
             when "security_group"   then SecurityGroupPoolJSON.new(client, user_flag)
-            when "vdc"        then VdcPoolJSON.new(client)
-            when "vrouter"    then VirtualRouterPoolJSON.new(client, user_flag)
+            when "vdc"              then VdcPoolJSON.new(client)
+            when "vrouter"          then VirtualRouterPoolJSON.new(client, user_flag)
+            when "marketplace"      then MarketPlacePoolJSON.new(client, user_flag)
+            when "marketplaceapp"   then MarketPlaceAppPoolJSON.new(client, user_flag)
             else
                 error = Error.new("Error: #{kind} resource not supported")
                 return [404, error.to_json]
@@ -106,20 +108,22 @@ class SunstoneServer < CloudServer
     ############################################################################
     def create_resource(kind, template)
         resource = case kind
-            when "group"      then GroupJSON.new(Group.build_xml, @client)
-            when "cluster"    then ClusterJSON.new(Group.build_xml, @client)
-            when "host"       then HostJSON.new(Host.build_xml, @client)
-            when "image"      then ImageJSON.new(Image.build_xml, @client)
-            when "vmtemplate" then TemplateJSON.new(Template.build_xml, @client)
-            when "vm"         then VirtualMachineJSON.new(VirtualMachine.build_xml,@client)
-            when "vnet"       then VirtualNetworkJSON.new(VirtualNetwork.build_xml, @client)
-            when "user"       then UserJSON.new(User.build_xml, @client)
-            when "acl"        then AclJSON.new(Acl.build_xml, @client)
-            when "datastore"  then DatastoreJSON.new(Datastore.build_xml, @client)
-            when "zone"       then ZoneJSON.new(Zone.build_xml, @client)
+            when "group"            then GroupJSON.new(Group.build_xml, @client)
+            when "cluster"          then ClusterJSON.new(Group.build_xml, @client)
+            when "host"             then HostJSON.new(Host.build_xml, @client)
+            when "image"            then ImageJSON.new(Image.build_xml, @client)
+            when "vmtemplate"       then TemplateJSON.new(Template.build_xml, @client)
+            when "vm"               then VirtualMachineJSON.new(VirtualMachine.build_xml,@client)
+            when "vnet"             then VirtualNetworkJSON.new(VirtualNetwork.build_xml, @client)
+            when "user"             then UserJSON.new(User.build_xml, @client)
+            when "acl"              then AclJSON.new(Acl.build_xml, @client)
+            when "datastore"        then DatastoreJSON.new(Datastore.build_xml, @client)
+            when "zone"             then ZoneJSON.new(Zone.build_xml, @client)
             when "security_group"   then SecurityGroupJSON.new(SecurityGroup.build_xml, @client)
-            when "vdc"        then VdcJSON.new(Vdc.build_xml, @client)
-            when "vrouter"    then VirtualRouterJSON.new(VirtualRouter.build_xml, @client)
+            when "vdc"              then VdcJSON.new(Vdc.build_xml, @client)
+            when "vrouter"          then VirtualRouterJSON.new(VirtualRouter.build_xml, @client)
+            when "marketplace"      then MarketPlaceJSON.new(MarketPlace.build_xml, @client)
+            when "marketplaceapp"   then MarketPlaceAppJSON.new(MarketPlaceApp.build_xml, @client)
             else
                 error = Error.new("Error: #{kind} resource not supported")
                 return [404, error.to_json]
@@ -428,20 +432,22 @@ class SunstoneServer < CloudServer
     ############################################################################
     def retrieve_resource(kind, id, extended=false)
         resource = case kind
-            when "group"      then GroupJSON.new_with_id(id, @client)
-            when "cluster"    then ClusterJSON.new_with_id(id, @client)
-            when "host"       then HostJSON.new_with_id(id, @client)
-            when "image"      then ImageJSON.new_with_id(id, @client)
-            when "vmtemplate" then TemplateJSON.new_with_id(id, @client)
-            when "vm"         then VirtualMachineJSON.new_with_id(id, @client)
-            when "vnet"       then VirtualNetworkJSON.new_with_id(id, @client)
-            when "user"       then UserJSON.new_with_id(id, @client)
-            when "acl"        then AclJSON.new_with_id(id, @client)
-            when "datastore"  then DatastoreJSON.new_with_id(id, @client)
-            when "zone"       then ZoneJSON.new_with_id(id, @client)
+            when "group"            then GroupJSON.new_with_id(id, @client)
+            when "cluster"          then ClusterJSON.new_with_id(id, @client)
+            when "host"             then HostJSON.new_with_id(id, @client)
+            when "image"            then ImageJSON.new_with_id(id, @client)
+            when "vmtemplate"       then TemplateJSON.new_with_id(id, @client)
+            when "vm"               then VirtualMachineJSON.new_with_id(id, @client)
+            when "vnet"             then VirtualNetworkJSON.new_with_id(id, @client)
+            when "user"             then UserJSON.new_with_id(id, @client)
+            when "acl"              then AclJSON.new_with_id(id, @client)
+            when "datastore"        then DatastoreJSON.new_with_id(id, @client)
+            when "zone"             then ZoneJSON.new_with_id(id, @client)
             when "security_group"   then SecurityGroupJSON.new_with_id(id, @client)
-            when "vdc"        then VdcJSON.new_with_id(id, @client)
-            when "vrouter"    then VirtualRouterJSON.new_with_id(id, @client)
+            when "vdc"              then VdcJSON.new_with_id(id, @client)
+            when "vrouter"          then VirtualRouterJSON.new_with_id(id, @client)
+            when "marketplace"      then MarketPlaceJSON.new(id, @client)
+            when "marketplaceapp"   then MarketPlaceAppJSON.new(id, @client)
             else
                 error = Error.new("Error: #{kind} resource not supported")
                 return error

From e08d21cec8204aef60915be99fb7b318c536e0c6 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 3 Feb 2016 17:40:29 +0100
Subject: [PATCH 168/197] Feature #4217: remove type from the onemarket list
 command

---
 src/cli/one_helper/onemarket_helper.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/cli/one_helper/onemarket_helper.rb b/src/cli/one_helper/onemarket_helper.rb
index 872467b294..eac7711929 100644
--- a/src/cli/one_helper/onemarket_helper.rb
+++ b/src/cli/one_helper/onemarket_helper.rb
@@ -68,11 +68,6 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            column :TYPE, "Marketplace type", :left, :size=>4 do |d|
-                type = MarketPlace::MARKETPLACE_TYPES[d["TYPE"].to_i]
-                MarketPlace::SHORT_MARKETPLACE_TYPES[type]
-            end
-
             column :MAD, "Marketplace driver", :left, :size=>7 do |d|
                 d["MARKET_MAD"]
             end

From 07fb60dd8380da2a0612a840eca3a03b29d0ee08 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 3 Feb 2016 21:50:20 +0100
Subject: [PATCH 169/197] Feature #4217: Bootstrap the OpenNebula Systems
 Marketplace

---
 include/MarketPlacePool.h            |  2 +-
 share/etc/oned.conf                  |  5 +++
 src/market/MarketPlacePool.cc        | 55 ++++++++++++++++++++++++++++
 src/nebula/Nebula.cc                 |  6 +--
 src/nebula/NebulaTemplate.cc         |  3 +-
 src/onedb/local/4.13.85_to_4.90.0.rb | 36 +++++++++++++++++-
 6 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/include/MarketPlacePool.h b/include/MarketPlacePool.h
index c61ed67fb1..bfe7c59a91 100644
--- a/include/MarketPlacePool.h
+++ b/include/MarketPlacePool.h
@@ -27,7 +27,7 @@ class MarketPlaceApp;
 class MarketPlacePool : public PoolSQL
 {
 public:
-    MarketPlacePool(SqlDB * db):PoolSQL(db, MarketPlace::table, true, true){};
+    MarketPlacePool(SqlDB * db);
 
     ~MarketPlacePool(){};
 
diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index 6d96e76c2e..ac6a35c44a 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -1080,6 +1080,11 @@ DS_MAD_CONF = [
 #                    template
 #*******************************************************************************
 
+MARKET_MAD_CONF = [
+    NAME = "one",
+    REQUIRED_ATTRS = ""
+]
+
 MARKET_MAD_CONF = [
     NAME = "http",
     REQUIRED_ATTRS = "BASE_URL,PUBLIC_DIR"
diff --git a/src/market/MarketPlacePool.cc b/src/market/MarketPlacePool.cc
index 512c2f547d..470fdcfb06 100644
--- a/src/market/MarketPlacePool.cc
+++ b/src/market/MarketPlacePool.cc
@@ -15,8 +15,63 @@
 /* -------------------------------------------------------------------------- */
 
 #include "MarketPlacePool.h"
+#include "User.h"
 #include "Nebula.h"
 
+/* -------------------------------------------------------------------------- */
+
+MarketPlacePool::MarketPlacePool(SqlDB * db)
+    :PoolSQL(db, MarketPlace::table, true, true)
+{
+    //lastOID is set in PoolSQL::init_cb
+    if (get_lastOID() == -1)
+    {
+        // Build the default default security group
+        string default_market =
+            "NAME=\"OpenNebula Public\"\n"
+            "MARKET_MAD=one\n"
+            "DESCRIPTION=\"OpenNebula Systems MarketPlace\"";
+
+        Nebula& nd         = Nebula::instance();
+        UserPool * upool   = nd.get_upool();
+        User *    oneadmin = upool->get(0, false);
+
+        string error;
+
+        MarketPlaceTemplate * default_tmpl = new MarketPlaceTemplate;
+        char * error_parse;
+
+        default_tmpl->parse(default_market, &error_parse);
+
+        MarketPlace * marketplace = new MarketPlace(
+                oneadmin->get_uid(),
+                oneadmin->get_gid(),
+                oneadmin->get_uname(),
+                oneadmin->get_gname(),
+                oneadmin->get_umask(),
+                default_tmpl);
+
+        marketplace->set_permissions(1,1,1, 1,0,0, 1,0,0, error);
+
+        if (PoolSQL::allocate(marketplace, error) < 0)
+        {
+            ostringstream oss;
+            oss << "Error trying to create default "
+                << "OpenNebula Systems MarketPlace: " << error;
+            NebulaLog::log("MKP", Log::ERROR, oss);
+
+            throw runtime_error(oss.str());
+        }
+
+        // The first 100 IDs are reserved for system MarketPlaces.
+        // Regular ones start from ID 100
+
+        set_update_lastOID(99);
+    }
+
+    return;
+}
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 13c61649f9..6366066769 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -488,9 +488,6 @@ void Nebula::start(bool bootstrap_only)
         zonepool= new ZonePool(db, is_federation_slave());
         vdcpool = new VdcPool(db, is_federation_slave());
 
-        marketpool  = new MarketPlacePool(db);
-        apppool     = new MarketPlaceAppPool(db);
-
         nebula_configuration->get("VM_HOOK",        vm_hooks);
         nebula_configuration->get("HOST_HOOK",      host_hooks);
         nebula_configuration->get("VROUTER_HOOK",   vrouter_hooks);
@@ -608,6 +605,9 @@ void Nebula::start(bool bootstrap_only)
         default_group_quota.select();
 
         secgrouppool = new SecurityGroupPool(db);
+
+        marketpool  = new MarketPlacePool(db);
+        apppool     = new MarketPlaceAppPool(db);
     }
     catch (exception&)
     {
diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc
index 1d677c79f9..510fe5d8da 100644
--- a/src/nebula/NebulaTemplate.cc
+++ b/src/nebula/NebulaTemplate.cc
@@ -156,8 +156,9 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 #******
 */
 
+    set_conf_market("one",  "");
     set_conf_market("http", "BASE_URL,PUBLIC_DIR");
-    set_conf_market("s3", "ACCESS_KEY_ID,SECRET_ACCESS_KEY,REGION,BUCKET");
+    set_conf_market("s3",   "ACCESS_KEY_ID,SECRET_ACCESS_KEY,REGION,BUCKET");
 
     register_multiple_conf_default("MARKET_MAD_CONF");
 }
diff --git a/src/onedb/local/4.13.85_to_4.90.0.rb b/src/onedb/local/4.13.85_to_4.90.0.rb
index c0822166e8..a5ecf9764f 100644
--- a/src/onedb/local/4.13.85_to_4.90.0.rb
+++ b/src/onedb/local/4.13.85_to_4.90.0.rb
@@ -83,7 +83,41 @@ module Migrator
 
     log_time()
 
+    ########################################################################
+    # OpenNebula Systems MarketPlace
+    ########################################################################
+
+    oneadmin_uname = nil
+
+    @db.fetch("SELECT name FROM user_pool WHERE oid=0") do |row|
+        oneadmin_uname = row[:name]
+    end
+
+    if oneadmin_uname == nil
+        puts "Error trying to read oneadmin's user name ('SELECT name FROM user_pool WHERE oid=0')"
+        return false
+    end
+
+    oneadmin_gname = nil
+
+    @db.fetch("SELECT name FROM group_pool WHERE oid=0") do |row|
+        oneadmin_gname = row[:name]
+    end
+
+    if oneadmin_gname == nil
+        puts "Error trying to read oneadmin's group name ('SELECT name FROM group_pool WHERE oid=0')"
+        return false
+    end
+
+    @db.run  "CREATE TABLE marketplace_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER);"
+
+    @db.run "INSERT INTO marketplace_pool VALUES(0,'OpenNebula Public','<MARKETPLACE><ID>0</ID><UID>0</UID><GID>0</GID><UNAME>#{oneadmin_uname}</UNAME><GNAME>#{oneadmin_gname}</GNAME><NAME>OpenNebula Public</NAME><MARKET_MAD><![CDATA[one]]></MARKET_MAD><TOTAL_MB>0</TOTAL_MB><FREE_MB>0</FREE_MB><USED_MB>0</USED_MB><MARKETPLACEAPPS></MARKETPLACEAPPS><PERMISSIONS><OWNER_U>1</OWNER_U><OWNER_M>1</OWNER_M><OWNER_A>1</OWNER_A><GROUP_U>1</GROUP_U><GROUP_M>0</GROUP_M><GROUP_A>0</GROUP_A><OTHER_U>1</OTHER_U><OTHER_M>0</OTHER_M><OTHER_A>0</OTHER_A></PERMISSIONS><TEMPLATE><DESCRIPTION><![CDATA[OpenNebula Systems MarketPlace]]></DESCRIPTION></TEMPLATE></MARKETPLACE>',0,0,1,1,1);"
+
+    @db.run "INSERT INTO pool_control VALUES('marketplace_pool',99);"
+
+    @db.run "CREATE TABLE marketplaceapp_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, UNIQUE(name,uid));"
+
     return true
   end
 
-end
\ No newline at end of file
+end

From 63d48aec5219a156c3b2d9327da0db709e75a024 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 4 Feb 2016 13:15:21 +0100
Subject: [PATCH 170/197] feature #4217: Rename marketplace type FLOW to
 SERVICE_TEMPLATE

---
 include/MarketPlaceApp.h                  | 16 ++++++++--------
 src/market/MarketPlaceApp.cc              |  4 ++--
 src/market/MarketPlaceManagerActions.cc   |  6 +++---
 src/market_mad/one_market.rb              |  2 +-
 src/oca/ruby/opennebula/marketplaceapp.rb | 10 +++++-----
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h
index ca5ff1f982..0edb83e23b 100644
--- a/include/MarketPlaceApp.h
+++ b/include/MarketPlaceApp.h
@@ -63,10 +63,10 @@ public:
      */
     enum MarketPlaceAppType
     {
-		UNKNOWN    = 0, /** < Unknown types     */
-        IMAGE      = 1, /** < Image MarketPlace App*/
-        VMTEMPLATE = 2, /** < VM Template MarketPlace App*/
-        FLOW       = 3  /** < Flow MarketPlace App*/
+		UNKNOWN          = 0, /** < Unknown types     */
+        IMAGE            = 1, /** < Image MarketPlace App*/
+        VMTEMPLATE       = 2, /** < VM Template MarketPlace App*/
+        SERVICE_TEMPLATE = 3  /** < Service Template MarketPlace App*/
     };
 
     /**
@@ -78,10 +78,10 @@ public:
     {
         switch (ob)
         {
-            case IMAGE:      return "IMAGE"; break;
-            case VMTEMPLATE: return "VMTEMPLATE"; break;
-            case FLOW:       return "FLOW"; break;
-            default:         return "";
+            case IMAGE:            return "IMAGE"; break;
+            case VMTEMPLATE:       return "VMTEMPLATE"; break;
+            case SERVICE_TEMPLATE: return "SERVICE_TEMPLATE"; break;
+            default:               return "";
         }
     };
 
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 18081ad684..26c7b8b080 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -372,9 +372,9 @@ MarketPlaceApp::MarketPlaceAppType MarketPlaceApp::str_to_type(string& str_type)
     {
         return VMTEMPLATE;
     }
-    else if ( str_type == "FLOW" )
+    else if ( str_type == "SERVICE_TEMPLATE" )
     {
-        return FLOW;
+        return SERVICE_TEMPLATE;
     }
 
     return UNKNOWN;
diff --git a/src/market/MarketPlaceManagerActions.cc b/src/market/MarketPlaceManagerActions.cc
index be9093b570..2ec1cfb768 100644
--- a/src/market/MarketPlaceManagerActions.cc
+++ b/src/market/MarketPlaceManagerActions.cc
@@ -104,7 +104,7 @@ int MarketPlaceManager::import_app(
 			break;
 
         case MarketPlaceApp::VMTEMPLATE:
-        case MarketPlaceApp::FLOW:
+        case MarketPlaceApp::SERVICE_TEMPLATE:
         case MarketPlaceApp::UNKNOWN:
             err = "Marketplace app type not supported.";
             return -1;
@@ -144,7 +144,7 @@ void MarketPlaceManager::release_app_resources(int appid)
             return;
 
         case MarketPlaceApp::VMTEMPLATE:
-        case MarketPlaceApp::FLOW:
+        case MarketPlaceApp::SERVICE_TEMPLATE:
         case MarketPlaceApp::UNKNOWN:
             return;
     }
@@ -204,7 +204,7 @@ int MarketPlaceManager::delete_app(int appid, const std::string& market_data,
             break;
 
         case MarketPlaceApp::VMTEMPLATE:
-        case MarketPlaceApp::FLOW:
+        case MarketPlaceApp::SERVICE_TEMPLATE:
         case MarketPlaceApp::UNKNOWN:
             return -1;
     }
diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
index fdcbf3536d..4186d16141 100755
--- a/src/market_mad/one_market.rb
+++ b/src/market_mad/one_market.rb
@@ -147,7 +147,7 @@ class MarketPlaceDriver < OpenNebulaDriver
         #-----------------------------------------------------------------------
         # Only IMAGE type is supported
         # when "VMTEMPLATE"
-        # when "FLOW"
+        # when "SERVICE_TEMPLATE"
         #-----------------------------------------------------------------------
         else
             failure(:import, id, "Type #{apptype} not supported")
diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb
index 7b91a56aff..99689d3043 100644
--- a/src/oca/ruby/opennebula/marketplaceapp.rb
+++ b/src/oca/ruby/opennebula/marketplaceapp.rb
@@ -43,13 +43,13 @@ module OpenNebula
             "DISABLED"  => "dis"
         }
 
-        MARKETPLACEAPP_TYPES=%w{UNKNOWN IMAGE VMTEMPLATE FLOW}
+        MARKETPLACEAPP_TYPES=%w{UNKNOWN IMAGE VMTEMPLATE SERVICE_TEMPLATE}
 
         SHORT_MARKETPLACEAPP_TYPES = {
-            "UNKNOWN"   => "unk",
-            "IMAGE"     => "img",
-            "VMTEMPLATE"=> "tpl",
-            "FLOW"      => "flo"
+            "UNKNOWN"           => "unk",
+            "IMAGE"             => "img",
+            "VMTEMPLATE"        => "tpl",
+            "SERVICE_TEMPLATE"  => "srv"
         }
         # Creates a MarketPlace description with just its identifier
         # this method should be used to create plain MarketPlace objects.

From 122a1a1791c171f184758a4c760c506a2830d36d Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 4 Feb 2016 13:19:04 +0100
Subject: [PATCH 171/197] feature #4217: Add marketplace.js and
 marketplaceapp.js

---
 src/sunstone/public/app/opennebula.js         |   8 +-
 .../public/app/opennebula/marketplace.js      |  74 ++++++------
 .../public/app/opennebula/marketplaceapp.js   | 112 ++++++++++++++++++
 3 files changed, 158 insertions(+), 36 deletions(-)
 create mode 100644 src/sunstone/public/app/opennebula/marketplaceapp.js

diff --git a/src/sunstone/public/app/opennebula.js b/src/sunstone/public/app/opennebula.js
index 3b718ed58d..2720d119ee 100644
--- a/src/sunstone/public/app/opennebula.js
+++ b/src/sunstone/public/app/opennebula.js
@@ -28,7 +28,6 @@ define(function(require) {
       Group           = require('./opennebula/group'),
       Host            = require('./opennebula/host'),
       Image           = require('./opennebula/image'),
-      Marketplace     = require('./opennebula/marketplace'),
       Network         = require('./opennebula/network'),
       Role            = require('./opennebula/role'),
       securitygroup   = require('./opennebula/securitygroup'),
@@ -41,6 +40,8 @@ define(function(require) {
       Vm              = require('./opennebula/vm'),
       Zone            = require('./opennebula/zone'),
       VirtualRouter   = require('./opennebula/virtualrouter');
+      MarketPlace     = require('./opennebula/marketplace');
+      MarketPlaceApp  = require('./opennebula/marketplaceapp');
 
   if (typeof(csrftoken) != "undefined") {
     $.ajaxPrefilter(function(options, originalOptions, jqXHR) {
@@ -78,7 +79,6 @@ define(function(require) {
     'Host': Host,
     'Image': Image,
     'File': Image,
-    'Marketplace': Marketplace,
     'Network': Network,
     'Role': Role,
     'SecurityGroup': securitygroup,
@@ -90,7 +90,9 @@ define(function(require) {
     'Vdc': Vdc,
     'VM': Vm,
     'Zone': Zone,
-    'VirtualRouter': VirtualRouter
+    'VirtualRouter': VirtualRouter,
+    'MarketPlace': MarketPlace,
+    'MarketPlaceApp': MarketPlaceApp
   };
 
   return OpenNebula;
diff --git a/src/sunstone/public/app/opennebula/marketplace.js b/src/sunstone/public/app/opennebula/marketplace.js
index d35fdb0b0e..fb566b29b6 100644
--- a/src/sunstone/public/app/opennebula/marketplace.js
+++ b/src/sunstone/public/app/opennebula/marketplace.js
@@ -16,45 +16,53 @@
 
 define(function(require) {
   var OpenNebulaAction = require('./action');
-  var OpenNebulaError = require('./error');
-  var OpenNebulaHelper = require('./helper');
-  var Notifier = require('utils/notifier');
   var Locale = require('utils/locale');
 
   var RESOURCE = "MARKETPLACE";
 
-  var Marketplace = {
+  var MarketPlace = {
     "resource": RESOURCE,
-    "show" : function(params) {
-      params.error = function() {
-        return Notifier.notifyError(Locale.tr("Cannot connect to OpenNebula Marketplace"));
-      };
-      OpenNebulaAction.show(params, RESOURCE);
+    "create" : function(params) {
+      OpenNebulaAction.create(params, RESOURCE);
+    },
+    "del" : function(params) {
+      OpenNebulaAction.del(params, RESOURCE);
     },
     "list" : function(params) {
-      //Custom list request function, since the contents do not come
-      //in the same format as the rest of opennebula resources.
-      var callback = params.success;
-      var callback_error = params.error;
-      var timeout = params.timeout || false;
-      var request = OpenNebulaHelper.request('MARKETPLACE', 'list');
-
-      $.ajax({
-        url: 'marketplace',
-        type: 'GET',
-        data: {timeout: timeout},
-        dataType: "json",
-        success: function(response) {
-          $(".marketplace_error_message").hide();
-          return callback ? callback(request, response) : null;
-        },
-        error: function(res) {
-          $(".marketplace_error_message").show();
-          return callback_error ? callback_error(request, OpenNebulaError(res)) : null;
-        }
-      });
+      OpenNebulaAction.list(params, RESOURCE);
+    },
+    "list_in_zone" : function(params) {
+      OpenNebulaAction.list_in_zone(params, RESOURCE);
+    },
+    "show" : function(params) {
+      OpenNebulaAction.show(params, RESOURCE);
+    },
+    "chown" : function(params) {
+      OpenNebulaAction.chown(params, RESOURCE);
+    },
+    "chgrp" : function(params) {
+      OpenNebulaAction.chgrp(params, RESOURCE);
+    },
+    "chmod" : function(params) {
+      var action_obj = params.data.extra_param;
+      OpenNebulaAction.simple_action(params, RESOURCE, "chmod", action_obj);
+    },
+    "update" : function(params) {
+      var action_obj = {"template_raw" : params.data.extra_param};
+      OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj);
+    },
+    "append": function(params) {
+      var action_obj = {"template_raw" : params.data.extra_param, append : true};
+      OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj);
+    },
+    "rename" : function(params) {
+      var action_obj = params.data.extra_param;
+      OpenNebulaAction.simple_action(params, RESOURCE, "rename", action_obj);
+    },
+    "getName": function(id){
+      return OpenNebulaAction.getName(id, RESOURCE);
     }
-  };
+  }
 
-  return Marketplace;
-});
+  return MarketPlace;
+})
diff --git a/src/sunstone/public/app/opennebula/marketplaceapp.js b/src/sunstone/public/app/opennebula/marketplaceapp.js
new file mode 100644
index 0000000000..4489aef21f
--- /dev/null
+++ b/src/sunstone/public/app/opennebula/marketplaceapp.js
@@ -0,0 +1,112 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var OpenNebulaAction = require('./action');
+  var Locale = require('utils/locale');
+
+  var RESOURCE = "MARKETPLACEAPP";
+
+  var STATES_STR = [
+    Locale.tr("INIT"),
+    Locale.tr("READY"),
+    Locale.tr("LOCKED"),
+    Locale.tr("ERROR"),
+    Locale.tr("DISABLED")
+  ];
+
+  var TYPES_STR = [
+    Locale.tr("UNKNOWN"),
+    Locale.tr("IMAGE"),
+    Locale.tr("VMTEMPLATE"),
+    Locale.tr("SERVICE_TEMPLATE")
+  ];
+
+  var STATES = {
+    INIT : 0,
+    READY : 1,
+    LOCKED : 2,
+    ERROR : 3,
+    DISABLED : 4
+  };
+
+  var TYPES = {
+    UNKNOWN : 0,
+    IMAGE : 1,
+    VMTEMPLATE : 2,
+    SERVICE_TEMPLATE : 3
+  };
+
+  var MarketPlaceApp = {
+    "resource": RESOURCE,
+    "stateStr": function(stateId) {
+      return STATES_STR[stateId];
+    },
+    "STATES": STATES,
+    "typeStr": function(typeId) {
+      return TYPES_STR[typeId];
+    },
+    "TYPES": TYPES,
+    "create" : function(params) {
+      OpenNebulaAction.create(params, RESOURCE);
+    },
+    "del" : function(params) {
+      OpenNebulaAction.del(params, RESOURCE);
+    },
+    "list" : function(params) {
+      OpenNebulaAction.list(params, RESOURCE);
+    },
+    "list_in_zone" : function(params) {
+      OpenNebulaAction.list_in_zone(params, RESOURCE);
+    },
+    "show" : function(params) {
+      OpenNebulaAction.show(params, RESOURCE);
+    },
+    "chown" : function(params) {
+      OpenNebulaAction.chown(params, RESOURCE);
+    },
+    "chgrp" : function(params) {
+      OpenNebulaAction.chgrp(params, RESOURCE);
+    },
+    "chmod" : function(params) {
+      var action_obj = params.data.extra_param;
+      OpenNebulaAction.simple_action(params, RESOURCE, "chmod", action_obj);
+    },
+    "update" : function(params) {
+      var action_obj = {"template_raw" : params.data.extra_param};
+      OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj);
+    },
+    "append": function(params) {
+      var action_obj = {"template_raw" : params.data.extra_param, append : true};
+      OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj);
+    },
+    "rename" : function(params) {
+      var action_obj = params.data.extra_param;
+      OpenNebulaAction.simple_action(params, RESOURCE, "rename", action_obj);
+    },
+    "enable": function(params) {
+      OpenNebulaAction.simple_action(params, RESOURCE, "enable");
+    },
+    "disable": function(params) {
+      OpenNebulaAction.simple_action(params, RESOURCE, "disable");
+    },
+    "getName": function(id){
+      return OpenNebulaAction.getName(id, RESOURCE);
+    }
+  }
+
+  return MarketPlaceApp;
+})

From 48f2f1c410d94c3d2660aa428dcfd6240b731f3b Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 4 Feb 2016 18:36:18 +0100
Subject: [PATCH 172/197] Feature #4217: Fix the way FREE_MB is calculated

---
 src/market_mad/remotes/http/monitor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/market_mad/remotes/http/monitor b/src/market_mad/remotes/http/monitor
index b4e8883bc2..0a9ef8bdaf 100755
--- a/src/market_mad/remotes/http/monitor
+++ b/src/market_mad/remotes/http/monitor
@@ -58,7 +58,7 @@ PUBLIC_DIR="${XPATH_ELEMENTS[i++]}"
 MONITOR_SCRIPT=$(cat <<EOF
 USED_MB=\$(df -B1M -P ${PUBLIC_DIR} 2>/dev/null | tail -n 1 | awk '{print \$3}')
 TOTAL_MB=\$(df -B1M -P ${PUBLIC_DIR} 2>/dev/null | tail -n 1 | awk '{print \$2}')
-FREE_MB=\$(df -B1M -P ${PUBLIC_DIR} 2>/dev/null | tail -n 1 | awk '{print \$4}')
+FREE_MB=\$(expr \$TOTAL_MB - \$USED_MB)
 
 if [ -z "\$USED_MB" -o -z "\$TOTAL_MB" -o -z "\$FREE_MB" ]; then
     msg="Empty value found"

From 756cd887721defc8b70474e42f1db01de20c08ae Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 4 Feb 2016 18:36:44 +0100
Subject: [PATCH 173/197] Feature #4217: the zie was not being set in the image
 template

---
 src/rm/RequestManagerAllocate.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 44454fad46..257d7c2cfe 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -289,6 +289,7 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     long long     size_mb;
     istringstream iss;
+    ostringstream oss;
 
     string ds_name;
     string ds_data;
@@ -391,7 +392,7 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
         if ( app == 0 )
         {
-            att.resp_msg = "Cannot determine image SIZE: " + size_str;
+            att.resp_msg = "Cannot determine image SIZE.";
             failure_response(INTERNAL, att);
 
             delete tmpl;
@@ -419,6 +420,9 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
         market->to_xml(extra_data);
 
         market->unlock();
+
+        oss << size_mb;
+        size_str = oss.str();
     }
     else
     {
@@ -446,7 +450,6 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
         }
     }
 
-
     if (ds_check && (size_mb > avail))
     {
         att.resp_msg = "Not enough space in datastore";

From ce13f5030aef08e618611b910ea817fe2b58c97e Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 4 Feb 2016 17:45:37 +0100
Subject: [PATCH 174/197] feature #4217: Remove user_flag from marketplace pool

---
 src/sunstone/models/SunstoneServer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
index 99d315f4a7..d575294844 100644
--- a/src/sunstone/models/SunstoneServer.rb
+++ b/src/sunstone/models/SunstoneServer.rb
@@ -62,7 +62,7 @@ class SunstoneServer < CloudServer
             when "security_group"   then SecurityGroupPoolJSON.new(client, user_flag)
             when "vdc"              then VdcPoolJSON.new(client)
             when "vrouter"          then VirtualRouterPoolJSON.new(client, user_flag)
-            when "marketplace"      then MarketPlacePoolJSON.new(client, user_flag)
+            when "marketplace"      then MarketPlacePoolJSON.new(client)
             when "marketplaceapp"   then MarketPlaceAppPoolJSON.new(client, user_flag)
             else
                 error = Error.new("Error: #{kind} resource not supported")

From a1039b07eaf7f36071dccbfbbcd247856ed7a76b Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 4 Feb 2016 17:46:12 +0100
Subject: [PATCH 175/197] feature #4217: Add marketplaces tab

---
 src/sunstone/etc/sunstone-views/admin.yaml    |  23 +++
 src/sunstone/etc/sunstone-views/user.yaml     |  15 ++
 src/sunstone/public/app/main.js               |   1 +
 .../public/app/tabs/marketplaces-tab.js       |  58 ++++++++
 .../app/tabs/marketplaces-tab/actions.js      |  48 ++++++
 .../app/tabs/marketplaces-tab/buttons.js      |  52 +++++++
 .../app/tabs/marketplaces-tab/datatable.js    | 139 ++++++++++++++++++
 .../public/app/tabs/marketplaces-tab/tabId.js |  19 +++
 8 files changed, 355 insertions(+)
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab/actions.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab/buttons.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab/datatable.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab/tabId.js

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 6c86a4eab0..3df41f6a2d 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -24,6 +24,7 @@ enabled_tabs:
     - oneflow-dashboard
     - oneflow-services-tab
     - oneflow-templates-tab
+    - marketplaces-tab
     - settings-tab
     - support-tab
 autorefresh: true
@@ -581,3 +582,25 @@ tabs:
             user_showback_tab: true
         actions:
             User.quotas_dialog: false
+    marketplaces-tab:
+        panel_tabs:
+            #marketplaces_info_tab: true
+            #marketplaces_apps_tab: true
+        table_columns:
+            - 0         # Checkbox
+            - 1         # ID
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
+            - 5         # Capacity
+            - 6         # Apps
+            - 7         # Driver
+            #- 8        # Labels
+        actions:
+            Datastore.refresh: true
+            #Datastore.create_dialog: true
+            Datastore.rename: true
+            Datastore.chown: true
+            Datastore.chgrp: true
+            Datastore.chmod: true
+            Datastore.delete: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 3c04a2f77a..f1bfb15061 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -23,6 +23,7 @@ enabled_tabs:
     - oneflow-dashboard
     - oneflow-services-tab
     - oneflow-templates-tab
+    - marketplaces-tab
     - settings-tab
     #- support-tab
 autorefresh: true
@@ -576,3 +577,17 @@ tabs:
             user_showback_tab: true
         actions:
             User.quotas_dialog: false
+    marketplaces-tab:
+        panel_tabs:
+            #marketplaces_info_tab: true
+            #marketplaces_apps_tab: true
+        table_columns:
+            - 0         # Checkbox
+            - 1         # ID
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
+            - 5         # Capacity
+            - 6         # Apps
+            - 7         # Driver
+            #- 8        # Labels
diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js
index 6ec3eb46fa..3360e6ffe6 100644
--- a/src/sunstone/public/app/main.js
+++ b/src/sunstone/public/app/main.js
@@ -142,6 +142,7 @@ require.config({
         'tabs/oneflow-dashboard',
         'tabs/oneflow-services-tab',
         'tabs/oneflow-templates-tab',
+        'tabs/marketplaces-tab',
         'tabs/settings-tab',
         'tabs/support-tab'
       ]
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab.js b/src/sunstone/public/app/tabs/marketplaces-tab.js
new file mode 100644
index 0000000000..c5bafd992a
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab.js
@@ -0,0 +1,58 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Locale = require('utils/locale');
+  var Buttons = require('./marketplaces-tab/buttons');
+  var Actions = require('./marketplaces-tab/actions');
+  var Table = require('./marketplaces-tab/datatable');
+
+  var TAB_ID = require('./marketplaces-tab/tabId');
+  var DATATABLE_ID = "dataTableMarketplaces";
+
+  var _dialogs = [
+  ];
+
+  var _panels = [
+    //require('./marketplaces-tab/panels/info')
+  ];
+
+  var _panelsHooks = [
+    require('../utils/hooks/header')
+  ];
+
+  var _formPanels = [
+    //require('./datastores-tab/form-panels/create')
+  ];
+
+  var Tab = {
+    tabId: TAB_ID,
+    title: '<i class="fa fa-lg fa-fw fa-shopping-cart"></i>&emsp;' + Locale.tr("MarketPlaces"),
+    listHeader: '<i class="fa fa-fw fa-shopping-cart"></i>&emsp;'+Locale.tr("MarketPlaces"),
+    infoHeader: '<i class="fa fa-fw fa-shopping-cart"></i>&emsp;'+Locale.tr("MarketPlace"),
+    subheader: '<span/> <small></small>&emsp;',
+    resource: 'MarketPlace',
+    buttons: Buttons,
+    actions: Actions,
+    dataTable: new Table(DATATABLE_ID, {actions: true, info: true, oneSelection: true}),
+    panels: _panels,
+    panelsHooks: _panelsHooks,
+    formPanels: _formPanels,
+    dialogs: _dialogs
+  };
+
+  return Tab;
+});
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/actions.js b/src/sunstone/public/app/tabs/marketplaces-tab/actions.js
new file mode 100644
index 0000000000..1a7c25f254
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/actions.js
@@ -0,0 +1,48 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Sunstone = require('sunstone');
+  var Notifier = require('utils/notifier');
+  var Locale = require('utils/locale');
+  var CommonActions = require('utils/common-actions');
+  var OpenNebulaResource = require('opennebula/marketplace');
+
+  var RESOURCE = "MarketPlace";
+  var XML_ROOT = "MARKETPLACE";
+  var TAB_ID = require('./tabId');
+  //var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId');
+
+  var _commonActions = new CommonActions(OpenNebulaResource, RESOURCE, TAB_ID, XML_ROOT);
+
+  var _actions = {
+    //"MarketPlace.create" : _commonActions.create(CREATE_DIALOG_ID),
+    //"MarketPlace.create_dialog" : _commonActions.showCreate(CREATE_DIALOG_ID),
+    "MarketPlace.list" : _commonActions.list(),
+    "MarketPlace.show" : _commonActions.show(),
+    "MarketPlace.refresh" : _commonActions.refresh(),
+    "MarketPlace.delete" : _commonActions.del(),
+    "MarketPlace.chown": _commonActions.multipleAction('chown'),
+    "MarketPlace.chgrp": _commonActions.multipleAction('chgrp'),
+    "MarketPlace.chmod": _commonActions.singleAction('chmod'),
+    //"MarketPlace.update" : _commonActions.updateTemplate(),
+    //"MarketPlace.update_template" : _commonActions.updateTemplate(),
+    //"MarketPlace.append_template" : _commonActions.appendTemplate(),
+    "MarketPlace.rename": _commonActions.singleAction('rename')
+  }
+
+  return _actions;
+});
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js b/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js
new file mode 100644
index 0000000000..dbebbf948b
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js
@@ -0,0 +1,52 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Locale = require('utils/locale');
+
+  var MarketPlaceButtons = {
+    "MarketPlace.refresh" : {
+      type: "action",
+      layout: "refresh",
+      alwaysActive: true
+    },
+    //"MarketPlace.create_dialog" : {
+    //  type: "create_dialog",
+    //  layout: "create"
+    //},
+    "MarketPlace.chown" : {
+      type: "confirm_with_select",
+      text: Locale.tr("Change owner"),
+      select: "User",
+      layout: "user_select",
+      tip: Locale.tr("Select the new owner") + ":"
+    },
+    "MarketPlace.chgrp" : {
+      type: "confirm_with_select",
+      text: Locale.tr("Change group"),
+      select: "Group",
+      layout: "user_select",
+      tip: Locale.tr("Select the new group") + ":"
+    },
+    "MarketPlace.delete" : {
+      type: "confirm",
+      text: Locale.tr("Delete"),
+      layout: "del"
+    }
+  };
+
+  return MarketPlaceButtons;
+})
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js
new file mode 100644
index 0000000000..8e6b788cac
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js
@@ -0,0 +1,139 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var TabDataTable = require('utils/tab-datatable');
+  var SunstoneConfig = require('sunstone-config');
+  var Locale = require('utils/locale');
+  var OpenNebulaMarketPlace = require('opennebula/marketplace');
+  var DatastoreCapacityBar = require('../datastores-tab/utils/datastore-capacity-bar');
+  var LabelsUtils = require('utils/labels/utils');
+
+  /*
+    CONSTANTS
+   */
+
+  var RESOURCE = "MarketPlace";
+  var XML_ROOT = "MARKETPLACE";
+  var TAB_NAME = require('./tabId');
+  var LABELS_COLUMN = 8;
+  var TEMPLATE_ATTR = 'TEMPLATE';
+
+  /*
+    CONSTRUCTOR
+   */
+
+  /*
+    @dataTableId
+    @param {String} dataTableId unique identifier
+    @param {Object} conf
+      conf = {
+        'info': true,     enable on click row will show the element
+        'action': true,   enable actions on row elements
+        'select': true,   enable selecting elements from the table
+        'selectOptions': {
+          'filter_fn': function(ds) { return ds.TYPE == 0; }
+        }
+      }
+    @returns {Table} A new table object
+   */
+  function Table(dataTableId, conf) {
+    this.conf = conf || {};
+    this.tabId = TAB_NAME;
+    this.dataTableId = dataTableId;
+    this.resource = RESOURCE;
+    this.xmlRoot = XML_ROOT;
+    this.labelsColumn = LABELS_COLUMN;
+
+    this.dataTableOptions = {
+      "bAutoWidth": false,
+      "bSortClasses" : false,
+      "bDeferRender": true,
+      "aoColumnDefs": [
+          {"bSortable": false, "aTargets": ["check"]},
+          {"sWidth": "35px", "aTargets": [0]},
+          {"sWidth": "250px", "aTargets": [5]},
+          {"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)},
+          {"bVisible": false, "aTargets": ['_all']}
+      ]
+    }
+
+    this.columns = [
+      Locale.tr("ID"),
+      Locale.tr("Owner"),
+      Locale.tr("Group"),
+      Locale.tr("Name"),
+      Locale.tr("Capacity"),
+      Locale.tr("Apps"),
+      Locale.tr("Driver"),
+      Locale.tr("Labels")
+    ]
+
+    this.selectOptions = {
+      "id_index": 1,
+      "name_index": 4,
+      "uname_index": 2,
+      "select_resource": Locale.tr("Please select a marketplace from the list"),
+      "you_selected": Locale.tr("You selected the following marketplace:"),
+      "select_resource_multiple": Locale.tr("Please select one or more marketplaces from the list"),
+      "you_selected_multiple": Locale.tr("You selected the following marketplaces:")
+    }
+
+    TabDataTable.call(this);
+  };
+
+  Table.prototype = Object.create(TabDataTable.prototype);
+  Table.prototype.constructor = Table;
+  Table.prototype.elementArray = _elementArray;
+
+  return Table;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _elementArray(element_json) {
+    var element = element_json[XML_ROOT];
+
+    return [
+        '<input class="check_item" type="checkbox" id="'+RESOURCE.toLowerCase()+'_' +
+                             element.ID + '" name="selected_items" value="' +
+                             element.ID + '"/>',
+        element.ID,
+        element.UNAME,
+        element.GNAME,
+        element.NAME,
+        DatastoreCapacityBar.html(element),
+        _lengthOf(element.MARKETPLACEAPPS.ID),
+        element.MARKET_MAD,
+        (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'')
+    ];
+  }
+
+  function _lengthOf(ids){
+    var l = 0;
+    if ($.isArray(ids))
+      l = ids.length;
+    else if (!$.isEmptyObject(ids))
+      l = 1;
+
+    return l;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/tabId.js b/src/sunstone/public/app/tabs/marketplaces-tab/tabId.js
new file mode 100644
index 0000000000..0a309c8e42
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/tabId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'marketplaces-tab';
+});

From 40c6cd9c705ffb4db2123d2371f93ae57e064e16 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 4 Feb 2016 19:01:04 +0100
Subject: [PATCH 176/197] feature #4217: Use new_with_id method in
 perform_action

---
 src/sunstone/models/SunstoneServer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
index d575294844..8ec3c85a5b 100644
--- a/src/sunstone/models/SunstoneServer.rb
+++ b/src/sunstone/models/SunstoneServer.rb
@@ -446,8 +446,8 @@ class SunstoneServer < CloudServer
             when "security_group"   then SecurityGroupJSON.new_with_id(id, @client)
             when "vdc"              then VdcJSON.new_with_id(id, @client)
             when "vrouter"          then VirtualRouterJSON.new_with_id(id, @client)
-            when "marketplace"      then MarketPlaceJSON.new(id, @client)
-            when "marketplaceapp"   then MarketPlaceAppJSON.new(id, @client)
+            when "marketplace"      then MarketPlaceJSON.new_with_id(id, @client)
+            when "marketplaceapp"   then MarketPlaceAppJSON.new_with_id(id, @client)
             else
                 error = Error.new("Error: #{kind} resource not supported")
                 return error

From c9dd78ce85dac01db1b2e977f9de1980d2e50aa4 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Wed, 3 Feb 2016 10:28:54 +0100
Subject: [PATCH 177/197] feature #4215: Add decorator interface for Quota
 class. Implement a Virtual Router decorator for QuotaNetwork

---
 include/Quota.h        | 132 ++++++++++++++++++++++++++++++++++-------
 include/QuotaNetwork.h |  87 +++++++++++++++++++++------
 src/um/Quotas.cc       |  20 +++----
 3 files changed, 188 insertions(+), 51 deletions(-)

diff --git a/include/Quota.h b/include/Quota.h
index 10d0b426e4..87a7963c70 100644
--- a/include/Quota.h
+++ b/include/Quota.h
@@ -23,24 +23,11 @@
 class Quotas;
 
 /**
- *  Base class for resource quotas, it provides basic storage and management of
- *  the quotas. Each resource MUST inherit from it to implement check and
- *  update methods. Quotas are stored in a template form, each class store the
- *  limits and usage in a resource specific format.
+ *  This class defines the public interface (pure abstract) for Quota.
  */
-class Quota: public Template
+class QuotaInterface
 {
 public:
-
-    /**
-     *  Set the quotas. If the quota previously exists its limit is updated.
-     *    @param quota_str the quota template in ASCII or XML formats
-     *    @param error describe the error in case of error
-     *
-     *    @return 0 on success -1 otherwise
-     */
-    int set(vector<Attribute*> * quotas, string& error);
-
     /**
      *  Check if the resource allocation will exceed the quota limits. If not
      *  the usage counters are updated
@@ -49,7 +36,113 @@ public:
      *    @param error string
      *    @return true if the operation can be performed
      */
-    //virtual bool check(Template* tmpl, Quotas& default_quotas, string& error) = 0;
+    virtual bool check(Template* tmpl, Quotas& default_quotas, string& error) = 0;
+
+    /**
+     *  Decrement usage counters when deallocating image
+     *    @param tmpl template for the resource
+     */
+    virtual void del(Template* tmpl) = 0;
+    /**
+     *  Set the quotas. If the quota previously exists its limit is updated.
+     *    @param quota_str the quota template in ASCII or XML formats
+     *    @param error describe the error in case of error
+     *
+     *    @return 0 on success -1 otherwise
+     */
+    virtual int set(vector<Attribute*> * quotas, string& error) = 0;
+
+    /**
+     *  Check if a resource update in usage counters will exceed the
+     *  quota limits. If not the usage counters are updated for that resource
+     *    @param tmpl with increments in MEMORY and CPU
+     *    @param default_quotas Quotas that contain the default limits
+     *    @param error string
+     *    @return true if the operation can be performed
+     */
+    virtual bool update(Template * tmpl, Quotas& default_quotas, string& error) = 0;
+
+    /**
+     * Returns the name that identifies the quota in a template
+     */
+     virtual const char * get_quota_name() = 0;
+
+     /**
+      *  Gets a quota identified by its ID.
+      *    @param id of the quota
+      *    @param va The quota, if it is found
+      *    @return 0 on success, -1 if not found
+      */
+     virtual int get_quota(const string& id, VectorAttribute **va) = 0;
+
+protected:
+    QuotaInterface(){};
+
+    virtual ~QuotaInterface(){};
+};
+
+/**
+ *  The QuotaDecorator class decorates the quota interface with specific
+ *  behavior over the same quota object and counters. Decorators must be derived
+ *  from this class and pass in its constructor the decorated object.
+ */
+class QuotaDecorator : public QuotaInterface
+{
+    virtual bool check(Template* tmpl, Quotas& default_quotas, string& error)
+    {
+        return quota->check(tmpl, default_quotas, error);
+    }
+
+    virtual void del(Template* tmpl)
+    {
+        return quota->del(tmpl);
+    }
+
+    virtual int set(vector<Attribute*> * quotas, string& error)
+    {
+        return quota->set(quotas, error);
+    }
+
+    virtual bool update(Template * tmpl, Quotas& default_quotas, string& error)
+    {
+        return quota->update(tmpl, default_quotas, error);
+    }
+
+    virtual const char * get_quota_name()
+    {
+        return quota->get_quota_name();
+    }
+
+    virtual int get_quota(const string& id, VectorAttribute **va)
+    {
+        return quota->get_quota(id, va);
+    }
+
+protected:
+    QuotaDecorator(QuotaInterface * _quota):quota(_quota){};
+
+    virtual ~QuotaDecorator(){};
+
+    QuotaInterface * quota;
+};
+
+/**
+ *  Base class for resource quotas, it provides basic storage and management of
+ *  the quotas. Each resource MUST inherit from it to implement check and
+ *  update methods. Quotas are stored in a template form, each class store the
+ *  limits and usage in a resource specific format.
+ */
+class Quota: public Template, public QuotaInterface
+{
+public:
+    /**
+     *  Set the quotas. If the quota previously exists its limit is updated.
+     *    @param quota_str the quota template in ASCII or XML formats
+     *    @param error describe the error in case of error
+     *
+     *    @return 0 on success -1 otherwise
+     */
+    int set(vector<Attribute*> * quotas, string& error);
 
     /**
      *  Check if a resource update in usage counters will exceed the
@@ -65,12 +158,6 @@ public:
         return false;
     };
 
-    /**
-     *  Decrement usage counters when deallocating image
-     *    @param tmpl template for the resource
-     */
-    //virtual void del(Template* tmpl) = 0;
-
     /**
      * Returns the name that identifies the quota in a template
      */
@@ -102,7 +189,6 @@ public:
       */
      static const int UNLIMITED;
 
-
 protected:
 
     Quota(const char *  quota_name,
diff --git a/include/QuotaNetwork.h b/include/QuotaNetwork.h
index 1d3087f213..13f6e0cd74 100644
--- a/include/QuotaNetwork.h
+++ b/include/QuotaNetwork.h
@@ -30,42 +30,38 @@
  *
  *   0 = unlimited, default if missing
  */
-
 class QuotaNetwork :  public Quota
 {
 public:
+    QuotaNetwork(bool is_default): Quota("NETWORK_QUOTA", "NETWORK", NET_METRICS,
+        NUM_NET_METRICS, is_default) {};
 
-    QuotaNetwork(bool is_default):
-        Quota("NETWORK_QUOTA",
-              "NETWORK",
-              NET_METRICS,
-              NUM_NET_METRICS,
-              is_default)
-    {};
-
-    ~QuotaNetwork(){};
+    virtual ~QuotaNetwork(){};
 
     /**
      *  Check if the resource allocation will exceed the quota limits. If not
-     *  the usage counters are updated
-     *    @param otype object type, VM or VRouter
+     *  the usage counters are updated. Assumes calling object is a VM
      *    @param tmpl template for the resource
      *    @param default_quotas Quotas that contain the default limits
      *    @param error string
      *    @return true if the operation can be performed
      */
-    bool check(PoolObjectSQL::ObjectType otype, Template* tmpl,
-            Quotas& default_quotas, string& error);
+    bool check(Template* tmpl, Quotas& default_quotas, string& err)
+    {
+        return check(PoolObjectSQL::VM, tmpl, default_quotas, err);
+    }
 
     /**
-     *  Decrement usage counters when deallocating image
-     *    @param otype object type, VM or VRouter
+     *  Decrement usage counters when freeing a lease. This method considers
+     *  the object type to accounto for FLOATING IP addresses or not
      *    @param tmpl template for the resource
      */
-    void del(PoolObjectSQL::ObjectType otype, Template* tmpl);
+    void del(Template* tmpl)
+    {
+        del(PoolObjectSQL::VM, tmpl);
+    }
 
 protected:
-
     /**
      * Gets the default quota identified by its ID.
      *
@@ -82,6 +78,61 @@ protected:
     static const char * NET_METRICS[];
 
     static const int NUM_NET_METRICS;
+
+private:
+    /**
+     *  Friends are decorators for the QuotaNetwork. They can access specialized
+     *  methods to operate over the same quota counters (base Template class)
+     */
+    friend class QuotaNetworkVirtualRouter;
+
+    /**
+     *  Check if the resource allocation will exceed the quota limits. If not
+     *  the usage counters are updated. This method considers the object type to
+     *  accounto for FLOATING IP addresses or not
+     *    @param otype object type, VM or VRouter
+     *    @param tmpl template for the resource
+     *    @param default_quotas Quotas that contain the default limits
+     *    @param error string
+     *    @return true if the operation can be performed
+     */
+    bool check(PoolObjectSQL::ObjectType otype, Template* tmpl,
+            Quotas& default_quotas, string& error);
+
+    /**
+     *  Decrement usage counters when freeing a lease. This method considers
+     *  the object type to accounto for FLOATING IP addresses or not
+     *    @param otype object type, VM or VRouter
+     *    @param tmpl template for the resource
+     */
+    void del(PoolObjectSQL::ObjectType otype, Template* tmpl);
+};
+
+/**
+ *  Decorates the QuotaNetwork object to consider the FLOATING_IP attribute
+ *  of the NIC attributes. It must be instantiated using an exisiting QuotaNetwork
+ *  object
+ */
+class QuotaNetworkVirtualRouter: public QuotaDecorator
+{
+public:
+    QuotaNetworkVirtualRouter(QuotaNetwork *qn):QuotaDecorator(qn){};
+
+    virtual ~QuotaNetworkVirtualRouter(){};
+
+    bool check(Template* tmpl, Quotas& default_quotas, string& err)
+    {
+        QuotaNetwork * qn = static_cast<QuotaNetwork *>(quota);
+
+        return qn->check(PoolObjectSQL::VROUTER, tmpl, default_quotas, err);
+    }
+
+    void del(Template* tmpl)
+    {
+        QuotaNetwork * qn = static_cast<QuotaNetwork *>(quota);
+
+        qn->del(PoolObjectSQL::VROUTER, tmpl);
+    }
 };
 
 #endif /*QUOTA_NETWORK_H_*/
diff --git a/src/um/Quotas.cc b/src/um/Quotas.cc
index d661db5647..9301f12b6d 100644
--- a/src/um/Quotas.cc
+++ b/src/um/Quotas.cc
@@ -150,7 +150,7 @@ void Quotas::quota_del(QuotaType type, Template *tmpl)
         break;
 
         case NETWORK:
-            network_quota.del(PoolObjectSQL::VM, tmpl);
+            network_quota.del(tmpl);
         break;
 
         case IMAGE:
@@ -162,13 +162,14 @@ void Quotas::quota_del(QuotaType type, Template *tmpl)
         break;
 
         case VIRTUALMACHINE:
-            network_quota.del(PoolObjectSQL::VM, tmpl);
+            network_quota.del(tmpl);
             vm_quota.del(tmpl);
             image_quota.del(tmpl);
         break;
 
         case VIRTUALROUTER:
-            network_quota.del(PoolObjectSQL::VROUTER, tmpl);
+            QuotaNetworkVirtualRouter vr_net_quota(&network_quota);
+            vr_net_quota.del(tmpl);
         break;
     }
 }
@@ -187,7 +188,7 @@ bool Quotas::quota_check(QuotaType  type,
             return datastore_quota.check(tmpl, default_quotas, error_str);
 
         case NETWORK:
-            return network_quota.check(PoolObjectSQL::VM, tmpl, default_quotas, error_str);
+            return network_quota.check(tmpl, default_quotas, error_str);
 
         case IMAGE:
             return image_quota.check(tmpl, default_quotas, error_str);
@@ -196,21 +197,20 @@ bool Quotas::quota_check(QuotaType  type,
             return vm_quota.check(tmpl, default_quotas, error_str);
 
         case VIRTUALMACHINE:
-            if ( network_quota.check(PoolObjectSQL::VM,
-                    tmpl, default_quotas, error_str) == false )
+            if ( network_quota.check(tmpl, default_quotas, error_str) == false )
             {
                 return false;
             }
 
             if ( vm_quota.check(tmpl, default_quotas, error_str) == false )
             {
-                network_quota.del(PoolObjectSQL::VM, tmpl);
+                network_quota.del(tmpl);
                 return false;
             }
 
             if ( image_quota.check(tmpl, default_quotas, error_str) == false )
             {
-                network_quota.del(PoolObjectSQL::VM, tmpl);
+                network_quota.del(tmpl);
                 vm_quota.del(tmpl);
                 return false;
             }
@@ -218,8 +218,8 @@ bool Quotas::quota_check(QuotaType  type,
             return true;
 
         case VIRTUALROUTER:
-            return network_quota.check(PoolObjectSQL::VROUTER,
-                    tmpl, default_quotas, error_str);
+            QuotaNetworkVirtualRouter vr_net_quota(&network_quota);
+            return vr_net_quota.check(tmpl, default_quotas, error_str);
     }
 
     return false;

From 816a5bf415b4a10a743cc3cebe651606a95574a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 3 Feb 2016 15:28:09 +0100
Subject: [PATCH 178/197] Feature #4215: Add vrouter to java oca

---
 .../client/vrouter/VirtualRouter.java         | 441 ++++++++++++++++++
 .../client/vrouter/VirtualRouterPool.java     | 263 +++++++++++
 src/oca/java/test/VirtualRouterTest.java      | 291 ++++++++++++
 src/oca/java/test/all_tests.sh                |   3 +
 src/oca/ruby/opennebula/virtual_router.rb     |   2 +-
 5 files changed, 999 insertions(+), 1 deletion(-)
 create mode 100644 src/oca/java/src/org/opennebula/client/vrouter/VirtualRouter.java
 create mode 100644 src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java
 create mode 100644 src/oca/java/test/VirtualRouterTest.java

diff --git a/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouter.java b/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouter.java
new file mode 100644
index 0000000000..5c61a65966
--- /dev/null
+++ b/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouter.java
@@ -0,0 +1,441 @@
+/*******************************************************************************
+ * Copyright 2002-2015, OpenNebula Project, OpenNebula Systems
+ *
+ * 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.
+ ******************************************************************************/
+package org.opennebula.client.vrouter;
+
+import org.opennebula.client.Client;
+import org.opennebula.client.OneResponse;
+import org.opennebula.client.PoolElement;
+import org.w3c.dom.Node;
+
+/**
+ * This class represents an OpenNebula Virtual Router
+ * It also offers static XML-RPC call wrappers.
+ */
+public class VirtualRouter extends PoolElement
+{
+
+    private static final String METHOD_PREFIX = "vrouter.";
+    private static final String ALLOCATE    = METHOD_PREFIX + "allocate";
+    private static final String INSTANTIATE = METHOD_PREFIX + "instantiate";
+    private static final String INFO        = METHOD_PREFIX + "info";
+    private static final String UPDATE      = METHOD_PREFIX + "update";
+    private static final String DELETE      = METHOD_PREFIX + "delete";
+    private static final String CHOWN       = METHOD_PREFIX + "chown";
+    private static final String CHMOD       = METHOD_PREFIX + "chmod";
+    private static final String RENAME      = METHOD_PREFIX + "rename";
+    private static final String ATTACHNIC   = METHOD_PREFIX + "attachnic";
+    private static final String DETACHNIC   = METHOD_PREFIX + "detachnic";
+
+    /**
+     * Creates a new VirtualRouter representation.
+     * @param id The VirtualRouter id.
+     * @param client XML-RPC Client.
+     */
+    public VirtualRouter(int id, Client client)
+    {
+        super(id, client);
+    }
+
+    /**
+     * @see PoolElement
+     */
+    protected VirtualRouter(Node xmlElement, Client client)
+    {
+        super(xmlElement, client);
+    }
+
+    // =================================
+    // Static XML-RPC methods
+    // =================================
+
+
+    /**
+     * Allocates a new VirtualRouter in OpenNebula.
+     *
+     * @param client XML-RPC Client.
+     * @param description A string containing the template of the VirtualRouter.
+     * @return If successful the message contains the associated
+     * id generated for this VirtualRouter.
+     */
+    public static OneResponse allocate(Client client, String description)
+    {
+        return client.call(ALLOCATE, description);
+    }
+
+    /**
+     * Retrieves the information of the given VirtualRouter.
+     *
+     * @param client XML-RPC Client.
+     * @param id The VirtualRouter id for the VirtualRouter to retrieve the information from
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public static OneResponse info(Client client, int id)
+    {
+        return client.call(INFO, id);
+    }
+
+    /**
+     * Creates VM instances from a VM Template. New VMs will be associated
+     * to this Virtual Router, and its Virtual Networks
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target VirtualRouter.
+     * @param nVMs Number of VMs to instantiate
+     * @param templateId VM Template id to instantiate
+     * @param name Name for the VM instances. If it is an empty string
+     * OpenNebula will set a default name. Wildcard %i can be used.
+     * @param onHold False to create this VM in pending state, true on hold
+     * @param template User provided Template to merge with the one
+     * being instantiated
+     * @return If an error occurs the error message contains the reason.
+     */
+    public static OneResponse instantiate(Client client, int id, int nVMs,
+        int templateId, String name, boolean onHold, String template)
+    {
+        return client.call(INSTANTIATE, id, nVMs, templateId, name, onHold, template);
+    }
+
+    /**
+     * Deletes a VirtualRouter from OpenNebula.
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target VirtualRouter we want to delete.
+     * @return A encapsulated response.
+     */
+    public static OneResponse delete(Client client, int id)
+    {
+        return client.call(DELETE, id);
+    }
+
+    /**
+     * Replaces the template contents.
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target VirtualRouter we want to modify.
+     * @param new_template New template contents.
+     * @param append True to append new attributes instead of replace the whole template
+     * @return If successful the message contains the VirtualRouter id.
+     */
+    public static OneResponse update(Client client, int id, String new_template,
+        boolean append)
+    {
+        return client.call(UPDATE, id, new_template, append ? 1 : 0);
+    }
+
+    /**
+     * Publishes or unpublishes a VirtualRouter.
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target VirtualRouter we want to modify.
+     * @param publish True for publishing, false for unpublishing.
+     * @return If successful the message contains the VirtualRouter id.
+     */
+    public static OneResponse publish(Client client, int id, boolean publish)
+    {
+        int group_u = publish ? 1 : 0;
+
+        return chmod(client, id, -1, -1, -1, group_u, -1, -1, -1, -1, -1);
+    }
+
+    /**
+     * Changes the owner/group
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target VirtualRouter we want to modify.
+     * @param uid The new owner user ID. Set it to -1 to leave the current one.
+     * @param gid The new group ID. Set it to -1 to leave the current one.
+     * @return If an error occurs the error message contains the reason.
+     */
+    public static OneResponse chown(Client client, int id, int uid, int gid)
+    {
+        return client.call(CHOWN, id, uid, gid);
+    }
+
+    /**
+     * Changes the VirtualRouter permissions
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target VirtualRouter.
+     * @param owner_u 1 to allow, 0 deny, -1 do not change
+     * @param owner_m 1 to allow, 0 deny, -1 do not change
+     * @param owner_a 1 to allow, 0 deny, -1 do not change
+     * @param group_u 1 to allow, 0 deny, -1 do not change
+     * @param group_m 1 to allow, 0 deny, -1 do not change
+     * @param group_a 1 to allow, 0 deny, -1 do not change
+     * @param other_u 1 to allow, 0 deny, -1 do not change
+     * @param other_m 1 to allow, 0 deny, -1 do not change
+     * @param other_a 1 to allow, 0 deny, -1 do not change
+     * @return If an error occurs the error message contains the reason.
+     */
+    public static OneResponse chmod(Client client, int id,
+                                    int owner_u, int owner_m, int owner_a,
+                                    int group_u, int group_m, int group_a,
+                                    int other_u, int other_m, int other_a)
+    {
+        return chmod(client, CHMOD, id,
+                            owner_u, owner_m, owner_a,
+                            group_u, group_m, group_a,
+                            other_u, other_m, other_a);
+    }
+
+    /**
+     * Changes the permissions
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target object.
+     * @param octet Permissions octed , e.g. 640
+     * @return If an error occurs the error message contains the reason.
+     */
+    public static OneResponse chmod(Client client, int id, String octet)
+    {
+        return chmod(client, CHMOD, id, octet);
+    }
+
+    /**
+     * Changes the permissions
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target object.
+     * @param octet Permissions octed , e.g. 640
+     * @return If an error occurs the error message contains the reason.
+     */
+    public static OneResponse chmod(Client client, int id, int octet)
+    {
+        return chmod(client, CHMOD, id, octet);
+    }
+
+    /**
+     * Renames this VirtualRouter
+     *
+     * @param client XML-RPC Client.
+     * @param id The id of the target VirtualRouter.
+     * @param name New name for the VirtualRouter.
+     * @return If an error occurs the error message contains the reason.
+     */
+    public static OneResponse rename(Client client, int id, String name)
+    {
+        return client.call(RENAME, id, name);
+    }
+
+    // =================================
+    // Instanced object XML-RPC methods
+    // =================================
+
+    /**
+     * Retrieves the information of the VirtualRouter.
+     *
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public OneResponse info()
+    {
+        OneResponse response = info(client, id);
+        super.processInfo(response);
+        return response;
+    }
+
+    /**
+     * Deletes the VirtualRouter from OpenNebula.
+     *
+     * @return A encapsulated response.
+     */
+    public OneResponse delete()
+    {
+        return delete(client, id);
+    }
+
+    /**
+     * Replaces the VirtualRouter contents.
+     *
+     * @param new_template New template contents.
+     * @return If successful the message contains the VirtualRouter id.
+     */
+    public OneResponse update(String new_template)
+    {
+        return update(new_template, false);
+    }
+
+    /**
+     * Replaces the template contents.
+     *
+     * @param new_template New template contents.
+     * @param append True to append new attributes instead of replace the whole template
+     * @return If successful the message contains the VirtualRouter id.
+     */
+    public OneResponse update(String new_template, boolean append)
+    {
+        return update(client, id, new_template, append);
+    }
+
+    /**
+     * Publishes or unpublishes the VirtualRouter.
+     *
+     * @param publish True for publishing, false for unpublishing.
+     * @return If successful the message contains the VirtualRouter id.
+     */
+    public OneResponse publish(boolean publish)
+    {
+        return publish(client, id, publish);
+    }
+
+    /**
+     * Publishes the VirtualRouter.
+     *
+     * @return If successful the message contains the VirtualRouter id.
+     */
+    public OneResponse publish()
+    {
+        return publish(true);
+    }
+
+    /**
+     * Unpublishes the VirtualRouter.
+     *
+     * @return If successful the message contains the VirtualRouter id.
+     */
+    public OneResponse unpublish()
+    {
+        return publish(false);
+    }
+
+    /**
+     * Changes the owner/group
+     *
+     * @param uid The new owner user ID. Set it to -1 to leave the current one.
+     * @param gid The new group ID. Set it to -1 to leave the current one.
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse chown(int uid, int gid)
+    {
+        return chown(client, id, uid, gid);
+    }
+
+    /**
+     * Changes the owner
+     *
+     * @param uid The new owner user ID.
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse chown(int uid)
+    {
+        return chown(uid, -1);
+    }
+
+    /**
+     * Changes the group
+     *
+     * @param gid The new group ID.
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse chgrp(int gid)
+    {
+        return chown(-1, gid);
+    }
+
+    /**
+     * Changes the VirtualRouter permissions
+     *
+     * @param owner_u 1 to allow, 0 deny, -1 do not change
+     * @param owner_m 1 to allow, 0 deny, -1 do not change
+     * @param owner_a 1 to allow, 0 deny, -1 do not change
+     * @param group_u 1 to allow, 0 deny, -1 do not change
+     * @param group_m 1 to allow, 0 deny, -1 do not change
+     * @param group_a 1 to allow, 0 deny, -1 do not change
+     * @param other_u 1 to allow, 0 deny, -1 do not change
+     * @param other_m 1 to allow, 0 deny, -1 do not change
+     * @param other_a 1 to allow, 0 deny, -1 do not change
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse chmod(int owner_u, int owner_m, int owner_a,
+                             int group_u, int group_m, int group_a,
+                             int other_u, int other_m, int other_a)
+    {
+        return chmod(client, id,
+                    owner_u, owner_m, owner_a,
+                    group_u, group_m, group_a,
+                    other_u, other_m, other_a);
+    }
+
+    /**
+     * Changes the permissions
+     *
+     * @param octet Permissions octed , e.g. 640
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse chmod(String octet)
+    {
+        return chmod(client, id, octet);
+    }
+
+    /**
+     * Changes the permissions
+     *
+     * @param octet Permissions octed , e.g. 640
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse chmod(int octet)
+    {
+        return chmod(client, id, octet);
+    }
+
+    /**
+     * Creates VM instances from a VM Template. New VMs will be associated
+     * to this Virtual Router, and its Virtual Networks
+     *
+     * @param nVMs Number of VMs to instantiate
+     * @param templateId VM Template id to instantiate
+     * @param name Name for the VM instances. If it is an empty string
+     * OpenNebula will set a default name. Wildcard %i can be used.
+     * @param onHold False to create this VM in pending state, true on hold
+     * @param template User provided Template to merge with the one
+     * being instantiated
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse instantiate(int nVMs, int templateId, String name,
+        boolean onHold, String template)
+    {
+        return instantiate(client, id, nVMs, templateId, name, onHold, template);
+    }
+
+    /**
+     * Creates VM instances from a VM Template. New VMs will be associated
+     * to this Virtual Router, and its Virtual Networks
+     *
+     * @param nVMs Number of VMs to instantiate
+     * @param templateId VM Template id to instantiate
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse instantiate(int nVMs, int templateId)
+    {
+        return instantiate(client, id, nVMs, templateId, "", false, "");
+    }
+
+    /**
+     * Renames this VirtualRouter
+     *
+     * @param name New name for the VirtualRouter.
+     * @return If an error occurs the error message contains the reason.
+     */
+    public OneResponse rename(String name)
+    {
+        return rename(client, id, name);
+    }
+
+    // =================================
+    // Helpers
+    // =================================
+}
diff --git a/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java b/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java
new file mode 100644
index 0000000000..69d9215cad
--- /dev/null
+++ b/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java
@@ -0,0 +1,263 @@
+/*******************************************************************************
+ * Copyright 2002-2015, OpenNebula Project, OpenNebula Systems
+ *
+ * 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.
+ ******************************************************************************/
+package org.opennebula.client.vrouter;
+
+import java.util.AbstractList;
+import java.util.Iterator;
+
+import org.opennebula.client.Client;
+import org.opennebula.client.OneResponse;
+import org.opennebula.client.Pool;
+import org.opennebula.client.PoolElement;
+import org.w3c.dom.Node;
+
+/**
+ * This class represents an OpenNebula VirtualRouter pool.
+ * It also offers static XML-RPC call wrappers.
+ */
+public class VirtualRouterPool extends Pool implements Iterable<VirtualRouter>
+{
+    private static final String ELEMENT_NAME = "VROUTER";
+    private static final String INFO_METHOD  = "vrouterpool.info";
+
+    private int filter;
+
+    /**
+     * Creates a new VirtualRouter pool with the default filter flag value
+     * set to {@link Pool#MINE_GROUP} (VirtualRouter belonging to the connected user,
+     * and the ones in his group)
+     *
+     * @param client XML-RPC Client.
+     *
+     * @see VirtualRouterPool#VirtualRouterPool(Client, int)
+     */
+    public VirtualRouterPool(Client client)
+    {
+        super(ELEMENT_NAME, client, INFO_METHOD);
+        this.filter = MINE_GROUP;
+    }
+
+    /**
+     * Creates a new VirtualRouter pool.
+     *
+     * @param client XML-RPC Client.
+     * @param filter Filter flag to use by default in the method
+     * {@link VirtualRouterPool#info()}. Possible values:
+     * <ul>
+     * <li>{@link Pool#ALL}: All VirtualRouters</li>
+     * <li>{@link Pool#MINE}: Connected user's VirtualRouters</li>
+     * <li>{@link Pool#MINE_GROUP}: Connected user's VirtualRouters, and the ones in
+     * his group</li>
+     * <li>>= 0: UID User's VirtualRouters</li>
+     * </ul>
+     */
+    public VirtualRouterPool(Client client, int filter)
+    {
+        super(ELEMENT_NAME, client, INFO_METHOD);
+        this.filter = filter;
+    }
+
+    /* (non-Javadoc)
+     * @see org.opennebula.client.Pool#factory(org.w3c.dom.Node)
+     */
+    @Override
+    public PoolElement factory(Node node)
+    {
+        return new VirtualRouter(node, client);
+    }
+
+    /**
+     * Retrieves all or part of the VirtualRouters in the pool.
+     *
+     * @param client XML-RPC Client.
+     * @param filter Filter flag to use. Possible values:
+     * <ul>
+     * <li>{@link Pool#ALL}: All VirtualRouters</li>
+     * <li>{@link Pool#MINE}: Connected user's VirtualRouters</li>
+     * <li>{@link Pool#MINE_GROUP}: Connected user's VirtualRouters, and the ones in
+     * his group</li>
+     * <li>>= 0: UID User's VirtualRouters</li>
+     * </ul>
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public static OneResponse info(Client client, int filter)
+    {
+        return Pool.info(client, INFO_METHOD, filter, -1, -1);
+    }
+
+    /**
+     * Retrieves all the VirtualRouters in the pool.
+     *
+     * @param client XML-RPC Client.
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public static OneResponse infoAll(Client client)
+    {
+        return Pool.infoAll(client, INFO_METHOD);
+    }
+
+    /**
+     * Retrieves all the connected user's VirtualRouters.
+     *
+     * @param client XML-RPC Client.
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public static OneResponse infoMine(Client client)
+    {
+        return Pool.infoMine(client, INFO_METHOD);
+    }
+
+    /**
+     * Retrieves all the connected user's VirtualRouters and the ones in
+     * his group.
+     *
+     * @param client XML-RPC Client.
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public static OneResponse infoGroup(Client client)
+    {
+        return Pool.infoGroup(client, INFO_METHOD);
+    }
+
+    /**
+     * Retrieves all or part of the VirtualRouters in the pool. The VirtualRouters to retrieve
+     * can be also filtered by Id, specifying the first and last Id to include.
+     *
+     * @param client XML-RPC Client.
+     * @param filter Filter flag to use. Possible values:
+     * <ul>
+     * <li>{@link Pool#ALL}: All VirtualRouters</li>
+     * <li>{@link Pool#MINE}: Connected user's VirtualRouters</li>
+     * <li>{@link Pool#MINE_GROUP}: Connected user's VirtualRouters, and the ones in
+     * his group</li>
+     * <li>>= 0: UID User's VirtualRouters</li>
+     * </ul>
+     * @param startId Lowest Id to retrieve
+     * @param endId Biggest Id to retrieve
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public static OneResponse info(Client client, int filter,
+            int startId, int endId)
+    {
+        return Pool.info(client, INFO_METHOD, filter, startId, endId);
+    }
+
+    /**
+     * Loads the xml representation of all or part of the
+     * VirtualRouters in the pool. The filter used is the one set in
+     * the constructor.
+     *
+     * @see VirtualRouterPool#info(Client, int)
+     *
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public OneResponse info()
+    {
+        return super.info(filter, -1, -1);
+    }
+
+    /**
+     * Loads the xml representation of all the VirtualRouters in the pool.
+     *
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public OneResponse infoAll()
+    {
+        return super.infoAll();
+    }
+
+    /**
+     * Loads the xml representation of all the connected user's VirtualRouters.
+     *
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public OneResponse infoMine()
+    {
+        return super.infoMine();
+    }
+
+    /**
+     * Loads the xml representation of all the connected user's VirtualRouters and
+     * the ones in his group.
+     *
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public OneResponse infoGroup()
+    {
+        return super.infoGroup();
+    }
+
+    /**
+     * Retrieves all or part of the VirtualRouters in the pool. The VirtualRouters to retrieve
+     * can be also filtered by Id, specifying the first and last Id to include.
+     *
+     * @param filter Filter flag to use. Possible values:
+     * <ul>
+     * <li>{@link Pool#ALL}: All VirtualRouters</li>
+     * <li>{@link Pool#MINE}: Connected user's VirtualRouters</li>
+     * <li>{@link Pool#MINE_GROUP}: Connected user's VirtualRouters, and the ones in
+     * his group</li>
+     * <li>>= 0: UID User's VirtualRouters</li>
+     * </ul>
+     * @param startId Lowest Id to retrieve
+     * @param endId Biggest Id to retrieve
+     * @return If successful the message contains the string
+     * with the information returned by OpenNebula.
+     */
+    public OneResponse info(int filter, int startId, int endId)
+    {
+        return super.info(filter, startId, endId);
+    }
+
+    public Iterator<VirtualRouter> iterator()
+    {
+        AbstractList<VirtualRouter> ab = new AbstractList<VirtualRouter>()
+        {
+            public int size()
+            {
+                return getLength();
+            }
+
+            public VirtualRouter get(int index)
+            {
+                return (VirtualRouter) item(index);
+            }
+        };
+
+        return ab.iterator();
+    }
+
+    /**
+     * Returns the VirtualRouter with the given Id from the pool. If it is not found,
+     * then returns null. The method {@link #info()} must be called before.
+     *
+     * @param id of the ACl rule to retrieve
+     * @return The VirtualRouter with the given Id, or null if it was not found.
+     */
+    public VirtualRouter getById(int id)
+    {
+        return (VirtualRouter) super.getById(id);
+    }
+}
diff --git a/src/oca/java/test/VirtualRouterTest.java b/src/oca/java/test/VirtualRouterTest.java
new file mode 100644
index 0000000000..d2b16223d8
--- /dev/null
+++ b/src/oca/java/test/VirtualRouterTest.java
@@ -0,0 +1,291 @@
+/*******************************************************************************
+ * Copyright 2002-2015, OpenNebula Project, OpenNebula Systems
+ *
+ * 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.
+ ******************************************************************************/
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.opennebula.client.Client;
+import org.opennebula.client.OneResponse;
+import org.opennebula.client.group.Group;
+import org.opennebula.client.template.*;
+import org.opennebula.client.vrouter.*;
+import org.opennebula.client.vm.*;
+import org.opennebula.client.user.User;
+import org.opennebula.client.vm.VirtualMachine;
+
+
+
+public class VirtualRouterTest
+{
+    private static VirtualRouter vrouter;
+    private static VirtualRouterPool vrouterPool;
+
+    private static Client client;
+
+    private static OneResponse res;
+    private static String name = "new_test_vrouter";
+
+
+    private static String template_str =
+        "NAME = \"" + name + "\"\n" +
+        "ATT1 = \"VAL1\"\n" +
+        "ATT2 = \"VAL2\"";
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception
+    {
+        client          = new Client();
+        vrouterPool     = new VirtualRouterPool(client);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception
+    {
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception
+    {
+        res = VirtualRouter.allocate(client, template_str);
+
+        int oid = res.isError() ? -1 : Integer.parseInt(res.getMessage());
+        vrouter = new VirtualRouter(oid, client);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception
+    {
+        vrouter.delete();
+    }
+
+    @Test
+    public void allocate()
+    {
+        vrouter.delete();
+
+        res = VirtualRouter.allocate(client, template_str);
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        int oid = res.isError() ? -1 : Integer.parseInt(res.getMessage());
+        vrouter = new VirtualRouter(oid, client);
+
+
+        vrouterPool.info();
+
+        boolean found = false;
+        for(VirtualRouter temp : vrouterPool)
+        {
+            found = found || temp.getName().equals(name);
+        }
+
+        assertTrue( found );
+    }
+
+    @Test
+    public void info()
+    {
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vrouter.getName().equals(name) );
+    }
+
+    @Test
+    public void publish()
+    {
+        res = vrouter.publish();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        vrouter.info();
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_U").equals("1") );
+    }
+
+    @Test
+    public void unpublish()
+    {
+        res = vrouter.unpublish();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        vrouter.info();
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_U").equals("0") );
+    }
+
+    @Test
+    public void chmod()
+    {
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        String owner_a = vrouter.xpath("PERMISSIONS/OWNER_A");
+        String group_a = vrouter.xpath("PERMISSIONS/GROUP_A");
+
+        res = vrouter.chmod(0, 1, -1, 1, 0, -1, 1, 1, 0);
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_U").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_M").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_A").equals(owner_a) );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_U").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_M").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_A").equals(group_a) );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_U").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_M").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_A").equals("0") );
+    }
+
+    @Test
+    public void chmod_octet()
+    {
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        res = vrouter.chmod(640);
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_U").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_M").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_A").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_U").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_M").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_A").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_U").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_M").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_A").equals("0") );
+
+        res = vrouter.chmod("147");
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_U").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_M").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OWNER_A").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_U").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_M").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/GROUP_A").equals("0") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_U").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_M").equals("1") );
+        assertTrue( vrouter.xpath("PERMISSIONS/OTHER_A").equals("1") );
+    }
+
+    @Test
+    public void attributes()
+    {
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vrouter.xpath("NAME").equals(name) );
+    }
+
+    @Test
+    public void delete()
+    {
+        res = vrouter.delete();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        res = vrouter.info();
+        assertTrue( res.isError() );
+    }
+
+    @Test
+    public void chown()
+    {
+        // Create a new User and Group
+        res = User.allocate(client, "template_test_user", "password");
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        int uid = Integer.parseInt(res.getMessage());
+
+        res = Group.allocate(client, "template_test_group");
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        int gid = Integer.parseInt(res.getMessage());
+
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vrouter.uid() == 0 );
+        assertTrue( vrouter.gid() == 0 );
+
+        res = vrouter.chown(uid, gid);
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vrouter.uid() == uid );
+        assertTrue( vrouter.gid() == gid );
+
+        res = vrouter.chgrp(0);
+
+        res = vrouter.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vrouter.uid() == uid );
+        assertTrue( vrouter.gid() == 0 );
+    }
+
+    @Test
+    public void instantiate()
+    {
+        VirtualMachinePool vmPool = new VirtualMachinePool(client);
+
+        res = vmPool.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vmPool.getLength() == 0 );
+
+        String tmpl_str =
+            "NAME = vrtemplate\n"+
+            "CPU = 0.1\n"+
+            "MEMORY = 64\n";
+
+        res = Template.allocate(client, tmpl_str);
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        int tmplid = Integer.parseInt(res.getMessage());
+
+        res = vrouter.instantiate(3, tmplid);
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        res = vmPool.info();
+        assertTrue( res.getErrorMessage(), !res.isError() );
+
+        assertTrue( vmPool.getLength() == 3 );
+    }
+}
diff --git a/src/oca/java/test/all_tests.sh b/src/oca/java/test/all_tests.sh
index 5488dd8518..dff793416c 100755
--- a/src/oca/java/test/all_tests.sh
+++ b/src/oca/java/test/all_tests.sh
@@ -73,4 +73,7 @@ let RC=RC+$?
 ./test.sh SecurityGroupTest
 let RC=RC+$?
 
+./test.sh VirtualRouterTest
+let RC=RC+$?
+
 exit $RC
\ No newline at end of file
diff --git a/src/oca/ruby/opennebula/virtual_router.rb b/src/oca/ruby/opennebula/virtual_router.rb
index fa46c961e9..6f47e02e35 100644
--- a/src/oca/ruby/opennebula/virtual_router.rb
+++ b/src/oca/ruby/opennebula/virtual_router.rb
@@ -87,7 +87,7 @@ module OpenNebula
         # @para n_vms [Integer] Number of VMs to instantiate
         # @para template_id [Integer] VM Template id to instantiate
         # @param name [String] Name for the VM instances. If it is an empty
-        #   string OpenNebula will set a default name
+        #   string OpenNebula will set a default name. Wildcard %i can be used.
         # @param hold [true,false] false to create the VM in pending state,
         #   true to create it on hold
         # @param template [String] User provided Template to merge with the

From 8b648b3badf458cfbc2677233a9de243fca8694d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 3 Feb 2016 15:47:43 +0100
Subject: [PATCH 179/197] Feature #4215: Use created_by uid to get
 token_password

---
 src/tm/TransferManager.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc
index 86004d7212..0ed2990ab4 100644
--- a/src/tm/TransferManager.cc
+++ b/src/tm/TransferManager.cc
@@ -684,7 +684,7 @@ void TransferManager::prolog_action(int vid)
         return;
     }
 
-    int uid = vm->get_uid();
+    int uid = vm->get_created_by_uid();
     vm->unlock();
 
     User * user = Nebula::instance().get_upool()->get(uid, true);

From 74f5f38276fd672ec6a5ad58b7d55dd6bc305099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 3 Feb 2016 18:29:39 +0100
Subject: [PATCH 180/197] Feature #4215: Use VROUTER=YES to differentiate vr
 templates

---
 include/VMTemplate.h                          | 10 +++++++++
 src/rm/RequestManagerVMTemplate.cc            | 20 ++++++++++++++++-
 src/rm/RequestManagerVirtualRouter.cc         | 22 +++++++++++++++++++
 .../app/tabs/templates-tab/datatable.js       |  8 ++++++-
 .../create/wizard-tabs/general/html.hbs       |  9 ++++++++
 .../tabs/vrouters-tab/form-panels/create.js   | 10 ++++++++-
 src/vm_template/VMTemplate.cc                 |  9 ++++++++
 7 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/include/VMTemplate.h b/include/VMTemplate.h
index 7a1b611e05..d9bd27f288 100644
--- a/include/VMTemplate.h
+++ b/include/VMTemplate.h
@@ -70,6 +70,16 @@ public:
                 *(static_cast<VirtualMachineTemplate *>(obj_template)));
     };
 
+    // ------------------------------------------------------------------------
+    // Virtual Router
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns true if this Template is a Virtual Router Template
+     * @return true if this Template is a Virtual Router Template
+     */
+    bool is_vrouter();
+
 private:
     // -------------------------------------------------------------------------
     // Friends
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index b474fef5fb..c550690abc 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -36,7 +36,25 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
         str_uattrs = xmlrpc_c::value_string(paramList.getString(4));
     }
 
-    // TODO: if Template has VROUTER = YES, do not allow to instantiate here
+    VMTemplate * tmpl = static_cast<VMTemplatePool* > (pool)->get(id,true);
+
+    if ( tmpl == 0 )
+    {
+        att.resp_id = id;
+        failure_response(NO_EXISTS, att);
+        return;
+    }
+
+    bool is_vrouter = tmpl->is_vrouter();
+
+    tmpl->unlock();
+
+    if (is_vrouter)
+    {
+        att.resp_msg = "Templates with VROUTER=YES cannot be instantiated as stand-alone VMs";
+        failure_response(ACTION, att);
+        return;
+    }
 
     int vid;
     ErrorCode ec;
diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc
index 13ecda56af..7841d7f229 100644
--- a/src/rm/RequestManagerVirtualRouter.cc
+++ b/src/rm/RequestManagerVirtualRouter.cc
@@ -38,6 +38,7 @@ void VirtualRouterInstantiate::request_execute(
     VirtualRouterPool*  vrpool = nd.get_vrouterpool();
     VirtualRouter *     vr;
     DispatchManager*    dm = nd.get_dm();
+    VMTemplatePool*     tpool = nd.get_tpool();
 
     PoolObjectAuth vr_perms;
     Template*      extra_attrs;
@@ -92,6 +93,27 @@ void VirtualRouterInstantiate::request_execute(
         return;
     }
 
+    VMTemplate * tmpl = tpool->get(tmpl_id,true);
+
+    if ( tmpl == 0 )
+    {
+        att.resp_id = tmpl_id;
+        att.resp_obj = PoolObjectSQL::TEMPLATE;
+        failure_response(NO_EXISTS, att);
+        return;
+    }
+
+    bool is_vrouter = tmpl->is_vrouter();
+
+    tmpl->unlock();
+
+    if (!is_vrouter)
+    {
+        att.resp_msg = "Only Templates with VROUTER=YES are allowed";
+        failure_response(ACTION, att);
+        return;
+    }
+
     if (name.empty())
     {
         name = "vr-" + vr_name + "-%i";
diff --git a/src/sunstone/public/app/tabs/templates-tab/datatable.js b/src/sunstone/public/app/tabs/templates-tab/datatable.js
index 3c807d4940..cb3653c907 100644
--- a/src/sunstone/public/app/tabs/templates-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/templates-tab/datatable.js
@@ -78,7 +78,13 @@ define(function(require) {
       "select_resource": Locale.tr("Please select a Template from the list"),
       "you_selected": Locale.tr("You selected the following Template:"),
       "select_resource_multiple": Locale.tr("Please select one or more Templates from the list"),
-      "you_selected_multiple": Locale.tr("You selected the following Templates:")
+      "you_selected_multiple": Locale.tr("You selected the following Templates:"),
+
+      // By default the filter is set to return all VM Templates that
+      // are NOT virtual router templates
+      "filter_fn": function(tmpl){
+        return (tmpl.TEMPLATE.VROUTER == undefined || tmpl.TEMPLATE.VROUTER.toUpperCase() != "YES");
+      }
     };
 
     this.labels = [];
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs
index 8028c0948d..29dfdc58d9 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs
@@ -131,3 +131,12 @@
     </label>
   </div>
 </div>
+<div class="row">
+  <div class="large-12 columns">
+    <input type="checkbox" wizard_field="VROUTER" id="VROUTER" value="YES"/>
+    <label  for="VROUTER">
+      {{tr "Make this template available for Virtual Router machines only"}}
+      {{{tip (tr "Virtual Routers create Virtual Machines from a source Template. This checkbox makes this template available to be selected in the New Virtual Router wizard")}}}
+    </label>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index c5ea3a9ea5..50f7226150 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -63,7 +63,15 @@ define(function(require) {
       }
     };
 
-    this.templatesTable = new TemplatesTable('vr_create', {'select': true});
+    this.templatesTable = new TemplatesTable(
+        'vr_create',
+        { 'select': true,
+          'selectOptions': {
+            'filter_fn': function(tmpl){
+              return (tmpl.TEMPLATE.VROUTER != undefined && tmpl.TEMPLATE.VROUTER.toUpperCase() == "YES");
+            }
+          }
+        });
 
     BaseFormPanel.call(this);
   }
diff --git a/src/vm_template/VMTemplate.cc b/src/vm_template/VMTemplate.cc
index 7a2f4380c4..3da58faf4a 100644
--- a/src/vm_template/VMTemplate.cc
+++ b/src/vm_template/VMTemplate.cc
@@ -248,3 +248,12 @@ int VMTemplate::from_xml(const string& xml)
 
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
+
+bool VMTemplate::is_vrouter()
+{
+    bool vr;
+
+    get_template_attribute("VROUTER", vr);
+
+    return vr;
+}

From b68a5faf26322c008b6cb956473557bf9fca62a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 3 Feb 2016 18:30:26 +0100
Subject: [PATCH 181/197] Feature #4215: RM failure message style

Fix missing white spaces in some cases
---
 src/rm/Request.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index e3a9accb90..ebd40fcd26 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -599,7 +599,7 @@ void Request::failure_response(ErrorCode ec, RequestAttributes& att)
         obname = object_name(att.resp_obj);
     }
 
-    oss << "[" << method_name << "]";
+    oss << "[" << method_name << "] ";
 
     switch(ec)
     {
@@ -607,7 +607,7 @@ void Request::failure_response(ErrorCode ec, RequestAttributes& att)
             return;
 
         case AUTHORIZATION:
-            oss << " User [" << att.uid << "] ";
+            oss << "User [" << att.uid << "] ";
 
             if (att.resp_msg.empty())
             {
@@ -620,7 +620,7 @@ void Request::failure_response(ErrorCode ec, RequestAttributes& att)
             break;
 
         case AUTHENTICATION:
-            oss << " User couldn't be authenticated, aborting call.";
+            oss << "User couldn't be authenticated, aborting call.";
             break;
 
         case ACTION:
@@ -630,7 +630,7 @@ void Request::failure_response(ErrorCode ec, RequestAttributes& att)
             break;
 
         case NO_EXISTS:
-            oss << " Error getting " << obname;
+            oss << "Error getting " << obname;
 
             if ( att.resp_id != -1 )
             {

From c5632940fcd05b705ed440b99699d79bb9d3fa91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 4 Feb 2016 13:17:48 +0100
Subject: [PATCH 182/197] Feature #4215: VR update removes the NICs from the
 new template

---
 include/VirtualRouter.h      | 22 +++++++++++++
 src/vrouter/VirtualRouter.cc | 64 ++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index c4be7d524c..da5836efc5 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -73,6 +73,28 @@ public:
 
     Template * get_vm_template() const;
 
+    /**
+     *  Replace template for this object. Object should be updated
+     *  after calling this method
+     *    @param tmpl_str new contents
+     *    @param keep_restricted If true, the restricted attributes of the
+     *    current template will override the new template
+     *    @param error string describing the error if any
+     *    @return 0 on success
+     */
+    int replace_template(const string& tmpl_str, bool keep_restricted, string& error);
+
+    /**
+     *  Append new attributes to this object's template. Object should be updated
+     *  after calling this method
+     *    @param tmpl_str new contents
+     *    @param keep_restricted If true, the restricted attributes of the
+     *    current template will override the new template
+     *    @param error string describing the error if any
+     *    @return 0 on success
+     */
+    int append_template(const string& tmpl_str, bool keep_restricted, string& error);
+
     // ------------------------------------------------------------------------
     // Attach and detach NIC
     // ------------------------------------------------------------------------
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index b50e806f7d..fbff84fb85 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -518,6 +518,70 @@ Template * VirtualRouter::get_vm_template() const
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+int VirtualRouter::replace_template(const string& tmpl_str, bool keep_restricted, string& error)
+{
+    Template * new_tmpl = get_new_template();
+    string     new_str;
+
+    if ( new_tmpl == 0 )
+    {
+        error = "Cannot allocate a new template";
+        return -1;
+    }
+
+    if ( new_tmpl->parse_str_or_xml(tmpl_str, error) != 0 )
+    {
+        delete new_tmpl;
+        return -1;
+    }
+
+    new_tmpl->erase("NIC");
+
+    vector<const Attribute*> nics;
+    get_template_attribute("NIC", nics);
+
+    for (vector<const Attribute*>::iterator it = nics.begin(); it != nics.end(); it++)
+    {
+        new_tmpl->set((*it)->clone());
+    }
+
+    new_tmpl->to_xml(new_str);
+    delete new_tmpl;
+
+    return PoolObjectSQL::replace_template(new_str, keep_restricted, error);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int VirtualRouter::append_template(const string& tmpl_str, bool keep_restricted, string& error)
+{
+    Template * new_tmpl = get_new_template();
+    string     new_str;
+
+    if ( new_tmpl == 0 )
+    {
+        error = "Cannot allocate a new template";
+        return -1;
+    }
+
+    if ( new_tmpl->parse_str_or_xml(tmpl_str, error) != 0 )
+    {
+        delete new_tmpl;
+        return -1;
+    }
+
+    new_tmpl->erase("NIC");
+
+    new_tmpl->to_xml(new_str);
+    delete new_tmpl;
+
+    return PoolObjectSQL::append_template(new_str, keep_restricted, error);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int VirtualRouter::add_vmid(int vmid)
 {
     return vms.add_collection_id(vmid);

From 6478bf17786be470b471ba62f3e5fa4d877d800f Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Wed, 3 Feb 2016 15:03:06 +0100
Subject: [PATCH 183/197] feature #4215: Use always created_by

---
 include/VirtualMachine.h         | 2 +-
 src/vm/VirtualMachine.cc         | 2 +-
 src/vmm/VirtualMachineManager.cc | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 43c7de0e32..3109ceaabd 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -1356,7 +1356,7 @@ public:
      */
     int  generate_context(string &files, int &disk_id, const string& token_password);
 
-    const VectorAttribute* get_context_disk() const;
+    const VectorAttribute* get_context() const;
 
     /**
      * Returns the CREATED_BY template attribute, or the uid if it does not exist
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 077e45bcb2..18bdcd160d 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -3679,7 +3679,7 @@ const VectorAttribute* VirtualMachine::get_disk(int disk_id) const
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-const VectorAttribute* VirtualMachine::get_context_disk() const
+const VectorAttribute* VirtualMachine::get_context() const
 {
     vector<const Attribute *> array_context;
     const VectorAttribute *   context;
diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index 31e2c35636..08b5846a7f 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -2434,17 +2434,13 @@ void VirtualMachineManager::attach_nic_action(
         goto error_driver;
     }
 
-    disk = vm->get_context_disk();
+    disk = vm->get_context();
 
     if ( disk != 0 )
     {
         vm_tm_mad = vm->get_tm_mad();
 
-        rc = tm->prolog_context_command(
-                    vm,
-                    token_password,
-                    vm_tm_mad,
-                    os);
+        rc = tm->prolog_context_command(vm, token_password, vm_tm_mad, os);
 
         prolog_cmd = os.str();
 

From 5761be4d10d88a9f74568a5037fe825d981c0232 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 4 Feb 2016 13:10:42 +0100
Subject: [PATCH 184/197] feature #4217: Simplify Template, Attribute and
 PoolObjectSQL class interfaces

---
 include/AddressRange.h                        |   2 +-
 include/AddressRangePool.h                    |   2 +-
 include/Attribute.h                           | 178 ++--
 include/AuthManager.h                         |   2 +-
 include/DatastorePool.h                       |   2 +-
 include/GroupPool.h                           |   6 +-
 include/HookManager.h                         |   2 +-
 include/Host.h                                |   8 +-
 include/HostPool.h                            |  12 +-
 include/HostShare.h                           |  23 +-
 include/ImageManager.h                        |   2 +-
 include/ImagePool.h                           |  16 +-
 include/ImageTemplate.h                       |   2 +-
 include/InformationManager.h                  |   2 +-
 include/MadManager.h                          |   4 +-
 include/Nebula.h                              |  29 +-
 include/NebulaTemplate.h                      |  86 --
 include/PoolObjectSQL.h                       | 196 +----
 include/PoolSQL.h                             |   4 +-
 include/Quota.h                               |   6 +-
 include/SqliteDB.h                            |   2 +-
 include/Template.h                            | 452 ++++++-----
 include/TransferManager.h                     |   6 +-
 include/UserPool.h                            |   2 +-
 include/VirtualMachine.h                      |  25 +-
 include/VirtualMachineManager.h               |   2 +-
 include/VirtualMachinePool.h                  |  14 +-
 include/VirtualMachineTemplate.h              |   2 +-
 include/VirtualNetwork.h                      |   2 +-
 include/VirtualNetworkPool.h                  |  11 +-
 include/VirtualNetworkTemplate.h              |   2 +-
 include/VirtualRouterPool.h                   |   7 +-
 src/common/Attribute.cc                       | 185 -----
 src/datastore/DatastorePool.cc                |   8 +-
 src/dm/DispatchManagerActions.cc              |   4 +-
 src/group/GroupPool.cc                        |   8 +-
 src/host/Host.cc                              |  25 +-
 src/host/HostPool.cc                          |  19 +-
 src/host/HostShare.cc                         | 117 +--
 src/image/ImagePool.cc                        |  22 +-
 src/lcm/LifeCycleActions.cc                   |   8 +-
 src/lcm/LifeCycleStates.cc                    |  10 +-
 src/mad/MadManager.cc                         |   2 +-
 src/nebula/Nebula.cc                          |  99 +--
 src/pool/PoolSQL.cc                           |  18 +-
 src/rm/RequestManagerVirtualMachine.cc        |   4 +-
 src/scheduler/include/HostXML.h               |   6 +-
 src/scheduler/include/VirtualMachineXML.h     |   2 +-
 src/scheduler/src/pool/HostXML.cc             |   2 +-
 .../src/pool/VirtualMachinePoolXML.cc         |   2 +-
 src/scheduler/src/pool/VirtualMachineXML.cc   |  11 +-
 src/scheduler/src/sched/Scheduler.cc          |  27 +-
 src/scheduler/src/sched/SchedulerTemplate.cc  |  18 +-
 src/secgroup/SecurityGroup.cc                 |  44 +-
 src/sql/SqliteDB.cc                           |   2 +-
 src/template/Template.cc                      | 347 ++------
 src/template/template_parser.c                | 207 +++--
 src/template/template_syntax.cc               |  26 +-
 src/template/template_syntax.h                |   9 +-
 src/tm/TransferManager.cc                     | 163 ++--
 src/um/Quota.cc                               |  27 +-
 src/um/QuotaImage.cc                          |  28 +-
 src/um/QuotaNetwork.cc                        |  32 +-
 src/um/QuotaVirtualMachine.cc                 |  14 +-
 src/um/Quotas.cc                              |   2 +-
 src/um/UserPool.cc                            |   2 +-
 src/vm/Snapshots.cc                           |  12 +-
 src/vm/VirtualMachine.cc                      | 763 +++++-------------
 src/vm/VirtualMachinePool.cc                  |  31 +-
 src/vm/VirtualMachineTemplate.cc              |   9 +-
 src/vm/vm_file_var_syntax.cc                  |  18 +-
 src/vm/vm_file_var_syntax.h                   |   8 +-
 src/vm/vm_var_parser.c                        | 123 +--
 src/vm/vm_var_syntax.cc                       |  86 +-
 src/vm/vm_var_syntax.h                        |  11 +-
 src/vm/vm_var_syntax.y                        |  46 +-
 src/vmm/LibVirtDriverKVM.cc                   | 318 +++-----
 src/vmm/LibVirtDriverVMware.cc                | 198 ++---
 src/vmm/VirtualMachineManager.cc              |   2 +-
 src/vmm/VirtualMachineManagerDriver.cc        |  13 +-
 src/vmm/XenDriver.cc                          | 379 ++++-----
 src/vnm/AddressRange.cc                       |   6 +-
 src/vnm/AddressRangePool.cc                   |  44 +-
 src/vnm/VirtualNetwork.cc                     |  56 +-
 src/vnm/VirtualNetworkPool.cc                 |  15 +-
 src/vrouter/VirtualRouter.cc                  |  61 +-
 src/xml/expr_arith.cc                         |  36 +-
 src/xml/expr_arith.h                          |   8 +-
 src/xml/expr_bool.cc                          |  50 +-
 src/xml/expr_bool.h                           |  12 +-
 src/xml/expr_parser.c                         | 127 +--
 91 files changed, 1808 insertions(+), 3235 deletions(-)

diff --git a/include/AddressRange.h b/include/AddressRange.h
index 7446febe9a..c6ed40c311 100644
--- a/include/AddressRange.h
+++ b/include/AddressRange.h
@@ -346,7 +346,7 @@ public:
      */
     friend int AddressRangePool::add_ar(AddressRange * ar);
 
-    static void set_restricted_attributes(vector<const Attribute *>& rattrs);
+    static void set_restricted_attributes(vector<const SingleAttribute *>& rattrs);
 
 private:
     /* ---------------------------------------------------------------------- */
diff --git a/include/AddressRangePool.h b/include/AddressRangePool.h
index 7c2dc7ff5d..a2b5d93773 100644
--- a/include/AddressRangePool.h
+++ b/include/AddressRangePool.h
@@ -82,7 +82,7 @@ public:
      *    the reason.
      *    @return 0 on success
      */
-    int update_ar(vector<Attribute *> ars, bool keep_restricted, string& error_msg);
+    int update_ar(vector<VectorAttribute *> ars, bool keep_restricted, string& error_msg);
 
     /**
      *  Allocates a new *empty* address range. It is not added to the pool as it
diff --git a/include/Attribute.h b/include/Attribute.h
index c80245dd63..20fb9eb2c5 100644
--- a/include/Attribute.h
+++ b/include/Attribute.h
@@ -247,84 +247,81 @@ public:
     string vector_value(const char *name) const;
 
     /**
-     *  Returns the string value
-     *    @param name of the attribute
-     *    @param value of the value
+     * Returns the value of the given element of the VectorAttribute
      *
-     *    @return 0 if the attribute was found, -1 otherwise
+     * @param name of the attribute
+     * @param value, not set if the element is not found of has invalid type
+     *
+     * @return 0 on success, -1 otherwise
      */
+    template<typename T>
+    int vector_value(const char *name, T& value) const
+    {
+        map<string,string>::const_iterator it;
+
+        it = attribute_value.find(name);
+
+        if ( it == attribute_value.end() )
+        {
+            return -1;
+        }
+
+        if ( it->second.empty() )
+        {
+            return -1;
+        }
+
+        istringstream iss(it->second);
+        iss >> value;
+
+        if (iss.fail() || !iss.eof())
+        {
+            return -1;
+        }
+
+        return 0;
+    }
+
     int vector_value(const char *name, string& value) const;
 
-    /**
-     *  Returns the boolean value
-     *    @param name of the attribute
-     *    @param value Bool value ("YES" is true)
-     *
-     *    @return 0 on success, -1 otherwise
-     */
     int vector_value(const char *name, bool& value) const;
 
-    /**
-     * Returns the integer value
-     *
-     * @param name Name of the attribute
-     * @param value Integer value
-     *
-     * @return 0 on success, -1 otherwise
-     */
-    int vector_value(const char *name, int& value) const;
-
-    /**
-     * Returns the unsigned integer value
-     *
-     * @param name Name of the attribute
-     * @param value Integer value
-     *
-     * @return 0 on success, -1 otherwise
-     */
-    int vector_value(const char *name, unsigned int& value) const;
-
-    /**
-     * Returns the long long value
-     *
-     * @param name Name of the attribute
-     * @param value Long long value
-     *
-     * @return 0 on success, -1 otherwise
-     */
-    int vector_value(const char *name, long long& value) const;
-
-    /**
-     * Returns the float value
-     *
-     * @param name Name of the attribute
-     * @param value Float value
-     *
-     * @return 0 on success, -1 otherwise
-     */
-    int vector_value(const char *name, float& value) const;
-
     /**
      * Returns the integer value
      *
      * @param name Name of the attribute
      * @param value Integer value, if an error occurred the string returned is
-     * empty and value set to -1;
+     * empty and value is not set
      *
      * @return the value in string form on success, "" otherwise
      */
-    string vector_value_str(const char *name, int& value) const;
+    template<typename T>
+    string vector_value_str(const char *name, T& value) const
+    {
+        map<string,string>::const_iterator it;
 
-    /**
-     * Returns the float value
-     *
-     * @param name Name of the attribute
-     * @param value Float value, if an error occurred the string returned is
-     * empty and value set to -1;
-     *
-     * @return the value in string form on success, "" otherwise
-     */
-    string vector_value_str(const char *name, float& value) const;
+        it = attribute_value.find(name);
+
+        if ( it == attribute_value.end() )
+        {
+            return  "";
+        }
+
+        if ( it->second.empty() )
+        {
+            return "";
+        }
+
+        istringstream iss(it->second);
+        iss >> value;
+
+        if (iss.fail() || !iss.eof())
+        {
+            return "";
+        }
+
+        return it->second;
+    }
 
     /**
      *  Marshall the attribute in a single string. The string MUST be freed
@@ -375,12 +372,8 @@ public:
     /**
      *  Replace the value of the given vector attribute
      */
-    void replace(const string& name, const string& value);
-
-    /**
-     *  Replace the value of the given vector attribute
-     */
-    void replace(const string& name, int value)
+    template<typename T>
+    void replace(const string& name, T value)
     {
         ostringstream oss;
 
@@ -389,59 +382,20 @@ public:
         replace(name, oss.str());
     }
 
-    /**
-     *  Replace the value of the given vector attribute
-     */
-    void replace(const string& name, unsigned int value)
-    {
-        ostringstream oss;
-
-        oss << value;
-
-        replace(name, oss.str());
-    }
-
-    /**
-     *  Replace the value of the given vector attribute
-     */
-    void replace(const string& name, long long value)
-    {
-        ostringstream oss;
-
-        oss << value;
-
-        replace(name, oss.str());
-    }
-
-    /**
-     *  Replace the value of the given vector attribute
-     */
-    void replace(const string& name, const char* value)
-    {
-        string svalue(value);
-
-        replace(name, svalue);
-    }
-
-    /**
-     *  Replace the value of the given vector attribute
-     */
     void replace(const string& name, bool value)
     {
-        string b_value;
-
         if (value == true)
         {
-            b_value = "YES";
+            replace(name, "YES");
         }
         else
         {
-            b_value = "NO";
+            replace(name, "NO");
         }
-
-        replace(name, b_value);
     }
 
+    void replace(const string& name, const string& value);
+
     /**
      * Removes given the vector attribute
      * @param name of the vector attribute
diff --git a/include/AuthManager.h b/include/AuthManager.h
index d3d717912c..e9a570849e 100644
--- a/include/AuthManager.h
+++ b/include/AuthManager.h
@@ -41,7 +41,7 @@ public:
 
     AuthManager(
         time_t                    timer,
-        vector<const Attribute*>& _mads):
+        vector<const VectorAttribute*>& _mads):
             MadManager(_mads), timer_period(timer)
     {
         am.addListener(this);
diff --git a/include/DatastorePool.h b/include/DatastorePool.h
index 3fd2f189c2..cd917c4e5f 100644
--- a/include/DatastorePool.h
+++ b/include/DatastorePool.h
@@ -26,7 +26,7 @@ using namespace std;
 class DatastorePool : public PoolSQL
 {
 public:
-    DatastorePool(SqlDB * db, const vector<const Attribute *>& _inherit_attrs);
+    DatastorePool(SqlDB * db, const vector<const SingleAttribute *>& _inherit_attrs);
 
     ~DatastorePool(){};
 
diff --git a/include/GroupPool.h b/include/GroupPool.h
index 9ff6b9ee38..cf88a5c81f 100644
--- a/include/GroupPool.h
+++ b/include/GroupPool.h
@@ -26,10 +26,8 @@ using namespace std;
 class GroupPool : public PoolSQL
 {
 public:
-    GroupPool(SqlDB * db,
-              vector<const Attribute *> hook_mads,
-              const string&             remotes_location,
-              bool                      is_federation_slave);
+    GroupPool(SqlDB * db, vector<const VectorAttribute *> hook_mads,
+          const string& remotes_location, bool is_federation_slave);
 
     ~GroupPool(){};
 
diff --git a/include/HookManager.h b/include/HookManager.h
index 677228ef31..1896e8f84a 100644
--- a/include/HookManager.h
+++ b/include/HookManager.h
@@ -30,7 +30,7 @@ class HookManager : public MadManager, public ActionListener
 {
 public:
 
-    HookManager(vector<const Attribute*>& _mads, VirtualMachinePool * _vmpool)
+    HookManager(vector<const VectorAttribute*>& _mads, VirtualMachinePool * _vmpool)
         :MadManager(_mads),vmpool(_vmpool)
     {
         am.addListener(this);
diff --git a/include/Host.h b/include/Host.h
index 9c10af777c..da15c503e0 100644
--- a/include/Host.h
+++ b/include/Host.h
@@ -383,7 +383,7 @@ public:
      *    @return 0 on success
      */
     void add_capacity(int vm_id, long long cpu, long long mem, long long disk,
-            vector<Attribute *> pci)
+            vector<VectorAttribute *> pci)
     {
         if ( vm_collection.add_collection_id(vm_id) == 0 )
         {
@@ -410,7 +410,7 @@ public:
      *    @return 0 on success
      */
     void del_capacity(int vm_id, long long cpu, long long mem, long long disk,
-            vector<Attribute *> pci)
+            vector<VectorAttribute *> pci)
     {
         if ( vm_collection.del_collection_id(vm_id) == 0 )
         {
@@ -449,7 +449,7 @@ public:
      *    @return true if the share can host the VM
      */
     bool test_capacity(long long cpu, long long mem, long long disk,
-                       vector<Attribute *> &pci, string& error) const
+                       vector<VectorAttribute *> &pci, string& error) const
     {
         return host_share.test(cpu, mem, disk, pci, error);
     }
@@ -461,7 +461,7 @@ public:
      *    @param error Returns the error reason, if any
      *    @return true if the share can host the VM
      */
-    bool test_capacity(vector<Attribute *> &pci, string& error) const
+    bool test_capacity(vector<VectorAttribute *> &pci, string& error) const
     {
         return host_share.test(pci, error);
     }
diff --git a/include/HostPool.h b/include/HostPool.h
index db1bceef9a..973a8acbb6 100644
--- a/include/HostPool.h
+++ b/include/HostPool.h
@@ -35,11 +35,9 @@ using namespace std;
 class HostPool : public PoolSQL
 {
 public:
-    HostPool(SqlDB *                   db,
-             vector<const Attribute *> hook_mads,
-             const string&             hook_location,
-             const string&             remotes_location,
-             time_t                    expire_time);
+    HostPool(SqlDB * db, vector<const VectorAttribute *> hook_mads,
+        const string& hook_location, const string& remotes_location,
+        time_t expire_time);
 
     ~HostPool(){};
 
@@ -128,7 +126,7 @@ public:
      *   @return 0 on success -1 in case of failure
      */
     int add_capacity(int oid, int vm_id, int cpu, int mem, int disk,
-            vector<Attribute *> pci)
+            vector<VectorAttribute *> pci)
     {
         int rc = 0;
         Host * host = get(oid, true);
@@ -159,7 +157,7 @@ public:
      *   @param pci devices requested by the VM
      */
     void del_capacity(int oid, int vm_id, int cpu, int mem, int disk,
-            vector<Attribute *> pci)
+            vector<VectorAttribute *> pci)
     {
         Host *  host = get(oid, true);
 
diff --git a/include/HostShare.h b/include/HostShare.h
index b95c5cb779..3f98129761 100644
--- a/include/HostShare.h
+++ b/include/HostShare.h
@@ -79,7 +79,7 @@ public:
      *    @param devs list of requested devices by the VM.
      *    @return true if all the devices are available.
      */
-    bool test(const vector<Attribute *> &devs) const;
+    bool test(const vector<VectorAttribute *> &devs) const;
 
     /**
      *  Assign the requested devices to the given VM. The assigned devices will
@@ -89,18 +89,18 @@ public:
      *    assigned devices.
      *    @param vmid of the VM
      */
-    void add(vector<Attribute *> &devs, int vmid);
+    void add(vector<VectorAttribute *> &devs, int vmid);
 
     /**
      *  Remove the VM assignment from the PCI device list
      */
-    void del(const vector<Attribute *> &devs);
+    void del(const vector<VectorAttribute *> &devs);
 
     /**
      *  Updates the PCI list with monitor data, it will create or
      *  remove PCIDevices as needed.
      */
-    void set_monitorization(vector<Attribute*> &pci_att);
+    void set_monitorization(vector<VectorAttribute*> &pci_att);
 
     /**
      *  Prints the PCI device list to an output stream. This function is used
@@ -122,7 +122,7 @@ private:
     /**
      *  Sets the internal class structures from the template
      */
-    int init();
+    void init();
 
     /**
      *  Internal structure to represent PCI devices for fast look up and
@@ -171,7 +171,7 @@ public:
      *    @param pci_devs requested by the VM
      */
     void add(int vmid, long long cpu, long long mem, long long disk,
-        vector<Attribute *> pci_devs)
+        vector<VectorAttribute *> pci_devs)
     {
         cpu_usage  += cpu;
         mem_usage  += mem;
@@ -202,7 +202,8 @@ public:
      *    @param disk requested by the VM
      *    @param pci_devs requested by the VM
      */
-    void del(long long cpu, long long mem, long long disk, vector<Attribute *> pci_devs)
+    void del(long long cpu, long long mem, long long disk,
+            vector<VectorAttribute *> pci_devs)
     {
         cpu_usage  -= cpu;
         mem_usage  -= mem;
@@ -225,7 +226,7 @@ public:
      *    configured
      */
     bool test(long long cpu, long long mem, long long disk,
-              vector<Attribute *>& pci_devs, string& error) const
+              vector<VectorAttribute *>& pci_devs, string& error) const
     {
         bool pci_fits = pci.test(pci_devs);
 
@@ -257,7 +258,7 @@ public:
      *    @return true if the share can host the VM or it is the only one
      *    configured
      */
-    bool test(vector<Attribute *>& pci_devs, string& error) const
+    bool test(vector<VectorAttribute *>& pci_devs, string& error) const
     {
         bool fits = pci.test(pci_devs);
 
@@ -282,9 +283,9 @@ public:
      */
     string& to_xml(string& xml) const;
 
-    void set_ds_monitorization(const vector<Attribute*> &ds_att);
+    void set_ds_monitorization(const vector<VectorAttribute*> &ds_att);
 
-    void set_pci_monitorization(vector<Attribute*> &pci_att)
+    void set_pci_monitorization(vector<VectorAttribute*> &pci_att)
     {
         pci.set_monitorization(pci_att);
     }
diff --git a/include/ImageManager.h b/include/ImageManager.h
index 755d50b655..0ac1f9c746 100644
--- a/include/ImageManager.h
+++ b/include/ImageManager.h
@@ -37,7 +37,7 @@ public:
                  time_t                    _monitor_period,
                  ImagePool *               _ipool,
                  DatastorePool *           _dspool,
-                 vector<const Attribute*>& _mads):
+                 vector<const VectorAttribute*>& _mads):
             MadManager(_mads),
             timer_period(_timer_period),
             monitor_period(_monitor_period),
diff --git a/include/ImagePool.h b/include/ImagePool.h
index f0bb89f064..4c7643bc11 100644
--- a/include/ImagePool.h
+++ b/include/ImagePool.h
@@ -41,14 +41,14 @@ class ImagePool : public PoolSQL
 public:
 
     ImagePool(
-            SqlDB *                             db,
-            const string&                       __default_type,
-            const string&                       __default_dev_prefix,
-            const string&                       __default_cdrom_dev_prefix,
-            vector<const Attribute *>&          restricted_attrs,
-            vector<const Attribute *>           hook_mads,
-            const string&                       remotes_location,
-            const vector<const Attribute *>&    _inherit_image_attrs);
+            SqlDB *                          db,
+            const string&                    __default_type,
+            const string&                    __default_dev_prefix,
+            const string&                    __default_cdrom_dev_prefix,
+            vector<const SingleAttribute *>& restricted_attrs,
+            vector<const VectorAttribute *>& hook_mads,
+            const string&                    remotes_location,
+            const vector<const SingleAttribute *>& _inherit_image_attrs);
 
     ~ImagePool(){};
 
diff --git a/include/ImageTemplate.h b/include/ImageTemplate.h
index 8cda4f3b3f..f3685b52d7 100644
--- a/include/ImageTemplate.h
+++ b/include/ImageTemplate.h
@@ -88,7 +88,7 @@ private:
      * ImageTemplate::check
      * @param rattrs Attributes to restrict
      */
-    static void set_restricted_attributes(vector<const Attribute *>& rattrs)
+    static void set_restricted_attributes(vector<const SingleAttribute *>& rattrs)
     {
         Template::set_restricted_attributes(rattrs, restricted_attributes);
     };
diff --git a/include/InformationManager.h b/include/InformationManager.h
index 67408e0508..bc30bccacb 100644
--- a/include/InformationManager.h
+++ b/include/InformationManager.h
@@ -41,7 +41,7 @@ public:
         int                         _host_limit,
         int                         _monitor_threads,
         const string&               _remotes_location,
-        vector<const Attribute*>&   _mads)
+        vector<const VectorAttribute*>&   _mads)
             :MadManager(_mads),
             hpool(_hpool),
             clpool(_clpool),
diff --git a/include/MadManager.h b/include/MadManager.h
index 0425c50a94..ba37ba837a 100644
--- a/include/MadManager.h
+++ b/include/MadManager.h
@@ -64,7 +64,7 @@ public:
 
 protected:
 
-    MadManager(vector<const Attribute *>& _mads);
+    MadManager(vector<const VectorAttribute *>& _mads);
 
     virtual ~MadManager();
 
@@ -72,7 +72,7 @@ protected:
      *  Vector containing Mad configuration for this Manager, as described in
      *  the nebula location
      */
-    vector<const Attribute *> mad_conf;
+    vector<const VectorAttribute *> mad_conf;
 
     /**
      *  This function initialize the communication pipes to register new MADs
diff --git a/include/Nebula.h b/include/Nebula.h
index 8f25dcc54e..09df54c2c2 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -402,33 +402,8 @@ public:
      *    @param name of the attribute
      *    @param value of the attribute
      */
-    void get_configuration_attribute(
-        const char * name,
-        string& value) const
-    {
-        string _name(name);
-
-        nebula_configuration->Template::get(_name, value);
-    };
-
-    /**
-     *  Gets a configuration attribute for oned (long long version)
-     */
-    void get_configuration_attribute(
-        const char * name,
-        long long& value) const
-    {
-        string _name(name);
-
-        nebula_configuration->Template::get(_name, value);
-    };
-
-    /**
-     *  Gets a configuration attribute for oned (time_t version)
-     */
-    void get_configuration_attribute(
-        const char * name,
-        time_t& value) const
+    template<typename T>
+    void get_configuration_attribute(const string& name, T& value) const
     {
         nebula_configuration->get(name, value);
     };
diff --git a/include/NebulaTemplate.h b/include/NebulaTemplate.h
index 4dc9c29b44..bfa4a16372 100644
--- a/include/NebulaTemplate.h
+++ b/include/NebulaTemplate.h
@@ -26,9 +26,6 @@
 class NebulaTemplate : public Template
 {
 public:
-    // -----------------------------------------------------------------------
-    // -----------------------------------------------------------------------
-
     NebulaTemplate(const string& etc_location, const char * _conf_name)
     {
         conf_file = etc_location + _conf_name;
@@ -36,89 +33,6 @@ public:
 
     virtual ~NebulaTemplate(){};
 
-    // -----------------------------------------------------------------------
-    // -----------------------------------------------------------------------
-
-    int get(const char * name, vector<const Attribute*>& values) const
-    {
-        string _name(name);
-
-        return Template::get(_name,values);
-    };
-
-    void get(const char * name, string& values) const
-    {
-        string _name(name);
-
-        Template::get(_name,values);
-    };
-
-    void get(const char * name, int& values) const
-    {
-        string _name(name);
-
-        Template::get(_name,values);
-    };
-
-    void get(const char *name, unsigned int& values) const
-    {
-        int ival;
-
-        NebulaTemplate::get(name, ival);
-
-        values = static_cast<unsigned int>(ival);
-    };
-
-    void get(const char * name, time_t& values) const
-    {
-        const SingleAttribute *   sattr;
-        vector<const Attribute *> attr;
-
-        string _name(name);
-
-        if ( Template::get(_name,attr) == 0 )
-        {
-            values = 0;
-            return;
-        }
-
-        sattr = dynamic_cast<const SingleAttribute *>(attr[0]);
-
-        if ( sattr != 0 )
-        {
-            istringstream   is;
-
-            is.str(sattr->value());
-            is >> values;
-        }
-        else
-            values = 0;
-    };
-
-    void get(const char *name, float& value) const
-    {
-        string _name(name);
-
-        Template::get(_name,value);
-    };
-
-    void get(const char *name, bool& value) const
-    {
-        string _name(name);
-
-        Template::get(_name,value);
-    };
-
-    void get(const char *name, long long& value) const
-    {
-        string _name(name);
-
-        Template::get(_name,value);
-    }
-
-    // -----------------------------------------------------------------------
-    // -----------------------------------------------------------------------
-
     /**
      *  Parse and loads the configuration in the template
      */
diff --git a/include/PoolObjectSQL.h b/include/PoolObjectSQL.h
index b832a43075..2b32e23fc2 100644
--- a/include/PoolObjectSQL.h
+++ b/include/PoolObjectSQL.h
@@ -327,152 +327,61 @@ public:
     // Template
     // ------------------------------------------------------------------------
     /**
-     *  Gets the values of a template attribute
+     *  Gets the first VectorAttribute of the specified type with the given name.
+     *  Const and non-const versions of this method is provided
+     *    @param name the attribute name.
+     *    @return true first attribute or 0 if not found or wrong type
+     */
+    const VectorAttribute * get_template_attribute(const string& s) const
+    {
+        return obj_template->get(s);
+    }
+
+    VectorAttribute * get_template_attribute(const string& s)
+    {
+        return obj_template->get(s);
+    }
+
+    /**
+     *  Gets the values of a template attribute, as a list of VectorAttributes
      *    @param name of the attribute
      *    @param values of the attribute
      *    @return the number of values
      */
-    int get_template_attribute(
-        const char *              name,
-        vector<const Attribute*>& values) const
+	template<typename T>
+    int get_template_attribute(const char * name, vector<const T*>& values) const
     {
         return obj_template->get(name,values);
     };
 
     /**
-     *  Gets a string based attribute (single)
+     *  These methods gets the value of a SingleAttribute and converts it to the
+	 *  target type
      *    @param name of the attribute
-     *    @param value of the attribute (a string), will be "" if not defined or
+     *    @param value of the attribute, will be ""/0/false if not defined or
      *    not a single attribute
+	 *
+     *    @return true if the attribute was found and is a valid type for the
+	 *    target value
      */
-    void get_template_attribute(
-        const char * name,
-        string&      value) const
-    {
-        obj_template->get(name,value);
-    }
-
-    /**
-     *  Gets and removes a string based attribute (single)
-     *    @param name of the attribute
-     *    @param value of the attribute (a string), will be "" if not defined or
-     *    not a single attribute
-     *    @return the number of attributes erased
-     */
-    int erase_template_attribute(
-        const char * name,
-        string&      value)
-    {
-        obj_template->get(name,value);
-        return obj_template->erase(name);
-    }
-
-    /**
-     *  Gets and removes a float based attribute (single)
-     *    @param name of the attribute
-     *    @param value of the attribute (a float), will be 0 if not defined or
-     *    not a single attribute
-     *    @return the number of attributes erased
-     */
-    int erase_template_attribute(
-        const char * name,
-        float&       value)
-    {
-        obj_template->get(name,value);
-        return obj_template->erase(name);
-    }
-
-    /**
-     *  Gets and removes a long long based attribute (single)
-     *    @param name of the attribute
-     *    @param value of the attribute (a long long), will be 0 if not defined or
-     *    not a single attribute
-     *    @return the number of attributes erased
-     */
-    int erase_template_attribute(
-        const char * name,
-        long long&   value)
-    {
-        obj_template->get(name,value);
-        return obj_template->erase(name);
-    }
-
-    /**
-     *  Gets and removes a boolean based attribute (single)
-     *    @param name of the attribute
-     *    @param value of the attribute (a boolean), will be false if not defined or
-     *    not a single attribute
-     *    @return the number of attributes erased
-     */
-    int erase_template_attribute(
-        const char * name,
-        bool&        value)
-    {
-        obj_template->get(name,value);
-        return obj_template->erase(name);
-    }
-
-    /**
-     *  Gets an int based attribute (single)
-     *    @param name of the attribute
-     *    @param value of the attribute (an int), will be 0 if not defined or
-     *    not a single attribute
-     *
-     *    @return True if the Single attribute was found and is a valid integer
-     *    value
-     */
-    bool get_template_attribute(
-        const char *    name,
-        int&            value) const
+	template<typename T>
+    bool get_template_attribute(const char * name, T& value) const
     {
         return obj_template->get(name,value);
     }
 
     /**
-     *  Gets a long long based attribute (single)
+     *  These methods get and remove a string based attribute (single)
      *    @param name of the attribute
-     *    @param value of the attribute (long long), will be 0 if not defined or
-     *    not a single attribute
-     *
-     *    @return True if the Single attribute was found and is a valid integer
-     *    value
+     *    @param value of the attribute (a string), will be ""/0/false if not
+	 *    defined or  not a single attribute, depending on the target value type
+     *    @return the number of attributes erased
      */
-    bool get_template_attribute(
-        const char *    name,
-        long long&      value) const
+	template<typename T>
+    int erase_template_attribute(const char * name, T& value)
     {
-        return obj_template->get(name,value);
-    }
-
-    /**
-     *  Gets a float based attribute (single)
-     *    @param name of the attribute
-     *    @param value of the attribute (a float), will be 0 if not defined or
-     *    not a single attribute
-     *
-     *    @return True if the Single attribute was found and is a valid float
-     *    value
-     */
-    bool get_template_attribute(
-        const char *    name,
-        float&          value) const
-    {
-        return obj_template->get(name,value);
-    }
-
-    /**
-     *  Gets a boolean attribute (single) (YES = true)
-     *    @param name of the attribute
-     *    @param value of the attribute (True if "YES", false otherwise)
-     *
-     *    @return True if the Single attribute was found and is a valid boolean
-     *    value
-     */
-    bool get_template_attribute(
-        const char *    name,
-        bool&           value) const
-    {
-        return obj_template->get(name,value);
+        obj_template->get(name,value);
+        return obj_template->erase(name);
     }
 
     /**
@@ -482,9 +391,8 @@ public:
      *    @param value of the new attribute
      *    @return 0 on success
      */
-    int replace_template_attribute(
-        const string& name,
-        const string& value)
+	template<typename T>
+    int replace_template_attribute(const string& name, const T& value)
     {
         return obj_template->replace(name, value);
     }
@@ -496,11 +404,10 @@ public:
      *    @param values a vector containing a pointer to the attributes
      *    @return the number of attributes removed
      */
-    int remove_template_attribute(
-        const string&        name,
-        vector<Attribute *>& values)
+	template<typename T>
+    int remove_template_attribute(const string& n, vector<T *>& v)
     {
-        return obj_template->remove(name, values);
+        return obj_template->remove(n, v);
     }
 
     /**
@@ -537,27 +444,8 @@ public:
      *    @param att_name Name for the attribute
      *    @param att_val Message string
      */
-    void add_template_attribute(const string& name, const string& value)
-    {
-        obj_template->add(name, value);
-    }
-
-    /**
-     *  Adds an int attribute
-     *    @param att_name Name for the attribute
-     *    @param att_val integer
-     */
-    void add_template_attribute(const string& name, int value)
-    {
-        obj_template->add(name, value);
-    }
-
-    /**
-     *  Adds a float attribute
-     *    @param att_name Name for the attribute
-     *    @param att_val integer
-     */
-    void add_template_attribute(const string& name, float value)
+	template<typename T>
+    void add_template_attribute(const string& name, const T& value)
     {
         obj_template->add(name, value);
     }
diff --git a/include/PoolSQL.h b/include/PoolSQL.h
index 8f7367154d..c1073c142d 100644
--- a/include/PoolSQL.h
+++ b/include/PoolSQL.h
@@ -248,8 +248,8 @@ protected:
      *    @param remotes_location, path to remotes in the front-end where the
      *    hooks are installed
      */
-    void register_hooks(vector<const Attribute *> hook_mads,
-                        const string&             remotes_location);
+    void register_hooks(vector<const VectorAttribute *> hook_mads,
+                        const string&                   remotes_location);
 
     /**
      *  Gets an object from the pool (if needed the object is loaded from the
diff --git a/include/Quota.h b/include/Quota.h
index 87a7963c70..cd7b38b025 100644
--- a/include/Quota.h
+++ b/include/Quota.h
@@ -50,7 +50,7 @@ public:
      *
      *    @return 0 on success -1 otherwise
      */
-    virtual int set(vector<Attribute*> * quotas, string& error) = 0;
+    virtual int set(vector<VectorAttribute*> * quotas, string& error) = 0;
 
     /**
      *  Check if a resource update in usage counters will exceed the
@@ -98,7 +98,7 @@ class QuotaDecorator : public QuotaInterface
         return quota->del(tmpl);
     }
 
-    virtual int set(vector<Attribute*> * quotas, string& error)
+    virtual int set(vector<VectorAttribute*> * quotas, string& error)
     {
         return quota->set(quotas, error);
     }
@@ -142,7 +142,7 @@ public:
      *
      *    @return 0 on success -1 otherwise
      */
-    int set(vector<Attribute*> * quotas, string& error);
+    int set(vector<VectorAttribute*> * quotas, string& error);
 
     /**
      *  Check if a resource update in usage counters will exceed the
diff --git a/include/SqliteDB.h b/include/SqliteDB.h
index 2f1244a457..ceb34ea02d 100644
--- a/include/SqliteDB.h
+++ b/include/SqliteDB.h
@@ -45,7 +45,7 @@ class SqliteDB : public SqlDB
 {
 public:
 
-    SqliteDB(string& db_name);
+    SqliteDB(const string& db_name);
 
     ~SqliteDB();
 
diff --git a/include/Template.h b/include/Template.h
index 07658fa286..ffde7a42cc 100644
--- a/include/Template.h
+++ b/include/Template.h
@@ -89,6 +89,9 @@ public:
      */
     virtual ~Template();
 
+    /* ---------------------------------------------------------------------- */
+    /* Functions to create a Template parsing a file, stream in txt or XML    */
+    /* ---------------------------------------------------------------------- */
     /**
      *  Parse a string representing the template, each attribute is inserted
      *  in the template class.
@@ -119,6 +122,30 @@ public:
      */
     int parse_str_or_xml(const string &parse_str, string& error_msg);
 
+    /**
+     *  Rebuilds the template from a xml formatted string
+     *    @param xml_str The xml-formatted string
+     *
+     *    @return 0 on success, -1 otherwise
+     */
+    int from_xml(const string &xml_str);
+
+    /**
+     *  Rebuilds the object from an xml node
+     *    @param node The xml node pointer
+     *
+     *    @return 0 on success, -1 otherwise
+     */
+    int from_xml_node(const xmlNodePtr node);
+
+    /**
+     *  Writes the Template into a output stream in txt format
+     */
+    friend ostream& operator<<(ostream& os, const Template& t);
+
+    /* ---------------------------------------------------------------------- */
+    /* Functions to render a Template in a str, or xml                        */
+    /* ---------------------------------------------------------------------- */
     /**
      *  Marshall a template. This function generates a single string with the
      *  template attributes ("VAR=VAL<delim>...").
@@ -150,6 +177,9 @@ public:
      */
     string& to_str(string& str) const;
 
+    /* ---------------------------------------------------------------------- */
+    /* Functions to add, remove and change attributes from a Template         */
+    /* ---------------------------------------------------------------------- */
     /**
      *  Clears all the attributes from the template
      */
@@ -163,98 +193,43 @@ public:
     virtual void set(Attribute * attr);
 
     /**
-     *  Adds a new attribute to the template (replacing it if
-     *  already defined)
+     *  Adds a new attribute to the template (replacing it if already defined)
      *    @param name of the new attribute
      *    @param value of the new attribute
      *    @return 0 on success
      */
+    template<typename T>
+    int replace(const string& name, const T& value)
+    {
+        std::ostringstream oss;
+
+        oss << value;
+
+        return replace(name, oss.str());
+    }
+
     int replace(const string& name, const string& value);
 
     /**
-     *  Adds a new attribute to the template (replacing it if
-     *  already defined)
-     *    @param name of the new attribute
-     *    @param value of the new attribute
-     *    @return 0 on success
-     */
-    int replace(const string& name, int value)
-    {
-        ostringstream oss;
-
-        oss << value;
-
-        return replace(name, oss.str());
-    }
-
-    /**
-     *  Adds a new attribute to the template (replacing it if
-     *  already defined)
-     *    @param name of the new attribute
-     *    @param value of the new attribute
-     *    @return 0 on success
-     */
-    int replace(const string& name, long long value)
-    {
-        ostringstream oss;
-
-        oss << value;
-
-        return replace(name, oss.str());
-    }
-
-    /*
      *  Adds a new single attribute to the template. It will replace an existing
      *  one if replace_mode was set to true
      *    @param name of the attribute
      *    @param value of the attribute
      */
-     void add(const string& name, const string& value)
-     {
-        set(new SingleAttribute(name, value));
-     }
-
-    /**
-     *  Adds a new single attribute to the template.
-     *    @param name of the attribute
-     *    @param value of the attribute
-     */
-     void add(const string& name, int value)
-     {
-        ostringstream oss;
+    template<typename T>
+    void add(const string& name, const T& value)
+    {
+        std::ostringstream oss;
 
         oss << value;
 
         set(new SingleAttribute(name, oss.str()));
-     }
+	}
 
-     /**
-      *  Adds a new single attribute to the template.
-      *    @param name of the attribute
-      *    @param value of the attribute
-      */
-     void add(const string& name, long long value)
-     {
-         ostringstream oss;
-
-         oss << value;
-
-         set(new SingleAttribute(name, oss.str()));
-     }
-
-    /**
-     *  Adds a new single attribute to the template.
-     *    @param name of the attribute
-     *    @param value of the attribute
-     */
-     void add(const string& name, float value)
-     {
-        ostringstream oss;
-
-        oss << value;
-
-        set(new SingleAttribute(name, oss.str()));
-     }
+	void add(const string& name, const string& value)
+	{
+		set(new SingleAttribute(name, value));
+	}
 
     /**
      *  Removes an attribute from the template. The attributes are returned. The
@@ -263,9 +238,27 @@ public:
      *    @param values a vector containing a pointer to the attributes
      *    @return the number of attributes removed
      */
-    virtual int remove(
-        const string&        name,
-        vector<Attribute *>& values);
+    template<typename T>
+    int remove(const string& name, vector<T *>& values)
+    {
+        pair<multimap<string, Attribute *>::iterator,
+             multimap<string, Attribute *>::iterator> index;
+
+        multimap<string, Attribute *>::iterator i;
+
+        int j;
+
+        index = attributes.equal_range(name);
+
+        for ( i = index.first,j=0 ; i != index.second ; i++,j++ )
+        {
+            values.push_back(static_cast<T *>(i->second));
+        }
+
+        attributes.erase(index.first, index.second);
+
+        return j;
+    }
 
     /**
      *  Removes an attribute from the template, but it DOES NOT free the
@@ -283,122 +276,90 @@ public:
      */
     virtual int erase(const string& name);
 
+    /* ---------------------------------------------------------------------- */
+    /* Functions get attributes from a template                               */
+    /* ---------------------------------------------------------------------- */
     /**
-     *  Gets all the attributes with the given name.
+     *  Gets the all the attributes of the given name and stores a reference
+     *  to them in a vector. If the selected attribute does not match the
+     *  requested type it will not be included
      *    @param name the attribute name.
+     *    @param values vector with the values
+     *
      *    @return the number of elements in the vector
      */
-    virtual int get(
-        const string& name,
-        vector<const Attribute*>& values) const;
-
-    /**
-     *  Gets all the attributes with the given name,  non-const version
-     *    @param name the attribute name.
-     *    @return the number of elements in the vector
-     */
-    virtual int get(
-        const string& name,
-        vector<Attribute*>& values);
-
-    /**
-     *  Gets the first VectorAttribute with the given name
-     *    @param name the attribute name.
-     *    @param vatt stores the first vector attribute found, or 0
-     *    @return true if a vector attribute was found
-     */
-    virtual bool get(
-        const string& name,
-        VectorAttribute*& vatt);
-
-    /**
-     *  Gets all the Vector Attributes with the given name
-     *    @param name the attribute name.
-     *    @return the number of elements in the vector
-     */
-    virtual int get(
-        const string& name,
-        vector<const VectorAttribute*>& values) const;
-
-    /**
-     *  Gets all the Vector Attributes with the given name, non-const version
-     *    @param name the attribute name.
-     *    @return the number of elements in the vector
-     */
-    virtual int get(
-        const string& name,
-        vector<VectorAttribute*>& values);
-
-    /**
-     *  Gets the value of a Single attributes (string) with the given name.
-     *    @param name the attribute name.
-     *    @param value the attribute value, a string, "" if the attribute is not
-     *    defined or not Single
-     */
-    virtual void get(
-        const string& name,
-        string& value) const;
-
-    /**
-     *  Gets the value of a Single attributes (int) with the given name.
-     *    @param name the attribute name.
-     *    @param value the attribute value, an int, 0 if the attribute is not
-     *    defined or not Single
-     *
-     *    @return True if the Single attribute was found and is a valid integer
-     *    value
-     */
-    virtual bool get(
-        const string& name,
-        int&    value) const;
-
-    /**
-     *  Gets the value of a Single attributes (long long) with the given name.
-     *    @param name the attribute name.
-     *    @param value the attribute value, a long long, 0 if the attribute is not
-     *    defined or not Single
-     *
-     *    @return True if the Single attribute was found and is a valid integer
-     *    value
-     */
-    virtual bool get(
-        const string& name,
-        long long&    value) const;
-
-    /**
-     *  Gets the value of a Single attributes (float) with the given name.
-     *    @param name the attribute name.
-     *    @param value the attribute value, an int, 0 if the attribute is not
-     *    defined or not Single
-     *
-     *    @return True if the Single attribute was found and is a valid float
-     *    value
-     */
-    virtual bool get(
-        const string&   name,
-        float&          value) const;
-
-    /**
-     *  Gets the value of a Single attributes (bool) with the given name.
-     *    @param name the attribute name.
-     *    @param value the attribute value, a bool, false if the attribute is not
-     *    defined or not Single
-     *
-     *    @return True if the Single attribute was found and is a valid bool
-     *    value
-     */
-    virtual bool get(
-        const string&   name,
-        bool&           value) const;
-
-    /**
-     *  Trims the trailing spaces in the NAME attribute
-     *    @return True if the attribute was found and trimmed
-     */
-    virtual bool trim_name()
+    inline virtual int get(const string& n, vector<const VectorAttribute*>& v) const
     {
-        return trim("NAME");
-    };
+        return __get<VectorAttribute>(n, v);
+    }
+
+    inline virtual int get( const string& n, vector<VectorAttribute*>& v)
+    {
+        return __get<VectorAttribute>(n, v);
+    }
+
+    inline virtual int get(const string& n, vector<const SingleAttribute*>& s) const
+    {
+        return __get<SingleAttribute>(n, s);
+    }
+
+    inline virtual int get( const string& n, vector<SingleAttribute*>& s)
+    {
+        return __get<SingleAttribute>(n, s);
+    }
+
+    /**
+     *  Gets the first Attribute of the specified type with the given name.
+     *  Const and non-const versions of this method is provided
+     *    @param name the attribute name.
+     *    @return true first attribute or 0 if not found or wrong type
+     */
+	inline const VectorAttribute * get(const string& name) const
+	{
+		return __get<VectorAttribute>(name);
+	}
+
+	inline VectorAttribute * get(const string& name)
+	{
+		return __get<VectorAttribute>(name);
+	}
+
+    /**
+     *  Gets the value of a SingleAttribute with the given name and converts
+     *  it to the target value format
+     *    @param name the attribute name.
+     *    @param value the attribute value
+     *
+     *    @return true if a SingleAttribute was found and it stores a valid
+     *    value, false otherwise.
+     */
+    template<typename T>
+    bool get(const string& name, T& value) const
+    {
+        const SingleAttribute * s = __get<SingleAttribute>(name);
+
+        value = 0;
+
+        if ( s == 0 )
+        {
+            return false;
+        }
+
+        istringstream iss(s->value());
+
+        iss >> value;
+
+        if (iss.fail() || !iss.eof())
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    virtual bool get(const string& name, bool& value) const;
+
+    virtual bool get(const string& name, string& value) const;
 
     /**
      *  Trims the trailing spaces in the attribute
@@ -407,23 +368,14 @@ public:
      */
     virtual bool trim(const string& name);
 
-    friend ostream& operator<<(ostream& os, const Template& t);
-
     /**
-     *  Rebuilds the template from a xml formatted string
-     *    @param xml_str The xml-formatted string
-     *
-     *    @return 0 on success, -1 otherwise
+     *  Trims the trailing spaces in the NAME attribute
+     *    @return True if the attribute was found and trimmed
      */
-    int from_xml(const string &xml_str);
-
-    /**
-     *  Rebuilds the object from an xml node
-     *    @param node The xml node pointer
-     *
-     *    @return 0 on success, -1 otherwise
-     */
-    int from_xml_node(const xmlNodePtr node);
+    inline virtual bool trim_name()
+    {
+        return trim("NAME");
+    };
 
     /**
      *  Merges another Template, adding the new attributes and
@@ -480,7 +432,7 @@ protected:
      * @param restricted_attributes The attributes will be stored here
      */
     static void set_restricted_attributes(
-            vector<const Attribute *>& rattrs,
+            vector<const SingleAttribute *>& rattrs,
             vector<string>& restricted_attributes);
 
     /**
@@ -533,6 +485,96 @@ private:
      *    @param root_element The xml element to build the template from.
      */
     void rebuild_attributes(const xmlNode * root_element);
+
+    /**
+     *  Gets the all the attributes of the given name and stores a reference
+     *  to them in a vector. If the selected attribute does not match the
+     *  requested type it will not be included
+     *    @param name the attribute name.
+     *    @param values vector with the values
+     *
+     *    @return the number of elements in the vector
+     */
+    template<typename T>
+    int __get(const string& name, vector<const T *>& values) const
+    {
+        pair<multimap<string, Attribute *>::const_iterator,
+             multimap<string, Attribute *>::const_iterator> index;
+
+        multimap<string, Attribute *>::const_iterator i;
+
+        int j;
+
+        index = attributes.equal_range(name);
+
+        for (i = index.first, j = 0 ; i != index.second ; i++, j++)
+        {
+            const T * vatt = dynamic_cast<const T *>(i->second);
+
+            if ( vatt == 0 )
+            {
+                continue;
+            }
+
+            values.push_back(vatt);
+        }
+
+        return j;
+    }
+
+    /* Non-const version of get for all attributes  */
+    template<typename T>
+    int __get(const string& name, vector<T *>& values)
+    {
+        pair<multimap<string, Attribute *>::iterator,
+             multimap<string, Attribute *>::iterator> index;
+
+        multimap<string, Attribute *>::iterator i;
+
+        int j;
+
+        index = attributes.equal_range(name);
+
+        for (i = index.first, j = 0 ; i != index.second ; i++, j++)
+        {
+            T * vatt = dynamic_cast<T *>(i->second);
+
+            if ( vatt == 0 )
+            {
+                continue;
+            }
+
+            values.push_back(vatt);
+        }
+
+        return j;
+    }
+
+    /**
+     *  Gets the first Attribute of the specified type with the given name.
+     *  Const and non-const versions of this method is provided
+     *    @param name the attribute name.
+     *    @return true first attribute or 0 if not found or wrong type
+     */
+    template<typename T>
+    const T * __get(const string& s) const
+    {
+        vector<const T*> atts;
+
+        if (__get<T>(s, atts) < 1)
+        {
+            return 0;
+        }
+
+        return atts[0];
+    }
+
+    template<typename T>
+    T * __get(const string& s)
+    {
+        return const_cast<T *>(
+                static_cast<const Template&>(*this).__get<T>(s));
+    }
 };
 
 /* -------------------------------------------------------------------------- */
diff --git a/include/TransferManager.h b/include/TransferManager.h
index fd75f67eb6..6dd76432f1 100644
--- a/include/TransferManager.h
+++ b/include/TransferManager.h
@@ -32,9 +32,9 @@ class TransferManager : public MadManager, public ActionListener
 public:
 
     TransferManager(
-        VirtualMachinePool *        _vmpool,
-        HostPool *                  _hpool,
-        vector<const Attribute*>&   _mads):
+        VirtualMachinePool * _vmpool,
+        HostPool *           _hpool,
+        vector<const VectorAttribute*>& _mads):
             MadManager(_mads),
             vmpool(_vmpool),
             hpool(_hpool)
diff --git a/include/UserPool.h b/include/UserPool.h
index bd60a1f58e..44b1797200 100644
--- a/include/UserPool.h
+++ b/include/UserPool.h
@@ -41,7 +41,7 @@ public:
 
     UserPool(SqlDB * db,
              time_t  __session_expiration_time,
-             vector<const Attribute *> hook_mads,
+             vector<const VectorAttribute *> hook_mads,
              const string&             remotes_location,
              bool                      is_federation_slave);
 
diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 3109ceaabd..319252adfa 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -463,18 +463,13 @@ public:
      */
     void set_kernel(const string& kernel)
     {
-        vector<Attribute *> os_attr;
-        VectorAttribute *   os;
+        VectorAttribute * os = obj_template->get("OS");
 
-        int num = obj_template->get("OS", os_attr);
-
-        if ( num == 0 )
+        if ( os == 0 )
         {
             return;
         }
 
-        os = dynamic_cast<VectorAttribute *>(os_attr[0]);
-
         os->replace("KERNEL", kernel);
     };
 
@@ -485,18 +480,13 @@ public:
      */
     void set_initrd(const string& initrd)
     {
-        vector<Attribute *> os_attr;
-        VectorAttribute *   os;
+        VectorAttribute * os = obj_template->get("OS");
 
-        int num = obj_template->get("OS", os_attr);
-
-        if ( num == 0 )
+        if ( os == 0 )
         {
             return;
         }
 
-        os = dynamic_cast<VectorAttribute *>(os_attr[0]);
-
         os->replace("INITRD", initrd);
     };
 
@@ -1225,7 +1215,7 @@ public:
      *    @param pci_dev
      */
     void get_requirements (int& cpu, int& memory, int& disk,
-            vector<Attribute *>& pci_dev);
+            vector<VectorAttribute *>& pci_dev);
 
     /**
      *  Checks if the resize parameters are valid
@@ -1356,7 +1346,10 @@ public:
      */
     int  generate_context(string &files, int &disk_id, const string& token_password);
 
-    const VectorAttribute* get_context() const;
+    const VectorAttribute* get_context() const
+    {
+        return obj_template->get("CONTEXT");
+    }
 
     /**
      * Returns the CREATED_BY template attribute, or the uid if it does not exist
diff --git a/include/VirtualMachineManager.h b/include/VirtualMachineManager.h
index b527265d76..d13e2203fb 100644
--- a/include/VirtualMachineManager.h
+++ b/include/VirtualMachineManager.h
@@ -38,7 +38,7 @@ public:
         time_t                    _poll_period,
         bool                      _do_vm_poll,
         int                       _vm_limit,
-        vector<const Attribute*>& _mads);
+        vector<const VectorAttribute*>& _mads);
 
     ~VirtualMachineManager(){};
 
diff --git a/include/VirtualMachinePool.h b/include/VirtualMachinePool.h
index 9c63d2a665..f4f2274429 100644
--- a/include/VirtualMachinePool.h
+++ b/include/VirtualMachinePool.h
@@ -33,10 +33,10 @@ class VirtualMachinePool : public PoolSQL
 public:
 
     VirtualMachinePool(SqlDB *                      db,
-                       vector<const Attribute *>    hook_mads,
+                       vector<const VectorAttribute *> hook_mads,
                        const string&                hook_location,
                        const string&                remotes_location,
-                       vector<const Attribute *>&   restricted_attrs,
+                       vector<const SingleAttribute *>& restricted_attrs,
                        time_t                       expire_time,
                        bool                         on_hold,
                        float                        default_cpu_cost,
@@ -359,14 +359,20 @@ public:
      *
      * @param vid VM id
      */
-    void attach_nic_failure(int vid);
+    void attach_nic_failure(int vid)
+    {
+        delete_hotplug_nic(vid, true);
+    }
 
     /**
      * Deletes the NIC that was in the process of being detached
      *
      * @param vid VM id
      */
-    void detach_nic_success(int vid);
+    void detach_nic_success(int vid)
+    {
+        delete_hotplug_nic(vid, false);
+    }
 
     /**
      * Deletes an entry in the HV-2-vmid mapping table for imported VMs
diff --git a/include/VirtualMachineTemplate.h b/include/VirtualMachineTemplate.h
index fa5f3aa72b..9515aafb71 100644
--- a/include/VirtualMachineTemplate.h
+++ b/include/VirtualMachineTemplate.h
@@ -101,7 +101,7 @@ private:
      * VirtualMachineTemplate::check
      * @param rattrs Attributes to restrict
      */
-    static void set_restricted_attributes(vector<const Attribute *>& rattrs)
+    static void set_restricted_attributes(vector<const SingleAttribute *>& rattrs)
     {
         Template::set_restricted_attributes(rattrs, restricted_attributes);
     };
diff --git a/include/VirtualNetwork.h b/include/VirtualNetwork.h
index d4ba3ce8c2..e9463d8ec3 100644
--- a/include/VirtualNetwork.h
+++ b/include/VirtualNetwork.h
@@ -83,7 +83,7 @@ public:
      *  @param error_msg If the action fails, this message contains the reason.
      *  @return 0 on success
      */
-    int add_var(vector<Attribute *> &var, string& error_msg);
+    int add_var(vector<VectorAttribute *> &var, string& error_msg);
 
     /**
      * Removes an address range from the VNET
diff --git a/include/VirtualNetworkPool.h b/include/VirtualNetworkPool.h
index c4142e48e5..f8079a40d3 100644
--- a/include/VirtualNetworkPool.h
+++ b/include/VirtualNetworkPool.h
@@ -33,13 +33,10 @@ class VirtualNetworkPool : public PoolSQL
 {
 public:
 
-    VirtualNetworkPool(SqlDB *                          db,
-                       const string&                    str_mac_prefix,
-                       int                              default_size,
-                       vector<const Attribute *>&       restricted_attrs,
-                       vector<const Attribute *>        hook_mads,
-                       const string&                    remotes_location,
-                       const vector<const Attribute *>& _inherit_attrs);
+    VirtualNetworkPool(SqlDB * db, const string& str_mac_prefix, int default_size,
+        vector<const SingleAttribute *>& restricted_attrs,
+        vector<const VectorAttribute *>& hook_mads, const string& remotes_location,
+        const vector<const SingleAttribute *>& _inherit_attrs);
 
     ~VirtualNetworkPool(){};
 
diff --git a/include/VirtualNetworkTemplate.h b/include/VirtualNetworkTemplate.h
index ba9d34f798..84d879bc4b 100644
--- a/include/VirtualNetworkTemplate.h
+++ b/include/VirtualNetworkTemplate.h
@@ -74,7 +74,7 @@ private:
      * VirtualMachineTemplate::check
      * @param rattrs Attributes to restrict
      */
-    static void set_restricted_attributes(vector<const Attribute *>& rattrs)
+    static void set_restricted_attributes(vector<const SingleAttribute *>& rattrs)
     {
         Template::set_restricted_attributes(rattrs, restricted_attributes);
     };
diff --git a/include/VirtualRouterPool.h b/include/VirtualRouterPool.h
index 0e7500c28d..38f1b1b822 100644
--- a/include/VirtualRouterPool.h
+++ b/include/VirtualRouterPool.h
@@ -27,11 +27,8 @@ class VirtualRouterPool : public PoolSQL
 {
 public:
 
-    VirtualRouterPool(
-            SqlDB *                     db,
-            vector<const Attribute *>   hook_mads,
-            const string&               remotes_location)
-                : PoolSQL(db, VirtualRouter::table, true, true)
+    VirtualRouterPool(SqlDB * db, vector<const VectorAttribute *> hook_mads,
+        const string& remotes_location) : PoolSQL(db, VirtualRouter::table, true, true)
     {
         register_hooks(hook_mads, remotes_location);
     };
diff --git a/src/common/Attribute.cc b/src/common/Attribute.cc
index 1849c5966f..11f731d44f 100644
--- a/src/common/Attribute.cc
+++ b/src/common/Attribute.cc
@@ -307,188 +307,3 @@ int VectorAttribute::vector_value(const char *name, bool& value) const
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VectorAttribute::vector_value(const char *name, int & value) const
-{
-    map<string,string>::const_iterator it;
-
-    it = attribute_value.find(name);
-
-    if ( it == attribute_value.end() )
-    {
-        return -1;
-    }
-
-    if ( it->second.empty() )
-    {
-        return -1;
-    }
-
-    istringstream iss(it->second);
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-int VectorAttribute::vector_value(const char *name, unsigned int & value) const
-{
-    map<string,string>::const_iterator it;
-
-    it = attribute_value.find(name);
-
-    if ( it == attribute_value.end() )
-    {
-        return -1;
-    }
-
-    if ( it->second.empty() )
-    {
-        return -1;
-    }
-
-    istringstream iss(it->second);
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-int VectorAttribute::vector_value(const char *name, long long& value) const
-{
-    map<string,string>::const_iterator it;
-
-    it = attribute_value.find(name);
-
-    if ( it == attribute_value.end() )
-    {
-        return -1;
-    }
-
-    if ( it->second.empty() )
-    {
-        return -1;
-    }
-
-    istringstream iss(it->second);
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-int VectorAttribute::vector_value(const char *name, float & value) const
-{
-    map<string,string>::const_iterator it;
-
-    it = attribute_value.find(name);
-
-    if ( it == attribute_value.end() )
-    {
-        return -1;
-    }
-
-    if ( it->second.empty() )
-    {
-        return -1;
-    }
-
-    istringstream iss(it->second);
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string VectorAttribute::vector_value_str(const char *name, int& value) const
-{
-    map<string,string>::const_iterator it;
-
-    it = attribute_value.find(name);
-
-    if ( it == attribute_value.end() )
-    {
-        value = -1;
-        return  "";
-    }
-
-    if ( it->second.empty() )
-    {
-        value = -1;
-        return "";
-    }
-
-    istringstream iss(it->second);
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        value = -1;
-        return "";
-    }
-
-    return it->second;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-string VectorAttribute::vector_value_str(const char *name, float& value) const
-{
-    map<string,string>::const_iterator it;
-
-    it = attribute_value.find(name);
-
-    if ( it == attribute_value.end() )
-    {
-        value = -1;
-        return  "";
-    }
-
-    if ( it->second.empty() )
-    {
-        value = -1;
-        return "";
-    }
-
-    istringstream iss(it->second);
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        value = -1;
-        return "";
-    }
-
-    return it->second;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
diff --git a/src/datastore/DatastorePool.cc b/src/datastore/DatastorePool.cc
index f1382ad658..a6f96456b3 100644
--- a/src/datastore/DatastorePool.cc
+++ b/src/datastore/DatastorePool.cc
@@ -40,20 +40,18 @@ const int    DatastorePool::FILE_DS_ID   = 2;
 
 DatastorePool::DatastorePool(
         SqlDB * db,
-        const vector<const Attribute *>& _inherit_attrs) :
+        const vector<const SingleAttribute *>& _inherit_attrs) :
     PoolSQL(db, Datastore::table, true, true)
 
 {
     ostringstream oss;
     string        error_str;
 
-    vector<const Attribute *>::const_iterator it;
+    vector<const SingleAttribute *>::const_iterator it;
 
     for (it = _inherit_attrs.begin(); it != _inherit_attrs.end(); it++)
     {
-        const SingleAttribute* sattr = static_cast<const SingleAttribute *>(*it);
-
-        inherit_attrs.push_back(sattr->value());
+        inherit_attrs.push_back((*it)->value());
     }
 
     if (get_lastOID() == -1) //lastOID is set in PoolSQL::init_cb
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index bd02eec4f2..d31c03750f 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -92,7 +92,7 @@ int DispatchManager::import (
 
     time_t the_time = time(0);
     int    cpu, mem, disk;
-    vector<Attribute *> pci;
+    vector<VectorAttribute *> pci;
 
     vm->get_requirements(cpu, mem, disk, pci);
 
@@ -772,7 +772,7 @@ int DispatchManager::finalize(
     Host * host;
     ostringstream oss;
 
-    vector<Attribute *> pci;
+    vector<VectorAttribute *> pci;
 
     VirtualMachine::VmState state;
     bool is_public_host = false;
diff --git a/src/group/GroupPool.cc b/src/group/GroupPool.cc
index 9ebddfbe0a..97d467a993 100644
--- a/src/group/GroupPool.cc
+++ b/src/group/GroupPool.cc
@@ -37,11 +37,9 @@ const int    GroupPool::USERS_ID      = 1;
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-GroupPool::GroupPool(SqlDB * db,
-                     vector<const Attribute *> hook_mads,
-                     const string&             remotes_location,
-                     bool                      is_federation_slave)
-    :PoolSQL(db, Group::table, !is_federation_slave, true)
+GroupPool::GroupPool(SqlDB * db, vector<const VectorAttribute *> hook_mads,
+    const string& remotes_location, bool is_federation_slave) :
+        PoolSQL(db, Group::table, !is_federation_slave, true)
 {
     ostringstream oss;
     string        error_str;
diff --git a/src/host/Host.cc b/src/host/Host.cc
index dd1197004f..f3079d9a9b 100644
--- a/src/host/Host.cc
+++ b/src/host/Host.cc
@@ -182,13 +182,11 @@ int Host::extract_ds_info(
             Template        &tmpl,
             map<int, const VectorAttribute*> &ds)
 {
-    char *    error_msg;
-    int       rc;
+    char * error_msg;
+    int    rc;
 
-    const VectorAttribute *  vatt;
-    vector<const Attribute*> ds_att;
-
-    vector<const Attribute*>::const_iterator it;
+    vector<const VectorAttribute*> ds_att;
+    vector<const VectorAttribute*>::const_iterator it;
 
     // -------------------------------------------------------------------------
     // Parse Template
@@ -223,18 +221,11 @@ int Host::extract_ds_info(
     {
         int dsid;
 
-        vatt = dynamic_cast<const VectorAttribute*>(*it);
-
-        if (vatt == 0)
-        {
-            continue;
-        }
-
-        rc = vatt->vector_value("ID", dsid);
+        rc = (*it)->vector_value("ID", dsid);
 
         if (rc == 0 && dsid != -1)
         {
-            ds.insert(make_pair(dsid, vatt));
+            ds.insert(make_pair(dsid, *it));
         }
     }
 
@@ -256,8 +247,8 @@ int Host::update_info(Template        &tmpl,
     vector<Attribute*>::iterator it;
     vector<Attribute*>           vm_att;
     vector<Attribute*>           ds_att;
-    vector<Attribute*>           pci_att;
-    vector<Attribute*>           local_ds_att;
+    vector<VectorAttribute*>     pci_att;
+    vector<VectorAttribute*>     local_ds_att;
 
     int   rc;
     int   vmid;
diff --git a/src/host/HostPool.cc b/src/host/HostPool.cc
index 434df31640..c42c4a494f 100644
--- a/src/host/HostPool.cc
+++ b/src/host/HostPool.cc
@@ -37,7 +37,7 @@ time_t HostPool::_monitor_expiration;
 /* -------------------------------------------------------------------------- */
 
 HostPool::HostPool(SqlDB*                    db,
-                   vector<const Attribute *> hook_mads,
+                   vector<const VectorAttribute *> hook_mads,
                    const string&             hook_location,
                    const string&             remotes_location,
                    time_t                    expire_time)
@@ -52,9 +52,6 @@ HostPool::HostPool(SqlDB*                    db,
     }
 
     // ------------------ Initialize Hooks for the pool ----------------------
-
-    const VectorAttribute * vattr;
-
     string name;
     string on;
     string cmd;
@@ -65,15 +62,13 @@ HostPool::HostPool(SqlDB*                    db,
 
     for (unsigned int i = 0 ; i < hook_mads.size() ; i++ )
     {
-        vattr = static_cast<const VectorAttribute *>(hook_mads[i]);
+        name = hook_mads[i]->vector_value("NAME");
+        on   = hook_mads[i]->vector_value("ON");
+        cmd  = hook_mads[i]->vector_value("COMMAND");
+        arg  = hook_mads[i]->vector_value("ARGUMENTS");
+        hook_mads[i]->vector_value("REMOTE", remote);
 
-        name = vattr->vector_value("NAME");
-        on   = vattr->vector_value("ON");
-        cmd  = vattr->vector_value("COMMAND");
-        arg  = vattr->vector_value("ARGUMENTS");
-        vattr->vector_value("REMOTE", remote);
-
-        transform (on.begin(),on.end(),on.begin(),(int(*)(int))toupper);
+        one_util::toupper(on);
 
         if ( on.empty() || cmd.empty() )
         {
diff --git a/src/host/HostShare.cc b/src/host/HostShare.cc
index 6a0fa68cc3..1dac5c6f34 100644
--- a/src/host/HostShare.cc
+++ b/src/host/HostShare.cc
@@ -38,40 +38,33 @@ int HostSharePCI::from_xml_node(const xmlNodePtr node)
         return -1;
     }
 
-    return init();
-}
-
-/* ------------------------------------------------------------------------*/
-
-int HostSharePCI::init()
-{
-    vector<Attribute *> devices;
-
-    int num_devs = get("PCI", devices);
-
-    for (int i=0; i < num_devs; i++)
-    {
-        VectorAttribute * pci = dynamic_cast<VectorAttribute *>(devices[i]);
-
-        if (pci == 0)
-        {
-            return -1;
-        }
-
-        PCIDevice * pcidev = new PCIDevice(pci);
-
-        pci_devices.insert(make_pair(pcidev->address, pcidev));
-    }
+    init();
 
     return 0;
 }
 
+/* ------------------------------------------------------------------------*/
+
+void HostSharePCI::init()
+{
+    vector<VectorAttribute *> devices;
+
+    int num_devs = get("PCI", devices);
+
+    for (int i=0; i < num_devs; i++)
+    {
+        PCIDevice * pcidev = new PCIDevice(devices[i]);
+
+        pci_devices.insert(make_pair(pcidev->address, pcidev));
+    }
+}
+
 /* ------------------------------------------------------------------------*/
 /* ------------------------------------------------------------------------*/
 
-bool HostSharePCI::test(const vector<Attribute *> &devs) const
+bool HostSharePCI::test(const vector<VectorAttribute *> &devs) const
 {
-    vector<Attribute *>::const_iterator it;
+    vector<VectorAttribute *>::const_iterator it;
     map<string, PCIDevice *>::const_iterator jt;
 
     std::set<string> assigned;
@@ -82,20 +75,11 @@ bool HostSharePCI::test(const vector<Attribute *> &devs) const
 
     for ( it=devs.begin(); it!= devs.end(); it++)
     {
-        const VectorAttribute* pci = dynamic_cast<const VectorAttribute *>(*it);
+        vendor_rc = get_pci_value("VENDOR", *it, vendor_id);
+        device_rc = get_pci_value("DEVICE", *it, device_id);
+        class_rc  = get_pci_value("CLASS" , *it, class_id);
 
-        if ( pci == 0 )
-        {
-            return false;
-        }
-
-        vendor_rc = get_pci_value("VENDOR", pci, vendor_id);
-        device_rc = get_pci_value("DEVICE", pci, device_id);
-        class_rc  = get_pci_value("CLASS" , pci, class_id);
-
-        if (vendor_rc <= 0 &&
-            device_rc <= 0 &&
-            class_rc  <= 0)
+        if (vendor_rc <= 0 && device_rc <= 0 && class_rc <= 0)
         {
             return false;
         }
@@ -130,9 +114,9 @@ bool HostSharePCI::test(const vector<Attribute *> &devs) const
 /* ------------------------------------------------------------------------*/
 /* ------------------------------------------------------------------------*/
 
-void HostSharePCI::add(vector<Attribute *> &devs, int vmid)
+void HostSharePCI::add(vector<VectorAttribute *> &devs, int vmid)
 {
-    vector<Attribute *>::iterator it;
+    vector<VectorAttribute *>::iterator it;
     map<string, PCIDevice *>::const_iterator jt;
 
     unsigned int vendor_id, device_id, class_id;
@@ -140,16 +124,9 @@ void HostSharePCI::add(vector<Attribute *> &devs, int vmid)
 
     for ( it=devs.begin(); it!= devs.end(); it++)
     {
-        VectorAttribute * pci = dynamic_cast<VectorAttribute *>(*it);
-
-        if ( pci == 0 )
-        {
-            return;
-        }
-
-        vendor_rc = get_pci_value("VENDOR", pci, vendor_id);
-        device_rc = get_pci_value("DEVICE", pci, device_id);
-        class_rc  = get_pci_value("CLASS" , pci, class_id);
+        vendor_rc = get_pci_value("VENDOR", *it, vendor_id);
+        device_rc = get_pci_value("DEVICE", *it, device_id);
+        class_rc  = get_pci_value("CLASS" , *it, class_id);
 
         for (jt=pci_devices.begin(); jt!=pci_devices.end(); jt++)
         {
@@ -163,12 +140,12 @@ void HostSharePCI::add(vector<Attribute *> &devs, int vmid)
                 dev->vmid = vmid;
                 dev->attrs->replace("VMID", vmid);
 
-                pci->replace("DOMAIN",dev->attrs->vector_value("DOMAIN"));
-                pci->replace("BUS",dev->attrs->vector_value("BUS"));
-                pci->replace("SLOT",dev->attrs->vector_value("SLOT"));
-                pci->replace("FUNCTION",dev->attrs->vector_value("FUNCTION"));
+                (*it)->replace("DOMAIN",dev->attrs->vector_value("DOMAIN"));
+                (*it)->replace("BUS",dev->attrs->vector_value("BUS"));
+                (*it)->replace("SLOT",dev->attrs->vector_value("SLOT"));
+                (*it)->replace("FUNCTION",dev->attrs->vector_value("FUNCTION"));
 
-                pci->replace("ADDRESS",dev->attrs->vector_value("ADDRESS"));
+                (*it)->replace("ADDRESS",dev->attrs->vector_value("ADDRESS"));
 
                 break;
             }
@@ -179,21 +156,14 @@ void HostSharePCI::add(vector<Attribute *> &devs, int vmid)
 /* ------------------------------------------------------------------------*/
 /* ------------------------------------------------------------------------*/
 
-void HostSharePCI::del(const vector<Attribute *> &devs)
+void HostSharePCI::del(const vector<VectorAttribute *> &devs)
 {
-    vector<Attribute *>::const_iterator it;
+    vector<VectorAttribute *>::const_iterator it;
     map<string, PCIDevice *>::iterator pci_it;
 
     for ( it=devs.begin(); it!= devs.end(); it++)
     {
-        const VectorAttribute * pci = dynamic_cast<const VectorAttribute *>(*it);
-
-        if ( pci == 0 )
-        {
-            continue;
-        }
-
-        pci_it = pci_devices.find(pci->vector_value("ADDRESS"));
+        pci_it = pci_devices.find((*it)->vector_value("ADDRESS"));
 
         if (pci_it != pci_devices.end())
         {
@@ -206,9 +176,9 @@ void HostSharePCI::del(const vector<Attribute *> &devs)
 /* ------------------------------------------------------------------------*/
 /* ------------------------------------------------------------------------*/
 
-void HostSharePCI::set_monitorization(vector<Attribute*> &pci_att)
+void HostSharePCI::set_monitorization(vector<VectorAttribute*> &pci_att)
 {
-    vector<Attribute*>::iterator it;
+    vector<VectorAttribute*>::iterator it;
     map<string, PCIDevice*>::iterator pci_it;
 
     string address;
@@ -223,12 +193,7 @@ void HostSharePCI::set_monitorization(vector<Attribute*> &pci_att)
 
     for (it = pci_att.begin(); it != pci_att.end(); it++)
     {
-        VectorAttribute * pci = dynamic_cast<VectorAttribute *>(*it);
-
-        if ( pci == 0 )
-        {
-            continue;
-        }
+        VectorAttribute * pci = *it;
 
         address = pci->vector_value("ADDRESS");
 
@@ -487,9 +452,9 @@ int HostShare::from_xml_node(const xmlNodePtr node)
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 
-void HostShare::set_ds_monitorization(const vector<Attribute*> &ds_att)
+void HostShare::set_ds_monitorization(const vector<VectorAttribute*> &ds_att)
 {
-    vector<Attribute*>::const_iterator it;
+    vector<VectorAttribute*>::const_iterator it;
 
     ds.erase("DS");
 
diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc
index 49cbece86d..3cf7d1b58b 100644
--- a/src/image/ImagePool.cc
+++ b/src/image/ImagePool.cc
@@ -34,14 +34,14 @@ string ImagePool::_default_cdrom_dev_prefix;
 /* -------------------------------------------------------------------------- */
 
 ImagePool::ImagePool(
-        SqlDB *                             db,
-        const string&                       __default_type,
-        const string&                       __default_dev_prefix,
-        const string&                       __default_cdrom_dev_prefix,
-        vector<const Attribute *>&          restricted_attrs,
-        vector<const Attribute *>           hook_mads,
-        const string&                       remotes_location,
-        const vector<const Attribute *>&    _inherit_attrs)
+        SqlDB *                          db,
+        const string&                    __default_type,
+        const string&                    __default_dev_prefix,
+        const string&                    __default_cdrom_dev_prefix,
+        vector<const SingleAttribute *>& restricted_attrs,
+        vector<const VectorAttribute *>& hook_mads,
+        const string&                    remotes_location,
+        const vector<const SingleAttribute *>& _inherit_attrs)
     :PoolSQL(db, Image::table, true, true)
 {
     // Init static defaults
@@ -51,13 +51,11 @@ ImagePool::ImagePool(
     _default_cdrom_dev_prefix = __default_cdrom_dev_prefix;
 
     // Init inherit attributes
-    vector<const Attribute *>::const_iterator it;
+    vector<const SingleAttribute *>::const_iterator it;
 
     for (it = _inherit_attrs.begin(); it != _inherit_attrs.end(); it++)
     {
-        const SingleAttribute* sattr = static_cast<const SingleAttribute *>(*it);
-
-        inherit_attrs.push_back(sattr->value());
+        inherit_attrs.push_back((*it)->value());
     }
 
     // Set default type
diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc
index ba0c9599a7..ab17317ad2 100644
--- a/src/lcm/LifeCycleActions.cc
+++ b/src/lcm/LifeCycleActions.cc
@@ -35,7 +35,7 @@ void  LifeCycleManager::deploy_action(int vid)
     {
         time_t thetime = time(0);
         int    cpu,mem,disk;
-        vector<Attribute *> pci;
+        vector<VectorAttribute *> pci;
 
         VirtualMachine::LcmState vm_state;
         TransferManager::Actions tm_action;
@@ -212,7 +212,7 @@ void  LifeCycleManager::migrate_action(int vid)
     VirtualMachine *    vm;
 
     int    cpu, mem, disk;
-    vector<Attribute *> pci;
+    vector<VectorAttribute *> pci;
 
     time_t the_time = time(0);
 
@@ -365,7 +365,7 @@ void  LifeCycleManager::live_migrate_action(int vid)
         vm->get_lcm_state() == VirtualMachine::RUNNING)
     {
         int cpu, mem, disk;
-        vector<Attribute *> pci;
+        vector<VectorAttribute *> pci;
 
         //----------------------------------------------------
         //                   MIGRATE STATE
@@ -873,7 +873,7 @@ void  LifeCycleManager::clean_action(int vid)
 void  LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& image_id)
 {
     int    cpu, mem, disk;
-    vector<Attribute *> pci;
+    vector<VectorAttribute *> pci;
     time_t the_time = time(0);
 
     VirtualMachine::LcmState state = vm->get_lcm_state();
diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc
index 773fc9d82d..fe2dc68401 100644
--- a/src/lcm/LifeCycleStates.cc
+++ b/src/lcm/LifeCycleStates.cc
@@ -38,7 +38,7 @@ void  LifeCycleManager::save_success_action(int vid)
     if ( vm->get_lcm_state() == VirtualMachine::SAVE_MIGRATE )
     {
         int    cpu, mem, disk;
-        vector<Attribute *> pci;
+        vector<VectorAttribute *> pci;
 
         time_t the_time = time(0);
 
@@ -157,7 +157,7 @@ void  LifeCycleManager::save_failure_action(int vid)
     if ( vm->get_lcm_state() == VirtualMachine::SAVE_MIGRATE )
     {
         int    cpu, mem, disk;
-        vector<Attribute *> pci;
+        vector<VectorAttribute *> pci;
 
         time_t the_time = time(0);
 
@@ -261,7 +261,7 @@ void  LifeCycleManager::deploy_success_action(int vid)
     if ( vm->get_lcm_state() == VirtualMachine::MIGRATE )
     {
         int    cpu,mem,disk;
-        vector<Attribute *> pci;
+        vector<VectorAttribute *> pci;
 
         time_t the_time = time(0);
 
@@ -335,7 +335,7 @@ void  LifeCycleManager::deploy_failure_action(int vid)
     if ( vm->get_lcm_state() == VirtualMachine::MIGRATE )
     {
         int    cpu, mem, disk;
-        vector<Attribute *> pci;
+        vector<VectorAttribute *> pci;
 
         time_t the_time = time(0);
 
@@ -797,7 +797,7 @@ void  LifeCycleManager::prolog_failure_action(int vid)
 void  LifeCycleManager::epilog_success_action(int vid)
 {
     VirtualMachine *    vm;
-    vector<Attribute *> pci;
+    vector<VectorAttribute *> pci;
 
     time_t the_time = time(0);
     int    cpu,mem,disk;
diff --git a/src/mad/MadManager.cc b/src/mad/MadManager.cc
index a9975361ed..811510e0e6 100644
--- a/src/mad/MadManager.cc
+++ b/src/mad/MadManager.cc
@@ -27,7 +27,7 @@
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-MadManager::MadManager(vector<const Attribute*>& _mads):mad_conf(_mads)
+MadManager::MadManager(vector<const VectorAttribute*>& _mads):mad_conf(_mads)
 {
     pthread_mutex_init(&mutex,0);
 }
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 6366066769..7fd5b1279e 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -157,23 +157,16 @@ void Nebula::start(bool bootstrap_only)
     // -----------------------------------------------------------
     // Init federation configuration
     // -----------------------------------------------------------
-
-    vector<const Attribute *> atts;
-
     federation_enabled  = false;
     federation_master   = false;
     zone_id             = 0;
     master_oned         = "";
 
-    rc = nebula_configuration->get("FEDERATION", atts);
+    const VectorAttribute * vatt = nebula_configuration->get("FEDERATION");
 
-    if (rc != 0)
+    if (vatt != 0)
     {
-        const VectorAttribute * vatt = static_cast<const VectorAttribute *>
-                                          (atts[0]);
-
-        string mode;
-        mode = vatt->vector_value("MODE");
+        string mode = vatt->vector_value("MODE");
         one_util::toupper(mode);
 
         if (mode == "STANDALONE")
@@ -225,10 +218,7 @@ void Nebula::start(bool bootstrap_only)
     // -----------------------------------------------------------
     try
     {
-        vector<const Attribute *> dbs;
-        int  rc;
-
-        bool   db_is_sqlite = true;
+        bool db_is_sqlite = true;
 
         string server  = "localhost";
         string port_str;
@@ -237,20 +227,17 @@ void Nebula::start(bool bootstrap_only)
         string passwd  = "oneadmin";
         string db_name = "opennebula";
 
-        rc = nebula_configuration->get("DB", dbs);
+        const VectorAttribute * _db = nebula_configuration->get("DB");
 
-        if ( rc != 0 )
+        if ( _db != 0 )
         {
-            string value;
-            const  VectorAttribute * db = static_cast<const VectorAttribute *>
-                                              (dbs[0]);
-            value = db->vector_value("BACKEND");
+            string value = _db->vector_value("BACKEND");
 
             if (value == "mysql")
             {
                 db_is_sqlite = false;
 
-                value = db->vector_value("SERVER");
+                value = _db->vector_value("SERVER");
                 if (!value.empty())
                 {
                     server = value;
@@ -258,7 +245,7 @@ void Nebula::start(bool bootstrap_only)
 
                 istringstream   is;
 
-                port_str = db->vector_value("PORT");
+                port_str = _db->vector_value("PORT");
 
                 is.str(port_str);
                 is >> port;
@@ -268,19 +255,19 @@ void Nebula::start(bool bootstrap_only)
                     port = 0;
                 }
 
-                value = db->vector_value("USER");
+                value = _db->vector_value("USER");
                 if (!value.empty())
                 {
                     user = value;
                 }
 
-                value = db->vector_value("PASSWD");
+                value = _db->vector_value("PASSWD");
                 if (!value.empty())
                 {
                     passwd = value;
                 }
 
-                value = db->vector_value("DB_NAME");
+                value = _db->vector_value("DB_NAME");
                 if (!value.empty())
                 {
                     db_name = value;
@@ -290,15 +277,11 @@ void Nebula::start(bool bootstrap_only)
 
         if ( db_is_sqlite )
         {
-            string  db_name = var_location + "one.db";
-
-            db = new SqliteDB(db_name);
+            db = new SqliteDB(var_location + "one.db");
         }
         else
         {
-            ostringstream   oss;
-
-            db = new MySqlDB(server,port,user,passwd,db_name);
+            db = new MySqlDB(server, port, user, passwd, db_name);
         }
 
         // ---------------------------------------------------------------------
@@ -465,36 +448,36 @@ void Nebula::start(bool bootstrap_only)
         float   mem_cost;
         float   disk_cost;
 
-        vector<const Attribute *> vm_hooks;
-        vector<const Attribute *> host_hooks;
-        vector<const Attribute *> vrouter_hooks;
-        vector<const Attribute *> vnet_hooks;
-        vector<const Attribute *> user_hooks;
-        vector<const Attribute *> group_hooks;
-        vector<const Attribute *> image_hooks;
+        vector<const VectorAttribute *> vm_hooks;
+        vector<const VectorAttribute *> host_hooks;
+        vector<const VectorAttribute *> vrouter_hooks;
+        vector<const VectorAttribute *> vnet_hooks;
+        vector<const VectorAttribute *> user_hooks;
+        vector<const VectorAttribute *> group_hooks;
+        vector<const VectorAttribute *> image_hooks;
 
-        vector<const Attribute *> vm_restricted_attrs;
-        vector<const Attribute *> img_restricted_attrs;
-        vector<const Attribute *> vnet_restricted_attrs;
+        vector<const SingleAttribute *> vm_restricted_attrs;
+        vector<const SingleAttribute *> img_restricted_attrs;
+        vector<const SingleAttribute *> vnet_restricted_attrs;
 
-        vector<const Attribute *> inherit_image_attrs;
-        vector<const Attribute *> inherit_datastore_attrs;
-        vector<const Attribute *> inherit_vnet_attrs;
+        vector<const SingleAttribute *> inherit_image_attrs;
+        vector<const SingleAttribute *> inherit_datastore_attrs;
+        vector<const SingleAttribute *> inherit_vnet_attrs;
 
-        vector<const Attribute *> default_cost;
+        vector<const VectorAttribute *> default_cost;
 
         clpool  = new ClusterPool(db);
         docpool = new DocumentPool(db);
         zonepool= new ZonePool(db, is_federation_slave());
         vdcpool = new VdcPool(db, is_federation_slave());
 
-        nebula_configuration->get("VM_HOOK",        vm_hooks);
-        nebula_configuration->get("HOST_HOOK",      host_hooks);
-        nebula_configuration->get("VROUTER_HOOK",   vrouter_hooks);
-        nebula_configuration->get("VNET_HOOK",      vnet_hooks);
-        nebula_configuration->get("USER_HOOK",      user_hooks);
-        nebula_configuration->get("GROUP_HOOK",     group_hooks);
-        nebula_configuration->get("IMAGE_HOOK",     image_hooks);
+        nebula_configuration->get("VM_HOOK",      vm_hooks);
+        nebula_configuration->get("HOST_HOOK",    host_hooks);
+        nebula_configuration->get("VROUTER_HOOK", vrouter_hooks);
+        nebula_configuration->get("VNET_HOOK",    vnet_hooks);
+        nebula_configuration->get("USER_HOOK",    user_hooks);
+        nebula_configuration->get("GROUP_HOOK",   group_hooks);
+        nebula_configuration->get("IMAGE_HOOK",   image_hooks);
 
         nebula_configuration->get("VM_RESTRICTED_ATTR", vm_restricted_attrs);
         nebula_configuration->get("IMAGE_RESTRICTED_ATTR", img_restricted_attrs);
@@ -618,7 +601,7 @@ void Nebula::start(bool bootstrap_only)
     // ---- Virtual Machine Manager ----
     try
     {
-        vector<const Attribute *> vmm_mads;
+        vector<const VectorAttribute *> vmm_mads;
         int    vm_limit;
 
         bool   do_poll;
@@ -671,7 +654,7 @@ void Nebula::start(bool bootstrap_only)
     // ---- Information Manager ----
     try
     {
-        vector<const Attribute *>   im_mads;
+        vector<const VectorAttribute *> im_mads;
 
         int host_limit;
         int monitor_threads;
@@ -706,7 +689,7 @@ void Nebula::start(bool bootstrap_only)
     // ---- Transfer Manager ----
     try
     {
-        vector<const Attribute *> tm_mads;
+        vector<const VectorAttribute *> tm_mads;
 
         nebula_configuration->get("TM_MAD", tm_mads);
 
@@ -744,7 +727,7 @@ void Nebula::start(bool bootstrap_only)
     // ---- Hook Manager ----
     try
     {
-        vector<const Attribute *> hm_mads;
+        vector<const VectorAttribute *> hm_mads;
 
         nebula_configuration->get("HM_MAD", hm_mads);
 
@@ -765,7 +748,7 @@ void Nebula::start(bool bootstrap_only)
     // ---- Auth Manager ----
     try
     {
-        vector<const Attribute *> auth_mads;
+        vector<const VectorAttribute *> auth_mads;
 
         nebula_configuration->get("AUTH_MAD", auth_mads);
 
@@ -796,7 +779,7 @@ void Nebula::start(bool bootstrap_only)
     // ---- Image Manager ----
     try
     {
-        vector<const Attribute *> image_mads;
+        vector<const VectorAttribute *> image_mads;
 
         nebula_configuration->get("DATASTORE_MAD", image_mads);
 
diff --git a/src/pool/PoolSQL.cc b/src/pool/PoolSQL.cc
index b6db69349f..478e605afc 100644
--- a/src/pool/PoolSQL.cc
+++ b/src/pool/PoolSQL.cc
@@ -852,11 +852,9 @@ void PoolSQL::oid_filter(int     start_id,
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void PoolSQL::register_hooks(vector<const Attribute *> hook_mads,
-                             const string&             remotes_location)
+void PoolSQL::register_hooks(vector<const VectorAttribute *> hook_mads,
+                             const string&                   remotes_location)
 {
-    const VectorAttribute * vattr;
-
     string name;
     string on;
     string cmd;
@@ -864,14 +862,12 @@ void PoolSQL::register_hooks(vector<const Attribute *> hook_mads,
 
     for (unsigned int i = 0 ; i < hook_mads.size() ; i++ )
     {
-        vattr = static_cast<const VectorAttribute *>(hook_mads[i]);
+        name = hook_mads[i]->vector_value("NAME");
+        on   = hook_mads[i]->vector_value("ON");
+        cmd  = hook_mads[i]->vector_value("COMMAND");
+        arg  = hook_mads[i]->vector_value("ARGUMENTS");
 
-        name = vattr->vector_value("NAME");
-        on   = vattr->vector_value("ON");
-        cmd  = vattr->vector_value("COMMAND");
-        arg  = vattr->vector_value("ARGUMENTS");
-
-        transform (on.begin(),on.end(),on.begin(),(int(*)(int))toupper);
+        one_util::toupper(on);
 
         if ( on.empty() || cmd.empty() )
         {
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index 85eea3b801..4a3ddd749d 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -385,7 +385,7 @@ bool RequestManagerVirtualMachine::check_host(
     string capacity_error;
 
     int cpu, mem, disk;
-    vector<Attribute *> pci;
+    vector<VectorAttribute *> pci;
 
     vm->get_requirements(cpu, mem, disk, pci);
 
@@ -1875,7 +1875,7 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
         int dcpu_host = (int) (dcpu * 100);//now in 100%
         int dmem_host = dmemory * 1024;    //now in Kilobytes
 
-        vector<Attribute *> empty_pci;
+        vector<VectorAttribute *> empty_pci;
 
         host = hpool->get(hid, true);
 
diff --git a/src/scheduler/include/HostXML.h b/src/scheduler/include/HostXML.h
index f46acff4af..8a9ef3b2f3 100644
--- a/src/scheduler/include/HostXML.h
+++ b/src/scheduler/include/HostXML.h
@@ -55,7 +55,7 @@ public:
      *    @param error error message
      *    @return true if the share can host the VM
      */
-    bool test_capacity(long long cpu, long long mem, vector<Attribute *> &pci,
+    bool test_capacity(long long cpu, long long mem, vector<VectorAttribute *> &pci,
         string & error);
 
     /**
@@ -65,7 +65,7 @@ public:
      *    @param pci devices needed by the VM
      *    @return true if the share can host the VM
      */
-    bool test_capacity(long long cpu,long long mem,vector<Attribute *> &p)
+    bool test_capacity(long long cpu,long long mem,vector<VectorAttribute *> &p)
     {
         string tmp_st;
         return test_capacity(cpu, mem, p, tmp_st);
@@ -79,7 +79,7 @@ public:
      *    @return 0 on success
      */
     void add_capacity(int vmid, long long cpu, long long mem,
-        vector<Attribute *> &p)
+        vector<VectorAttribute *> &p)
     {
         cpu_usage  += cpu;
         mem_usage  += mem;
diff --git a/src/scheduler/include/VirtualMachineXML.h b/src/scheduler/include/VirtualMachineXML.h
index bb68bb84c7..c46d06c96d 100644
--- a/src/scheduler/include/VirtualMachineXML.h
+++ b/src/scheduler/include/VirtualMachineXML.h
@@ -117,7 +117,7 @@ public:
     }
 
     void get_requirements (int& cpu, int& memory, long long& disk,
-        vector<Attribute *> &pci);
+        vector<VectorAttribute *> &pci);
 
     map<int,long long> get_storage_usage();
 
diff --git a/src/scheduler/src/pool/HostXML.cc b/src/scheduler/src/pool/HostXML.cc
index 7130ad7c41..41f5487569 100644
--- a/src/scheduler/src/pool/HostXML.cc
+++ b/src/scheduler/src/pool/HostXML.cc
@@ -133,7 +133,7 @@ int HostXML::search(const char *name, int& value)
 /* -------------------------------------------------------------------------- */
 
 bool HostXML::test_capacity(long long cpu, long long mem,
-    vector<Attribute *>& p, string & error)
+    vector<VectorAttribute *>& p, string & error)
 {
     bool pci_fits = pci.test(p);
     bool fits     = ((max_cpu  - cpu_usage ) >= cpu) &&
diff --git a/src/scheduler/src/pool/VirtualMachinePoolXML.cc b/src/scheduler/src/pool/VirtualMachinePoolXML.cc
index 86eb70718e..8b9c4f10c9 100644
--- a/src/scheduler/src/pool/VirtualMachinePoolXML.cc
+++ b/src/scheduler/src/pool/VirtualMachinePoolXML.cc
@@ -48,7 +48,7 @@ int VirtualMachinePoolXML::set_up()
             {
                 int cpu, mem;
                 long long disk;
-                vector<Attribute *> pci;
+                vector<VectorAttribute *> pci;
 
                 string action = "DEPLOY";
 
diff --git a/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc
index efeb4247c7..f534f1877f 100644
--- a/src/scheduler/src/pool/VirtualMachineXML.cc
+++ b/src/scheduler/src/pool/VirtualMachineXML.cc
@@ -142,17 +142,14 @@ void VirtualMachineXML::init_attributes()
         system_ds_usage = 0;
     }
 
-    vector<Attribute*> attrs;
-    user_template->get("PUBLIC_CLOUD", attrs);
+    vector<VectorAttribute*> attrs;
 
-    public_cloud = (attrs.size() > 0);
+    public_cloud = (user_template->get("PUBLIC_CLOUD", attrs) > 0);
 
     if (public_cloud == false)
     {
         attrs.clear();
-        user_template->get("EC2", attrs);
-
-        public_cloud = (attrs.size() > 0);
+        public_cloud = (user_template->get("EC2", attrs) > 0);
     }
 
     only_public_cloud = false;
@@ -203,7 +200,7 @@ ostream& operator<<(ostream& os, VirtualMachineXML& vm)
 /* -------------------------------------------------------------------------- */
 
 void VirtualMachineXML::get_requirements (int& cpu, int& memory,
-    long long& disk, vector<Attribute *> &pci)
+    long long& disk, vector<VectorAttribute *> &pci)
 {
     pci.clear();
 
diff --git a/src/scheduler/src/sched/Scheduler.cc b/src/scheduler/src/sched/Scheduler.cc
index e2f48748e5..682191ae87 100644
--- a/src/scheduler/src/sched/Scheduler.cc
+++ b/src/scheduler/src/sched/Scheduler.cc
@@ -165,21 +165,16 @@ void Scheduler::start()
 
     try
     {
-        vector<const Attribute *> logs;
-        int rc;
-
         NebulaLog::LogType log_system = NebulaLog::UNDEFINED;
         Log::MessageType   clevel     = Log::ERROR;;
 
-        rc = conf.get("LOG", logs);
+        const VectorAttribute * log = conf.get("LOG");
 
-        if ( rc != 0 )
+        if ( log != 0 )
         {
             string value;
             int    ilevel;
 
-            const VectorAttribute * log = static_cast<const VectorAttribute *>
-                                                          (logs[0]);
             value      = log->vector_value("SYSTEM");
             log_system = NebulaLog::str_to_type(value);
 
@@ -297,15 +292,13 @@ void Scheduler::start()
 
     NebulaLog::log("SCHED", Log::INFO, "oned successfully contacted.");
 
-    vector<const Attribute*> fed;
-
     zone_id = 0;
 
-    if (oned_conf.get("FEDERATION", fed) > 0)
-    {
-        const VectorAttribute * va=static_cast<const VectorAttribute *>(fed[0]);
+    const VectorAttribute * fed = oned_conf.get("FEDERATION");
 
-        if (va->vector_value("ZONE_ID", zone_id) != 0)
+    if (fed != 0)
+    {
+        if (fed->vector_value("ZONE_ID", zone_id) != 0)
         {
             zone_id = 0;
         }
@@ -524,8 +517,8 @@ int Scheduler::set_up_pools()
  *  @return true for a positive match
  */
 static bool match_host(AclXML * acls, UserPoolXML * upool, VirtualMachineXML* vm,
-    int vmem, int vcpu, vector<Attribute *>& vpci, HostXML * host, int &n_auth,
-    int& n_error, int &n_fits, int &n_matched, string &error)
+    int vmem, int vcpu, vector<VectorAttribute *>& vpci, HostXML * host,
+    int &n_auth, int& n_error, int &n_fits, int &n_matched, string &error)
 {
     // -------------------------------------------------------------------------
     // Filter current Hosts for resched VMs
@@ -747,7 +740,7 @@ void Scheduler::match_schedule()
     int vm_memory;
     int vm_cpu;
     long long vm_disk;
-    vector<Attribute *> vm_pci;
+    vector<VectorAttribute *> vm_pci;
 
     int n_resources;
     int n_matched;
@@ -1055,7 +1048,7 @@ void Scheduler::dispatch()
 
     int cpu, mem;
     long long dsk;
-    vector<Attribute *> pci;
+    vector<VectorAttribute *> pci;
 
     int hid, dsid, cid;
     bool test_cap_result;
diff --git a/src/scheduler/src/sched/SchedulerTemplate.cc b/src/scheduler/src/sched/SchedulerTemplate.cc
index cb9499b10b..5d8036796a 100644
--- a/src/scheduler/src/sched/SchedulerTemplate.cc
+++ b/src/scheduler/src/sched/SchedulerTemplate.cc
@@ -122,18 +122,13 @@ string SchedulerTemplate::get_policy() const
 
     istringstream iss;
 
-    vector<const Attribute *> vsched;
-    const  VectorAttribute *  sched;
+    const  VectorAttribute * sched = get("DEFAULT_SCHED");
 
-    get("DEFAULT_SCHED", vsched);
-
-    if (vsched.empty())
+    if (sched == 0)
     {
         return "";
     }
 
-    sched = static_cast<const VectorAttribute *> (vsched[0]);
-
     iss.str(sched->vector_value("POLICY"));
     iss >> policy;
 
@@ -176,18 +171,13 @@ string SchedulerTemplate::get_ds_policy() const
 
     istringstream iss;
 
-    vector<const Attribute *> vsched;
-    const  VectorAttribute *  sched;
+    const  VectorAttribute * sched = get("DEFAULT_DS_SCHED");
 
-    get("DEFAULT_DS_SCHED", vsched);
-
-    if (vsched.empty())
+    if (sched == 0)
     {
         return "";
     }
 
-    sched = static_cast<const VectorAttribute *> (vsched[0]);
-
     iss.str(sched->vector_value("POLICY"));
     iss >> policy;
 
diff --git a/src/secgroup/SecurityGroup.cc b/src/secgroup/SecurityGroup.cc
index 7a41cbe628..c7738ba1ea 100644
--- a/src/secgroup/SecurityGroup.cc
+++ b/src/secgroup/SecurityGroup.cc
@@ -67,8 +67,8 @@ SecurityGroup::~SecurityGroup()
 
 int SecurityGroup::insert(SqlDB *db, string& error_str)
 {
-    vector<const Attribute*>::const_iterator it;
-    vector<const Attribute*> rules;
+    vector<const VectorAttribute*>::const_iterator it;
+    vector<const VectorAttribute*> rules;
 
     erase_template_attribute("NAME",name);
 
@@ -81,14 +81,7 @@ int SecurityGroup::insert(SqlDB *db, string& error_str)
 
     for ( it = rules.begin(); it != rules.end(); it++ )
     {
-        const VectorAttribute* rule = dynamic_cast<const VectorAttribute*>(*it);
-
-        if (rule == 0)
-        {
-            goto error_format;
-        }
-
-        if (!isValidRule(rule, error_str))
+        if (!isValidRule(*it, error_str))
         {
             goto error_valid;
         }
@@ -105,10 +98,6 @@ error_name:
     error_str = "No NAME in template for Security Group.";
     goto error_common;
 
-error_format:
-    error_str = "RULE has to be defined as a vector attribute.";
-    goto error_common;
-
 error_valid:
 error_db:
 error_common:
@@ -288,22 +277,15 @@ int SecurityGroup::from_xml(const string& xml)
 
 void SecurityGroup::get_rules(vector<VectorAttribute*>& result) const
 {
-    vector<const Attribute*>::const_iterator it;
-    vector<const Attribute*> rules;
+    vector<const VectorAttribute*>::const_iterator it;
+    vector<const VectorAttribute*> rules;
 
     get_template_attribute("RULE", rules);
 
     for ( it = rules.begin(); it != rules.end(); it++ )
     {
-        const VectorAttribute* rule = dynamic_cast<const VectorAttribute*>(*it);
-
-        if ( rule == 0 )
-        {
-            continue;
-        }
-
         VectorAttribute* new_rule = new VectorAttribute(
-                                    "SECURITY_GROUP_RULE", rule->value());
+                                    "SECURITY_GROUP_RULE", (*it)->value());
 
         new_rule->replace("SECURITY_GROUP_ID", this->get_oid());
         new_rule->replace("SECURITY_GROUP_NAME", this->get_name());
@@ -430,22 +412,14 @@ bool SecurityGroup::isValidRule(const VectorAttribute * rule, string& error) con
 
 int SecurityGroup::post_update_template(string& error)
 {
-    vector<const Attribute*>::const_iterator it;
-    vector<const Attribute*> rules;
+    vector<const VectorAttribute*>::const_iterator it;
+    vector<const VectorAttribute*> rules;
 
     get_template_attribute("RULE", rules);
 
     for ( it = rules.begin(); it != rules.end(); it++ )
     {
-        const VectorAttribute* rule = dynamic_cast<const VectorAttribute*>(*it);
-
-        if (rule == 0)
-        {
-            error = "RULE has to be defined as a vector attribute.";
-            return -1;
-        }
-
-        if (!isValidRule(rule, error))
+        if (!isValidRule(*it, error))
         {
             return -1;
         }
diff --git a/src/sql/SqliteDB.cc b/src/sql/SqliteDB.cc
index 74b0356015..5cbbde3f36 100644
--- a/src/sql/SqliteDB.cc
+++ b/src/sql/SqliteDB.cc
@@ -41,7 +41,7 @@ extern "C" int sqlite_callback (
 
 /* -------------------------------------------------------------------------- */
 
-SqliteDB::SqliteDB(string& db_name)
+SqliteDB::SqliteDB(const string& db_name)
 {
     int rc;
 
diff --git a/src/template/Template.cc b/src/template/Template.cc
index 9a97c9bb01..c2c9850bdb 100644
--- a/src/template/Template.cc
+++ b/src/template/Template.cc
@@ -264,28 +264,6 @@ int Template::replace(const string& name, const string& value)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int Template::remove(const string& name, vector<Attribute *>& values)
-{
-    multimap<string, Attribute *>::iterator         i;
-    pair<multimap<string, Attribute *>::iterator,
-    multimap<string, Attribute *>::iterator>        index;
-    int                                             j;
-
-    index = attributes.equal_range(name);
-
-    for ( i = index.first,j=0 ; i != index.second ; i++,j++ )
-    {
-        values.push_back(i->second);
-    }
-
-    attributes.erase(index.first, index.second);
-
-    return j;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
 int Template::erase(const string& name)
 {
     multimap<string, Attribute *>::iterator         i;
@@ -342,278 +320,45 @@ Attribute * Template::remove(Attribute * att)
     return 0;
 }
 
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int Template::get(
-    const string& name,
-    vector<const Attribute*>& values) const
+bool Template::get(const string& name, string& value) const
 {
-    multimap<string, Attribute *>::const_iterator       i;
-    pair<multimap<string, Attribute *>::const_iterator,
-    multimap<string, Attribute *>::const_iterator>      index;
-    int                                                 j;
+    const SingleAttribute * s = __get<SingleAttribute>(name);
 
-    index = attributes.equal_range(name);
-
-    for ( i = index.first,j=0 ; i != index.second ; i++,j++ )
-    {
-        values.push_back(i->second);
-    }
-
-    return j;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-int Template::get(
-    const string& name,
-    vector<Attribute*>& values)
-{
-    multimap<string, Attribute *>::iterator       i;
-    pair<multimap<string, Attribute *>::iterator,
-    multimap<string, Attribute *>::iterator>      index;
-    int                                           j;
-
-    index = attributes.equal_range(name);
-
-    for ( i = index.first,j=0 ; i != index.second ; i++,j++ )
-    {
-        values.push_back(i->second);
-    }
-
-    return j;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-bool Template::get(
-    const string& name,
-    VectorAttribute*& vatt)
-{
-    vector<Attribute *> array_attr;
-    int                 num;
-
-    num = get(name, array_attr);
-
-    if ( num < 1 )
-    {
-        vatt = 0;
-        return false;
-    }
-
-    vatt = dynamic_cast<VectorAttribute *>(array_attr[0]);
-
-    return ( vatt != 0 );
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-int Template::get(
-    const string& name,
-    vector<const VectorAttribute*>& values) const
-{
-    multimap<string, Attribute *>::const_iterator       i;
-    pair<multimap<string, Attribute *>::const_iterator,
-    multimap<string, Attribute *>::const_iterator>      index;
-    const VectorAttribute *                             vatt;
-
-    index = attributes.equal_range(name);
-
-    for ( i = index.first ; i != index.second ; i++ )
-    {
-        vatt = dynamic_cast<const VectorAttribute * >(i->second);
-
-        if ( vatt == 0 )
-        {
-            continue;
-        }
-
-        values.push_back(vatt);
-    }
-
-    return values.size();
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-int Template::get(
-    const string& name,
-    vector<VectorAttribute*>& values)
-{
-    multimap<string, Attribute *>::iterator       i;
-    pair<multimap<string, Attribute *>::iterator,
-    multimap<string, Attribute *>::iterator>      index;
-    VectorAttribute *                             vatt;
-
-    index = attributes.equal_range(name);
-
-    for ( i = index.first ; i != index.second ; i++ )
-    {
-        vatt = dynamic_cast<VectorAttribute * >(i->second);
-
-        if ( vatt == 0 )
-        {
-            continue;
-        }
-
-        values.push_back(vatt);
-    }
-
-    return values.size();
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-void Template::get(
-        const string& name,
-        string& value) const
-{
-    vector<const Attribute *>   attrs;
-    const SingleAttribute *     sattr;
-    int                         rc;
-    rc = get(name,attrs);
-
-    if  (rc == 0)
+    if ( s == 0 )
     {
         value = "";
-        return;
+        return false;
     }
 
-    sattr = dynamic_cast<const SingleAttribute *>(attrs[0]);
+    value = s->value();
 
-    if ( sattr != 0 )
-    {
-        value = sattr->value();
-    }
-    else
-    {
-        value="";
-    }
+	return true;
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-bool Template::get(
-        const string& name,
-        int&    value) const
+bool Template::get(const string& name, bool& value) const
 {
-    string sval;
+    const SingleAttribute * s = __get<SingleAttribute>(name);
 
-    get(name, sval);
+    value = false;
 
-    if ( sval == "" )
+    if ( s == 0 )
     {
-        value = 0;
         return false;
     }
 
-    istringstream iss(sval);
+    string sval = s->value();
 
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        value = 0;
-        return false;
-    }
-
-    return true;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-bool Template::get(
-        const string& name,
-        long long&    value) const
-{
-    string sval;
-
-    get(name, sval);
-
-    if ( sval == "" )
-    {
-        value = 0;
-        return false;
-    }
-
-    istringstream iss(sval);
-
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        value = 0;
-        return false;
-    }
-
-    return true;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-bool Template::get(
-        const string&   name,
-        float&          value) const
-{
-    string sval;
-
-    get(name, sval);
-
-    if ( sval == "" )
-    {
-        value = 0;
-        return false;
-    }
-
-    istringstream iss(sval);
-
-    iss >> value;
-
-    if (iss.fail() || !iss.eof())
-    {
-        value = 0;
-        return false;
-    }
-
-    return true;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-bool Template::get(
-        const string&   name,
-        bool&           value) const
-{
-    string sval;
-
-    get(name, sval);
-
-    if ( sval == "" )
-    {
-        value = false;
-        return false;
-    }
-
-    one_util::toupper(sval);
-
-    if ( sval == "YES" )
+    if (one_util::toupper(sval) == "YES")
     {
         value = true;
     }
-    else
-    {
-        value = false;
-    }
 
     return true;
 }
@@ -855,26 +600,38 @@ void Template::rebuild_attributes(const xmlNode * root_element)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void Template::set_restricted_attributes( vector<const Attribute *>& rattrs,
-                                vector<string>& restricted_attributes)
+void Template::set_restricted_attributes(vector<const SingleAttribute *>& rattrs,
+    vector<string>& restricted_attributes)
 {
-    const SingleAttribute * sattr;
-    string attr;
-
     for (unsigned int i = 0 ; i < rattrs.size() ; i++ )
     {
-        sattr = static_cast<const SingleAttribute *>(rattrs[i]);
-
-        attr = sattr->value();
-        transform (attr.begin(),attr.end(),attr.begin(),(int(*)(int))toupper);
-
-        restricted_attributes.push_back(attr);
+        string va = rattrs[i]->value();
+        restricted_attributes.push_back(one_util::toupper(va));
     }
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+static int get_attributes(
+        multimap<string, Attribute *>& attributes,
+        const string& name, vector<const Attribute*>& values)
+{
+    multimap<string, Attribute *>::const_iterator       i;
+    pair<multimap<string, Attribute *>::const_iterator,
+    multimap<string, Attribute *>::const_iterator>      index;
+    int                                           j;
+
+    index = attributes.equal_range(name);
+
+    for ( i = index.first,j=0 ; i != index.second ; i++,j++ )
+    {
+        values.push_back(i->second);
+    }
+
+    return j;
+}
+
 bool Template::check(string& rs_attr, const vector<string> &restricted_attributes)
 {
     size_t pos;
@@ -892,7 +649,8 @@ bool Template::check(string& rs_attr, const vector<string> &restricted_attribute
             avector = restricted_attributes[i].substr(0,pos);
             vattr   = restricted_attributes[i].substr(pos+1);
 
-            if ((num = get(avector,values)) > 0 ) //Template contains the attr
+            //Template contains the attr
+            if ((num = get_attributes(attributes, avector, values)) > 0 )
             {
                 const VectorAttribute * attr;
 
@@ -915,7 +673,7 @@ bool Template::check(string& rs_attr, const vector<string> &restricted_attribute
         }
         else //Single Attribute
         {
-            if (get(restricted_attributes[i],values) > 0 )
+            if (get_attributes(attributes, restricted_attributes[i], values) > 0)
             {
                 rs_attr = restricted_attributes[i];
                 return true;
@@ -949,6 +707,25 @@ bool Template::has_restricted()
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+static int get_attributes(
+        multimap<string, Attribute *>& attributes,
+        const string& name, vector<Attribute*>& values)
+{
+    multimap<string, Attribute *>::iterator       i;
+    pair<multimap<string, Attribute *>::iterator,
+    multimap<string, Attribute *>::iterator>      index;
+    int                                           j;
+
+    index = attributes.equal_range(name);
+
+    for ( i = index.first,j=0 ; i != index.second ; i++,j++ )
+    {
+        values.push_back(i->second);
+    }
+
+    return j;
+}
+
 void Template::remove_restricted(const vector<string> &restricted_attributes)
 {
     size_t pos;
@@ -966,7 +743,8 @@ void Template::remove_restricted(const vector<string> &restricted_attributes)
             avector = restricted_attributes[i].substr(0,pos);
             vattr   = restricted_attributes[i].substr(pos+1);
 
-            if ((num = get(avector,values)) > 0 ) //Template contains the attr
+            //Template contains the attr
+            if ((num = get_attributes(attributes, avector,values)) > 0 )
             {
                 VectorAttribute * attr;
 
@@ -1012,7 +790,8 @@ void Template::remove_all_except_restricted(const vector<string> &restricted_att
             avector = restricted_attributes[i].substr(0,pos);
             vattr   = restricted_attributes[i].substr(pos+1);
 
-            if ((num = get(avector,values)) > 0 ) //Template contains the attr
+            //Template contains the attr
+            if ((num = get_attributes(attributes, avector,values)) > 0 )
             {
                 VectorAttribute * attr;
 
@@ -1034,7 +813,7 @@ void Template::remove_all_except_restricted(const vector<string> &restricted_att
         }
         else //Single Attribute
         {
-            this->get(restricted_attributes[i], restricted);
+            get_attributes(attributes, restricted_attributes[i], restricted);
         }
     }
 
diff --git a/src/template/template_parser.c b/src/template/template_parser.c
index 04a40af87e..035fbdb088 100644
--- a/src/template/template_parser.c
+++ b/src/template/template_parser.c
@@ -27,8 +27,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -53,7 +53,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -70,7 +70,7 @@ typedef uint32_t flex_uint32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -161,7 +161,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -188,7 +196,7 @@ extern FILE *template_in, *template_out;
 
     /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
      *       access to the local variable yy_act. Since yyless() is a macro, it would break
-     *       existing scanners that call yyless() from OUTSIDE template_lex.
+     *       existing scanners that call yyless() from OUTSIDE template_lex. 
      *       One obvious solution it to make yy_act a global. I tried that, and saw
      *       a 5% performance hit in a non-template_lineno scanner, because yy_act is
      *       normally declared as a register variable-- so it is not worth it.
@@ -207,7 +215,7 @@ extern FILE *template_in, *template_out;
                     if ( *p == '\n' )\
                         --template_lineno;\
             }while(0)
-
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -264,7 +272,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -383,11 +391,17 @@ extern int template_lineno;
 int template_lineno = 1;
 
 extern char *template_text;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
 #define yytext_ptr template_text
 
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
 static int yy_get_next_buffer (void );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
 static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
@@ -420,7 +434,7 @@ static yyconst flex_int16_t yy_accept[69] =
         9,    9,    9,    9,    9,    9,    9,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -452,13 +466,13 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[13] =
+static yyconst YY_CHAR yy_meta[13] =
     {   0,
         1,    2,    3,    1,    1,    1,    1,    1,    1,    1,
         1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[77] =
+static yyconst flex_uint16_t yy_base[77] =
     {   0,
         0,    0,   12,    0,   70,  196,   23,   34,   65,    0,
        60,   45,    0,   48,   59,   71,   54,   82,   53,    0,
@@ -482,7 +496,7 @@ static yyconst flex_int16_t yy_def[77] =
        68,   68,   68,   68,   68,   68
     } ;
 
-static yyconst flex_int16_t yy_nxt[209] =
+static yyconst flex_uint16_t yy_nxt[209] =
     {   0,
         6,    7,    8,    6,    9,   10,   11,   12,    6,    6,
         6,   13,   14,   15,    6,   16,   17,   17,   14,   17,
@@ -589,7 +603,7 @@ char *template_text;
                         llocp->first_column = llocp->last_column;   \
                         llocp->last_column += template_leng;
 
-#line 593 "template_parser.c"
+#line 607 "template_parser.c"
 
 #define INITIAL 0
 #define VALUE 1
@@ -623,11 +637,11 @@ void template_set_extra (YY_EXTRA_TYPE user_defined  );
 
 FILE *template_get_in (void );
 
-void template_set_in  (FILE * in_str  );
+void template_set_in  (FILE * _in_str  );
 
 FILE *template_get_out (void );
 
-void template_set_out  (FILE * out_str  );
+void template_set_out  (FILE * _out_str  );
 
 yy_size_t template_get_leng (void );
 
@@ -635,7 +649,7 @@ char *template_get_text (void );
 
 int template_get_lineno (void );
 
-void template_set_lineno (int line_number  );
+void template_set_lineno (int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -649,6 +663,10 @@ extern int template_wrap (void );
 #endif
 #endif
 
+#ifndef YY_NO_UNPUT
+    
+#endif
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -669,7 +687,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -756,7 +779,7 @@ extern int template_lex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -766,10 +789,10 @@ extern int template_lex (void);
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
+    
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -803,9 +826,9 @@ YY_DECL
  /* ------------------------------------------------------------------------- */
  /* Comments (lines with an starting #), and empty lines                      */
  /* ------------------------------------------------------------------------- */
-#line 807 "template_parser.c"
+#line 830 "template_parser.c"
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
@@ -821,7 +844,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -854,7 +877,7 @@ yy_find_action:
 			yy_size_t yyl;
 			for ( yyl = 0; yyl < template_leng; ++yyl )
 				if ( template_text[yyl] == '\n' )
-					
+					   
     template_lineno++;
 ;
 			}
@@ -954,7 +977,7 @@ YY_RULE_SETUP
 #line 89 "template_parser.l"
 ECHO;
 	YY_BREAK
-#line 958 "template_parser.c"
+#line 981 "template_parser.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(VALUE):
 	yyterminate();
@@ -1098,9 +1121,9 @@ case YY_STATE_EOF(VALUE):
  */
 static int yy_get_next_buffer (void)
 {
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	yy_size_t number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1129,7 +1152,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -1232,14 +1255,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
+	yy_state_type yy_current_state;
+	char *yy_cp;
+    
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -1264,10 +1287,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -1285,6 +1308,10 @@ static int yy_get_next_buffer (void)
 		return yy_is_jam ? 0 : yy_current_state;
 }
 
+#ifndef YY_NO_UNPUT
+
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -1294,7 +1321,7 @@ static int yy_get_next_buffer (void)
 
 {
 	int c;
-
+    
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1356,7 +1383,7 @@ static int yy_get_next_buffer (void)
 	(yy_hold_char) = *++(yy_c_buf_p);
 
 	if ( c == '\n' )
-		
+		   
     template_lineno++;
 ;
 
@@ -1366,12 +1393,12 @@ static int yy_get_next_buffer (void)
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- *
+ * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void template_restart  (FILE * input_file )
 {
-
+    
 	if ( ! YY_CURRENT_BUFFER ){
         template_ensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1384,11 +1411,11 @@ static int yy_get_next_buffer (void)
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- *
+ * 
  */
     void template__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
+    
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		template_pop_buffer_state();
@@ -1428,18 +1455,18 @@ static void template__load_buffer_state  (void)
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- *
+ * 
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE template__create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	b = (YY_BUFFER_STATE) template_alloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in template__create_buffer()" );
 
-	b->yy_buf_size = size;
+	b->yy_buf_size = (yy_size_t)size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -1457,11 +1484,11 @@ static void template__load_buffer_state  (void)
 
 /** Destroy the buffer.
  * @param b a buffer created with template__create_buffer()
- *
+ * 
  */
     void template__delete_buffer (YY_BUFFER_STATE  b )
 {
-
+    
 	if ( ! b )
 		return;
 
@@ -1482,7 +1509,7 @@ static void template__load_buffer_state  (void)
 
 {
 	int oerrno = errno;
-
+    
 	template__flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1498,13 +1525,13 @@ static void template__load_buffer_state  (void)
     }
 
         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-
+    
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
+ * 
  */
     void template__flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -1533,7 +1560,7 @@ static void template__load_buffer_state  (void)
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *
+ *  
  */
 void template_push_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -1563,7 +1590,7 @@ void template_push_buffer_state (YY_BUFFER_STATE new_buffer )
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *
+ *  
  */
 void template_pop_buffer_state (void)
 {
@@ -1587,20 +1614,20 @@ void template_pop_buffer_state (void)
 static void template_ensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
-
+    
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1;
+		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
 		(yy_buffer_stack) = (struct yy_buffer_state**)template_alloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in template_ensure_buffer_stack()" );
-								
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -1611,7 +1638,7 @@ static void template_ensure_buffer_stack (void)
 	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
 		(yy_buffer_stack) = (struct yy_buffer_state**)template_realloc
@@ -1630,13 +1657,13 @@ static void template_ensure_buffer_stack (void)
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
+ * 
+ * @return the newly allocated buffer state object. 
  */
 YY_BUFFER_STATE template__scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -1665,14 +1692,14 @@ YY_BUFFER_STATE template__scan_buffer  (char * base, yy_size_t  size )
 /** Setup the input buffer state to scan a string. The next call to template_lex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- *
+ * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       template__scan_bytes() instead.
  */
 YY_BUFFER_STATE template__scan_string (yyconst char * yystr )
 {
-
+    
 	return template__scan_bytes(yystr,strlen(yystr) );
 }
 
@@ -1680,7 +1707,7 @@ YY_BUFFER_STATE template__scan_string (yyconst char * yystr )
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- *
+ * 
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE template__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
@@ -1689,7 +1716,7 @@ YY_BUFFER_STATE template__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybyt
 	char *buf;
 	yy_size_t n;
 	yy_size_t i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) template_alloc(n  );
@@ -1719,7 +1746,7 @@ YY_BUFFER_STATE template__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybyt
 
 static void yy_fatal_error (yyconst char* msg )
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+			(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -1743,16 +1770,16 @@ static void yy_fatal_error (yyconst char* msg )
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- *
+ * 
  */
 int template_get_lineno  (void)
 {
-
+        
     return template_lineno;
 }
 
 /** Get the input stream.
- *
+ * 
  */
 FILE *template_get_in  (void)
 {
@@ -1760,7 +1787,7 @@ FILE *template_get_in  (void)
 }
 
 /** Get the output stream.
- *
+ * 
  */
 FILE *template_get_out  (void)
 {
@@ -1768,7 +1795,7 @@ FILE *template_get_out  (void)
 }
 
 /** Get the length of the current token.
- *
+ * 
  */
 yy_size_t template_get_leng  (void)
 {
@@ -1776,7 +1803,7 @@ yy_size_t template_get_leng  (void)
 }
 
 /** Get the current token.
- *
+ * 
  */
 
 char *template_get_text  (void)
@@ -1785,29 +1812,29 @@ char *template_get_text  (void)
 }
 
 /** Set the current line number.
- * @param line_number
- *
+ * @param _line_number line number
+ * 
  */
-void template_set_lineno (int  line_number )
+void template_set_lineno (int  _line_number )
 {
-
-    template_lineno = line_number;
+    
+    template_lineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
- *
+ * @param _in_str A readable stream.
+ * 
  * @see template__switch_to_buffer
  */
-void template_set_in (FILE *  in_str )
+void template_set_in (FILE *  _in_str )
 {
-        template_in = in_str ;
+        template_in = _in_str ;
 }
 
-void template_set_out (FILE *  out_str )
+void template_set_out (FILE *  _out_str )
 {
-        template_out = out_str ;
+        template_out = _out_str ;
 }
 
 int template_get_debug  (void)
@@ -1815,9 +1842,9 @@ int template_get_debug  (void)
         return template__flex_debug;
 }
 
-void template_set_debug (int  bdebug )
+void template_set_debug (int  _bdebug )
 {
-        template__flex_debug = bdebug ;
+        template__flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
@@ -1828,7 +1855,7 @@ static int yy_init_globals (void)
 
     /* We do not touch template_lineno unless the option is enabled. */
     template_lineno =  1;
-
+    
     (yy_buffer_stack) = 0;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
@@ -1854,7 +1881,7 @@ static int yy_init_globals (void)
 /* template_lex_destroy is for both reentrant and non-reentrant scanners. */
 int template_lex_destroy  (void)
 {
-
+    
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		template__delete_buffer(YY_CURRENT_BUFFER  );
@@ -1880,7 +1907,8 @@ int template_lex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-	register int i;
+		
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -1889,7 +1917,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -1899,11 +1927,12 @@ static int yy_flex_strlen (yyconst char * s )
 
 void *template_alloc (yy_size_t  size )
 {
-	return (void *) malloc( size );
+			return (void *) malloc( size );
 }
 
 void *template_realloc  (void * ptr, yy_size_t  size )
 {
+		
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -1916,7 +1945,7 @@ void *template_realloc  (void * ptr, yy_size_t  size )
 
 void template_free (void * ptr )
 {
-	free( (char *) ptr );	/* see template_realloc() for (char *) cast */
+			free( (char *) ptr );	/* see template_realloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
diff --git a/src/template/template_syntax.cc b/src/template/template_syntax.cc
index 9762644be2..757b10c671 100644
--- a/src/template/template_syntax.cc
+++ b/src/template/template_syntax.cc
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -167,7 +167,7 @@ extern int template__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 #line 74 "template_syntax.y" /* yacc.c:355  */
@@ -177,6 +177,8 @@ union YYSTYPE
 
 #line 179 "template_syntax.cc" /* yacc.c:355  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -203,7 +205,7 @@ int template__parse (mem_collector * mc, Template *      tmpl, char **         e
 
 /* Copy the second part of user declarations.  */
 
-#line 207 "template_syntax.cc" /* yacc.c:358  */
+#line 209 "template_syntax.cc" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -1397,7 +1399,7 @@ yyreduce:
 
                 tmpl->set(pattr);
             }
-#line 1401 "template_syntax.cc" /* yacc.c:1646  */
+#line 1403 "template_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 7:
@@ -1414,7 +1416,7 @@ yyreduce:
 
                 delete amap;
             }
-#line 1418 "template_syntax.cc" /* yacc.c:1646  */
+#line 1420 "template_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 8:
@@ -1428,7 +1430,7 @@ yyreduce:
 
                 tmpl->set(pattr);
             }
-#line 1432 "template_syntax.cc" /* yacc.c:1646  */
+#line 1434 "template_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 9:
@@ -1436,7 +1438,7 @@ yyreduce:
     {
                 YYABORT;
             }
-#line 1440 "template_syntax.cc" /* yacc.c:1646  */
+#line 1442 "template_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 10:
@@ -1453,7 +1455,7 @@ yyreduce:
 
                 (yyval.val_attr) = static_cast<void *>(vattr);
             }
-#line 1457 "template_syntax.cc" /* yacc.c:1646  */
+#line 1459 "template_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 11:
@@ -1470,11 +1472,11 @@ yyreduce:
                 attrmap->insert(make_pair(name,unescape(value)));
                 (yyval.val_attr) = (yyvsp[-4].val_attr);
             }
-#line 1474 "template_syntax.cc" /* yacc.c:1646  */
+#line 1476 "template_syntax.cc" /* yacc.c:1646  */
     break;
 
 
-#line 1478 "template_syntax.cc" /* yacc.c:1646  */
+#line 1480 "template_syntax.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/template/template_syntax.h b/src/template/template_syntax.h
index e0eaf25995..dce3431d13 100644
--- a/src/template/template_syntax.h
+++ b/src/template/template_syntax.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@ extern int template__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 #line 74 "template_syntax.y" /* yacc.c:1909  */
@@ -68,6 +68,8 @@ union YYSTYPE
 
 #line 70 "template_syntax.hh" /* yacc.c:1909  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -85,4 +87,5 @@ struct YYLTYPE
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
+
 #endif /* !YY_TEMPLATE_TEMPLATE_SYNTAX_HH_INCLUDED  */
diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc
index 0ed2990ab4..b7e7cfb35a 100644
--- a/src/tm/TransferManager.cc
+++ b/src/tm/TransferManager.cc
@@ -655,8 +655,6 @@ void TransferManager::prolog_action(int vid)
     ostringstream os("prolog, ");
     string        xfr_name;
 
-    const VectorAttribute * disk;
-
     string  files;
     string  vm_tm_mad;
     string  opennebula_hostname;
@@ -668,8 +666,9 @@ void TransferManager::prolog_action(int vid)
 
     const TransferManagerDriver * tm_md;
 
-    vector<const Attribute *> attrs;
-    int                       num;
+    vector<const VectorAttribute *> disk;
+    const VectorAttribute * os_attr;
+    int num;
 
     string token_password;
 
@@ -728,19 +727,12 @@ void TransferManager::prolog_action(int vid)
     // -------------------------------------------------------------------------
     // Image Transfer Commands
     // -------------------------------------------------------------------------
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disk);
 
     for (int i=0; i < num; i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
         rc = prolog_transfer_command(vm,
-                                     disk,
+                                     disk[i],
                                      vm_tm_mad,
                                      opennebula_hostname,
                                      xfr,
@@ -754,37 +746,28 @@ void TransferManager::prolog_action(int vid)
     // -------------------------------------------------------------------------
     // Transfers for kernel and initrd files
     // -------------------------------------------------------------------------
-    attrs.clear();
+    os_attr = vm->get_template_attribute("OS");
 
-    num = vm->get_template_attribute("OS",attrs);
-
-    if ( num > 0 )
+    if ( os_attr != 0 )
     {
         string kernel;
         string initrd;
 
         bool update = false;
 
-        const VectorAttribute * os_attr;
+        kernel = prolog_os_transfer_commands(
+                    vm,
+                    os_attr,
+                    "KERNEL",
+                    opennebula_hostname,
+                    xfr);
 
-        os_attr = dynamic_cast<const VectorAttribute *>(attrs[0]);
-
-        if (os_attr != 0 )
-        {
-            kernel = prolog_os_transfer_commands(
-                        vm,
-                        os_attr,
-                        "KERNEL",
-                        opennebula_hostname,
-                        xfr);
-
-            initrd = prolog_os_transfer_commands(
-                        vm,
-                        os_attr,
-                        "INITRD",
-                        opennebula_hostname,
-                        xfr);
-        }
+        initrd = prolog_os_transfer_commands(
+                    vm,
+                    os_attr,
+                    "INITRD",
+                    opennebula_hostname,
+                    xfr);
 
         if ( !kernel.empty() )
         {
@@ -809,7 +792,6 @@ void TransferManager::prolog_action(int vid)
     // -------------------------------------------------------------------------
     // Generate context file
     // -------------------------------------------------------------------------
-
     rc = prolog_context_command( vm,
                                  token_password,
                                  vm_tm_mad,
@@ -867,14 +849,13 @@ void TransferManager::prolog_migr_action(int vid)
     ostringstream   os;
     string          xfr_name;
 
-    const VectorAttribute * disk;
     string tm_mad;
     string vm_tm_mad;
 
     int ds_id;
     int disk_id;
 
-    vector<const Attribute *> attrs;
+    vector<const VectorAttribute *> disk;
     int                       num;
 
     VirtualMachine *    vm;
@@ -917,28 +898,21 @@ void TransferManager::prolog_migr_action(int vid)
     // Move system directory and disks
     // ------------------------------------------------------------------------
 
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disk);
 
     for (int i=0 ; i < num ; i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
+        disk[i]->vector_value_str("DISK_ID", disk_id);
 
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        disk->vector_value_str("DISK_ID", disk_id);
-
-        if ( VirtualMachine::is_volatile(disk) == true )
+        if ( VirtualMachine::is_volatile(disk[i]) == true )
         {
             tm_mad = vm_tm_mad;
             ds_id  = vm->get_ds_id();
         }
         else
         {
-            tm_mad    = disk->vector_value("TM_MAD");
-            int vv_rc = disk->vector_value("DATASTORE_ID", ds_id);
+            tm_mad    = disk[i]->vector_value("TM_MAD");
+            int vv_rc = disk[i]->vector_value("DATASTORE_ID", ds_id);
 
             if (tm_mad.empty() || vv_rc == -1)
             {
@@ -1006,7 +980,6 @@ void TransferManager::prolog_resume_action(int vid)
     ostringstream   os;
     string          xfr_name;
 
-    const VectorAttribute * disk;
     string tm_mad;
     string vm_tm_mad;
     string token_password;
@@ -1015,8 +988,8 @@ void TransferManager::prolog_resume_action(int vid)
     int disk_id;
     int rc;
 
-    vector<const Attribute *> attrs;
-    int                       num;
+    vector<const VectorAttribute *> disk;
+    int num;
 
     VirtualMachine *    vm;
     Nebula&             nd = Nebula::instance();
@@ -1075,28 +1048,21 @@ void TransferManager::prolog_resume_action(int vid)
     // ------------------------------------------------------------------------
     // Move system directory and disks
     // ------------------------------------------------------------------------
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disk);
 
     for (int i=0 ; i < num ; i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
+        disk[i]->vector_value_str("DISK_ID", disk_id);
 
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        disk->vector_value_str("DISK_ID", disk_id);
-
-        if ( VirtualMachine::is_volatile(disk) == true )
+        if ( VirtualMachine::is_volatile(disk[i]) == true )
         {
             tm_mad = vm_tm_mad;
             ds_id  = vm->get_ds_id();
         }
         else
         {
-            tm_mad    = disk->vector_value("TM_MAD");
-            int vv_rc = disk->vector_value("DATASTORE_ID", ds_id);
+            tm_mad    = disk[i]->vector_value("TM_MAD");
+            int vv_rc = disk[i]->vector_value("DATASTORE_ID", ds_id);
 
             if ( tm_mad.empty() || vv_rc == -1)
             {
@@ -1376,15 +1342,13 @@ void TransferManager::epilog_action(int vid)
     string vm_tm_mad;
     string error_str;
 
-    const VectorAttribute * disk;
-
     VirtualMachine *    vm;
     Nebula&             nd = Nebula::instance();
 
     const TransferManagerDriver * tm_md;
 
-    vector<const Attribute *>   attrs;
-    int                         num;
+    vector<const VectorAttribute *> disk;
+    int num;
 
     // ------------------------------------------------------------------------
     // Setup & Transfer script
@@ -1420,18 +1384,11 @@ void TransferManager::epilog_action(int vid)
     // -------------------------------------------------------------------------
     // copy back VM image (DISK with SAVE="yes")
     // -------------------------------------------------------------------------
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disk);
 
     for (int i=0; i < num; i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        epilog_transfer_command(vm, disk, xfr);
+        epilog_transfer_command(vm, disk[i], xfr);
     }
 
     //DELETE vm_tm_mad hostname:remote_system_dir vmid ds_id
@@ -1491,9 +1448,8 @@ void TransferManager::epilog_stop_action(int vid)
 
     const TransferManagerDriver * tm_md;
 
-    vector<const Attribute *> attrs;
-    const VectorAttribute *   disk;
-    int                       num;
+    vector<const VectorAttribute *> disk;
+    int num;
 
     // ------------------------------------------------------------------------
     // Setup & Transfer script
@@ -1529,28 +1485,21 @@ void TransferManager::epilog_stop_action(int vid)
     // ------------------------------------------------------------------------
     // Move system directory and disks
     // ------------------------------------------------------------------------
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disk);
 
     for (int i=0 ; i < num ; i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
+        disk[i]->vector_value_str("DISK_ID", disk_id);
 
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        disk->vector_value_str("DISK_ID", disk_id);
-
-        if ( VirtualMachine::is_volatile(disk) == true )
+        if ( VirtualMachine::is_volatile(disk[i]) == true )
         {
             tm_mad = vm_tm_mad;
             ds_id  = vm->get_ds_id();
         }
         else
         {
-            tm_mad    = disk->vector_value("TM_MAD");
-            int vv_rc = disk->vector_value("DATASTORE_ID", ds_id);
+            tm_mad    = disk[i]->vector_value("TM_MAD");
+            int vv_rc = disk[i]->vector_value("DATASTORE_ID", ds_id);
 
             if (tm_mad.empty() || vv_rc == -1)
             {
@@ -1630,9 +1579,8 @@ int TransferManager::epilog_delete_commands(VirtualMachine *vm,
 
     Nebula& nd = Nebula::instance();
 
-    const VectorAttribute *   disk;
-    vector<const Attribute *> attrs;
-    int                       num;
+    vector<const VectorAttribute *> disk;
+    int num;
 
     // ------------------------------------------------------------------------
     // Setup transfer
@@ -1680,28 +1628,21 @@ int TransferManager::epilog_delete_commands(VirtualMachine *vm,
     // -------------------------------------------------------------------------
     // Delete disk images and the remote system Directory
     // -------------------------------------------------------------------------
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disk);
 
     for (int i=0 ; i < num ; i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
+        disk[i]->vector_value_str("DISK_ID", disk_id);
 
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        disk->vector_value_str("DISK_ID", disk_id);
-
-        if ( VirtualMachine::is_volatile(disk) == true )
+        if ( VirtualMachine::is_volatile(disk[i]) == true )
         {
             tm_mad = vm_tm_mad;
             ds_id  = vm_ds_id;
         }
         else
         {
-            tm_mad    = disk->vector_value("TM_MAD");
-            int vv_rc = disk->vector_value("DATASTORE_ID", ds_id);
+            tm_mad    = disk[i]->vector_value("TM_MAD");
+            int vv_rc = disk[i]->vector_value("DATASTORE_ID", ds_id);
 
             if (tm_mad.empty() || vv_rc == -1)
             {
@@ -2376,7 +2317,7 @@ int TransferManager::load_mads(int uid)
 
     if ( mad_conf.size() > 0 )
     {
-        vattr = static_cast<const VectorAttribute *>(mad_conf[0]);
+        vattr = mad_conf[0];
     }
 
     if ( vattr == 0 )
@@ -2385,7 +2326,7 @@ int TransferManager::load_mads(int uid)
         return -1;
     }
 
-    VectorAttribute tm_conf("TM_MAD",vattr->value());
+    VectorAttribute tm_conf("TM_MAD", vattr->value());
 
     tm_conf.replace("NAME",transfer_driver_name);
 
diff --git a/src/um/Quota.cc b/src/um/Quota.cc
index 46631d57b9..62873ad4a3 100644
--- a/src/um/Quota.cc
+++ b/src/um/Quota.cc
@@ -85,24 +85,16 @@ void Quota::add_to_quota(VectorAttribute * attr, const string& va_name, float nu
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int Quota::set(vector<Attribute*> * new_quotas, string& error)
+int Quota::set(vector<VectorAttribute*> * new_quotas, string& error)
 {
-    vector<Attribute *>::iterator  it;
+    vector<VectorAttribute *>::iterator  it;
 
-    VectorAttribute * iq;
     VectorAttribute * tq;
     string            id;
 
     for ( it = new_quotas->begin(); it != new_quotas->end(); it++)
     {
-        iq = dynamic_cast<VectorAttribute *>(*it);
-
-        if ( iq == 0 )
-        {
-            goto error_limits;
-        }
-
-        id = iq->vector_value("ID");
+        id = (*it)->vector_value("ID");
 
         if ( get_quota(id, &tq) == -1 )
         {
@@ -113,7 +105,7 @@ int Quota::set(vector<Attribute*> * new_quotas, string& error)
         {
             VectorAttribute * nq;
 
-            if ((nq = new_quota(iq)) == 0)
+            if ((nq = new_quota(*it)) == 0)
             {
                 goto error_limits;
             }
@@ -122,7 +114,7 @@ int Quota::set(vector<Attribute*> * new_quotas, string& error)
         }
         else
         {
-            if (update_limits(tq, iq) != 0)
+            if (update_limits(tq, *it) != 0)
             {
                 goto error_limits;
             }
@@ -138,14 +130,11 @@ error_limits:
 
     oss <<  "Negative limits or bad format in quota " << template_name;
 
-    if ( iq != 0 )
-    {
-        string * quota_str = iq->marshall(",");
+    string * quota_str = (*it)->marshall(",");
 
-        oss << " = [ " << *quota_str << " ]";
+    oss << " = [ " << *quota_str << " ]";
 
-        delete quota_str;
-    }
+    delete quota_str;
 
     error = oss.str();
 
diff --git a/src/um/QuotaImage.cc b/src/um/QuotaImage.cc
index 86e84dc867..abe900d38f 100644
--- a/src/um/QuotaImage.cc
+++ b/src/um/QuotaImage.cc
@@ -29,8 +29,7 @@ const int QuotaImage::NUM_IMAGE_METRICS  = 1;
 
 bool QuotaImage::check(Template * tmpl, Quotas& default_quotas, string& error)
 {
-    vector<Attribute*> disks;
-    VectorAttribute *  disk;
+    vector<VectorAttribute*> disk;
 
     string image_id;
     int num;
@@ -39,18 +38,11 @@ bool QuotaImage::check(Template * tmpl, Quotas& default_quotas, string& error)
 
     image_request.insert(make_pair("RVMS",1));
 
-    num = tmpl->get("DISK", disks);
+    num = tmpl->get("DISK", disk);
 
     for (int i = 0 ; i < num ; i++)
     {
-        disk = dynamic_cast<VectorAttribute *>(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        image_id = disk->vector_value("IMAGE_ID");
+        image_id = disk[i]->vector_value("IMAGE_ID");
 
         if ( !image_id.empty() )
         {
@@ -70,8 +62,7 @@ bool QuotaImage::check(Template * tmpl, Quotas& default_quotas, string& error)
 void QuotaImage::del(Template * tmpl)
 {
 
-    vector<Attribute*> disks;
-    VectorAttribute *  disk;
+    vector<VectorAttribute*> disk;
 
     string image_id;
     int num;
@@ -80,18 +71,11 @@ void QuotaImage::del(Template * tmpl)
 
     image_request.insert(make_pair("RVMS",1));
 
-    num = tmpl->get("DISK", disks);
+    num = tmpl->get("DISK", disk);
 
     for (int i = 0 ; i < num ; i++)
     {
-        disk = dynamic_cast<VectorAttribute *>(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        image_id = disk->vector_value("IMAGE_ID");
+        image_id = disk[i]->vector_value("IMAGE_ID");
 
         del_quota(image_id, image_request);
     }
diff --git a/src/um/QuotaNetwork.cc b/src/um/QuotaNetwork.cc
index 2944e4a0ec..3042dd1ca1 100644
--- a/src/um/QuotaNetwork.cc
+++ b/src/um/QuotaNetwork.cc
@@ -30,8 +30,7 @@ const int QuotaNetwork::NUM_NET_METRICS  = 1;
 bool QuotaNetwork::check(PoolObjectSQL::ObjectType otype, Template * tmpl,
         Quotas& default_quotas, string& error)
 {
-    vector<Attribute*> nics;
-    VectorAttribute *  nic;
+    vector<VectorAttribute*> nic;
 
     string net_id;
     int num;
@@ -41,24 +40,17 @@ bool QuotaNetwork::check(PoolObjectSQL::ObjectType otype, Template * tmpl,
 
     net_request.insert(make_pair("LEASES",1));
 
-    num = tmpl->get("NIC", nics);
+    num = tmpl->get("NIC", nic);
 
     for (int i = 0 ; i < num ; i++)
     {
-        nic = dynamic_cast<VectorAttribute *>(nics[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
-        net_id = nic->vector_value("NETWORK_ID");
+        net_id = nic[i]->vector_value("NETWORK_ID");
 
         uses_lease = true;
 
         if ( otype == PoolObjectSQL::VROUTER )
         {
-            nic->vector_value("FLOATING_IP", uses_lease);
+            nic[i]->vector_value("FLOATING_IP", uses_lease);
         }
 
         if ( !net_id.empty() && uses_lease )
@@ -79,8 +71,7 @@ bool QuotaNetwork::check(PoolObjectSQL::ObjectType otype, Template * tmpl,
 void QuotaNetwork::del(PoolObjectSQL::ObjectType otype, Template * tmpl)
 {
 
-    vector<Attribute*> nics;
-    VectorAttribute *  nic;
+    vector<VectorAttribute *> nic;
 
     string net_id;
     int num;
@@ -90,24 +81,17 @@ void QuotaNetwork::del(PoolObjectSQL::ObjectType otype, Template * tmpl)
 
     net_request.insert(make_pair("LEASES",1));
 
-    num = tmpl->get("NIC", nics);
+    num = tmpl->get("NIC", nic);
 
     for (int i = 0 ; i < num ; i++)
     {
-        nic = dynamic_cast<VectorAttribute *>(nics[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
-        net_id = nic->vector_value("NETWORK_ID");
+        net_id = nic[i]->vector_value("NETWORK_ID");
 
         uses_lease = true;
 
         if ( otype == PoolObjectSQL::VROUTER )
         {
-            nic->vector_value("FLOATING_IP", uses_lease);
+            nic[i]->vector_value("FLOATING_IP", uses_lease);
         }
 
         if (uses_lease)
diff --git a/src/um/QuotaVirtualMachine.cc b/src/um/QuotaVirtualMachine.cc
index 24b67aeeed..a4c0285d49 100644
--- a/src/um/QuotaVirtualMachine.cc
+++ b/src/um/QuotaVirtualMachine.cc
@@ -31,19 +31,7 @@ const int QuotaVirtualMachine::NUM_VM_METRICS  = 4;
 
 int QuotaVirtualMachine::get_quota(const string& id, VectorAttribute **va)
 {
-    vector<Attribute*> values;
-    int num;
-
-    *va = 0;
-
-    num = get(template_name, values);
-
-    if ( num == 0 )
-    {
-        return 0;
-    }
-
-    *va = dynamic_cast<VectorAttribute *>(values[0]);
+    *va = get(template_name);
 
     return 0;
 }
diff --git a/src/um/Quotas.cc b/src/um/Quotas.cc
index 9301f12b6d..bbb73b418c 100644
--- a/src/um/Quotas.cc
+++ b/src/um/Quotas.cc
@@ -21,7 +21,7 @@
 
 int Quotas::set(Template *tmpl, string& error)
 {
-    vector<Attribute *> vquotas;
+    vector<VectorAttribute *> vquotas;
 
     if ( tmpl->get(datastore_quota.get_quota_name(), vquotas) > 0 )
     {
diff --git a/src/um/UserPool.cc b/src/um/UserPool.cc
index e2df07c883..308a1bcbce 100644
--- a/src/um/UserPool.cc
+++ b/src/um/UserPool.cc
@@ -53,7 +53,7 @@ string UserPool::oneadmin_name;
 
 UserPool::UserPool(SqlDB * db,
                    time_t  __session_expiration_time,
-                   vector<const Attribute *> hook_mads,
+                   vector<const VectorAttribute *> hook_mads,
                    const string&             remotes_location,
                    bool                      is_federation_slave):
                        PoolSQL(db, User::table, !is_federation_slave, true)
diff --git a/src/vm/Snapshots.cc b/src/vm/Snapshots.cc
index b7adc19bf5..dfd7364cfd 100644
--- a/src/vm/Snapshots.cc
+++ b/src/vm/Snapshots.cc
@@ -83,20 +83,18 @@ int Snapshots::from_xml_node(const xmlNodePtr node)
 
 void Snapshots::init()
 {
-    vector<Attribute *> vsnap;
+    vector<VectorAttribute *> snap;
 
     int  id;
     bool current;
 
-    int num_snap = snapshot_template.get("SNAPSHOT", vsnap);
+    int num_snap = snapshot_template.get("SNAPSHOT", snap);
 
     for (int i=0; i < num_snap; i++)
     {
-        VectorAttribute * snap = static_cast<VectorAttribute *>(vsnap[i]);
+        snap[i]->vector_value("ID", id);
 
-        snap->vector_value("ID", id);
-
-        snap->vector_value("ACTIVE", current);
+        snap[i]->vector_value("ACTIVE", current);
 
         if (current)
         {
@@ -108,7 +106,7 @@ void Snapshots::init()
             next_snapshot = id + 1;
         }
 
-        snapshot_pool.insert(pair<int, VectorAttribute *>(id, snap));
+        snapshot_pool.insert(pair<int, VectorAttribute *>(id, snap[i]));
     }
 
     int did;
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 18bdcd160d..2f99a16755 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -972,27 +972,18 @@ int VirtualMachine::parse_context(string& error_str)
 
     if (net_context)
     {
-        vector<Attribute  * > v_attributes;
-        VectorAttribute *     vatt;
-
-        int num_vatts = obj_template->get("NIC", v_attributes);
+        vector<VectorAttribute *> vatts;
+        int num_vatts = obj_template->get("NIC", vatts);
 
         for(int i=0; i<num_vatts; i++)
         {
-            vatt = dynamic_cast<VectorAttribute * >(v_attributes[i]);
-
-            if ( vatt == 0 )
-            {
-                continue;
-            }
-
             parse_context_network(NETWORK_CONTEXT, NUM_NETWORK_CONTEXT,
-                    context, vatt);
+                    context, vatts[i]);
 
-            if (!vatt->vector_value("IP6_GLOBAL").empty())
+            if (!vatts[i]->vector_value("IP6_GLOBAL").empty())
             {
                 parse_context_network(NETWORK6_CONTEXT, NUM_NETWORK6_CONTEXT,
-                        context, vatt);
+                        context, vatts[i]);
             }
         }
     }
@@ -1157,14 +1148,18 @@ int VirtualMachine::reparse_context()
 {
     int rc;
 
-    VectorAttribute * context;
     VectorAttribute * context_parsed;
 
     string * str;
     string   parsed;
     string   error_str;
 
-    obj_template->get("CONTEXT", context);
+    const VectorAttribute * context = obj_template->get("CONTEXT");
+
+    if ( context == 0 )
+    {
+        return -1;
+    }
 
     // -------------------------------------------------------------------------
     // Parse CONTEXT variables & free vector attributes
@@ -1439,7 +1434,7 @@ void VirtualMachine::parse_well_known_attributes()
 /* ------------------------------------------------------------------------ */
 
 static int check_and_set_cluster_id(const char *      id_name,
-                                    VectorAttribute * vatt,
+                                    const VectorAttribute * vatt,
                                     string&           cluster_id)
 {
     string vatt_cluster_id;
@@ -1465,9 +1460,8 @@ static int check_and_set_cluster_id(const char *      id_name,
 
 int VirtualMachine::automatic_requirements(string& error_str)
 {
-    int                   num_vatts;
-    vector<Attribute  * > v_attributes;
-    VectorAttribute *     vatt;
+    int num_vatts;
+    vector<const VectorAttribute  *> vatts;
 
     ostringstream   oss;
     string          requirements;
@@ -1480,20 +1474,32 @@ int VirtualMachine::automatic_requirements(string& error_str)
     int incomp_id;
     int rc;
 
-    // Get cluster id from all DISK vector attributes (IMAGE Datastore)
+    // Get cluster id from the KERNEL and INITRD (FILE Datastores)
+    const VectorAttribute * osatt = obj_template->get("OS");
 
-    num_vatts = obj_template->get("DISK",v_attributes);
+    if ( osatt != 0 )
+    {
+        rc = check_and_set_cluster_id("KERNEL_CLUSTER_ID", osatt, cluster_id);
+
+        if ( rc != 0 )
+        {
+            goto error_kernel;
+        }
+
+        rc = check_and_set_cluster_id("INITRD_CLUSTER_ID", osatt, cluster_id);
+
+        if ( rc != 0 )
+        {
+            goto error_initrd;
+        }
+    }
+
+    // Get cluster id from all DISK vector attributes (IMAGE Datastore)
+    num_vatts = obj_template->get("DISK",vatts);
 
     for(int i=0; i<num_vatts; i++)
     {
-        vatt = dynamic_cast<VectorAttribute * >(v_attributes[i]);
-
-        if ( vatt == 0 )
-        {
-            continue;
-        }
-
-        rc = check_and_set_cluster_id("CLUSTER_ID", vatt, cluster_id);
+        rc = check_and_set_cluster_id("CLUSTER_ID", vatts[i], cluster_id);
 
         if ( rc != 0 )
         {
@@ -1502,48 +1508,14 @@ int VirtualMachine::automatic_requirements(string& error_str)
         }
     }
 
-    // Get cluster id from the KERNEL and INITRD (FILE Datastores)
-
-    v_attributes.clear();
-    num_vatts = obj_template->get("OS",v_attributes);
-
-    if ( num_vatts > 0 )
-    {
-        vatt = dynamic_cast<VectorAttribute * >(v_attributes[0]);
-
-        if ( vatt != 0 )
-        {
-            rc = check_and_set_cluster_id("KERNEL_CLUSTER_ID", vatt, cluster_id);
-
-            if ( rc != 0 )
-            {
-                goto error_kernel;
-            }
-
-            rc = check_and_set_cluster_id("INITRD_CLUSTER_ID", vatt, cluster_id);
-
-            if ( rc != 0 )
-            {
-                goto error_initrd;
-            }
-        }
-    }
+    vatts.clear();
 
     // Get cluster id from all NIC vector attributes
-
-    v_attributes.clear();
-    num_vatts = obj_template->get("NIC",v_attributes);
+    num_vatts = obj_template->get("NIC", vatts);
 
     for(int i=0; i<num_vatts; i++)
     {
-        vatt = dynamic_cast<VectorAttribute * >(v_attributes[i]);
-
-        if ( vatt == 0 )
-        {
-            continue;
-        }
-
-        rc = check_and_set_cluster_id("CLUSTER_ID", vatt, cluster_id);
+        rc = check_and_set_cluster_id("CLUSTER_ID", vatts[i], cluster_id);
 
         if ( rc != 0 )
         {
@@ -1864,7 +1836,7 @@ void VirtualMachine::cp_previous_history()
 /* -------------------------------------------------------------------------- */
 
 void VirtualMachine::get_requirements (int& cpu, int& memory, int& disk,
-        vector<Attribute *>& pci_devs)
+        vector<VectorAttribute *>& pci_devs)
 {
     istringstream   iss;
     float           fcpu;
@@ -1988,12 +1960,13 @@ static void assign_disk_targets(queue<pair <string, VectorAttribute *> >& _queue
 
 int VirtualMachine::get_disk_images(string& error_str)
 {
-    int                  num_disks, num_context, rc;
-    vector<Attribute  *> disks;
-    vector<Attribute  *> context_disks;
-    ImagePool *          ipool;
-    VectorAttribute *    disk;
-    vector<int>          acquired_images;
+    vector<Attribute *> disks;
+    vector<Attribute *> context_disks;
+
+    int               num_disks, num_context, rc;
+    ImagePool *       ipool;
+    VectorAttribute * disk;
+    vector<int>       acquired_images;
 
     int     image_id;
     string  dev_prefix;
@@ -2198,8 +2171,8 @@ error_common:
 void VirtualMachine::get_disk_info(int&         max_disk_id,
                                    set<string>& used_targets)
 {
-    vector<Attribute  *> disks;
-    VectorAttribute *    disk;
+    vector<VectorAttribute  *> disk;
+    VectorAttribute * context;
 
     string target;
 
@@ -2208,25 +2181,18 @@ void VirtualMachine::get_disk_info(int&         max_disk_id,
 
     max_disk_id = -1;
 
-    num_disks = obj_template->get("DISK", disks);
+    num_disks = obj_template->get("DISK", disk);
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        target = disk->vector_value("TARGET");
+        target = disk[i]->vector_value("TARGET");
 
         if ( !target.empty() )
         {
             used_targets.insert(target);
         }
 
-        disk->vector_value("DISK_ID", disk_id);
+        disk[i]->vector_value("DISK_ID", disk_id);
 
         if ( disk_id > max_disk_id )
         {
@@ -2234,27 +2200,24 @@ void VirtualMachine::get_disk_info(int&         max_disk_id,
         }
     }
 
-    disks.clear();
+    disk.clear();
 
-    if ( obj_template->get("CONTEXT", disks) > 0 )
+    context = obj_template->get("CONTEXT");
+
+    if ( context != 0 )
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[0]);
+        target = context->vector_value("TARGET");
 
-        if ( disk != 0 )
+        if ( !target.empty() )
         {
-            target = disk->vector_value("TARGET");
+            used_targets.insert(target);
+        }
 
-            if ( !target.empty() )
-            {
-                used_targets.insert(target);
-            }
+        context->vector_value("DISK_ID", disk_id);
 
-            disk->vector_value("DISK_ID", disk_id);
-
-            if ( disk_id > max_disk_id )
-            {
-                max_disk_id = disk_id;
-            }
+        if ( disk_id > max_disk_id )
+        {
+            max_disk_id = disk_id;
         }
     }
 }
@@ -2272,8 +2235,7 @@ VectorAttribute * VirtualMachine::set_up_attach_disk(
                 Snapshots **             snap,
                 string&                  error_str)
 {
-    vector<Attribute  *> disks;
-    VectorAttribute *    new_disk;
+    VectorAttribute * new_disk;
 
     string target;
 
@@ -2290,14 +2252,7 @@ VectorAttribute * VirtualMachine::set_up_attach_disk(
     // -------------------------------------------------------------------------
     // Get the DISK attribute from the template
     // -------------------------------------------------------------------------
-
-    if ( tmpl->get("DISK", disks) != 1 )
-    {
-        error_str = "The template must contain one DISK attribute";
-        return 0;
-    }
-
-    new_disk = dynamic_cast<VectorAttribute * >(disks[0]);
+    new_disk = tmpl->get("DISK");
 
     if ( new_disk == 0 )
     {
@@ -2310,7 +2265,6 @@ VectorAttribute * VirtualMachine::set_up_attach_disk(
     // -------------------------------------------------------------------------
     // Acquire the new disk image
     // -------------------------------------------------------------------------
-
     int rc = ipool->acquire_disk(vm_id,
                                  new_disk,
                                  max_disk_id + 1,
@@ -2383,24 +2337,15 @@ int VirtualMachine::set_attach_disk(int disk_id)
 
 VectorAttribute* VirtualMachine::get_attach_disk()
 {
-    int                  num_disks;
-    vector<Attribute  *> disks;
-    VectorAttribute *    disk;
+    vector<VectorAttribute *> disk;
 
-    num_disks = obj_template->get("DISK", disks);
+    int num_disks = obj_template->get("DISK", disk);
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
+        if ( disk[i]->vector_value("ATTACH") == "YES" )
         {
-            continue;
-        }
-
-        if ( disk->vector_value("ATTACH") == "YES" )
-        {
-            return disk;
+            return disk[i];
         }
     }
 
@@ -2412,24 +2357,15 @@ VectorAttribute* VirtualMachine::get_attach_disk()
 
 void VirtualMachine::clear_attach_disk()
 {
-    int                  num_disks;
-    vector<Attribute  *> disks;
-    VectorAttribute *    disk;
+    vector<VectorAttribute *> disks;
 
-    num_disks = obj_template->get("DISK", disks);
+    int num_disks = obj_template->get("DISK", disks);
 
-    for(int i=0; i<num_disks; i++)
+    for(int i=0; i < num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
+        if ( disks[i]->vector_value("ATTACH") == "YES" )
         {
-            continue;
-        }
-
-        if ( disk->vector_value("ATTACH") == "YES" )
-        {
-            disk->remove("ATTACH");
+            disks[i]->remove("ATTACH");
             return;
         }
     }
@@ -2440,8 +2376,7 @@ void VirtualMachine::clear_attach_disk()
 
 VectorAttribute * VirtualMachine::delete_attach_disk(Snapshots **snap)
 {
-    vector<Attribute  *> disks;
-    VectorAttribute *    disk;
+    vector<VectorAttribute  *> disks;
 
     int num_disks = obj_template->get("DISK", disks);
 
@@ -2449,18 +2384,11 @@ VectorAttribute * VirtualMachine::delete_attach_disk(Snapshots **snap)
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        if ( disk->vector_value("ATTACH") == "YES" )
+        if ( disks[i]->vector_value("ATTACH") == "YES" )
         {
             int disk_id;
 
-            disk->vector_value("DISK_ID", disk_id);
+            disks[i]->vector_value("DISK_ID", disk_id);
 
             map<int, Snapshots *>::iterator it = snapshots.find(disk_id);
 
@@ -2470,7 +2398,7 @@ VectorAttribute * VirtualMachine::delete_attach_disk(Snapshots **snap)
                 snapshots.erase(it);
             }
 
-            return static_cast<VectorAttribute * >(obj_template->remove(disk));
+            return static_cast<VectorAttribute *>(obj_template->remove(disks[i]));
         }
     }
 
@@ -2536,34 +2464,26 @@ long long VirtualMachine::get_system_disk_size(Template * tmpl)
     long long size = 0;
     long long disk_size, snapshot_size;
 
-    vector<const Attribute*> disks;
-    const VectorAttribute *  disk;
+    vector<const VectorAttribute*> disks;
 
     int num_disks = tmpl->get("DISK", disks);
 
     for (int i = 0 ; i < num_disks ; i++)
     {
-        disk = dynamic_cast<const VectorAttribute*>(disks[i]);
-
-        if (disk == 0)
+        if (disks[i]->vector_value("SIZE", disk_size) != 0)
         {
             continue;
         }
 
-        if (disk->vector_value("SIZE", disk_size) != 0)
-        {
-            continue;
-        }
-
-        if (is_volatile(disk))
+        if (is_volatile(disks[i]))
         {
             size += disk_size;
         }
-        else if ( disk_tm_target(disk) == "SYSTEM")
+        else if ( disk_tm_target(disks[i]) == "SYSTEM")
         {
             size += disk_size;
 
-            if (disk->vector_value("DISK_SNAPSHOT_TOTAL_SIZE", snapshot_size) == 0)
+            if (disks[i]->vector_value("DISK_SNAPSHOT_TOTAL_SIZE", snapshot_size) == 0)
             {
                 size += snapshot_size;
             }
@@ -2606,8 +2526,8 @@ VectorAttribute * VirtualMachine::get_attach_nic_info(
                             int&                     max_nic_id,
                             string&                  error_str)
 {
-    vector<Attribute  *> nics;
-    VectorAttribute *    nic;
+    vector<VectorAttribute *> nics;
+    VectorAttribute * nic;
 
     int nic_id;
     int num_nics;
@@ -2615,21 +2535,13 @@ VectorAttribute * VirtualMachine::get_attach_nic_info(
     // -------------------------------------------------------------------------
     // Get the highest NIC_ID
     // -------------------------------------------------------------------------
-
     max_nic_id = -1;
 
     num_nics = obj_template->get("NIC", nics);
 
     for(int i=0; i<num_nics; i++)
     {
-        nic = dynamic_cast<VectorAttribute * >(nics[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
-        nic->vector_value("NIC_ID", nic_id);
+        nics[i]->vector_value("NIC_ID", nic_id);
 
         if ( nic_id > max_nic_id )
         {
@@ -2649,7 +2561,7 @@ VectorAttribute * VirtualMachine::get_attach_nic_info(
         return 0;
     }
 
-    nic = dynamic_cast<VectorAttribute * >(nics[0]);
+    nic = tmpl->get("NIC");
 
     if ( nic == 0 )
     {
@@ -2706,24 +2618,16 @@ int VirtualMachine::set_up_attach_nic(
 
 VectorAttribute* VirtualMachine::get_attach_nic()
 {
-    int                  num_nics;
-    vector<Attribute  *> nics;
-    VectorAttribute *    nic;
+    vector<VectorAttribute  *> nics;
+    int num_nics;
 
     num_nics = obj_template->get("NIC", nics);
 
     for(int i=0; i<num_nics; i++)
     {
-        nic = dynamic_cast<VectorAttribute * >(nics[i]);
-
-        if ( nic == 0 )
+        if ( nics[i]->vector_value("ATTACH") == "YES" )
         {
-            continue;
-        }
-
-        if ( nic->vector_value("ATTACH") == "YES" )
-        {
-            return nic;
+            return nics[i];
         }
     }
 
@@ -2748,11 +2652,8 @@ void VirtualMachine::attach_nic_success()
 
 VectorAttribute * VirtualMachine::attach_nic_failure()
 {
-    VectorAttribute *    nic;
-    VectorAttribute *    context = 0;
-    int                  nic_id;
 
-    nic = get_attach_nic();
+    VectorAttribute * nic = get_attach_nic();
 
     if (nic == 0)
     {
@@ -2761,10 +2662,12 @@ VectorAttribute * VirtualMachine::attach_nic_failure()
 
     obj_template->remove(nic);
 
-    obj_template->get("CONTEXT", context);
+    VectorAttribute * context = obj_template->get("CONTEXT");
 
     if (context != 0)
     {
+        int nic_id;
+
         nic->vector_value("NIC_ID", nic_id);
 
         clear_context_network(NETWORK_CONTEXT,  NUM_NETWORK_CONTEXT,  context, nic_id);
@@ -2779,11 +2682,9 @@ VectorAttribute * VirtualMachine::attach_nic_failure()
 
 void VirtualMachine::detach_nic_failure()
 {
-    VectorAttribute *    nic;
-    VectorAttribute *    context = 0;
-    bool                 net_context;
+    bool net_context;
 
-    nic = get_attach_nic();
+    VectorAttribute * nic = get_attach_nic();
 
     if (nic == 0)
     {
@@ -2792,7 +2693,7 @@ void VirtualMachine::detach_nic_failure()
 
     nic->remove("ATTACH");
 
-    obj_template->get("CONTEXT", context);
+    VectorAttribute * context = obj_template->get("CONTEXT");
 
     if (context == 0)
     {
@@ -2840,7 +2741,6 @@ void VirtualMachine::set_attach_nic(
         VectorAttribute *       new_nic,
         vector<VectorAttribute*> &rules)
 {
-    VectorAttribute *   context = 0;
     bool                net_context;
 
     vector<VectorAttribute*>::iterator it;
@@ -2854,7 +2754,7 @@ void VirtualMachine::set_attach_nic(
         obj_template->set(*it);
     }
 
-    obj_template->get("CONTEXT", context);
+    VectorAttribute * context = obj_template->get("CONTEXT");
 
     if (context == 0)
     {
@@ -2883,31 +2783,21 @@ void VirtualMachine::set_attach_nic(
 
 int VirtualMachine::set_detach_nic(int nic_id)
 {
-    int num_nics;
     int n_id;
 
-    vector<Attribute  *> nics;
-    VectorAttribute *    nic;
-    VectorAttribute *    context = 0;
+    vector<VectorAttribute *> nics;
 
     bool found = false;
 
-    num_nics = obj_template->get("NIC", nics);
+    int num_nics = obj_template->get("NIC", nics);
 
     for(int i=0; !found && i<num_nics; i++)
     {
-        nic = dynamic_cast<VectorAttribute * >(nics[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
-        nic->vector_value("NIC_ID", n_id);
+        nics[i]->vector_value("NIC_ID", n_id);
 
         if ( n_id == nic_id )
         {
-            nic->replace("ATTACH", "YES");
+            nics[i]->replace("ATTACH", "YES");
             found = true;
         }
     }
@@ -2917,7 +2807,7 @@ int VirtualMachine::set_detach_nic(int nic_id)
         return -1;
     }
 
-    obj_template->get("CONTEXT", context);
+    VectorAttribute * context = obj_template->get("CONTEXT");
 
     if (context != 0)
     {
@@ -2942,7 +2832,7 @@ void VirtualMachine::release_disk_images()
 
     bool img_error;
 
-    vector<Attribute const  * > disks;
+    vector<const VectorAttribute * > disks;
     ImageManager *              imagem;
 
     string  disk_base_path = "";
@@ -2954,20 +2844,12 @@ void VirtualMachine::release_disk_images()
 
     for(int i=0; i<num_disks; i++)
     {
-        VectorAttribute const *  disk =
-            dynamic_cast<VectorAttribute const * >(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
         img_error = (state == ACTIVE && lcm_state != EPILOG) &&
                      state != PENDING && state != HOLD;
 
-        if ( disk->vector_value("IMAGE_ID", iid) == 0 )
+        if ( disks[i]->vector_value("IMAGE_ID", iid) == 0 )
         {
-            disk->vector_value("DISK_ID", did);
+            disks[i]->vector_value("DISK_ID", did);
 
             map<int, Snapshots *>::iterator it = snapshots.find(did);
 
@@ -2990,21 +2872,13 @@ int VirtualMachine::new_snapshot(string& name, int& snap_id)
     int id;
     int max_id = -1;
 
-    vector<Attribute  *> snaps;
-    VectorAttribute *    snap;
+    vector<VectorAttribute *> snaps;
 
     num_snaps = obj_template->get("SNAPSHOT", snaps);
 
     for(int i=0; i<num_snaps; i++)
     {
-        snap = dynamic_cast<VectorAttribute * >(snaps[i]);
-
-        if ( snap == 0 )
-        {
-            continue;
-        }
-
-        snap->vector_value("SNAPSHOT_ID", id);
+        snaps[i]->vector_value("SNAPSHOT_ID", id);
 
         if (id > max_id)
         {
@@ -3023,7 +2897,7 @@ int VirtualMachine::new_snapshot(string& name, int& snap_id)
         name = oss.str();
     }
 
-    snap = new VectorAttribute("SNAPSHOT");
+    VectorAttribute * snap = new VectorAttribute("SNAPSHOT");
     snap->replace("SNAPSHOT_ID", snap_id);
     snap->replace("NAME", name);
     snap->replace("TIME", (int)time(0));
@@ -3041,28 +2915,18 @@ int VirtualMachine::new_snapshot(string& name, int& snap_id)
 
 int VirtualMachine::set_active_snapshot(int snap_id)
 {
-    int num_snaps;
     int s_id;
 
-    vector<Attribute  *> snaps;
-    VectorAttribute *    snap;
-
-    num_snaps = obj_template->get("SNAPSHOT", snaps);
+    vector<VectorAttribute *> snaps;
+    int num_snaps = obj_template->get("SNAPSHOT", snaps);
 
     for(int i=0; i<num_snaps; i++)
     {
-        snap = dynamic_cast<VectorAttribute * >(snaps[i]);
-
-        if ( snap == 0 )
-        {
-            continue;
-        }
-
-        snap->vector_value("SNAPSHOT_ID", s_id);
+        snaps[i]->vector_value("SNAPSHOT_ID", s_id);
 
         if ( s_id == snap_id )
         {
-            snap->replace("ACTIVE", "YES");
+            snaps[i]->replace("ACTIVE", "YES");
             return 0;
         }
     }
@@ -3075,24 +2939,14 @@ int VirtualMachine::set_active_snapshot(int snap_id)
 
 void VirtualMachine::update_snapshot_id(string& hypervisor_id)
 {
-    int                  num_snaps;
-    vector<Attribute  *> snaps;
-    VectorAttribute *    snap;
-
-    num_snaps = obj_template->get("SNAPSHOT", snaps);
+    vector<VectorAttribute  *> snaps;
+    int num_snaps = obj_template->get("SNAPSHOT", snaps);
 
     for(int i=0; i<num_snaps; i++)
     {
-        snap = dynamic_cast<VectorAttribute * >(snaps[i]);
-
-        if ( snap == 0 )
+        if ( snaps[i]->vector_value("ACTIVE") == "YES" )
         {
-            continue;
-        }
-
-        if ( snap->vector_value("ACTIVE") == "YES" )
-        {
-            snap->replace("HYPERVISOR_ID", hypervisor_id);
+            snaps[i]->replace("HYPERVISOR_ID", hypervisor_id);
             break;
         }
     }
@@ -3103,24 +2957,15 @@ void VirtualMachine::update_snapshot_id(string& hypervisor_id)
 
 void VirtualMachine::clear_active_snapshot()
 {
-    int                  num_snaps;
-    vector<Attribute  *> snaps;
-    VectorAttribute *    snap;
+    vector<VectorAttribute  *> snaps;
 
-    num_snaps = obj_template->get("SNAPSHOT", snaps);
+    int num_snaps = obj_template->get("SNAPSHOT", snaps);
 
     for(int i=0; i<num_snaps; i++)
     {
-        snap = dynamic_cast<VectorAttribute * >(snaps[i]);
-
-        if ( snap == 0 )
+        if ( snaps[i]->vector_value("ACTIVE") == "YES" )
         {
-            continue;
-        }
-
-        if ( snap->vector_value("ACTIVE") == "YES" )
-        {
-            snap->remove("ACTIVE");
+            snaps[i]->remove("ACTIVE");
             return;
         }
     }
@@ -3131,23 +2976,14 @@ void VirtualMachine::clear_active_snapshot()
 
 void VirtualMachine::delete_active_snapshot()
 {
-    vector<Attribute  *> snaps;
-    VectorAttribute *    snap;
-
+    vector<VectorAttribute *> snaps;
     int num_snaps = obj_template->get("SNAPSHOT", snaps);
 
     for(int i=0; i<num_snaps; i++)
     {
-        snap = dynamic_cast<VectorAttribute * >(snaps[i]);
-
-        if ( snap == 0 )
+        if ( snaps[i]->vector_value("ACTIVE") == "YES" )
         {
-            continue;
-        }
-
-        if ( snap->vector_value("ACTIVE") == "YES" )
-        {
-            delete obj_template->remove(snap);
+            delete obj_template->remove(snaps[i]);
 
             return;
         }
@@ -3228,26 +3064,12 @@ int VirtualMachine::get_network_leases(string& estr)
 
 void VirtualMachine::merge_nic_defaults(VectorAttribute* nic)
 {
-    vector<Attribute  *> nics_def;
-    VectorAttribute *    nic_def = 0;
+    VectorAttribute * nic_def = obj_template->get("NIC_DEFAULT");
 
-    int num;
-
-    num = obj_template->get("NIC_DEFAULT", nics_def);
-
-    if (num == 0)
+    if (nic_def == 0)
     {
         return;
     }
-    else
-    {
-        nic_def = dynamic_cast<VectorAttribute * >(nics_def[0]);
-
-        if ( nic_def == 0 )
-        {
-            return;
-        }
-    }
 
     nic->merge(nic_def, false);
 }
@@ -3257,19 +3079,15 @@ void VirtualMachine::merge_nic_defaults(VectorAttribute* nic)
 
 void VirtualMachine::release_network_leases()
 {
-    string                        vnid;
-    string                        ip;
-    int                           num_nics;
-    vector<Attribute const  * >   nics;
+    string vnid;
+    string ip;
 
-    num_nics = get_template_attribute("NIC",nics);
+    vector<VectorAttribute const  * > nics;
+    int num_nics = get_template_attribute("NIC",nics);
 
     for(int i=0; i<num_nics; i++)
     {
-        VectorAttribute const *  nic =
-            dynamic_cast<VectorAttribute const * >(nics[i]);
-
-        release_network_leases(nic, oid);
+        release_network_leases(nics[i], oid);
     }
 }
 
@@ -3334,20 +3152,13 @@ int VirtualMachine::release_network_leases(
 
 void VirtualMachine::get_security_groups(set<int>& sgs) const
 {
-    vector<Attribute const  * > ns;
+    vector<VectorAttribute *> ns;
 
-    int num_nics = get_template_attribute("NIC", ns);
+    int num_nics = obj_template->get("NIC", ns);
 
     for(int i=0; i<num_nics; i++)
     {
-        const VectorAttribute *n = dynamic_cast<const VectorAttribute *>(ns[i]);
-
-        if ( n == 0 )
-        {
-            continue;
-        }
-
-        get_security_groups(n, sgs);
+        get_security_groups(ns[i], sgs);
     }
 }
 /* -------------------------------------------------------------------------- */
@@ -3497,8 +3308,7 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
     ofstream file;
     string   files_ds;
 
-    vector<const Attribute*> attrs;
-    const VectorAttribute *  context;
+    vector<const VectorAttribute*> attrs;
 
     map<string, string>::const_iterator it;
 
@@ -3506,9 +3316,13 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
     bool token;
 
     if ( history == 0 )
+    {
         return -1;
+    }
 
-    if ( get_template_attribute("CONTEXT",attrs) != 1 )
+    const VectorAttribute * context = obj_template->get("CONTEXT");
+
+    if ( context == 0 )
     {
         log("VM", Log::INFO, "Virtual Machine has no context");
         return 0;
@@ -3525,16 +3339,7 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
         return -1;
     }
 
-    context = dynamic_cast<const VectorAttribute *>(attrs[0]);
-
-    if (context == 0)
-    {
-        file.close();
-        return -1;
-    }
-
-    files = context->vector_value("FILES");
-
+    files    = context->vector_value("FILES");
     files_ds = context->vector_value("FILES_DS");
 
     if (!files_ds.empty())
@@ -3648,28 +3453,18 @@ int VirtualMachine::get_created_by_uid() const
 
 const VectorAttribute* VirtualMachine::get_disk(int disk_id) const
 {
-    int num_disks;
     int tdisk_id;
 
-    vector<const Attribute  *> disks;
-    const VectorAttribute *    disk;
-
-    num_disks = obj_template->get("DISK", disks);
+    vector<const VectorAttribute  *> disks;
+    int num_disks = obj_template->get("DISK", disks);
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<const VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        disk->vector_value("DISK_ID", tdisk_id);
+        disks[i]->vector_value("DISK_ID", tdisk_id);
 
         if ( tdisk_id == disk_id )
         {
-            return disk;
+            return disks[i];
         }
     }
 
@@ -3679,56 +3474,22 @@ const VectorAttribute* VirtualMachine::get_disk(int disk_id) const
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-const VectorAttribute* VirtualMachine::get_context() const
-{
-    vector<const Attribute *> array_context;
-    const VectorAttribute *   context;
-    int                       num;
-
-    num = obj_template->get("CONTEXT", array_context);
-
-    if ( num != 1 )
-    {
-        return 0;
-    }
-
-    context = dynamic_cast<const VectorAttribute *>(array_context[0]);
-
-    if ( context == 0 )
-    {
-        return 0;
-    }
-
-    return context;
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
 const VectorAttribute* VirtualMachine::get_nic(int nic_id) const
 {
     int num_nics;
     int tnic_id;
 
-    vector<const Attribute  *> nics;
-    const VectorAttribute *    nic;
+    vector<const VectorAttribute  *> nics;
 
     num_nics = obj_template->get("NIC", nics);
 
     for(int i=0; i<num_nics; i++)
     {
-        nic = dynamic_cast<const VectorAttribute * >(nics[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
-        nic->vector_value("NIC_ID", tnic_id);
+        nics[i]->vector_value("NIC_ID", tnic_id);
 
         if ( tnic_id == nic_id )
         {
-            return nic;
+            return nics[i];
         }
     }
 
@@ -3868,33 +3629,25 @@ int VirtualMachine::clear_saveas_state()
 
 int VirtualMachine::clear_saveas_disk()
 {
-    vector<Attribute  *> disks;
-    VectorAttribute *    disk;
+    vector<VectorAttribute  *> disks;
 
-    int  num_disks, image_id;
+    int  image_id;
     bool active;
 
-    num_disks = obj_template->get("DISK", disks);
+    int num_disks = obj_template->get("DISK", disks);
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        disk->vector_value("HOTPLUG_SAVE_AS_ACTIVE", active);
+        disks[i]->vector_value("HOTPLUG_SAVE_AS_ACTIVE", active);
 
         if (active)
         {
-            disk->vector_value("HOTPLUG_SAVE_AS", image_id);
+            disks[i]->vector_value("HOTPLUG_SAVE_AS", image_id);
 
-            disk->remove("HOTPLUG_SAVE_AS_ACTIVE");
-            disk->remove("HOTPLUG_SAVE_AS");
-            disk->remove("HOTPLUG_SAVE_AS_SOURCE");
-            disk->remove("HOTPLUG_SAVE_AS_SNAPSHOT_ID");
+            disks[i]->remove("HOTPLUG_SAVE_AS_ACTIVE");
+            disks[i]->remove("HOTPLUG_SAVE_AS");
+            disks[i]->remove("HOTPLUG_SAVE_AS_SOURCE");
+            disks[i]->remove("HOTPLUG_SAVE_AS_SNAPSHOT_ID");
 
             return image_id;
         }
@@ -3910,31 +3663,21 @@ int VirtualMachine::clear_saveas_disk()
 int VirtualMachine::get_saveas_disk(int& disk_id, string& source,
         int& image_id, string& snap_id, string& tm_mad, string& ds_id)
 {
-    vector<Attribute  *> disks;
-    VectorAttribute *    disk;
+    vector<VectorAttribute  *> disks;
 
     int rc;
-    int num_disks;
-
-    num_disks = obj_template->get("DISK", disks);
+    int num_disks = obj_template->get("DISK", disks);
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
+        if ( disks[i]->vector_value("HOTPLUG_SAVE_AS_ACTIVE") == "YES" )
         {
-            continue;
-        }
-
-        if ( disk->vector_value("HOTPLUG_SAVE_AS_ACTIVE") == "YES" )
-        {
-            rc  = disk->vector_value("HOTPLUG_SAVE_AS_SOURCE", source);
-            rc += disk->vector_value("HOTPLUG_SAVE_AS", image_id);
-            rc += disk->vector_value("HOTPLUG_SAVE_AS_SNAPSHOT_ID", snap_id);
-            rc += disk->vector_value("DISK_ID",  disk_id);
-            rc += disk->vector_value("DATASTORE_ID", ds_id);
-            rc += disk->vector_value("TM_MAD", tm_mad);
+            rc  = disks[i]->vector_value("HOTPLUG_SAVE_AS_SOURCE", source);
+            rc += disks[i]->vector_value("HOTPLUG_SAVE_AS", image_id);
+            rc += disks[i]->vector_value("HOTPLUG_SAVE_AS_SNAPSHOT_ID", snap_id);
+            rc += disks[i]->vector_value("DISK_ID",  disk_id);
+            rc += disks[i]->vector_value("DATASTORE_ID", ds_id);
+            rc += disks[i]->vector_value("TM_MAD", tm_mad);
 
             return rc;
         }
@@ -3950,9 +3693,8 @@ void VirtualMachine::set_auth_request(int uid,
                                       AuthRequest& ar,
                                       VirtualMachineTemplate *tmpl)
 {
-    int                   num;
-    vector<Attribute  * > vectors;
-    VectorAttribute *     vector;
+    int num;
+    vector<VectorAttribute  *> vectors;
 
     Nebula& nd = Nebula::instance();
 
@@ -3963,37 +3705,22 @@ void VirtualMachine::set_auth_request(int uid,
     set<int>        sgroups;
     SecurityGroup * sgroup;
 
-    num = tmpl->get("DISK",vectors);
+    num = tmpl->get("DISK", vectors);
 
     for(int i=0; i<num; i++)
     {
-
-        vector = dynamic_cast<VectorAttribute * >(vectors[i]);
-
-        if ( vector == 0 )
-        {
-            continue;
-        }
-
-        ipool->authorize_disk(vector,uid,&ar);
+        ipool->authorize_disk(vectors[i], uid, &ar);
     }
 
     vectors.clear();
 
-    num = tmpl->get("NIC",vectors);
+    num = tmpl->get("NIC", vectors);
 
     for(int i=0; i<num; i++, sgroups.clear())
     {
-        vector = dynamic_cast<VectorAttribute * >(vectors[i]);
+        vnpool->authorize_nic(PoolObjectSQL::VM, vectors[i], uid, &ar);
 
-        if ( vector == 0 )
-        {
-            continue;
-        }
-
-        vnpool->authorize_nic(PoolObjectSQL::VM, vector, uid, &ar);
-
-        get_security_groups(vector, sgroups);
+        get_security_groups(vectors[i], sgroups);
 
         for(set<int>::iterator it = sgroups.begin(); it != sgroups.end(); it++)
         {
@@ -4018,23 +3745,14 @@ void VirtualMachine::set_auth_request(int uid,
 void VirtualMachine::disk_extended_info(int uid,
                                        VirtualMachineTemplate *tmpl)
 {
-    int                   num;
-    vector<Attribute  * > disks;
-    VectorAttribute *     disk;
-    ImagePool *           ipool  = Nebula::instance().get_ipool();
+    ImagePool * ipool  = Nebula::instance().get_ipool();
 
-    num = tmpl->get("DISK",disks);
+    vector<VectorAttribute  * > disks;
+    int num = tmpl->get("DISK",disks);
 
     for(int i=0; i<num; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        ipool->disk_attribute(disk, i, uid);
+        ipool->disk_attribute(disks[i], i, uid);
     }
 }
 
@@ -4043,20 +3761,17 @@ void VirtualMachine::disk_extended_info(int uid,
 
 bool VirtualMachine::volatile_disk_extended_info(Template *tmpl)
 {
-    int                   num;
-    vector<Attribute  * > disks;
-    VectorAttribute *     disk;
-    DatastorePool *       ds_pool = Nebula::instance().get_dspool();
+    int  num;
+    vector<VectorAttribute  * > disks;
+    DatastorePool * ds_pool = Nebula::instance().get_dspool();
 
     bool found = false;
 
-    num = tmpl->get("DISK",disks);
+    num = tmpl->get("DISK", disks);
 
     for(int i=0; i<num; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 || !is_volatile(disk) )
+        if ( !is_volatile(disks[i]) )
         {
             continue;
         }
@@ -4065,7 +3780,7 @@ bool VirtualMachine::volatile_disk_extended_info(Template *tmpl)
 
         if (hasHistory())
         {
-            ds_pool->disk_attribute(get_ds_id(), disk);
+            ds_pool->disk_attribute(get_ds_id(), disks[i]);
         }
     }
 
@@ -4607,28 +4322,19 @@ void VirtualMachine::clear_template_monitor_error()
 
 void VirtualMachine::get_public_clouds(const string& pname, set<string> &clouds) const
 {
-    vector<Attribute*>                  attrs;
-    vector<Attribute*>::const_iterator  it;
-
-    VectorAttribute *   vatt;
+    vector<VectorAttribute *>                 attrs;
+    vector<VectorAttribute *>::const_iterator it;
 
     user_obj_template->get(pname, attrs);
 
     if ( !attrs.empty() && pname == "EC2" )
     {
-	clouds.insert("ec2");
+	    clouds.insert("ec2");
     }
 
     for (it = attrs.begin(); it != attrs.end(); it++)
     {
-        vatt = dynamic_cast<VectorAttribute * >(*it);
-
-        if ( vatt == 0 )
-        {
-            continue;
-        }
-
-        string type = vatt->vector_value("TYPE");
+        string type = (*it)->vector_value("TYPE");
 
         if (!type.empty())
         {
@@ -4642,10 +4348,9 @@ void VirtualMachine::get_public_clouds(const string& pname, set<string> &clouds)
 
 int VirtualMachine::parse_public_clouds(const char * pname, string& error)
 {
-    vector<Attribute*>            attrs;
-    vector<Attribute*>::iterator  it;
+    vector<VectorAttribute *>           attrs;
+    vector<VectorAttribute *>::iterator it;
 
-    VectorAttribute * vatt;
     string * str;
     string p_vatt;
 
@@ -4654,18 +4359,7 @@ int VirtualMachine::parse_public_clouds(const char * pname, string& error)
 
     for (it = attrs.begin(); it != attrs.end(); it++)
     {
-        vatt = dynamic_cast<VectorAttribute * >(*it);
-
-        if ( vatt == 0 )
-        {
-            ostringstream oss;
-            oss << "Wrong format for " << pname << " attribute";
-            error = oss.str();
-            rc    = -1;
-            break;
-        }
-
-        str = vatt->marshall();
+        str = (*it)->marshall();
 
         if ( str == 0 )
         {
@@ -4725,25 +4419,15 @@ int VirtualMachine::set_snapshot_disk(int did, int snap_id)
 
 void VirtualMachine::clear_snapshot_disk()
 {
-    int                  num_disks;
-    vector<Attribute  *> disks;
-    VectorAttribute *    disk;
-
-    num_disks = obj_template->get("DISK", disks);
+    vector<VectorAttribute  *> disks;
+    int num_disks = obj_template->get("DISK", disks);
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
+        if ( disks[i]->vector_value("DISK_SNAPSHOT_ACTIVE") == "YES" )
         {
-            continue;
-        }
-
-        if ( disk->vector_value("DISK_SNAPSHOT_ACTIVE") == "YES" )
-        {
-            disk->remove("DISK_SNAPSHOT_ACTIVE");
-            disk->remove("DISK_SNAPSHOT_ID");
+            disks[i]->remove("DISK_SNAPSHOT_ACTIVE");
+            disks[i]->remove("DISK_SNAPSHOT_ID");
             return;
         }
     }
@@ -4754,28 +4438,17 @@ void VirtualMachine::clear_snapshot_disk()
 int VirtualMachine::get_snapshot_disk(int& ds_id, string& tm_mad,
         int& disk_id, int& snap_id)
 {
-    vector<Attribute  *> disks;
-    VectorAttribute *    disk;
-
-    int num_disks;
-
-    num_disks = obj_template->get("DISK", disks);
+    vector<VectorAttribute *> disks;
+    int num_disks = obj_template->get("DISK", disks);
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        if ( disk->vector_value("DISK_SNAPSHOT_ACTIVE") == "YES" )
+        if ( disks[i]->vector_value("DISK_SNAPSHOT_ACTIVE") == "YES" )
         {
             map<int, Snapshots *>::iterator it;
             int did, rc;
 
-            if (disk->vector_value("DISK_ID", did) == -1)
+            if (disks[i]->vector_value("DISK_ID", did) == -1)
             {
                 return -1;
             }
@@ -4787,10 +4460,10 @@ int VirtualMachine::get_snapshot_disk(int& ds_id, string& tm_mad,
                 return -1;
             }
 
-            tm_mad  = disk->vector_value("TM_MAD");
-            rc =  disk->vector_value("DATASTORE_ID", ds_id);
-            rc += disk->vector_value("DISK_ID", disk_id);
-            rc += disk->vector_value("DISK_SNAPSHOT_ID", snap_id);
+            tm_mad  = disks[i]->vector_value("TM_MAD");
+            rc =  disks[i]->vector_value("DATASTORE_ID", ds_id);
+            rc += disks[i]->vector_value("DISK_ID", disk_id);
+            rc += disks[i]->vector_value("DISK_SNAPSHOT_ID", snap_id);
 
             if (tm_mad.empty() || rc != 0)
             {
@@ -4999,8 +4672,7 @@ void VirtualMachine::delete_disk_snapshot(int did, int snap_id,
 void VirtualMachine::delete_non_persistent_disk_snapshots(Template **vm_quotas,
         map<int, Template *>& ds_quotas)
 {
-    vector<Attribute *> disks;
-    VectorAttribute *   disk;
+    vector<VectorAttribute *> disks;
 
     map<int, Snapshots *>::iterator it;
 
@@ -5012,14 +4684,7 @@ void VirtualMachine::delete_non_persistent_disk_snapshots(Template **vm_quotas,
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if (disk == 0)
-        {
-            continue;
-        }
-
-        if (disk->vector_value("DISK_ID", disk_id) != 0)
+        if (disks[i]->vector_value("DISK_ID", disk_id) != 0)
         {
             continue;
         }
@@ -5031,23 +4696,23 @@ void VirtualMachine::delete_non_persistent_disk_snapshots(Template **vm_quotas,
             continue;
         }
 
-		if ( disk_tm_target(disk) != "SYSTEM" )
+		if ( disk_tm_target(disks[i]) != "SYSTEM" )
 		{
 			continue;
 		}
 
-        if (is_persistent(disk))
+        if (is_persistent(disks[i]))
         {
             int image_id;
 
-            if ( disk->vector_value("IMAGE_ID", image_id) != 0 )
+            if ( disks[i]->vector_value("IMAGE_ID", image_id) != 0 )
             {
                 continue;
             }
 
             Template * d_ds = new Template();
 
-            d_ds->add("DATASTORE", disk->vector_value("DATASTORE_ID"));
+            d_ds->add("DATASTORE", disks[i]->vector_value("DATASTORE_ID"));
             d_ds->add("SIZE", it->second->get_total_size());
             d_ds->add("IMAGES", 0);
 
@@ -5064,9 +4729,9 @@ void VirtualMachine::delete_non_persistent_disk_snapshots(Template **vm_quotas,
 
         delete tmp;
 
-        disk->remove("DISK_SNAPSHOT_ACTIVE");
-        disk->remove("DISK_SNAPSHOT_ID");
-        disk->remove("DISK_SNAPSHOT_TOTAL_SIZE");
+        disks[i]->remove("DISK_SNAPSHOT_ACTIVE");
+        disks[i]->remove("DISK_SNAPSHOT_ID");
+        disks[i]->remove("DISK_SNAPSHOT_TOTAL_SIZE");
     }
 
     if ( system_disk > 0 )
diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc
index 571baaa53e..1dcf6ff6c8 100644
--- a/src/vm/VirtualMachinePool.cc
+++ b/src/vm/VirtualMachinePool.cc
@@ -46,10 +46,10 @@ const char * VirtualMachinePool::import_db_bootstrap =
 
 VirtualMachinePool::VirtualMachinePool(
         SqlDB *                     db,
-        vector<const Attribute *>   hook_mads,
+        vector<const VectorAttribute *>   hook_mads,
         const string&               hook_location,
         const string&               remotes_location,
-        vector<const Attribute *>&  restricted_attrs,
+        vector<const SingleAttribute *>&  restricted_attrs,
         time_t                      expire_time,
         bool                        on_hold,
         float                       default_cpu_cost,
@@ -57,7 +57,6 @@ VirtualMachinePool::VirtualMachinePool(
         float                       default_disk_cost)
     : PoolSQL(db, VirtualMachine::table, true, false)
 {
-    const VectorAttribute * vattr;
 
     string name;
     string on;
@@ -78,15 +77,15 @@ VirtualMachinePool::VirtualMachinePool(
 
     for (unsigned int i = 0 ; i < hook_mads.size() ; i++ )
     {
-        vattr = static_cast<const VectorAttribute *>(hook_mads[i]);
+        const VectorAttribute * vattr = hook_mads[i];
 
-        name = vattr->vector_value("NAME");
-        on   = vattr->vector_value("ON");
-        cmd  = vattr->vector_value("COMMAND");
-        arg  = vattr->vector_value("ARGUMENTS");
-        vattr->vector_value("REMOTE", remote);
+        name = hook_mads[i]->vector_value("NAME");
+        on   = hook_mads[i]->vector_value("ON");
+        cmd  = hook_mads[i]->vector_value("COMMAND");
+        arg  = hook_mads[i]->vector_value("ARGUMENTS");
+        hook_mads[i]->vector_value("REMOTE", remote);
 
-        transform (on.begin(),on.end(),on.begin(),(int(*)(int))toupper);
+        one_util::toupper(on);
 
         if ( on.empty() || cmd.empty() )
         {
@@ -1159,15 +1158,3 @@ void VirtualMachinePool::delete_hotplug_nic(int vid, bool attach)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-void VirtualMachinePool::attach_nic_failure(int vid)
-{
-    delete_hotplug_nic(vid, true);
-}
-
-/* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
-
-void VirtualMachinePool::detach_nic_success(int vid)
-{
-    delete_hotplug_nic(vid, false);
-}
diff --git a/src/vm/VirtualMachineTemplate.cc b/src/vm/VirtualMachineTemplate.cc
index e363886b0c..4e334e3e93 100644
--- a/src/vm/VirtualMachineTemplate.cc
+++ b/src/vm/VirtualMachineTemplate.cc
@@ -34,19 +34,14 @@ int VirtualMachineTemplate::replace_disk_image(int target_id, const string&
     string tmp_name;
     string tmp_uname;
 
-    vector<Attribute  *> disks;
+    vector<VectorAttribute  *> disks;
     VectorAttribute *    disk = 0;
 
     num_disks = get("DISK", disks);
 
     for(int i=0; i<num_disks; i++)
     {
-        disk = dynamic_cast<VectorAttribute * >(disks[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
+        disk = disks[i];
 
         if (disk->vector_value("IMAGE_ID", tmp_id) == 0) //DISK has IMAGE_ID
         {
diff --git a/src/vm/vm_file_var_syntax.cc b/src/vm/vm_file_var_syntax.cc
index 4ef96903dd..38eb476b38 100644
--- a/src/vm/vm_file_var_syntax.cc
+++ b/src/vm/vm_file_var_syntax.cc
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -299,7 +299,7 @@ extern int vm_file_var__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 #line 206 "vm_file_var_syntax.y" /* yacc.c:355  */
@@ -310,6 +310,8 @@ union YYSTYPE
 
 #line 312 "vm_file_var_syntax.cc" /* yacc.c:355  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -336,7 +338,7 @@ int vm_file_var__parse (mem_collector *  mc, VirtualMachine * vm, vector<int> *
 
 /* Copy the second part of user declarations.  */
 
-#line 340 "vm_file_var_syntax.cc" /* yacc.c:358  */
+#line 342 "vm_file_var_syntax.cc" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -1534,7 +1536,7 @@ yyreduce:
             YYABORT;
         }
     }
-#line 1538 "vm_file_var_syntax.cc" /* yacc.c:1646  */
+#line 1540 "vm_file_var_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 5:
@@ -1559,11 +1561,11 @@ yyreduce:
             YYABORT;
         }
     }
-#line 1563 "vm_file_var_syntax.cc" /* yacc.c:1646  */
+#line 1565 "vm_file_var_syntax.cc" /* yacc.c:1646  */
     break;
 
 
-#line 1567 "vm_file_var_syntax.cc" /* yacc.c:1646  */
+#line 1569 "vm_file_var_syntax.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/vm/vm_file_var_syntax.h b/src/vm/vm_file_var_syntax.h
index df0c81c381..d0184441c7 100644
--- a/src/vm/vm_file_var_syntax.h
+++ b/src/vm/vm_file_var_syntax.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@ extern int vm_file_var__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 #line 206 "vm_file_var_syntax.y" /* yacc.c:1909  */
@@ -70,6 +70,8 @@ union YYSTYPE
 
 #line 72 "vm_file_var_syntax.hh" /* yacc.c:1909  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
diff --git a/src/vm/vm_var_parser.c b/src/vm/vm_var_parser.c
index 21083baace..c7db1cdb71 100644
--- a/src/vm/vm_var_parser.c
+++ b/src/vm/vm_var_parser.c
@@ -27,8 +27,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -161,7 +161,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -383,11 +391,17 @@ extern int vm_var_lineno;
 int vm_var_lineno = 1;
 
 extern char *vm_var_text;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
 #define yytext_ptr vm_var_text
 
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
 static int yy_get_next_buffer (void );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
 static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
@@ -417,7 +431,7 @@ static yyconst flex_int16_t yy_accept[34] =
         7,    8,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -449,13 +463,13 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[12] =
+static yyconst YY_CHAR yy_meta[12] =
     {   0,
         1,    1,    1,    1,    2,    1,    3,    1,    1,    1,
         3
     } ;
 
-static yyconst flex_int16_t yy_base[39] =
+static yyconst flex_uint16_t yy_base[39] =
     {   0,
        41,   40,    0,    0,    8,   12,   44,    0,   47,   47,
        18,   47,   47,   41,    0,   40,   39,   47,   32,   20,
@@ -471,7 +485,7 @@ static yyconst flex_int16_t yy_def[39] =
        33,   33,    0,   33,   33,   33,   33,   33
     } ;
 
-static yyconst flex_int16_t yy_nxt[59] =
+static yyconst flex_uint16_t yy_nxt[59] =
     {   0,
        10,   11,   12,   10,   13,   14,   15,   16,   17,   18,
        15,   19,   27,   32,   20,   19,   31,   29,   20,   22,
@@ -535,7 +549,7 @@ char *vm_var_text;
 #include "vm_var_syntax.h"
 #include "mem_collector.h"
 
-#define YY_NO_INPUT 
+#define YY_NO_INPUT
 
 #define YY_DECL int vm_var_lex (YYSTYPE *lvalp, YYLTYPE *llocp, \
                                 mem_collector *mc)
@@ -545,7 +559,7 @@ char *vm_var_text;
                         llocp->last_column += vm_var_leng;
 
 
-#line 549 "vm_var_parser.c"
+#line 563 "vm_var_parser.c"
 
 #define INITIAL 0
 #define VAR 1
@@ -580,11 +594,11 @@ void vm_var_set_extra (YY_EXTRA_TYPE user_defined  );
 
 FILE *vm_var_get_in (void );
 
-void vm_var_set_in  (FILE * in_str  );
+void vm_var_set_in  (FILE * _in_str  );
 
 FILE *vm_var_get_out (void );
 
-void vm_var_set_out  (FILE * out_str  );
+void vm_var_set_out  (FILE * _out_str  );
 
 yy_size_t vm_var_get_leng (void );
 
@@ -592,7 +606,7 @@ char *vm_var_get_text (void );
 
 int vm_var_get_lineno (void );
 
-void vm_var_set_lineno (int line_number  );
+void vm_var_set_lineno (int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -606,6 +620,10 @@ extern int vm_var_wrap (void );
 #endif
 #endif
 
+#ifndef YY_NO_UNPUT
+    
+#endif
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -626,7 +644,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -713,7 +736,7 @@ extern int vm_var_lex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -723,9 +746,9 @@ extern int vm_var_lex (void);
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     
 	if ( !(yy_init) )
 		{
@@ -765,9 +788,9 @@ YY_DECL
  /*   $NUM.CONTEXT_VARIABLE                                                   */
  /* ------------------------------------------------------------------------- */
 
-#line 769 "vm_var_parser.c"
+#line 792 "vm_var_parser.c"
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
@@ -783,7 +806,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -915,7 +938,7 @@ YY_RULE_SETUP
 #line 92 "vm_var_parser.l"
 ECHO;
 	YY_BREAK
-#line 919 "vm_var_parser.c"
+#line 942 "vm_var_parser.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(VALUE):
 	yyterminate();
@@ -1059,9 +1082,9 @@ case YY_STATE_EOF(VALUE):
  */
 static int yy_get_next_buffer (void)
 {
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	yy_size_t number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1090,7 +1113,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -1193,14 +1216,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -1225,10 +1248,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -1246,6 +1269,10 @@ static int yy_get_next_buffer (void)
 		return yy_is_jam ? 0 : yy_current_state;
 }
 
+#ifndef YY_NO_UNPUT
+
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -1400,7 +1427,7 @@ static void vm_var__load_buffer_state  (void)
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in vm_var__create_buffer()" );
 
-	b->yy_buf_size = size;
+	b->yy_buf_size = (yy_size_t)size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -1555,7 +1582,7 @@ static void vm_var_ensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1;
+		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
 		(yy_buffer_stack) = (struct yy_buffer_state**)vm_var_alloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
@@ -1572,7 +1599,7 @@ static void vm_var_ensure_buffer_stack (void)
 	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
 		(yy_buffer_stack) = (struct yy_buffer_state**)vm_var_realloc
@@ -1680,7 +1707,7 @@ YY_BUFFER_STATE vm_var__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes
 
 static void yy_fatal_error (yyconst char* msg )
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+			(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -1746,29 +1773,29 @@ char *vm_var_get_text  (void)
 }
 
 /** Set the current line number.
- * @param line_number
+ * @param _line_number line number
  * 
  */
-void vm_var_set_lineno (int  line_number )
+void vm_var_set_lineno (int  _line_number )
 {
     
-    vm_var_lineno = line_number;
+    vm_var_lineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
  * 
  * @see vm_var__switch_to_buffer
  */
-void vm_var_set_in (FILE *  in_str )
+void vm_var_set_in (FILE *  _in_str )
 {
-        vm_var_in = in_str ;
+        vm_var_in = _in_str ;
 }
 
-void vm_var_set_out (FILE *  out_str )
+void vm_var_set_out (FILE *  _out_str )
 {
-        vm_var_out = out_str ;
+        vm_var_out = _out_str ;
 }
 
 int vm_var_get_debug  (void)
@@ -1776,9 +1803,9 @@ int vm_var_get_debug  (void)
         return vm_var__flex_debug;
 }
 
-void vm_var_set_debug (int  bdebug )
+void vm_var_set_debug (int  _bdebug )
 {
-        vm_var__flex_debug = bdebug ;
+        vm_var__flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
@@ -1841,7 +1868,8 @@ int vm_var_lex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-	register int i;
+		
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -1850,7 +1878,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -1860,11 +1888,12 @@ static int yy_flex_strlen (yyconst char * s )
 
 void *vm_var_alloc (yy_size_t  size )
 {
-	return (void *) malloc( size );
+			return (void *) malloc( size );
 }
 
 void *vm_var_realloc  (void * ptr, yy_size_t  size )
 {
+		
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -1877,7 +1906,7 @@ void *vm_var_realloc  (void * ptr, yy_size_t  size )
 
 void vm_var_free (void * ptr )
 {
-	free( (char *) ptr );	/* see vm_var_realloc() for (char *) cast */
+			free( (char *) ptr );	/* see vm_var_realloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
diff --git a/src/vm/vm_var_syntax.cc b/src/vm/vm_var_syntax.cc
index 63f0a42f51..bb800019d0 100644
--- a/src/vm/vm_var_syntax.cc
+++ b/src/vm/vm_var_syntax.cc
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -142,8 +142,7 @@ void get_image_attribute(VirtualMachine * vm,
     int         iid = -1;
 
     int num;
-    vector<const Attribute *> attrs;
-    const VectorAttribute *   disk;
+    vector<const VectorAttribute *> disks;
 
     attr_value.clear();
 
@@ -156,20 +155,13 @@ void get_image_attribute(VirtualMachine * vm,
     // Check that the image is in the template, so
     // are sure that we can access the image template
     // ----------------------------------------------
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disks);
 
     for (int i=0; i < num ;i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( disk == 0 )
+        if ( disks[i]->vector_value(img_name.c_str()) == img_value )
         {
-            continue;
-        }
-
-        if ( disk->vector_value(img_name.c_str()) == img_value )
-        {
-            string        iid_str = disk->vector_value("IMAGE_ID");
+            string        iid_str = disks[i]->vector_value("IMAGE_ID");
             istringstream iss(iid_str);
 
             iss >> iid;
@@ -204,7 +196,7 @@ void get_image_attribute(VirtualMachine * vm,
     }
     else
     {
-        img->get_template_attribute(attr_name.c_str(),attr_value);
+        img->get_template_attribute(attr_name.c_str(), attr_value);
     }
 
     img->unlock();
@@ -226,8 +218,7 @@ void get_network_attribute(VirtualMachine * vm,
     int                  ar_id, vnet_id = -1;
 
     int num;
-    vector<const Attribute *> attrs;
-    const VectorAttribute *   net;
+    vector<const VectorAttribute *> nets;
 
     attr_value.clear();
 
@@ -241,25 +232,18 @@ void get_network_attribute(VirtualMachine * vm,
     // Check that the network is in the template, so
     // are sure that we can access its template
     // ----------------------------------------------
-    num = vm->get_template_attribute("NIC",attrs);
+    num = vm->get_template_attribute("NIC", nets);
 
     for (int i=0; i < num ;i++)
     {
-        net = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( net == 0 )
+        if ( nets[i]->vector_value(net_name.c_str()) == net_value )
         {
-            continue;
-        }
-
-        if ( net->vector_value(net_name.c_str()) == net_value )
-        {
-            if (net->vector_value("NETWORK_ID", vnet_id) != 0)
+            if (nets[i]->vector_value("NETWORK_ID", vnet_id) != 0)
             {
                 vnet_id = -1;
             }
 
-            if (net->vector_value("AR_ID", ar_id) != 0)
+            if (nets[i]->vector_value("AR_ID", ar_id) != 0)
             {
                 vnet_id = -1;
             }
@@ -390,7 +374,7 @@ void insert_vector(VirtualMachine * vm,
                    const string&    vval)
 
 {
-    vector<const Attribute*> values;
+    vector<const VectorAttribute*> values;
     const VectorAttribute *  vattr = 0;
 
     int    num;
@@ -436,14 +420,14 @@ void insert_vector(VirtualMachine * vm,
     }
     else
     {
-        if ( ( num = vm->get_template_attribute(name.c_str(),values) ) <= 0 )
+        if ( ( num = vm->get_template_attribute(name.c_str(), values) ) <= 0 )
         {
             return;
         }
 
         if ( vvar.empty() )
         {
-            vattr = dynamic_cast<const VectorAttribute *>(values[0]);
+            vattr = values[0];
         }
         else
         {
@@ -451,9 +435,7 @@ void insert_vector(VirtualMachine * vm,
 
             for (int i=0 ; i < num ; i++)
             {
-                tmp = dynamic_cast<const VectorAttribute *>(values[i]);
-
-                if ( tmp && ( tmp->vector_value(vvar.c_str()) == vval ))
+                if (tmp->vector_value(vvar.c_str()) == vval)
                 {
                     vattr = tmp;
                     break;
@@ -472,7 +454,7 @@ void insert_vector(VirtualMachine * vm,
 /* -------------------------------------------------------------------------- */
 
 
-#line 475 "vm_var_syntax.cc" /* yacc.c:339  */
+#line 458 "vm_var_syntax.cc" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -521,17 +503,19 @@ extern int vm_var__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
-#line 427 "vm_var_syntax.y" /* yacc.c:355  */
+#line 410 "vm_var_syntax.y" /* yacc.c:355  */
 
     char * val_str;
     int    val_int;
     char   val_char;
 
-#line 533 "vm_var_syntax.cc" /* yacc.c:355  */
+#line 516 "vm_var_syntax.cc" /* yacc.c:355  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -558,7 +542,7 @@ int vm_var__parse (mem_collector * mc, VirtualMachine * vm, ostringstream *  par
 
 /* Copy the second part of user declarations.  */
 
-#line 561 "vm_var_syntax.cc" /* yacc.c:358  */
+#line 546 "vm_var_syntax.cc" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -858,7 +842,7 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   451,   451,   452,   455,   459,   472,   487
+       0,   434,   434,   435,   438,   442,   455,   470
 };
 #endif
 
@@ -1738,15 +1722,15 @@ yyreduce:
   switch (yyn)
     {
         case 4:
-#line 456 "vm_var_syntax.y" /* yacc.c:1646  */
+#line 439 "vm_var_syntax.y" /* yacc.c:1646  */
     {
         (*parsed) << (yyvsp[0].val_str);
     }
-#line 1745 "vm_var_syntax.cc" /* yacc.c:1646  */
+#line 1730 "vm_var_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 460 "vm_var_syntax.y" /* yacc.c:1646  */
+#line 443 "vm_var_syntax.y" /* yacc.c:1646  */
     {
         string name((yyvsp[-1].val_str));
 
@@ -1759,11 +1743,11 @@ yyreduce:
             (*parsed) << (yyvsp[0].val_char);
         }
     }
-#line 1762 "vm_var_syntax.cc" /* yacc.c:1646  */
+#line 1747 "vm_var_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 473 "vm_var_syntax.y" /* yacc.c:1646  */
+#line 456 "vm_var_syntax.y" /* yacc.c:1646  */
     {
         string name((yyvsp[-4].val_str));
         string vname((yyvsp[-2].val_str));
@@ -1778,11 +1762,11 @@ yyreduce:
             (*parsed) << (yyvsp[0].val_char);
         }
     }
-#line 1781 "vm_var_syntax.cc" /* yacc.c:1646  */
+#line 1766 "vm_var_syntax.cc" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 488 "vm_var_syntax.y" /* yacc.c:1646  */
+#line 471 "vm_var_syntax.y" /* yacc.c:1646  */
     {
         string name((yyvsp[-8].val_str));
         string vname((yyvsp[-6].val_str));
@@ -1800,11 +1784,11 @@ yyreduce:
             (*parsed) << (yyvsp[0].val_char);
         }
     }
-#line 1803 "vm_var_syntax.cc" /* yacc.c:1646  */
+#line 1788 "vm_var_syntax.cc" /* yacc.c:1646  */
     break;
 
 
-#line 1807 "vm_var_syntax.cc" /* yacc.c:1646  */
+#line 1792 "vm_var_syntax.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2039,7 +2023,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 506 "vm_var_syntax.y" /* yacc.c:1906  */
+#line 489 "vm_var_syntax.y" /* yacc.c:1906  */
 
 
 extern "C" void vm_var__error(
diff --git a/src/vm/vm_var_syntax.h b/src/vm/vm_var_syntax.h
index 7558dd0e9e..802497f373 100644
--- a/src/vm/vm_var_syntax.h
+++ b/src/vm/vm_var_syntax.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -59,10 +59,10 @@ extern int vm_var__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
-#line 427 "vm_var_syntax.y" /* yacc.c:1909  */
+#line 410 "vm_var_syntax.y" /* yacc.c:1909  */
 
     char * val_str;
     int    val_int;
@@ -70,6 +70,8 @@ union YYSTYPE
 
 #line 72 "vm_var_syntax.hh" /* yacc.c:1909  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -87,4 +89,5 @@ struct YYLTYPE
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
+
 #endif /* !YY_VM_VAR_VM_VAR_SYNTAX_HH_INCLUDED  */
diff --git a/src/vm/vm_var_syntax.y b/src/vm/vm_var_syntax.y
index 8754ab4380..a79436b090 100644
--- a/src/vm/vm_var_syntax.y
+++ b/src/vm/vm_var_syntax.y
@@ -87,8 +87,7 @@ void get_image_attribute(VirtualMachine * vm,
     int         iid = -1;
 
     int num;
-    vector<const Attribute *> attrs;
-    const VectorAttribute *   disk;
+    vector<const VectorAttribute *> disks;
 
     attr_value.clear();
 
@@ -101,20 +100,13 @@ void get_image_attribute(VirtualMachine * vm,
     // Check that the image is in the template, so
     // are sure that we can access the image template
     // ----------------------------------------------
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disks);
 
     for (int i=0; i < num ;i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( disk == 0 )
+        if ( disks[i]->vector_value(img_name.c_str()) == img_value )
         {
-            continue;
-        }
-
-        if ( disk->vector_value(img_name.c_str()) == img_value )
-        {
-            string        iid_str = disk->vector_value("IMAGE_ID");
+            string        iid_str = disks[i]->vector_value("IMAGE_ID");
             istringstream iss(iid_str);
 
             iss >> iid;
@@ -149,7 +141,7 @@ void get_image_attribute(VirtualMachine * vm,
     }
     else
     {
-        img->get_template_attribute(attr_name.c_str(),attr_value);
+        img->get_template_attribute(attr_name.c_str(), attr_value);
     }
 
     img->unlock();
@@ -171,8 +163,7 @@ void get_network_attribute(VirtualMachine * vm,
     int                  ar_id, vnet_id = -1;
 
     int num;
-    vector<const Attribute *> attrs;
-    const VectorAttribute *   net;
+    vector<const VectorAttribute *> nets;
 
     attr_value.clear();
 
@@ -186,25 +177,18 @@ void get_network_attribute(VirtualMachine * vm,
     // Check that the network is in the template, so
     // are sure that we can access its template
     // ----------------------------------------------
-    num = vm->get_template_attribute("NIC",attrs);
+    num = vm->get_template_attribute("NIC", nets);
 
     for (int i=0; i < num ;i++)
     {
-        net = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( net == 0 )
+        if ( nets[i]->vector_value(net_name.c_str()) == net_value )
         {
-            continue;
-        }
-
-        if ( net->vector_value(net_name.c_str()) == net_value )
-        {
-            if (net->vector_value("NETWORK_ID", vnet_id) != 0)
+            if (nets[i]->vector_value("NETWORK_ID", vnet_id) != 0)
             {
                 vnet_id = -1;
             }
 
-            if (net->vector_value("AR_ID", ar_id) != 0)
+            if (nets[i]->vector_value("AR_ID", ar_id) != 0)
             {
                 vnet_id = -1;
             }
@@ -335,7 +319,7 @@ void insert_vector(VirtualMachine * vm,
                    const string&    vval)
 
 {
-    vector<const Attribute*> values;
+    vector<const VectorAttribute*> values;
     const VectorAttribute *  vattr = 0;
 
     int    num;
@@ -381,14 +365,14 @@ void insert_vector(VirtualMachine * vm,
     }
     else
     {
-        if ( ( num = vm->get_template_attribute(name.c_str(),values) ) <= 0 )
+        if ( ( num = vm->get_template_attribute(name.c_str(), values) ) <= 0 )
         {
             return;
         }
 
         if ( vvar.empty() )
         {
-            vattr = dynamic_cast<const VectorAttribute *>(values[0]);
+            vattr = values[0];
         }
         else
         {
@@ -396,9 +380,7 @@ void insert_vector(VirtualMachine * vm,
 
             for (int i=0 ; i < num ; i++)
             {
-                tmp = dynamic_cast<const VectorAttribute *>(values[i]);
-
-                if ( tmp && ( tmp->vector_value(vvar.c_str()) == vval ))
+                if (tmp->vector_value(vvar.c_str()) == vval)
                 {
                     vattr = tmp;
                     break;
diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc
index adc9abfacd..d59fbc9a89 100644
--- a/src/vmm/LibVirtDriverKVM.cc
+++ b/src/vmm/LibVirtDriverKVM.cc
@@ -89,10 +89,9 @@ int LibVirtDriver::deployment_description_kvm(
         const VirtualMachine *  vm,
         const string&           file_name) const
 {
-    ofstream                    file;
+    ofstream  file;
 
-    int                         num;
-    vector<const Attribute *>   attrs;
+    int       num;
 
     string  vcpu;
     float   cpu;
@@ -100,6 +99,8 @@ int LibVirtDriver::deployment_description_kvm(
 
     string  emulator_path = "";
 
+    const VectorAttribute * os;
+
     string  kernel     = "";
     string  initrd     = "";
     string  boot       = "";
@@ -111,7 +112,7 @@ int LibVirtDriver::deployment_description_kvm(
 
     vector<string> boots;
 
-    const VectorAttribute * disk;
+    vector<const VectorAttribute *> disk;
     const VectorAttribute * context;
 
     string  type            = "";
@@ -158,7 +159,7 @@ int LibVirtDriver::deployment_description_kvm(
     string  default_driver_discard  = "";
     bool    readonly;
 
-    const VectorAttribute * nic;
+    vector<const VectorAttribute *> nic;
 
     string  mac        = "";
     string  bridge     = "";
@@ -181,7 +182,7 @@ int LibVirtDriver::deployment_description_kvm(
 
     const VectorAttribute * input;
 
-    const VectorAttribute * pci;
+    vector<const VectorAttribute *> pci;
 
     string  domain          = "";
     /* bus is already defined for disks */
@@ -204,7 +205,7 @@ int LibVirtDriver::deployment_description_kvm(
 
     string hyperv_options = "";
 
-    const VectorAttribute * raw;
+    vector<const VectorAttribute *> raw;
     string default_raw;
     string data;
 
@@ -273,27 +274,18 @@ int LibVirtDriver::deployment_description_kvm(
 
     file << "\t<os>" << endl;
 
-    num = vm->get_template_attribute("OS",attrs);
+    os = vm->get_template_attribute("OS");
 
-    // Get values & defaults
-
-    if ( num > 0 )
+    if( os != 0 )
     {
-        const VectorAttribute * os;
-
-        os = dynamic_cast<const VectorAttribute *>(attrs[0]);
-
-        if( os != 0 )
-        {
-            kernel     = os->vector_value("KERNEL");
-            initrd     = os->vector_value("INITRD");
-            boot       = os->vector_value("BOOT");
-            root       = os->vector_value("ROOT");
-            kernel_cmd = os->vector_value("KERNEL_CMD");
-            bootloader = os->vector_value("BOOTLOADER");
-            arch       = os->vector_value("ARCH");
-            machine    = os->vector_value("MACHINE");
-        }
+        kernel     = os->vector_value("KERNEL");
+        initrd     = os->vector_value("INITRD");
+        boot       = os->vector_value("BOOT");
+        root       = os->vector_value("ROOT");
+        kernel_cmd = os->vector_value("KERNEL_CMD");
+        bootloader = os->vector_value("BOOTLOADER");
+        arch       = os->vector_value("ARCH");
+        machine    = os->vector_value("MACHINE");
     }
 
     if ( arch.empty() )
@@ -390,8 +382,6 @@ int LibVirtDriver::deployment_description_kvm(
 
     file << "\t</os>" << endl;
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // DEVICES SECTION
     // ------------------------------------------------------------------------
@@ -434,48 +424,36 @@ int LibVirtDriver::deployment_description_kvm(
 
     // ------------------------------------------------------------------------
 
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disk);
 
     for (int i=0; i < num ;i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
+        type            = disk[i]->vector_value("TYPE");
+        disk_type       = disk[i]->vector_value("DISK_TYPE");
+        target          = disk[i]->vector_value("TARGET");
+        ro              = disk[i]->vector_value("READONLY");
+        driver          = disk[i]->vector_value("DRIVER");
+        cache           = disk[i]->vector_value("CACHE");
+        disk_io         = disk[i]->vector_value("IO");
+        discard         = disk[i]->vector_value("DISCARD");
+        source          = disk[i]->vector_value("SOURCE");
+        clone           = disk[i]->vector_value("CLONE");
 
-        if ( disk == 0 )
-        {
-            continue;
-        }
+        ceph_host       = disk[i]->vector_value("CEPH_HOST");
+        ceph_secret     = disk[i]->vector_value("CEPH_SECRET");
+        ceph_user       = disk[i]->vector_value("CEPH_USER");
+        pool_name       = disk[i]->vector_value("POOL_NAME");
 
-        type            = disk->vector_value("TYPE");
-        disk_type       = disk->vector_value("DISK_TYPE");
-        target          = disk->vector_value("TARGET");
-        ro              = disk->vector_value("READONLY");
-        driver          = disk->vector_value("DRIVER");
-        cache           = disk->vector_value("CACHE");
-        disk_io         = disk->vector_value("IO");
-        discard         = disk->vector_value("DISCARD");
-        source          = disk->vector_value("SOURCE");
-        clone           = disk->vector_value("CLONE");
+        gluster_host    = disk[i]->vector_value("GLUSTER_HOST");
+        gluster_volume  = disk[i]->vector_value("GLUSTER_VOLUME");
 
-        ceph_host       = disk->vector_value("CEPH_HOST");
-        ceph_secret     = disk->vector_value("CEPH_SECRET");
-        ceph_user       = disk->vector_value("CEPH_USER");
-        pool_name       = disk->vector_value("POOL_NAME");
-
-        iscsi_host      = disk->vector_value("ISCSI_HOST");
-        iscsi_user      = disk->vector_value("ISCSI_USER");
-        iscsi_usage     = disk->vector_value("ISCSI_USAGE");
-        iscsi_iqn       = disk->vector_value("ISCSI_IQN");
-
-        gluster_host    = disk->vector_value("GLUSTER_HOST");
-        gluster_volume  = disk->vector_value("GLUSTER_VOLUME");
-
-        sheepdog_host   = disk->vector_value("SHEEPDOG_HOST");
-        total_bytes_sec = disk->vector_value("TOTAL_BYTES_SEC");
-        read_bytes_sec  = disk->vector_value("READ_BYTES_SEC");
-        write_bytes_sec = disk->vector_value("WRITE_BYTES_SEC");
-        total_iops_sec  = disk->vector_value("TOTAL_IOPS_SEC");
-        read_iops_sec   = disk->vector_value("READ_IOPS_SEC");
-        write_iops_sec  = disk->vector_value("WRITE_IOPS_SEC");
+        sheepdog_host   = disk[i]->vector_value("SHEEPDOG_HOST");
+        total_bytes_sec = disk[i]->vector_value("TOTAL_BYTES_SEC");
+        read_bytes_sec  = disk[i]->vector_value("READ_BYTES_SEC");
+        write_bytes_sec = disk[i]->vector_value("WRITE_BYTES_SEC");
+        total_iops_sec  = disk[i]->vector_value("TOTAL_IOPS_SEC");
+        read_iops_sec   = disk[i]->vector_value("READ_IOPS_SEC");
+        write_iops_sec  = disk[i]->vector_value("WRITE_IOPS_SEC");
 
         if ( total_bytes_sec.empty() && !default_total_bytes_sec.empty())
         {
@@ -507,7 +485,7 @@ int LibVirtDriver::deployment_description_kvm(
             write_iops_sec = default_write_iops_sec;
         }
 
-        disk->vector_value_str("DISK_ID", disk_id);
+        disk[i]->vector_value_str("DISK_ID", disk_id);
 
         if (target.empty())
         {
@@ -772,15 +750,13 @@ int LibVirtDriver::deployment_description_kvm(
         file << "\t\t</disk>" << endl;
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Context Device
     // ------------------------------------------------------------------------
+    context = vm->get_template_attribute("CONTEXT");
 
-    if ( vm->get_template_attribute("CONTEXT",attrs) == 1 )
+    if ( context != 0 )
     {
-        context = dynamic_cast<const VectorAttribute *>(attrs[0]);
         target  = context->vector_value("TARGET");
         driver  = context->vector_value("DRIVER");
 
@@ -807,35 +783,25 @@ int LibVirtDriver::deployment_description_kvm(
         }
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Network interfaces
     // ------------------------------------------------------------------------
-
     get_default("NIC", "FILTER", default_filter);
 
     get_default("NIC", "MODEL", default_model);
 
-    num = vm->get_template_attribute("NIC", attrs);
+    num = vm->get_template_attribute("NIC", nic);
 
     for(int i=0; i<num; i++)
     {
-        nic = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
-        bridge     = nic->vector_value("BRIDGE");
-        bridge_ovs = nic->vector_value("BRIDGE_OVS");
-        mac        = nic->vector_value("MAC");
-        target     = nic->vector_value("TARGET");
-        script     = nic->vector_value("SCRIPT");
-        model      = nic->vector_value("MODEL");
-        ip         = nic->vector_value("IP");
-        filter     = nic->vector_value("FILTER");
+        bridge     = nic[i]->vector_value("BRIDGE");
+        bridge_ovs = nic[i]->vector_value("BRIDGE_OVS");
+        mac        = nic[i]->vector_value("MAC");
+        target     = nic[i]->vector_value("TARGET");
+        script     = nic[i]->vector_value("SCRIPT");
+        model      = nic[i]->vector_value("MODEL");
+        ip         = nic[i]->vector_value("IP");
+        filter     = nic[i]->vector_value("FILTER");
 
         if ( bridge.empty() )
         {
@@ -917,120 +883,99 @@ int LibVirtDriver::deployment_description_kvm(
         file << "\t\t</interface>" << endl;
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Graphics
     // ------------------------------------------------------------------------
+    graphics = vm->get_template_attribute("GRAPHICS");
 
-    if ( vm->get_template_attribute("GRAPHICS",attrs) > 0 )
+    if ( graphics != 0 )
     {
-        graphics = dynamic_cast<const VectorAttribute *>(attrs[0]);
+        type   = graphics->vector_value("TYPE");
+        listen = graphics->vector_value("LISTEN");
+        port   = graphics->vector_value("PORT");
+        passwd = graphics->vector_value("PASSWD");
+        keymap = graphics->vector_value("KEYMAP");
 
-        if ( graphics != 0 )
+        one_util::tolower(type);
+
+        if ( type == "vnc" || type == "spice" )
         {
-            type   = graphics->vector_value("TYPE");
-            listen = graphics->vector_value("LISTEN");
-            port   = graphics->vector_value("PORT");
-            passwd = graphics->vector_value("PASSWD");
-            keymap = graphics->vector_value("KEYMAP");
+            file << "\t\t<graphics type='" << type << "'";
 
-            one_util::tolower(type);
-
-            if ( type == "vnc" || type == "spice" )
+            if ( !listen.empty() )
             {
-                file << "\t\t<graphics type='" << type << "'";
-
-                if ( !listen.empty() )
-                {
-                    file << " listen='" << listen << "'";
-                }
-
-                if ( !port.empty() )
-                {
-                    file << " port='" << port << "'";
-                }
-
-                if ( !passwd.empty() )
-                {
-                    file << " passwd='" << passwd << "'";
-                }
-
-                if ( !keymap.empty() )
-                {
-                    file << " keymap='" << keymap << "'";
-                }
-
-                file << "/>" << endl;
-
-                if ( type == "spice" )
-                {
-                    get_default("SPICE_OPTIONS", spice_options);
-
-                    if ( spice_options != "" )
-                    {
-                        file << "\t\t" << spice_options << endl;
-                    }
-                }
+                file << " listen='" << listen << "'";
             }
-            else
+
+            if ( !port.empty() )
             {
-                vm->log("VMM", Log::WARNING,
-                        "Graphics not supported or undefined, ignored.");
+                file << " port='" << port << "'";
+            }
+
+            if ( !passwd.empty() )
+            {
+                file << " passwd='" << passwd << "'";
+            }
+
+            if ( !keymap.empty() )
+            {
+                file << " keymap='" << keymap << "'";
+            }
+
+            file << "/>" << endl;
+
+            if ( type == "spice" )
+            {
+                get_default("SPICE_OPTIONS", spice_options);
+
+                if ( spice_options != "" )
+                {
+                    file << "\t\t" << spice_options << endl;
+                }
             }
         }
+        else
+        {
+            vm->log("VMM", Log::WARNING,
+                    "Graphics not supported or undefined, ignored.");
+        }
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Input
     // ------------------------------------------------------------------------
+    input = vm->get_template_attribute("INPUT");
 
-    if ( vm->get_template_attribute("INPUT",attrs) > 0 )
+    if ( input != 0 )
     {
-        input = dynamic_cast<const VectorAttribute *>(attrs[0]);
+        type = input->vector_value("TYPE");
+        bus  = input->vector_value("BUS");
 
-        if ( input != 0 )
+        if ( !type.empty() )
         {
-            type = input->vector_value("TYPE");
-            bus  = input->vector_value("BUS");
+            file << "\t\t<input type='" << type << "'";
 
-            if ( !type.empty() )
+            if ( !bus.empty() )
             {
-                file << "\t\t<input type='" << type << "'";
-
-                if ( !bus.empty() )
-                {
-                    file << " bus='" << bus << "'";
-                }
-
-                file << "/>" << endl;
+                file << " bus='" << bus << "'";
             }
+
+            file << "/>" << endl;
         }
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // PCI Passthrough
     // ------------------------------------------------------------------------
 
-    num = vm->get_template_attribute("PCI",attrs);
+    num = vm->get_template_attribute("PCI", pci);
 
     for (int i=0; i < num ;i++)
     {
-        pci = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( pci == 0 )
-        {
-            continue;
-        }
-
-        domain  = pci->vector_value("DOMAIN");
-        bus     = pci->vector_value("BUS");
-        slot    = pci->vector_value("SLOT");
-        func    = pci->vector_value("FUNCTION");
+        domain  = pci[i]->vector_value("DOMAIN");
+        bus     = pci[i]->vector_value("BUS");
+        slot    = pci[i]->vector_value("SLOT");
+        func    = pci[i]->vector_value("FUNCTION");
 
         if ( domain.empty() || bus.empty() || slot.empty() || func.empty() )
         {
@@ -1054,28 +999,20 @@ int LibVirtDriver::deployment_description_kvm(
         file << "\t\t</hostdev>" << endl;
     }
 
-    attrs.clear();
-
     file << "\t</devices>" << endl;
 
     // ------------------------------------------------------------------------
     // Features
     // ------------------------------------------------------------------------
+    features = vm->get_template_attribute("FEATURES");
 
-    num = vm->get_template_attribute("FEATURES",attrs);
-
-    if ( num > 0 )
+    if ( features != 0 )
     {
-        features = dynamic_cast<const VectorAttribute *>(attrs[0]);
-
-        if ( features != 0 )
-        {
-            pae_found       = features->vector_value("PAE", pae);
-            acpi_found      = features->vector_value("ACPI", acpi);
-            apic_found      = features->vector_value("APIC", apic);
-            hyperv_found    = features->vector_value("HYPERV", hyperv);
-            localtime_found = features->vector_value("LOCALTIME", localtime);
-        }
+        pae_found       = features->vector_value("PAE", pae);
+        acpi_found      = features->vector_value("ACPI", acpi);
+        apic_found      = features->vector_value("APIC", apic);
+        hyperv_found    = features->vector_value("HYPERV", hyperv);
+        localtime_found = features->vector_value("LOCALTIME", localtime);
     }
 
     if ( pae_found != 0 )
@@ -1139,30 +1076,20 @@ int LibVirtDriver::deployment_description_kvm(
         file << "\t<clock offset='localtime'/>" << endl;
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Raw KVM attributes
     // ------------------------------------------------------------------------
-
-    num = vm->get_template_attribute("RAW",attrs);
+    num = vm->get_template_attribute("RAW", raw);
 
     for(int i=0; i<num;i++)
     {
-        raw = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( raw == 0 )
-        {
-            continue;
-        }
-
-        type = raw->vector_value("TYPE");
+        type = raw[i]->vector_value("TYPE");
 
         one_util::toupper(type);
 
         if ( type == "KVM" )
         {
-            data = raw->vector_value("DATA");
+            data = raw[i]->vector_value("DATA");
             file << "\t" << data << endl;
         }
     }
@@ -1177,7 +1104,6 @@ int LibVirtDriver::deployment_description_kvm(
     // ------------------------------------------------------------------------
     // Metadata used by drivers
     // ------------------------------------------------------------------------
-
     file << "\t<metadata>" << endl;
     file << "\t\t<system_datastore>" << vm->get_remote_system_dir() <<
         "</system_datastore>" << endl;
diff --git a/src/vmm/LibVirtDriverVMware.cc b/src/vmm/LibVirtDriverVMware.cc
index c808f5e14e..21ebdb70ec 100644
--- a/src/vmm/LibVirtDriverVMware.cc
+++ b/src/vmm/LibVirtDriverVMware.cc
@@ -1,5 +1,3 @@
-
-
 /* -------------------------------------------------------------------------- */
 /* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
 /*                                                                            */
@@ -33,16 +31,17 @@ int LibVirtDriver::deployment_description_vmware(
         const VirtualMachine *  vm,
         const string&           file_name) const
 {
-    ofstream                    file;
+    ofstream file;
 
-    int                         num;
-    vector<const Attribute *>   attrs;
+    int num;
 
     string  vcpu;
     string  memory;
 
     int     memory_in_kb = 0;
 
+    const VectorAttribute * os;
+
     string  arch       = "";
     string  guestOS    = "";
     string  pciBridge  = "";
@@ -52,7 +51,7 @@ int LibVirtDriver::deployment_description_vmware(
 
     const VectorAttribute * features;
 
-    const VectorAttribute * disk;
+    vector<const VectorAttribute *> disk;
     const VectorAttribute * context;
 
     string  type       = "";
@@ -64,7 +63,7 @@ int LibVirtDriver::deployment_description_vmware(
     string  default_driver = "";
     bool    readonly;
 
-    const VectorAttribute * nic;
+    vector<const VectorAttribute *> nic;
 
     string  network_id = "";
     string  mac        = "";
@@ -81,7 +80,7 @@ int LibVirtDriver::deployment_description_vmware(
     string  passwd     = "";
     string  keymap     = "";
 
-    const VectorAttribute * raw;
+    vector<const VectorAttribute *> raw;
     string data;
     string default_raw;
     string data_vmx    = "";
@@ -145,22 +144,13 @@ int LibVirtDriver::deployment_description_vmware(
     // ------------------------------------------------------------------------
     //  OS and boot options
     // ------------------------------------------------------------------------
+    os = vm->get_template_attribute("OS");
 
-    num = vm->get_template_attribute("OS",attrs);
-
-    // Get values & defaults
-    if ( num > 0 )
+    if( os != 0 )
     {
-        const VectorAttribute * os;
-
-        os = dynamic_cast<const VectorAttribute *>(attrs[0]);
-
-        if( os != 0 )
-        {
-            arch    = os->vector_value("ARCH");
-            guestOS = os->vector_value("GUESTOS");
-            boot    = os->vector_value("BOOT");
-        }
+        arch    = os->vector_value("ARCH");
+        guestOS = os->vector_value("GUESTOS");
+        boot    = os->vector_value("BOOT");
     }
 
     if ( arch.empty() )
@@ -201,31 +191,21 @@ int LibVirtDriver::deployment_description_vmware(
 
     file << "\t</os>" << endl;
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Features
     // ------------------------------------------------------------------------
+    features = vm->get_template_attribute("FEATURES");
 
-    num = vm->get_template_attribute("FEATURES",attrs);
-
-    if ( num > 0 )
+    if ( features != 0 )
     {
-        features = dynamic_cast<const VectorAttribute *>(attrs[0]);
+        pciBridge = features->vector_value("PCIBRIDGE");
 
-        if ( features != 0 )
+        if (!pciBridge.empty())
         {
-            pciBridge = features->vector_value("PCIBRIDGE");
-
-            if (!pciBridge.empty())
-            {
-                metadata << "<pcibridge>" << pciBridge << "</pcibridge>";
-            }
+            metadata << "<pcibridge>" << pciBridge << "</pcibridge>";
         }
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Disks
     // ------------------------------------------------------------------------
@@ -234,23 +214,16 @@ int LibVirtDriver::deployment_description_vmware(
 
     get_default("DISK","DRIVER",default_driver);
 
-    num = vm->get_template_attribute("DISK",attrs);
+    num = vm->get_template_attribute("DISK", disk);
 
     for (int i=0; i < num ;i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( disk == 0 )
-        {
-         continue;
-        }
-
-        type   = disk->vector_value("TYPE");
-        target = disk->vector_value("TARGET");
-        ro     = disk->vector_value("READONLY");
-        source = disk->vector_value("SOURCE");
-        driver = disk->vector_value("DRIVER");
-        disk->vector_value_str("DISK_ID", disk_id);
+        type   = disk[i]->vector_value("TYPE");
+        target = disk[i]->vector_value("TARGET");
+        ro     = disk[i]->vector_value("READONLY");
+        source = disk[i]->vector_value("SOURCE");
+        driver = disk[i]->vector_value("DRIVER");
+        disk[i]->vector_value_str("DISK_ID", disk_id);
 
         if (target.empty())
         {
@@ -261,7 +234,7 @@ int LibVirtDriver::deployment_description_vmware(
 
         if ( !ro.empty() )
         {
-            transform(ro.begin(),ro.end(),ro.begin(),(int(*)(int))toupper);
+            one_util::toupper(ro);
 
             if ( ro == "YES" )
             {
@@ -269,7 +242,7 @@ int LibVirtDriver::deployment_description_vmware(
             }
         }
 
-        transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper);
+        one_util::toupper(type);
 
         // ---- Disk type and source for the image ----
 
@@ -321,15 +294,13 @@ int LibVirtDriver::deployment_description_vmware(
         file << "\t\t</disk>" << endl;
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Context Device
     // ------------------------------------------------------------------------
+    context = vm->get_template_attribute("CONTEXT");
 
-    if ( vm->get_template_attribute("CONTEXT",attrs) == 1 )
+    if ( context != 0 )
     {
-        context = dynamic_cast<const VectorAttribute *>(attrs[0]);
         target  = context->vector_value("TARGET");
 
         context->vector_value_str("DISK_ID", disk_id);
@@ -350,30 +321,20 @@ int LibVirtDriver::deployment_description_vmware(
         }
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Network interfaces
     // ------------------------------------------------------------------------
-
     get_default("NIC", "MODEL", default_model);
 
-    num = vm->get_template_attribute("NIC",attrs);
+    num = vm->get_template_attribute("NIC", nic);
 
     for(int i=0; i<num; i++)
     {
-        nic = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
-        network_id = nic->vector_value("NETWORK_ID");
-        mac        = nic->vector_value("MAC");
-        target     = nic->vector_value("TARGET");
-        script     = nic->vector_value("SCRIPT");
-        model      = nic->vector_value("MODEL");
+        network_id = nic[i]->vector_value("NETWORK_ID");
+        mac        = nic[i]->vector_value("MAC");
+        target     = nic[i]->vector_value("TARGET");
+        script     = nic[i]->vector_value("SCRIPT");
+        model      = nic[i]->vector_value("MODEL");
 
         if (vm->get_vnm_mad() == LibVirtDriver::vmware_vnm_name)
         {
@@ -382,7 +343,7 @@ int LibVirtDriver::deployment_description_vmware(
         }
         else
         {
-            bridge = nic->vector_value("BRIDGE");
+            bridge = nic[i]->vector_value("BRIDGE");
         }
 
         file << "\t\t<interface type='bridge'>" << endl;
@@ -420,90 +381,73 @@ int LibVirtDriver::deployment_description_vmware(
         }
 
         file << "\t\t</interface>" << endl;
-
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Graphics
     // ------------------------------------------------------------------------
+    graphics = vm->get_template_attribute("GRAPHICS");
 
-    if ( vm->get_template_attribute("GRAPHICS",attrs) > 0 )
+    if ( graphics != 0 )
     {
-        graphics = dynamic_cast<const VectorAttribute *>(attrs[0]);
+        type   = graphics->vector_value("TYPE");
+        listen = graphics->vector_value("LISTEN");
+        port   = graphics->vector_value("PORT");
+        passwd = graphics->vector_value("PASSWD");
+        keymap = graphics->vector_value("KEYMAP");
 
-        if ( graphics != 0 )
+        if ( type == "vnc" || type == "VNC" )
         {
-            type   = graphics->vector_value("TYPE");
-            listen = graphics->vector_value("LISTEN");
-            port   = graphics->vector_value("PORT");
-            passwd = graphics->vector_value("PASSWD");
-            keymap = graphics->vector_value("KEYMAP");
+            file << "\t\t<graphics type='vnc'";
 
-            if ( type == "vnc" || type == "VNC" )
+            if ( !listen.empty() )
             {
-                file << "\t\t<graphics type='vnc'";
-
-                if ( !listen.empty() )
-                {
-                    file << " listen='" << listen << "'";
-                }
-
-                if ( !port.empty() )
-                {
-                    file << " port='" << port << "'";
-                }
-
-                if ( !passwd.empty() )
-                {
-                    file << " passwd='" << passwd << "'";
-                }
-
-                if ( !keymap.empty() )
-                {
-                    file << " keymap='" << keymap << "'";
-                }
-
-                file << "/>" << endl;
+                file << " listen='" << listen << "'";
             }
-            else
+
+            if ( !port.empty() )
             {
-                vm->log("VMM", Log::WARNING,
-                        "Not supported graphics type, ignored.");
+                file << " port='" << port << "'";
             }
+
+            if ( !passwd.empty() )
+            {
+                file << " passwd='" << passwd << "'";
+            }
+
+            if ( !keymap.empty() )
+            {
+                file << " keymap='" << keymap << "'";
+            }
+
+            file << "/>" << endl;
+        }
+        else
+        {
+            vm->log("VMM", Log::WARNING,
+                    "Not supported graphics type, ignored.");
         }
     }
 
-    attrs.clear();
-
     file << "\t</devices>" << endl;
 
     // ------------------------------------------------------------------------
     // Raw VMware attributes
     // ------------------------------------------------------------------------
-
-    num = vm->get_template_attribute("RAW",attrs);
+    num = vm->get_template_attribute("RAW", raw);
 
     for(int i=0; i<num;i++)
     {
-        raw = dynamic_cast<const VectorAttribute *>(attrs[i]);
+        type = raw[i]->vector_value("TYPE");
 
-        if ( raw == 0 )
-        {
-            continue;
-        }
-
-        type = raw->vector_value("TYPE");
-
-        transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper);
+        one_util::toupper(type);
 
         if ( type == "VMWARE" )
         {
-            data = raw->vector_value("DATA");
+            data = raw[i]->vector_value("DATA");
             file << "\t" << data << endl;
 
-            data_vmx = raw->vector_value("DATA_VMX");
+            data_vmx = raw[i]->vector_value("DATA_VMX");
             if ( !data_vmx.empty() )
             {
                 metadata << "<datavmx>" << data_vmx << "</datavmx>";
diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index 08b5846a7f..68feb8f319 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -34,7 +34,7 @@ VirtualMachineManager::VirtualMachineManager(
     time_t                          _poll_period,
     bool                            _do_vm_poll,
     int                             _vm_limit,
-    vector<const Attribute*>&       _mads):
+    vector<const VectorAttribute*>&       _mads):
         MadManager(_mads),
         timer_period(_timer_period),
         poll_period(_poll_period),
diff --git a/src/vmm/VirtualMachineManagerDriver.cc b/src/vmm/VirtualMachineManagerDriver.cc
index 224eac86d6..0a68b3516a 100644
--- a/src/vmm/VirtualMachineManagerDriver.cc
+++ b/src/vmm/VirtualMachineManagerDriver.cc
@@ -151,20 +151,15 @@ void VirtualMachineManagerDriver::get_default(
     const char *  vname,
     string&       value) const
 {
-    vector<const Attribute *>   attrs;
-    string                      sn = name;
+    const VectorAttribute * vattr = driver_conf.get(name);
 
-    if ( driver_conf.get(sn,attrs) == 1 )
+    if ( vattr == 0 )
     {
-        const VectorAttribute * vattr;
-
-        vattr = static_cast<const VectorAttribute *>(attrs[0]);
-
-        value = vattr->vector_value(vname);
+        value.clear();
     }
     else
     {
-        value = "";
+        value = vattr->vector_value(vname);
     }
 }
 
diff --git a/src/vmm/XenDriver.cc b/src/vmm/XenDriver.cc
index 790077dad6..124e18e666 100644
--- a/src/vmm/XenDriver.cc
+++ b/src/vmm/XenDriver.cc
@@ -31,10 +31,9 @@ int XenDriver::deployment_description(
     const VirtualMachine *  vm,
     const string&           file_name) const
 {
-    ofstream                    file;
+    ofstream file;
 
-    int                         num;
-    vector<const Attribute *>   attrs;
+    int num;
 
     string  credits;
     string  cpu;
@@ -44,6 +43,8 @@ int XenDriver::deployment_description(
     float   base_credit = 1.0;
     float   cpu_units   = 1.0;
 
+    const VectorAttribute * os;
+
     string kernel     = "";
     string initrd     = "";
     string root       = "";
@@ -55,7 +56,7 @@ int XenDriver::deployment_description(
 
     vector<string> boots;
 
-    const VectorAttribute * disk;
+    vector<const VectorAttribute *> disk;
     const VectorAttribute * context;
 
     string target     = "";
@@ -66,7 +67,7 @@ int XenDriver::deployment_description(
     string default_driver = "";
     string mode;
 
-    const VectorAttribute * nic;
+    vector<const VectorAttribute *> nic;
 
     string ip         = "";
     string mac        = "";
@@ -100,7 +101,7 @@ int XenDriver::deployment_description(
     int device_model_found  = -1;
     int localtime_found     = -1;
 
-    const VectorAttribute * raw;
+    vector<const VectorAttribute *> raw;
     string data;
     string default_raw;
 
@@ -170,24 +171,17 @@ int XenDriver::deployment_description(
     //  OS and boot options
     // ------------------------------------------------------------------------
 
-    num = vm->get_template_attribute("OS",attrs);
+    os = vm->get_template_attribute("OS");
 
-    if ( num > 0 )
+    if ( os != 0 )
     {
-        const VectorAttribute * os;
-
-        os = dynamic_cast<const VectorAttribute *>(attrs[0]);
-
-        if ( os != 0 )
-        {
-            kernel     = os->vector_value("KERNEL");
-            initrd     = os->vector_value("INITRD");
-            root       = os->vector_value("ROOT");
-            kernel_cmd = os->vector_value("KERNEL_CMD");
-            bootloader = os->vector_value("BOOTLOADER");
-            hvm        = os->vector_value("HVM");
-            boot       = os->vector_value("BOOT");
-        }
+        kernel     = os->vector_value("KERNEL");
+        initrd     = os->vector_value("INITRD");
+        root       = os->vector_value("ROOT");
+        kernel_cmd = os->vector_value("KERNEL_CMD");
+        bootloader = os->vector_value("BOOTLOADER");
+        hvm        = os->vector_value("HVM");
+        boot       = os->vector_value("BOOT");
     }
 
     if ( kernel.empty() )
@@ -286,14 +280,9 @@ int XenDriver::deployment_description(
         }
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Disks
     // ------------------------------------------------------------------------
-
-    num = vm->get_template_attribute("DISK",attrs);
-
     get_default("DISK","DRIVER",default_driver);
 
     if (default_driver.empty())
@@ -307,20 +296,15 @@ int XenDriver::deployment_description(
 
     file << "disk = [" << endl;
 
+    num = vm->get_template_attribute("DISK", disk);
+
     for (int i=0; i < num ;i++)
     {
-        disk = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( disk == 0 )
-        {
-            continue;
-        }
-
-        target = disk->vector_value("TARGET");
-        type   = disk->vector_value("TYPE");
-        ro     = disk->vector_value("READONLY");
-        driver = disk->vector_value("DRIVER");
-        disk->vector_value_str("DISK_ID", disk_id);
+        target = disk[i]->vector_value("TARGET");
+        type   = disk[i]->vector_value("TYPE");
+        ro     = disk[i]->vector_value("READONLY");
+        driver = disk[i]->vector_value("DRIVER");
+        disk[i]->vector_value_str("DISK_ID", disk_id);
 
         if ( target.empty() )
         {
@@ -373,15 +357,13 @@ int XenDriver::deployment_description(
         file << "," << mode << "'," << endl;
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Context Device
     // ------------------------------------------------------------------------
+    context = vm->get_template_attribute("CONTEXT");
 
-    if ( vm->get_template_attribute("CONTEXT",attrs) == 1 )
+    if ( context != 0 )
     {
-        context = dynamic_cast<const VectorAttribute *>(attrs[0]);
         target  = context->vector_value("TARGET");
         driver  = context->vector_value("DRIVER");
 
@@ -417,13 +399,10 @@ int XenDriver::deployment_description(
 
     file << "]" << endl;
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Network
     // ------------------------------------------------------------------------
-
-    num = vm->get_template_attribute("NIC",attrs);
+    num = vm->get_template_attribute("NIC", nic);
 
     get_default("NIC", "MODEL", default_model);
 
@@ -433,19 +412,12 @@ int XenDriver::deployment_description(
     {
         char pre_char = ' ';
 
-        nic = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( nic == 0 )
-        {
-            continue;
-        }
-
         file << "    '";
 
-        ip     = nic->vector_value("IP");
-        mac    = nic->vector_value("MAC");
-        bridge = nic->vector_value("BRIDGE");
-        model  = nic->vector_value("MODEL");
+        ip     = nic[i]->vector_value("IP");
+        mac    = nic[i]->vector_value("MAC");
+        bridge = nic[i]->vector_value("BRIDGE");
+        model  = nic[i]->vector_value("MODEL");
 
         string * the_model = 0;
 
@@ -487,188 +459,168 @@ int XenDriver::deployment_description(
 
     file << "]" << endl;
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Graphics
     // ------------------------------------------------------------------------
+    graphics = vm->get_template_attribute("GRAPHICS");
 
-    if ( vm->get_template_attribute("GRAPHICS",attrs) > 0 )
+    if ( graphics != 0 )
     {
-        graphics = dynamic_cast<const VectorAttribute *>(attrs[0]);
+        type   = graphics->vector_value("TYPE");
+        listen = graphics->vector_value("LISTEN");
+        port   = graphics->vector_value("PORT");
+        passwd = graphics->vector_value("PASSWD");
+        keymap = graphics->vector_value("KEYMAP");
 
-        if ( graphics != 0 )
+        one_util::toupper(type);
+
+        if ( type == "VNC" )
         {
-            type   = graphics->vector_value("TYPE");
-            listen = graphics->vector_value("LISTEN");
-            port   = graphics->vector_value("PORT");
-            passwd = graphics->vector_value("PASSWD");
-            keymap = graphics->vector_value("KEYMAP");
-
-            one_util::toupper(type);
-
-            if ( type == "VNC" )
+            if ( !is_hvm )
             {
-                if ( !is_hvm )
-                {
-                    file << "vfb = ['type=vnc";
-                }
-                else
-                {
-                    file << "vnc = '1'" << endl;
-                }
-
-                if ( !listen.empty() )
-                {
-                    if ( is_hvm )
-                    {
-                        file << "vnclisten = '" << listen << "'" << endl;
-                    }
-                    else
-                    {
-                        file << ",vnclisten=" << listen;
-                    }
-                }
-
-                if ( !port.empty() )
-                {
-                    istringstream iss(port);
-                    int           display;
-
-                    iss >> display;
-
-                    if ( iss.fail() || display < 5900 )
-                    {
-                        goto error_vncdisplay;
-                    }
-
-                    if ( is_hvm )
-                    {
-                        file << "vncunused = '0'" << endl;
-                        file << "vncdisplay = '" << display - 5900 << "'" << endl;
-                    }
-                    else
-                    {
-                        file << ",vncunused=0";
-                        file << ",vncdisplay=" << display - 5900;
-                    }
-                }
-
-                if ( !passwd.empty() )
-                {
-                    if ( is_hvm )
-                    {
-                        file << "vncpasswd = '" << passwd << "'" << endl;
-                    }
-                    else
-                    {
-                        file << ",vncpasswd=" << passwd;
-                    }
-                }
-
-                if ( !keymap.empty() )
-                {
-                    if ( is_hvm )
-                    {
-                        file << "keymap = '" << keymap << "'" << endl;
-                    }
-                    else
-                    {
-                        file << ",keymap=" << keymap;
-                    }
-                }
-
-                if ( !is_hvm )
-                {
-                    file <<"']" << endl;
-                }
-            }
-            else if ( is_hvm && type == "SPICE" )
-            {
-                file << "spice = '1'" << endl;
-
-                if ( !listen.empty() )
-                {
-                    file << "spicehost = '" << listen << "'" << endl;
-                }
-
-                if ( !port.empty() )
-                {
-                    file << "spiceport = '" << port << "'" << endl;
-                }
-
-                if ( !passwd.empty() )
-                {
-                    file << "spicepasswd = '" << passwd << "'" << endl;
-                }
-                else
-                {
-                    file << "spicedisable_ticketing = '1'" << endl;
-                }
+                file << "vfb = ['type=vnc";
             }
             else
             {
-                vm->log("VMM", Log::WARNING,
-                        "Not supported graphics type, ignored.");
+                file << "vnc = '1'" << endl;
+            }
+
+            if ( !listen.empty() )
+            {
+                if ( is_hvm )
+                {
+                    file << "vnclisten = '" << listen << "'" << endl;
+                }
+                else
+                {
+                    file << ",vnclisten=" << listen;
+                }
+            }
+
+            if ( !port.empty() )
+            {
+                istringstream iss(port);
+                int           display;
+
+                iss >> display;
+
+                if ( iss.fail() || display < 5900 )
+                {
+                    goto error_vncdisplay;
+                }
+
+                if ( is_hvm )
+                {
+                    file << "vncunused = '0'" << endl;
+                    file << "vncdisplay = '" << display - 5900 << "'" << endl;
+                }
+                else
+                {
+                    file << ",vncunused=0";
+                    file << ",vncdisplay=" << display - 5900;
+                }
+            }
+
+            if ( !passwd.empty() )
+            {
+                if ( is_hvm )
+                {
+                    file << "vncpasswd = '" << passwd << "'" << endl;
+                }
+                else
+                {
+                    file << ",vncpasswd=" << passwd;
+                }
+            }
+
+            if ( !keymap.empty() )
+            {
+                if ( is_hvm )
+                {
+                    file << "keymap = '" << keymap << "'" << endl;
+                }
+                else
+                {
+                    file << ",keymap=" << keymap;
+                }
+            }
+
+            if ( !is_hvm )
+            {
+                file <<"']" << endl;
             }
         }
-    }
+        else if ( is_hvm && type == "SPICE" )
+        {
+            file << "spice = '1'" << endl;
 
-    attrs.clear();
+            if ( !listen.empty() )
+            {
+                file << "spicehost = '" << listen << "'" << endl;
+            }
+
+            if ( !port.empty() )
+            {
+                file << "spiceport = '" << port << "'" << endl;
+            }
+
+            if ( !passwd.empty() )
+            {
+                file << "spicepasswd = '" << passwd << "'" << endl;
+            }
+            else
+            {
+                file << "spicedisable_ticketing = '1'" << endl;
+            }
+        }
+        else
+        {
+            vm->log("VMM", Log::WARNING,
+                    "Not supported graphics type, ignored.");
+        }
+    }
 
     // ------------------------------------------------------------------------
     // Input (only usb tablet)
     // ------------------------------------------------------------------------
+    input = vm->get_template_attribute("INPUT");
 
-    if ( vm->get_template_attribute("INPUT",attrs) > 0 )
+    if ( input != 0 )
     {
-        input = dynamic_cast<const VectorAttribute *>(attrs[0]);
+        type = input->vector_value("TYPE");
+        bus  = input->vector_value("BUS");
 
-        if ( input != 0 )
+        if ( type == "tablet" && bus == "usb" )
         {
-            type = input->vector_value("TYPE");
-            bus  = input->vector_value("BUS");
-
-            if ( type == "tablet" && bus == "usb" )
-            {
-                file << "usb = 1" << endl;
-                file << "usbdevice = 'tablet'" << endl;
-            }
-            else
-            {
-                vm->log("VMM", Log::WARNING,
-                    "Not supported input, only usb tablet, ignored.");
-            }
+            file << "usb = 1" << endl;
+            file << "usbdevice = 'tablet'" << endl;
+        }
+        else
+        {
+            vm->log("VMM", Log::WARNING,
+                "Not supported input, only usb tablet, ignored.");
         }
     }
 
-    attrs.clear();
-
     // ------------------------------------------------------------------------
     // Features (only for HVM)
     // ------------------------------------------------------------------------
-
     if ( is_hvm )
     {
-        num = vm->get_template_attribute("FEATURES",attrs);
+        features = vm->get_template_attribute("FEATURES");
 
-        if ( num > 0 )
+        if ( features != 0 )
         {
-            features = dynamic_cast<const VectorAttribute *>(attrs[0]);
+            pae_found  = features->vector_value("PAE", pae);
+            acpi_found = features->vector_value("ACPI", acpi);
+            apic_found = features->vector_value("APIC", apic);
+            localtime_found =
+                features->vector_value("LOCALTIME", localtime);
 
-            if ( features != 0 )
+            device_model = features->vector_value("DEVICE_MODEL");
+            if ( device_model != "" )
             {
-                pae_found  = features->vector_value("PAE", pae);
-                acpi_found = features->vector_value("ACPI", acpi);
-                apic_found = features->vector_value("APIC", apic);
-                localtime_found =
-                    features->vector_value("LOCALTIME", localtime);
-
-                device_model = features->vector_value("DEVICE_MODEL");
-                if ( device_model != "" )
-                {
-                    device_model_found = 0;
-                }
+                device_model_found = 0;
             }
         }
 
@@ -725,32 +677,23 @@ int XenDriver::deployment_description(
         {
             file << "localtime = '1'" << endl;
         }
-
-        attrs.clear();
     }
 
     // ------------------------------------------------------------------------
     // Raw XEN attributes
     // ------------------------------------------------------------------------
 
-    num = vm->get_template_attribute("RAW",attrs);
+    num = vm->get_template_attribute("RAW", raw);
 
     for(int i=0; i<num;i++)
     {
-        raw = dynamic_cast<const VectorAttribute *>(attrs[i]);
-
-        if ( raw == 0 )
-        {
-            continue;
-        }
-
-        type = raw->vector_value("TYPE");
+        type = raw[i]->vector_value("TYPE");
 
         one_util::toupper(type);
 
         if ( type == "XEN" )
         {
-            data = raw->vector_value("DATA");
+            data = raw[i]->vector_value("DATA");
             file << data << endl;
         }
     }
diff --git a/src/vnm/AddressRange.cc b/src/vnm/AddressRange.cc
index a6a5528d96..c324eedbfb 100644
--- a/src/vnm/AddressRange.cc
+++ b/src/vnm/AddressRange.cc
@@ -1502,8 +1502,7 @@ bool AddressRange::check(string& rs_attr) const
     return false;
 };
 
-void AddressRange::set_restricted_attributes(
-    vector<const Attribute *>& rattrs)
+void AddressRange::set_restricted_attributes(vector<const SingleAttribute *>& rattrs)
 {
     if (restricted_set)
     {
@@ -1514,8 +1513,7 @@ void AddressRange::set_restricted_attributes(
 
     for (unsigned int i = 0 ; i < rattrs.size() ; i++ )
     {
-        const SingleAttribute * sattr = static_cast<const SingleAttribute *>(rattrs[i]);
-        string attr_s = sattr->value();
+        string attr_s = rattrs[i]->value();
 
         restricted_attributes.insert(one_util::toupper(attr_s));
     }
diff --git a/src/vnm/AddressRangePool.cc b/src/vnm/AddressRangePool.cc
index 5965cd2e6b..1e7e143710 100644
--- a/src/vnm/AddressRangePool.cc
+++ b/src/vnm/AddressRangePool.cc
@@ -81,26 +81,17 @@ int AddressRangePool::add_ar(AddressRange * ar)
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int AddressRangePool::update_ar(
-        vector<Attribute *>     ars,
-        bool                    keep_restricted,
-        string&                 error_msg)
+int AddressRangePool::update_ar(vector<VectorAttribute *> ars, bool keep_restricted,
+        string& error_msg)
 {
-    vector<Attribute *>::iterator               it;
+    vector<VectorAttribute *>::iterator it;
     map<unsigned int, AddressRange *>::iterator ar_it;
 
     unsigned int arid;
 
     for (it = ars.begin(); it != ars.end(); it++)
     {
-        VectorAttribute * va = dynamic_cast<VectorAttribute *>(*it);
-
-        if (va == 0)
-        {
-            continue;
-        }
-
-        if (va->vector_value("AR_ID", arid) != 0)
+        if ((*it)->vector_value("AR_ID", arid) != 0)
         {
             error_msg = "AR/AR_ID attribute is missing.";
             return -1;
@@ -118,7 +109,7 @@ int AddressRangePool::update_ar(
             return -1;
         }
 
-        return ar_it->second->update_attributes(va, keep_restricted, error_msg);
+        return ar_it->second->update_attributes(*it, keep_restricted, error_msg);
     }
 
     error_msg = "Wrong AR definition. AR vector attribute is missing.";
@@ -137,17 +128,15 @@ int AddressRangePool::from_xml_node(const xmlNodePtr node)
         return -1;
     }
 
-    vector<Attribute*> var;
+    vector<VectorAttribute *> var;
 
     int num_ar = ar_template.get("AR", var);
 
     for (int i = 0; i < num_ar; i++)
     {
-        VectorAttribute * va = static_cast<VectorAttribute *>(var[i]);
-
         AddressRange * ar = new AddressRange(0);
 
-        if (ar->from_vattr_db(va)!= 0)
+        if (ar->from_vattr_db(var[i])!= 0)
         {
             return -1;
         }
@@ -192,27 +181,20 @@ int AddressRangePool::rm_ar(unsigned int ar_id, string& error_msg)
 
     delete ar_ptr;
 
-    vector<Attribute*> ars;
-    vector<Attribute*>::iterator it_ar;
+    vector<VectorAttribute *> ars;
+    vector<VectorAttribute *>::iterator it_ar;
 
-    Attribute * the_ar = 0;
+    VectorAttribute * the_ar = 0;
 
-    unsigned int ar_id_templ;
+    unsigned int ar_id_tpl;
 
     ar_template.get("AR", ars);
 
     for (it_ar=ars.begin(); it_ar!=ars.end(); it_ar++)
     {
-        VectorAttribute *ar = dynamic_cast<VectorAttribute *>(*it_ar);
-
-        if (ar == 0)
+        if (((*it_ar)->vector_value("AR_ID",ar_id_tpl)==0) && (ar_id_tpl==ar_id))
         {
-            continue;
-        }
-
-        if ((ar->vector_value("AR_ID",ar_id_templ)==0) && (ar_id_templ==ar_id))
-        {
-            the_ar = ar;
+            the_ar = *it_ar;
             break;
         }
     }
diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc
index 4a3881b132..36f2124e9f 100644
--- a/src/vnm/VirtualNetwork.cc
+++ b/src/vnm/VirtualNetwork.cc
@@ -103,7 +103,7 @@ const char * VirtualNetwork::db_bootstrap = "CREATE TABLE IF NOT EXISTS"
 
 int VirtualNetwork::insert(SqlDB * db, string& error_str)
 {
-    vector<Attribute *> ars;
+    vector<VectorAttribute *> ars;
     ostringstream       ose;
 
     string sg_str;
@@ -726,19 +726,11 @@ void VirtualNetwork::process_security_rule(
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualNetwork::add_var(vector<Attribute *> &var, string& error_msg)
+int VirtualNetwork::add_var(vector<VectorAttribute *> &var, string& error_msg)
 {
-    for (vector<Attribute *>::iterator it=var.begin(); it!=var.end(); it++)
+    for (vector<VectorAttribute *>::iterator it=var.begin(); it!=var.end(); it++)
     {
-        VectorAttribute * oar = dynamic_cast<VectorAttribute *>(*it);
-
-        if (oar == 0)
-        {
-            error_msg = "Invalid format for address range";
-            return -1;
-        }
-
-        VectorAttribute * ar = oar->clone();
+        VectorAttribute * ar = (*it)->clone();
 
         if (ar_pool.from_vattr(ar, error_msg) != 0)
         {
@@ -754,18 +746,11 @@ int VirtualNetwork::add_var(vector<Attribute *> &var, string& error_msg)
 
 int VirtualNetwork::add_ar(VirtualNetworkTemplate * ars_tmpl, string& error_msg)
 {
-    vector<Attribute *> var;
+    const VectorAttribute * ar = ars_tmpl->get("AR");
 
-    if (ars_tmpl->get("AR", var) <= 0)
+    if ( ar == 0 )
     {
-        return 0;
-    }
-
-    const VectorAttribute * ar = dynamic_cast<const VectorAttribute *>(var[0]);
-
-    if (ar == 0)
-    {
-        error_msg = "Wrong AR definition";
+        error_msg = "Wrong AR definition. AR vector attribute is missing.";
         return -1;
     }
 
@@ -788,12 +773,11 @@ int VirtualNetwork::update_ar(
         bool                    keep_restricted,
         string&                 error_msg)
 {
-    vector<Attribute *> tmp_ars;
+    vector<VectorAttribute *> tmp_ars;
 
     if(ars_tmpl->get("AR", tmp_ars) == 0)
     {
         error_msg = "Wrong AR definition. AR vector attribute is missing.";
-
         return -1;
     }
 
@@ -816,16 +800,7 @@ int VirtualNetwork::rm_ar(unsigned int ar_id, string& error_msg)
 int VirtualNetwork::hold_leases(VirtualNetworkTemplate * leases_template,
                                 string&                  error_msg)
 {
-    vector<const Attribute *> vleases;
-    const VectorAttribute *   lease = 0;
-
-    if (leases_template->get("LEASES", vleases) <= 0)
-    {
-        error_msg = "Empty lease description.";
-        return -1;
-    }
-
-   lease = dynamic_cast<const VectorAttribute *>(vleases[0]);
+    const VectorAttribute * lease = leases_template->get("LEASES");
 
     if ( lease == 0 )
     {
@@ -883,17 +858,7 @@ int VirtualNetwork::hold_leases(VirtualNetworkTemplate * leases_template,
 int VirtualNetwork::free_leases(VirtualNetworkTemplate * leases_template,
                                 string&                  error_msg)
 {
-
-    vector<const Attribute *> vleases;
-    const VectorAttribute *   lease = 0;
-
-    if (leases_template->get("LEASES", vleases) <= 0)
-    {
-        error_msg = "Empty lease description.";
-        return -1;
-    }
-
-   lease = dynamic_cast<const VectorAttribute *>(vleases[0]);
+    const VectorAttribute * lease = leases_template->get("LEASES");
 
     if ( lease == 0 )
     {
@@ -906,7 +871,6 @@ int VirtualNetwork::free_leases(VirtualNetworkTemplate * leases_template,
     string  ip  = lease->vector_value("IP");
     string  mac = lease->vector_value("MAC");
 
-
     if (ip.empty() && mac.empty())
     {
         error_msg = "Missing MAC or IP.";
diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc
index 0f698f07df..4bcd840f42 100644
--- a/src/vnm/VirtualNetworkPool.cc
+++ b/src/vnm/VirtualNetworkPool.cc
@@ -31,23 +31,22 @@ unsigned int VirtualNetworkPool::_mac_prefix;
 unsigned int VirtualNetworkPool::_default_size;
 
 /* -------------------------------------------------------------------------- */
-
 VirtualNetworkPool::VirtualNetworkPool(
     SqlDB *                             db,
     const string&                       prefix,
     int                                 __default_size,
-    vector<const Attribute *>&          restricted_attrs,
-    vector<const Attribute *>           hook_mads,
+    vector<const SingleAttribute *>&    restricted_attrs,
+    vector<const VectorAttribute *>&    hook_mads,
     const string&                       remotes_location,
-    const vector<const Attribute *>&    _inherit_attrs):
-    PoolSQL(db, VirtualNetwork::table, true, true)
+    const vector<const SingleAttribute *>& _inherit_attrs):
+        PoolSQL(db, VirtualNetwork::table, true, true)
 {
     istringstream iss;
     size_t        pos   = 0;
     int           count = 0;
     unsigned int  tmp;
 
-    vector<const Attribute *>::const_iterator it;
+    vector<const SingleAttribute *>::const_iterator it;
 
     string mac = prefix;
 
@@ -82,9 +81,7 @@ VirtualNetworkPool::VirtualNetworkPool(
 
     for (it = _inherit_attrs.begin(); it != _inherit_attrs.end(); it++)
     {
-        const SingleAttribute* sattr = static_cast<const SingleAttribute *>(*it);
-
-        inherit_attrs.push_back(sattr->value());
+        inherit_attrs.push_back((*it)->value());
     }
 }
 
diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc
index fbff84fb85..5a7a9459dc 100644
--- a/src/vrouter/VirtualRouter.cc
+++ b/src/vrouter/VirtualRouter.cc
@@ -170,24 +170,18 @@ int VirtualRouter::shutdown_vms()
 
 int VirtualRouter::get_network_leases(string& estr)
 {
-    int                   num_nics, rc;
-    vector<Attribute  * > nics;
+    vector<VectorAttribute  *> nics;
     VirtualNetworkPool *  vnpool;
-    VectorAttribute *     nic;
 
     Nebula& nd = Nebula::instance();
     vnpool     = nd.get_vnpool();
 
-    num_nics = obj_template->get("NIC",nics);
+    int num_nics = obj_template->get("NIC",nics);
 
     for(int i=0; i<num_nics; i++)
     {
-        nic = static_cast<VectorAttribute * >(nics[i]);
-
-        rc = vnpool->nic_attribute(PoolObjectSQL::VROUTER,
-                nic, i, uid, oid, estr);
-
-        if (rc == -1)
+        if (vnpool->nic_attribute(PoolObjectSQL::VROUTER, nics[i], i, uid, oid,
+                estr) == -1)
         {
             return -1;
         }
@@ -368,26 +362,20 @@ int VirtualRouter::from_xml(const string& xml)
 
 void VirtualRouter::release_network_leases()
 {
-    string                        vnid;
-    string                        ip;
-    int                           num_nics;
-    vector<Attribute const  * >   nics;
+    vector<VectorAttribute const *> nics;
 
-    num_nics = get_template_attribute("NIC",nics);
+    int num_nics = get_template_attribute("NIC",nics);
 
     for(int i=0; i<num_nics; i++)
     {
-        VectorAttribute const *  nic =
-            dynamic_cast<VectorAttribute const * >(nics[i]);
-
-        release_network_leases(nic);
+        release_network_leases(nics[i]);
     }
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualRouter::release_network_leases(VectorAttribute const * nic)
+int VirtualRouter::release_network_leases(const VectorAttribute * nic)
 {
     VirtualNetworkPool* vnpool = Nebula::instance().get_vnpool();
     VirtualNetwork*     vn;
@@ -472,24 +460,17 @@ Template * VirtualRouter::get_vm_template() const
 {
     Template * tmpl = new Template();
 
-    int                   num_nics;
-    vector<Attribute  * > nics;
-    VectorAttribute *     nic;
-    int                   keepalived_id;
-    string                st;
+    vector<const VectorAttribute  *> nics;
+    VectorAttribute * nic;
 
-    num_nics = obj_template->get("NIC",nics);
+    int    keepalived_id;
+    string st;
+
+    int num_nics = obj_template->get("NIC",nics);
 
     for(int i=0; i<num_nics; i++)
     {
-        nic = static_cast<VectorAttribute * >(nics[i]);
-
-        if (nic == 0)
-        {
-            continue;
-        }
-
-        nic = nic->clone();
+        nic = nics[i]->clone();
 
         prepare_nic_vm(nic);
 
@@ -518,7 +499,8 @@ Template * VirtualRouter::get_vm_template() const
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualRouter::replace_template(const string& tmpl_str, bool keep_restricted, string& error)
+int VirtualRouter::replace_template(const string &tmpl_str,bool keep_restricted,
+		string& error)
 {
     Template * new_tmpl = get_new_template();
     string     new_str;
@@ -537,10 +519,12 @@ int VirtualRouter::replace_template(const string& tmpl_str, bool keep_restricted
 
     new_tmpl->erase("NIC");
 
-    vector<const Attribute*> nics;
+    vector<const VectorAttribute*> nics;
+	vector<const VectorAttribute*>::const_iterator it;
+
     get_template_attribute("NIC", nics);
 
-    for (vector<const Attribute*>::iterator it = nics.begin(); it != nics.end(); it++)
+    for (it = nics.begin(); it != nics.end(); it++)
     {
         new_tmpl->set((*it)->clone());
     }
@@ -554,7 +538,8 @@ int VirtualRouter::replace_template(const string& tmpl_str, bool keep_restricted
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualRouter::append_template(const string& tmpl_str, bool keep_restricted, string& error)
+int VirtualRouter::append_template(const string& tmpl_str, bool keep_restricted,
+	   	string& error)
 {
     Template * new_tmpl = get_new_template();
     string     new_str;
diff --git a/src/xml/expr_arith.cc b/src/xml/expr_arith.cc
index c2082b94ee..0d846fa727 100644
--- a/src/xml/expr_arith.cc
+++ b/src/xml/expr_arith.cc
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -165,7 +165,7 @@ extern int expr_arith__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 #line 78 "expr_arith.y" /* yacc.c:355  */
@@ -176,6 +176,8 @@ union YYSTYPE
 
 #line 178 "expr_arith.cc" /* yacc.c:355  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -202,7 +204,7 @@ int expr_arith__parse (mem_collector * mc, ObjectXML * oxml, int&        result,
 
 /* Copy the second part of user declarations.  */
 
-#line 206 "expr_arith.cc" /* yacc.c:358  */
+#line 208 "expr_arith.cc" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -1388,71 +1390,71 @@ yyreduce:
         case 2:
 #line 100 "expr_arith.y" /* yacc.c:1646  */
     { result = static_cast<int>((yyvsp[0].val_float));}
-#line 1392 "expr_arith.cc" /* yacc.c:1646  */
+#line 1394 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 3:
 #line 101 "expr_arith.y" /* yacc.c:1646  */
     { result = 0; }
-#line 1398 "expr_arith.cc" /* yacc.c:1646  */
+#line 1400 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 4:
 #line 104 "expr_arith.y" /* yacc.c:1646  */
     { float val; oxml->search((yyvsp[0].val_str), val); (yyval.val_float) = val; }
-#line 1404 "expr_arith.cc" /* yacc.c:1646  */
+#line 1406 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 5:
 #line 105 "expr_arith.y" /* yacc.c:1646  */
     { (yyval.val_float) = (yyvsp[0].val_float); }
-#line 1410 "expr_arith.cc" /* yacc.c:1646  */
+#line 1412 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 6:
 #line 106 "expr_arith.y" /* yacc.c:1646  */
     { (yyval.val_float) = static_cast<float>((yyvsp[0].val_int)); }
-#line 1416 "expr_arith.cc" /* yacc.c:1646  */
+#line 1418 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 7:
 #line 107 "expr_arith.y" /* yacc.c:1646  */
     { (yyval.val_float) = (yyvsp[-2].val_float) + (yyvsp[0].val_float);}
-#line 1422 "expr_arith.cc" /* yacc.c:1646  */
+#line 1424 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 8:
 #line 108 "expr_arith.y" /* yacc.c:1646  */
     { (yyval.val_float) = (yyvsp[-2].val_float) - (yyvsp[0].val_float);}
-#line 1428 "expr_arith.cc" /* yacc.c:1646  */
+#line 1430 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 9:
 #line 109 "expr_arith.y" /* yacc.c:1646  */
     { (yyval.val_float) = (yyvsp[-2].val_float) * (yyvsp[0].val_float);}
-#line 1434 "expr_arith.cc" /* yacc.c:1646  */
+#line 1436 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 10:
 #line 110 "expr_arith.y" /* yacc.c:1646  */
     { (yyval.val_float) = (yyvsp[-2].val_float) / (yyvsp[0].val_float);}
-#line 1440 "expr_arith.cc" /* yacc.c:1646  */
+#line 1442 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 11:
 #line 111 "expr_arith.y" /* yacc.c:1646  */
     { (yyval.val_float) = - (yyvsp[0].val_float);}
-#line 1446 "expr_arith.cc" /* yacc.c:1646  */
+#line 1448 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
   case 12:
 #line 112 "expr_arith.y" /* yacc.c:1646  */
     { (yyval.val_float) = (yyvsp[-1].val_float);}
-#line 1452 "expr_arith.cc" /* yacc.c:1646  */
+#line 1454 "expr_arith.cc" /* yacc.c:1646  */
     break;
 
 
-#line 1456 "expr_arith.cc" /* yacc.c:1646  */
+#line 1458 "expr_arith.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/xml/expr_arith.h b/src/xml/expr_arith.h
index a70060e546..9ca01cd30d 100644
--- a/src/xml/expr_arith.h
+++ b/src/xml/expr_arith.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ extern int expr_arith__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 #line 78 "expr_arith.y" /* yacc.c:1909  */
@@ -64,6 +64,8 @@ union YYSTYPE
 
 #line 66 "expr_arith.hh" /* yacc.c:1909  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
diff --git a/src/xml/expr_bool.cc b/src/xml/expr_bool.cc
index 1e875b27a4..fa3725d31c 100644
--- a/src/xml/expr_bool.cc
+++ b/src/xml/expr_bool.cc
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -166,17 +166,19 @@ extern int expr_bool__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 #line 77 "expr_bool.y" /* yacc.c:355  */
 
-    char * 	val_str;
-    int 	val_int;
+    char *  val_str;
+    int     val_int;
     float   val_float;
 
 #line 177 "expr_bool.cc" /* yacc.c:355  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -203,7 +205,7 @@ int expr_bool__parse (mem_collector * mc, ObjectXML *     oxml, bool&
 
 /* Copy the second part of user declarations.  */
 
-#line 205 "expr_bool.cc" /* yacc.c:358  */
+#line 207 "expr_bool.cc" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -1392,13 +1394,13 @@ yyreduce:
         case 2:
 #line 97 "expr_bool.y" /* yacc.c:1646  */
     { result=(yyvsp[0].val_int);   }
-#line 1394 "expr_bool.cc" /* yacc.c:1646  */
+#line 1396 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 3:
 #line 98 "expr_bool.y" /* yacc.c:1646  */
     { result=true; }
-#line 1400 "expr_bool.cc" /* yacc.c:1646  */
+#line 1402 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 4:
@@ -1411,7 +1413,7 @@ yyreduce:
 
             (yyval.val_int) = (rc == 0 && val == (yyvsp[0].val_int));
         }
-#line 1413 "expr_bool.cc" /* yacc.c:1646  */
+#line 1415 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 5:
@@ -1424,7 +1426,7 @@ yyreduce:
 
             (yyval.val_int) = (rc == 0 && val != (yyvsp[0].val_int));
         }
-#line 1426 "expr_bool.cc" /* yacc.c:1646  */
+#line 1428 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 6:
@@ -1435,7 +1437,7 @@ yyreduce:
             rc = oxml->search((yyvsp[-2].val_str),val);
             (yyval.val_int) = (rc == 0 && val > (yyvsp[0].val_int));
         }
-#line 1437 "expr_bool.cc" /* yacc.c:1646  */
+#line 1439 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 7:
@@ -1446,7 +1448,7 @@ yyreduce:
             rc = oxml->search((yyvsp[-2].val_str),val);
             (yyval.val_int) = (rc == 0 && val < (yyvsp[0].val_int));
         }
-#line 1448 "expr_bool.cc" /* yacc.c:1646  */
+#line 1450 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 8:
@@ -1457,7 +1459,7 @@ yyreduce:
             rc = oxml->search((yyvsp[-2].val_str),val);
             (yyval.val_int) = (rc == 0 && val == (yyvsp[0].val_float));
         }
-#line 1459 "expr_bool.cc" /* yacc.c:1646  */
+#line 1461 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 9:
@@ -1468,7 +1470,7 @@ yyreduce:
             rc = oxml->search((yyvsp[-3].val_str),val);
             (yyval.val_int) = (rc == 0 && val != (yyvsp[0].val_float));
         }
-#line 1470 "expr_bool.cc" /* yacc.c:1646  */
+#line 1472 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 10:
@@ -1479,7 +1481,7 @@ yyreduce:
             rc = oxml->search((yyvsp[-2].val_str),val);
             (yyval.val_int) = (rc == 0 && val > (yyvsp[0].val_float));
         }
-#line 1481 "expr_bool.cc" /* yacc.c:1646  */
+#line 1483 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 11:
@@ -1489,7 +1491,7 @@ yyreduce:
 
             rc = oxml->search((yyvsp[-2].val_str),val);
             (yyval.val_int) = (rc == 0 && val < (yyvsp[0].val_float));}
-#line 1491 "expr_bool.cc" /* yacc.c:1646  */
+#line 1493 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 12:
@@ -1501,7 +1503,7 @@ yyreduce:
             rc = oxml->search((yyvsp[-2].val_str),val);
             (yyval.val_int) = (rc != 0 || (yyvsp[0].val_str)==0) ? false : fnmatch((yyvsp[0].val_str),val.c_str(),0)==0;
         }
-#line 1503 "expr_bool.cc" /* yacc.c:1646  */
+#line 1505 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 13:
@@ -1513,35 +1515,35 @@ yyreduce:
             rc = oxml->search((yyvsp[-3].val_str),val);
             (yyval.val_int) = (rc != 0 || (yyvsp[0].val_str)==0) ? false : fnmatch((yyvsp[0].val_str),val.c_str(),0)!=0;
         }
-#line 1515 "expr_bool.cc" /* yacc.c:1646  */
+#line 1517 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 14:
 #line 176 "expr_bool.y" /* yacc.c:1646  */
     { (yyval.val_int) = (yyvsp[-2].val_int) && (yyvsp[0].val_int); }
-#line 1521 "expr_bool.cc" /* yacc.c:1646  */
+#line 1523 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 15:
 #line 177 "expr_bool.y" /* yacc.c:1646  */
     { (yyval.val_int) = (yyvsp[-2].val_int) || (yyvsp[0].val_int); }
-#line 1527 "expr_bool.cc" /* yacc.c:1646  */
+#line 1529 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 16:
 #line 178 "expr_bool.y" /* yacc.c:1646  */
     { (yyval.val_int) = ! (yyvsp[0].val_int); }
-#line 1533 "expr_bool.cc" /* yacc.c:1646  */
+#line 1535 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
   case 17:
 #line 179 "expr_bool.y" /* yacc.c:1646  */
     { (yyval.val_int) =   (yyvsp[-1].val_int); }
-#line 1539 "expr_bool.cc" /* yacc.c:1646  */
+#line 1541 "expr_bool.cc" /* yacc.c:1646  */
     break;
 
 
-#line 1543 "expr_bool.cc" /* yacc.c:1646  */
+#line 1545 "expr_bool.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/xml/expr_bool.h b/src/xml/expr_bool.h
index f25fe5de14..728bed85e4 100644
--- a/src/xml/expr_bool.h
+++ b/src/xml/expr_bool.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,17 +53,19 @@ extern int expr_bool__debug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 #line 77 "expr_bool.y" /* yacc.c:1909  */
 
-    char * 	val_str;
-    int 	val_int;
+    char *  val_str;
+    int     val_int;
     float   val_float;
 
 #line 66 "expr_bool.hh" /* yacc.c:1909  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
diff --git a/src/xml/expr_parser.c b/src/xml/expr_parser.c
index 535ba0c412..076a5375c6 100644
--- a/src/xml/expr_parser.c
+++ b/src/xml/expr_parser.c
@@ -27,8 +27,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -161,7 +161,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -383,11 +391,17 @@ extern int expr_lineno;
 int expr_lineno = 1;
 
 extern char *expr_text;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
 #define yytext_ptr expr_text
 
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
 static int yy_get_next_buffer (void );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
 static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
@@ -415,7 +429,7 @@ static yyconst flex_int16_t yy_accept[20] =
         7,    0,    3,    5,    0,    2,    4,    6,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -447,12 +461,12 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[10] =
+static yyconst YY_CHAR yy_meta[10] =
     {   0,
         1,    1,    1,    1,    1,    1,    2,    2,    2
     } ;
 
-static yyconst flex_int16_t yy_base[22] =
+static yyconst flex_uint16_t yy_base[22] =
     {   0,
         0,    0,   22,   23,   19,   23,   16,   12,    4,    0,
        16,   13,   23,    0,    9,    0,   23,    8,   23,   11,
@@ -466,7 +480,7 @@ static yyconst flex_int16_t yy_def[22] =
        19
     } ;
 
-static yyconst flex_int16_t yy_nxt[33] =
+static yyconst flex_uint16_t yy_nxt[33] =
     {   0,
         4,    5,    6,    7,    8,    4,    9,   10,    4,   15,
        14,   12,   12,   16,   18,   18,   17,   11,   14,   13,
@@ -525,14 +539,14 @@ char *expr_text;
 #include "expr_arith.h"
 #include "mem_collector.h"
 
-#define YY_NO_INPUT 
+#define YY_NO_INPUT
 
 #define YY_DECL int expr_lex (YYSTYPE *lvalp, YYLTYPE *llocp, mem_collector *mc)
 
-#define YY_USER_ACTION  llocp->first_line = expr_lineno; 				\
-                        llocp->first_column = llocp->last_column;	\
+#define YY_USER_ACTION  llocp->first_line = expr_lineno;               \
+                        llocp->first_column = llocp->last_column;   \
                         llocp->last_column += expr_leng;
-#line 536 "expr_parser.c"
+#line 550 "expr_parser.c"
 
 #define INITIAL 0
 
@@ -565,11 +579,11 @@ void expr_set_extra (YY_EXTRA_TYPE user_defined  );
 
 FILE *expr_get_in (void );
 
-void expr_set_in  (FILE * in_str  );
+void expr_set_in  (FILE * _in_str  );
 
 FILE *expr_get_out (void );
 
-void expr_set_out  (FILE * out_str  );
+void expr_set_out  (FILE * _out_str  );
 
 yy_size_t expr_get_leng (void );
 
@@ -577,7 +591,7 @@ char *expr_get_text (void );
 
 int expr_get_lineno (void );
 
-void expr_set_lineno (int line_number  );
+void expr_set_lineno (int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -591,6 +605,10 @@ extern int expr_wrap (void );
 #endif
 #endif
 
+#ifndef YY_NO_UNPUT
+    
+#endif
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -611,7 +629,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -698,7 +721,7 @@ extern int expr_lex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -708,9 +731,9 @@ extern int expr_lex (void);
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     
 	if ( !(yy_init) )
 		{
@@ -743,9 +766,9 @@ YY_DECL
 
    /* --- Tokens --- */
 
-#line 747 "expr_parser.c"
+#line 770 "expr_parser.c"
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
@@ -761,7 +784,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -860,7 +883,7 @@ YY_RULE_SETUP
 #line 68 "expr_parser.l"
 ECHO;
 	YY_BREAK
-#line 864 "expr_parser.c"
+#line 887 "expr_parser.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1003,9 +1026,9 @@ case YY_STATE_EOF(INITIAL):
  */
 static int yy_get_next_buffer (void)
 {
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	yy_size_t number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1034,7 +1057,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -1137,14 +1160,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -1169,10 +1192,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -1190,6 +1213,10 @@ static int yy_get_next_buffer (void)
 		return yy_is_jam ? 0 : yy_current_state;
 }
 
+#ifndef YY_NO_UNPUT
+
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -1344,7 +1371,7 @@ static void expr__load_buffer_state  (void)
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in expr__create_buffer()" );
 
-	b->yy_buf_size = size;
+	b->yy_buf_size = (yy_size_t)size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -1499,7 +1526,7 @@ static void expr_ensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1;
+		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
 		(yy_buffer_stack) = (struct yy_buffer_state**)expr_alloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
@@ -1516,7 +1543,7 @@ static void expr_ensure_buffer_stack (void)
 	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
 		(yy_buffer_stack) = (struct yy_buffer_state**)expr_realloc
@@ -1624,7 +1651,7 @@ YY_BUFFER_STATE expr__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_l
 
 static void yy_fatal_error (yyconst char* msg )
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+			(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -1690,29 +1717,29 @@ char *expr_get_text  (void)
 }
 
 /** Set the current line number.
- * @param line_number
+ * @param _line_number line number
  * 
  */
-void expr_set_lineno (int  line_number )
+void expr_set_lineno (int  _line_number )
 {
     
-    expr_lineno = line_number;
+    expr_lineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
  * 
  * @see expr__switch_to_buffer
  */
-void expr_set_in (FILE *  in_str )
+void expr_set_in (FILE *  _in_str )
 {
-        expr_in = in_str ;
+        expr_in = _in_str ;
 }
 
-void expr_set_out (FILE *  out_str )
+void expr_set_out (FILE *  _out_str )
 {
-        expr_out = out_str ;
+        expr_out = _out_str ;
 }
 
 int expr_get_debug  (void)
@@ -1720,9 +1747,9 @@ int expr_get_debug  (void)
         return expr__flex_debug;
 }
 
-void expr_set_debug (int  bdebug )
+void expr_set_debug (int  _bdebug )
 {
-        expr__flex_debug = bdebug ;
+        expr__flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
@@ -1785,7 +1812,8 @@ int expr_lex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-	register int i;
+		
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -1794,7 +1822,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -1804,11 +1832,12 @@ static int yy_flex_strlen (yyconst char * s )
 
 void *expr_alloc (yy_size_t  size )
 {
-	return (void *) malloc( size );
+			return (void *) malloc( size );
 }
 
 void *expr_realloc  (void * ptr, yy_size_t  size )
 {
+		
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -1821,7 +1850,7 @@ void *expr_realloc  (void * ptr, yy_size_t  size )
 
 void expr_free (void * ptr )
 {
-	free( (char *) ptr );	/* see expr_realloc() for (char *) cast */
+			free( (char *) ptr );	/* see expr_realloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"

From 6a0b71e9ddec60ad0bea3329f541861e707515cd Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 5 Feb 2016 00:55:24 +0100
Subject: [PATCH 185/197] feature #4217: Adapt Marketplace classes to new
 Template interfaces

---
 include/MarketPlaceManager.h                |   2 +-
 include/ObjectXML.h                         | 240 ++++++++------------
 src/datastore/Datastore.cc                  |   6 +-
 src/host/Host.cc                            |   2 +-
 src/host/HostShare.cc                       |  26 +--
 src/image/Image.cc                          |  15 +-
 src/market/MarketPlace.cc                   |   6 +-
 src/market/MarketPlaceApp.cc                |   4 +-
 src/market/MarketPlaceManager.cc            |   2 +-
 src/market/MarketPlaceManagerDriver.cc      |  11 +-
 src/nebula/Nebula.cc                        |  48 ++--
 src/nebula/NebulaTemplate.cc                |  63 ++---
 src/pool/PoolObjectSQL.cc                   |   2 +-
 src/rm/RequestManagerAllocate.cc            |   7 +-
 src/scheduler/src/pool/DatastoreXML.cc      |   8 +-
 src/scheduler/src/pool/HostXML.cc           |  12 +-
 src/scheduler/src/pool/VirtualMachineXML.cc |   2 +-
 src/um/LoginToken.cc                        |   4 +-
 src/vm/History.cc                           |  16 +-
 src/vm/VirtualMachine.cc                    |   8 +-
 src/vm/VirtualMachinePool.cc                |   6 +-
 src/vm_template/VMTemplate.cc               |   2 +-
 22 files changed, 192 insertions(+), 300 deletions(-)

diff --git a/include/MarketPlaceManager.h b/include/MarketPlaceManager.h
index d2c64c4b55..42deafe9c9 100644
--- a/include/MarketPlaceManager.h
+++ b/include/MarketPlaceManager.h
@@ -40,7 +40,7 @@ public:
      *    @param m, monitor_period to monitor marketplaces
      *    @param mad, list of drivers for the manager
      */
-    MarketPlaceManager(time_t t, time_t m, std::vector<const Attribute*>& mad);
+    MarketPlaceManager(time_t t, time_t m, std::vector<const VectorAttribute*>& mad);
 
     ~MarketPlaceManager(){};
 
diff --git a/include/ObjectXML.h b/include/ObjectXML.h
index dfbb3aabac..2ae12be37b 100644
--- a/include/ObjectXML.h
+++ b/include/ObjectXML.h
@@ -53,71 +53,107 @@ public:
     virtual ~ObjectXML();
 
     /**
-     *  Gets elements using Xpath expression.
-     *    @param xpath_expr the Xpath of the element
-     *    @return a vector with the elements
+     *  Gets elements by xpath.
+     *    @param values vector with the element values.
+     *    @param expr of the xml element
      */
+    template<typename T>
+    void xpaths(std::vector<T>& values, const char * expr)
+    {
+        xmlXPathObjectPtr obj;
+
+        xmlNodePtr cur;
+        xmlChar *  str_ptr;
+
+        obj=xmlXPathEvalExpression(reinterpret_cast<const xmlChar *>(expr),ctx);
+
+        if (obj == 0)
+        {
+            return;
+        }
+
+        switch (obj->type)
+        {
+            case XPATH_NUMBER:
+                values.push_back(static_cast<T>(obj->floatval));
+                break;
+
+            case XPATH_NODESET:
+                for(int i = 0; i < obj->nodesetval->nodeNr ; ++i)
+                {
+                    cur = obj->nodesetval->nodeTab[i];
+
+                    if ( cur == 0 || cur->type != XML_ELEMENT_NODE )
+                    {
+                        continue;
+                    }
+
+                    str_ptr = xmlNodeGetContent(cur);
+
+                    if (str_ptr != 0)
+                    {
+                        std::istringstream iss(reinterpret_cast<char *>(str_ptr));
+                        T val;
+
+                        iss >> std::dec >> val;
+
+                        if (!iss.fail())
+                        {
+                            values.push_back(val);
+                        }
+
+                        xmlFree(str_ptr);
+                    }
+                }
+                break;
+
+            default:
+                break;
+
+        }
+
+        xmlXPathFreeObject(obj);
+    };
+
     void xpaths(std::vector<std::string>& values, const char * xpath_expr);
 
-    /* ---------------------------------------------------------------------- */
-    /*  Gets elements, type wrappers. See __xpaths definition for full        */
-    /*  description of these methods.                                         */
-    /* ---------------------------------------------------------------------- */
-    inline void xpaths(std::vector<int>& values, const char * xpath_expr)
-    {
-       __xpaths<int>(values, xpath_expr);
-    };
-
-    inline void xpaths(std::vector<float>& values, const char * xpath_expr)
-    {
-       __xpaths<float>(values, xpath_expr);
-    };
-
     /**
-     *  Gets and sets a xpath attribute, if the attribute is not found a default
-     *  is used
-     *    @param value to set
+     *  Gets a xpath attribute, if the attribute is not found a default is used.
+     *  This function only returns the first element
+     *    @param value of the element
      *    @param xpath_expr of the xml element
      *    @param def default value if the element is not found
      *
      *    @return -1 if default was set
      */
+    template<typename T>
+    int xpath(T& value, const char * xpath_expr, const T& def)
+    {
+        std::vector<std::string> values;
+
+        xpaths(values, xpath_expr);
+
+        if (values.empty() == true)
+        {
+            value = def;
+            return -1;
+        }
+
+        std::istringstream iss(values[0]);
+
+        iss >> std::dec >> value;
+
+        if (iss.fail() == true)
+        {
+            value = def;
+            return -1;
+        }
+
+        return 0;
+    }
+
     int xpath(std::string& value, const char * xpath_expr, const char * def);
 
-    /* ---------------------------------------------------------------------- */
-    /*  Gets xpath attribute, type wrappers. See __xpath definition for full  */
-    /*  description of these methods.                                         */
-    /* ---------------------------------------------------------------------- */
-    inline int xpath(int& v, const char * x, const int& d)
-    {
-        return __xpath<int>(v, x, d);
-    }
-
-    inline int xpath(float& v, const char * x, const float& d)
-    {
-        return __xpath<float>(v, x, d);
-    }
-
-    inline int xpath(unsigned int& v, const char * x, const unsigned int& d)
-    {
-        return __xpath<unsigned int>(v, x, d);
-    }
-
-    inline int xpath(long long& v, const char * x, const long long& d)
-    {
-        return __xpath<long long>(v, x, d);
-    }
-
-    inline int xpath(unsigned long long& v, const char * x, const unsigned long long& d)
-    {
-        return __xpath<unsigned long long>(v, x, d);
-    }
-
-    inline int xpath(time_t& v, const char * x, const time_t& d)
-    {
-        return __xpath<time_t>(v, x, d);
-    }
-
     /**
      *  Gets the value of an element from an xml string
      *    @param value the value of the element
@@ -293,103 +329,7 @@ private:
      */
     void search(const char* name, std::vector<std::string>& results);
 
-    /**
-     *  Gets a xpath attribute, if the attribute is not found a default is used.
-     *  This function only returns the first element
-     *    @param value of the element
-     *    @param xpath_expr of the xml element
-     *    @param def default value if the element is not found
-     *
-     *    @return -1 if default was set
-     */
-    template<typename T>
-    int __xpath(T& value, const char * xpath_expr, const T& def)
-    {
-        std::vector<std::string> values;
 
-        xpaths(values, xpath_expr);
-
-        if (values.empty() == true)
-        {
-            value = def;
-            return -1;
-        }
-
-        std::istringstream iss(values[0]);
-
-        iss >> std::dec >> value;
-
-        if (iss.fail() == true)
-        {
-            value = def;
-            return -1;
-        }
-
-        return 0;
-    }
-
-    /**
-     *  Gets elements by xpath.
-     *    @param values vector with the element values.
-     *    @param expr of the xml element
-     */
-    template<typename T>
-    void __xpaths(std::vector<T>& values, const char * expr)
-    {
-        xmlXPathObjectPtr obj;
-
-        xmlNodePtr cur;
-        xmlChar *  str_ptr;
-
-        obj=xmlXPathEvalExpression(reinterpret_cast<const xmlChar *>(expr),ctx);
-
-        if (obj == 0)
-        {
-            return;
-        }
-
-        switch (obj->type)
-        {
-            case XPATH_NUMBER:
-                values.push_back(static_cast<T>(obj->floatval));
-                break;
-
-            case XPATH_NODESET:
-                for(int i = 0; i < obj->nodesetval->nodeNr ; ++i)
-                {
-                    cur = obj->nodesetval->nodeTab[i];
-
-                    if ( cur == 0 || cur->type != XML_ELEMENT_NODE )
-                    {
-                        continue;
-                    }
-
-                    str_ptr = xmlNodeGetContent(cur);
-
-                    if (str_ptr != 0)
-                    {
-                        std::istringstream iss(reinterpret_cast<char *>(str_ptr));
-                        T val;
-
-                        iss >> std::dec >> val;
-
-                        if (!iss.fail())
-                        {
-                            values.push_back(val);
-                        }
-
-                        xmlFree(str_ptr);
-                    }
-                }
-                break;
-
-            default:
-                break;
-
-        }
-
-        xmlXPathFreeObject(obj);
-    };
 };
 
 #endif /*OBJECT_XML_H_*/
diff --git a/src/datastore/Datastore.cc b/src/datastore/Datastore.cc
index ec3bf80203..9c67cde324 100644
--- a/src/datastore/Datastore.cc
+++ b/src/datastore/Datastore.cc
@@ -711,9 +711,9 @@ int Datastore::from_xml(const string& xml)
     rc += xpath(cluster_id, "/DATASTORE/CLUSTER_ID", -1);
     rc += xpath(cluster,    "/DATASTORE/CLUSTER",    "not_found");
 
-    rc += xpath(total_mb, "/DATASTORE/TOTAL_MB", 0);
-    rc += xpath(free_mb,  "/DATASTORE/FREE_MB",  0);
-    rc += xpath(used_mb,  "/DATASTORE/USED_MB",  0);
+    rc += xpath<long long>(total_mb,"/DATASTORE/TOTAL_MB",0);
+    rc += xpath<long long>(free_mb, "/DATASTORE/FREE_MB", 0);
+    rc += xpath<long long>(used_mb, "/DATASTORE/USED_MB", 0);
 
     // Permissions
     rc += perms_from_xml();
diff --git a/src/host/Host.cc b/src/host/Host.cc
index f3079d9a9b..4be82146e0 100644
--- a/src/host/Host.cc
+++ b/src/host/Host.cc
@@ -630,7 +630,7 @@ int Host::from_xml(const string& xml)
     rc += xpath(vmm_mad_name, "/HOST/VM_MAD", "not_found");
     rc += xpath(vnm_mad_name, "/HOST/VN_MAD", "not_found");
 
-    rc += xpath(last_monitored, "/HOST/LAST_MON_TIME", 0);
+    rc += xpath<time_t>(last_monitored, "/HOST/LAST_MON_TIME", 0);
 
     rc += xpath(cluster_id, "/HOST/CLUSTER_ID", -1);
     rc += xpath(cluster,    "/HOST/CLUSTER",    "not_found");
diff --git a/src/host/HostShare.cc b/src/host/HostShare.cc
index 1dac5c6f34..d9e411ce1f 100644
--- a/src/host/HostShare.cc
+++ b/src/host/HostShare.cc
@@ -387,23 +387,23 @@ int HostShare::from_xml_node(const xmlNodePtr node)
     // Initialize the internal XML object
     ObjectXML::update_from_node(node);
 
-    rc += xpath(disk_usage, "/HOST_SHARE/DISK_USAGE", -1);
-    rc += xpath(mem_usage,  "/HOST_SHARE/MEM_USAGE",  -1);
-    rc += xpath(cpu_usage,  "/HOST_SHARE/CPU_USAGE",  -1);
+    rc += xpath<long long>(disk_usage, "/HOST_SHARE/DISK_USAGE", -1);
+    rc += xpath<long long>(mem_usage,  "/HOST_SHARE/MEM_USAGE",  -1);
+    rc += xpath<long long>(cpu_usage,  "/HOST_SHARE/CPU_USAGE",  -1);
 
-    rc += xpath(max_disk,   "/HOST_SHARE/MAX_DISK",   -1);
-    rc += xpath(max_mem ,   "/HOST_SHARE/MAX_MEM",    -1);
-    rc += xpath(max_cpu ,   "/HOST_SHARE/MAX_CPU",    -1);
+    rc += xpath<long long>(max_disk,   "/HOST_SHARE/MAX_DISK",   -1);
+    rc += xpath<long long>(max_mem ,   "/HOST_SHARE/MAX_MEM",    -1);
+    rc += xpath<long long>(max_cpu ,   "/HOST_SHARE/MAX_CPU",    -1);
 
-    rc += xpath(free_disk,  "/HOST_SHARE/FREE_DISK",  -1);
-    rc += xpath(free_mem ,  "/HOST_SHARE/FREE_MEM",   -1);
-    rc += xpath(free_cpu ,  "/HOST_SHARE/FREE_CPU",   -1);
+    rc += xpath<long long>(free_disk,  "/HOST_SHARE/FREE_DISK",  -1);
+    rc += xpath<long long>(free_mem ,  "/HOST_SHARE/FREE_MEM",   -1);
+    rc += xpath<long long>(free_cpu ,  "/HOST_SHARE/FREE_CPU",   -1);
 
-    rc += xpath(used_disk,  "/HOST_SHARE/USED_DISK",  -1);
-    rc += xpath(used_mem ,  "/HOST_SHARE/USED_MEM",   -1);
-    rc += xpath(used_cpu ,  "/HOST_SHARE/USED_CPU",   -1);
+    rc += xpath<long long>(used_disk,  "/HOST_SHARE/USED_DISK",  -1);
+    rc += xpath<long long>(used_mem ,  "/HOST_SHARE/USED_MEM",   -1);
+    rc += xpath<long long>(used_cpu ,  "/HOST_SHARE/USED_CPU",   -1);
 
-    rc += xpath(running_vms,"/HOST_SHARE/RUNNING_VMS",-1);
+    rc += xpath<long long>(running_vms,"/HOST_SHARE/RUNNING_VMS",-1);
 
     // ------------ Datastores ---------------
 
diff --git a/src/image/Image.cc b/src/image/Image.cc
index a7b5fdd7f9..100f347e3b 100644
--- a/src/image/Image.cc
+++ b/src/image/Image.cc
@@ -402,14 +402,15 @@ int Image::from_xml(const string& xml)
     rc += xpath(int_type,       "/IMAGE/TYPE",      0);
     rc += xpath(int_disk_type,  "/IMAGE/DISK_TYPE", 0);
     rc += xpath(persistent_img, "/IMAGE/PERSISTENT",0);
-    rc += xpath(regtime,        "/IMAGE/REGTIME",   0);
+    rc += xpath<time_t>(regtime,"/IMAGE/REGTIME",   0);
 
-    rc += xpath(source,         "/IMAGE/SOURCE",        "not_found");
-    rc += xpath(size_mb,        "/IMAGE/SIZE",          0);
-    rc += xpath(int_state,      "/IMAGE/STATE",         0);
-    rc += xpath(running_vms,    "/IMAGE/RUNNING_VMS",   -1);
-    rc += xpath(cloning_ops,    "/IMAGE/CLONING_OPS",   -1);
-    rc += xpath(cloning_id,     "/IMAGE/CLONING_ID",    -1);
+    rc += xpath<long long>(size_mb, "/IMAGE/SIZE", 0);
+
+    rc += xpath(source,     "/IMAGE/SOURCE",     "not_found");
+    rc += xpath(int_state,  "/IMAGE/STATE",      0);
+    rc += xpath(running_vms,"/IMAGE/RUNNING_VMS",-1);
+    rc += xpath(cloning_ops,"/IMAGE/CLONING_OPS",-1);
+    rc += xpath(cloning_id, "/IMAGE/CLONING_ID", -1);
 
     rc += xpath(target_snapshot, "/IMAGE/TARGET_SNAPSHOT", -1);
 
diff --git a/src/market/MarketPlace.cc b/src/market/MarketPlace.cc
index 830e0eba6f..dd0d7204fc 100644
--- a/src/market/MarketPlace.cc
+++ b/src/market/MarketPlace.cc
@@ -308,9 +308,9 @@ int MarketPlace::from_xml(const std::string &xml_str)
 
     rc += xpath(market_mad, "/MARKETPLACE/MARKET_MAD", "not_found");
 
-    rc += xpath(total_mb, "/MARKETPLACE/TOTAL_MB", 0);
-    rc += xpath(free_mb,  "/MARKETPLACE/FREE_MB",  0);
-    rc += xpath(used_mb,  "/MARKETPLACE/USED_MB",  0);
+    rc += xpath<long long>(total_mb, "/MARKETPLACE/TOTAL_MB", 0);
+    rc += xpath<long long>(free_mb,  "/MARKETPLACE/FREE_MB",  0);
+    rc += xpath<long long>(used_mb,  "/MARKETPLACE/USED_MB",  0);
 
 	// ----- Permissions -----
     rc += perms_from_xml();
diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc
index 26c7b8b080..d896bf12f4 100644
--- a/src/market/MarketPlaceApp.cc
+++ b/src/market/MarketPlaceApp.cc
@@ -290,13 +290,13 @@ int MarketPlaceApp::from_xml(const std::string &xml_str)
     rc += xpath(uname,        "/MARKETPLACEAPP/UNAME", "not_found");
     rc += xpath(gname,        "/MARKETPLACEAPP/GNAME", "not_found");
     rc += xpath(name,         "/MARKETPLACEAPP/NAME", "not_found");
-    rc += xpath(date,         "/MARKETPLACEAPP/DATE", -1);
+    rc += xpath<time_t>(date, "/MARKETPLACEAPP/DATE", -1);
     rc += xpath(source,       "/MARKETPLACEAPP/SOURCE", "not_found");
     rc += xpath(origin_id,    "/MARKETPLACEAPP/ORIGIN_ID", -1);
     rc += xpath(istate,       "/MARKETPLACEAPP/STATE", -1);
     rc += xpath(itype,        "/MARKETPLACEAPP/TYPE",  -1);
     rc += xpath(description,  "/MARKETPLACEAPP/DESCRIPTION", "not_found");
-    rc += xpath(size_mb,      "/MARKETPLACEAPP/SIZE", -1);
+    rc += xpath<long long>(size_mb, "/MARKETPLACEAPP/SIZE", -1);
     rc += xpath(version,      "/MARKETPLACEAPP/VERSION", "not_found");
     rc += xpath(md5,          "/MARKETPLACEAPP/MD5", "not_found");
     rc += xpath(publisher,    "/MARKETPLACEAPP/PUBLISHER", "not_found");
diff --git a/src/market/MarketPlaceManager.cc b/src/market/MarketPlaceManager.cc
index 0558b4e421..93a26b2f89 100644
--- a/src/market/MarketPlaceManager.cc
+++ b/src/market/MarketPlaceManager.cc
@@ -52,7 +52,7 @@ extern "C" void * marketplace_action_loop(void *arg)
 MarketPlaceManager::MarketPlaceManager(
             time_t _timer_period,
             time_t _monitor_period,
-            std::vector<const Attribute*>& _mads):
+            std::vector<const VectorAttribute*>& _mads):
         MadManager(_mads),
         timer_period(_timer_period),
         monitor_period(_monitor_period),
diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc
index 675b58b7c0..a878bfd038 100644
--- a/src/market/MarketPlaceManagerDriver.cc
+++ b/src/market/MarketPlaceManagerDriver.cc
@@ -136,21 +136,14 @@ static void monitor_action(
 
     market->unlock();
 
-    std::vector<Attribute *> apps;
+    std::vector<SingleAttribute *> apps;
     std::string err;
 
     int num = monitor_data.get("APP", apps);
 
     for (int i=0; i< num ; i++)
     {
-        SingleAttribute * sa = static_cast<SingleAttribute *>(apps[i]);
-
-        if ( sa == 0 )
-        {
-            continue;
-        }
-
-        if ( apppool->import(sa->value(), id, name, err) == -1 )
+        if ( apppool->import(apps[i]->value(), id, name, err) == -1 )
         {
             NebulaLog::log("MKP", Log::ERROR, "Error importing app: " + err);
         }
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 7fd5b1279e..266de84db1 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -804,7 +804,7 @@ void Nebula::start(bool bootstrap_only)
     // ---- Marketplace Manager ----
     try
     {
-        vector<const Attribute *> mmads ;
+        vector<const VectorAttribute *> mmads ;
 
         nebula_configuration->get("MARKET_MAD", mmads);
 
@@ -990,19 +990,14 @@ error_mad:
 
 Log::MessageType Nebula::get_debug_level() const
 {
-    Log::MessageType            clevel = Log::ERROR;
-    vector<const Attribute *>   logs;
-    int                         rc;
-    int                         log_level_int;
+    Log::MessageType clevel = Log::ERROR;
+    int              log_level_int;
 
-    rc = nebula_configuration->get("LOG", logs);
+    const VectorAttribute * log = nebula_configuration->get("LOG");
 
-    if ( rc != 0 )
+    if ( log != 0 )
     {
-        string value;
-        const VectorAttribute * log = static_cast<const VectorAttribute *>
-                                                      (logs[0]);
-        value = log->vector_value("DEBUG_LEVEL");
+        string value = log->vector_value("DEBUG_LEVEL");
 
         log_level_int = atoi(value.c_str());
 
@@ -1020,20 +1015,14 @@ Log::MessageType Nebula::get_debug_level() const
 
 NebulaLog::LogType Nebula::get_log_system() const
 {
-    vector<const Attribute *> logs;
-    int                       rc;
-    NebulaLog::LogType        log_system = NebulaLog::UNDEFINED;
+    NebulaLog::LogType log_system = NebulaLog::UNDEFINED;
 
-    rc = nebula_configuration->get("LOG", logs);
+    const VectorAttribute * log = nebula_configuration->get("LOG");
 
-    if ( rc != 0 )
+    if ( log != 0 )
     {
-        string value;
-        const VectorAttribute * log = static_cast<const VectorAttribute *>
-                                                      (logs[0]);
-
-        value      = log->vector_value("SYSTEM");
-        log_system = NebulaLog::str_to_type(value);
+        string value = log->vector_value("SYSTEM");
+        log_system   = NebulaLog::str_to_type(value);
     }
 
     return log_system;
@@ -1092,23 +1081,16 @@ int Nebula::get_conf_attribute(
     const std::string& name,
     const VectorAttribute* &value) const
 {
-    std::vector<const Attribute*>::const_iterator it;
-    std::vector<const Attribute*> values;
+    std::vector<const VectorAttribute*>::const_iterator it;
+    std::vector<const VectorAttribute*> values;
     std::string template_name;
     std::string name_upper;
 
-    nebula_configuration->Template::get(key, values);
+    nebula_configuration->get(key, values);
 
     for (it = values.begin(); it != values.end(); it ++)
     {
-        value = dynamic_cast<const VectorAttribute*>(*it);
-
-        if (value == 0)
-        {
-            continue;
-        }
-
-        template_name = value->vector_value("NAME");
+        template_name = (*it)->vector_value("NAME");
         name_upper    = name;
 
         one_util::toupper(name_upper);
diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc
index 510fe5d8da..31c529a6b5 100644
--- a/src/nebula/NebulaTemplate.cc
+++ b/src/nebula/NebulaTemplate.cc
@@ -87,7 +87,6 @@ const char * OpenNebulaTemplate::conf_name="oned.conf";
 
 void OpenNebulaTemplate::set_multiple_conf_default()
 {
-
 /*
 #*******************************************************************************
 # Transfer Manager Configuration
@@ -103,7 +102,6 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 # dev
 #*******************************************************************************
 */
-
     set_conf_tm("dummy",  "NONE",   "SYSTEM", "YES", "YES");
     set_conf_tm("lvm",    "NONE",   "SELF",   "YES", "NO");
     set_conf_tm("shared", "NONE",   "SYSTEM", "YES", "YES");
@@ -115,8 +113,6 @@ void OpenNebulaTemplate::set_multiple_conf_default()
     set_conf_tm("dev",    "NONE",   "NONE",   "YES", "NO");
 
     register_multiple_conf_default("TM_MAD_CONF");
-
-
 /*
 #*******************************************************************************
 # Datastore Manager Configuration
@@ -131,7 +127,6 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 # vmfs
 #******
 */
-
     set_conf_ds("dev",    "DISK_TYPE",            "YES");
     set_conf_ds("iscsi",  "DISK_TYPE,ISCSI_HOST", "YES");
     set_conf_ds("dummy",  "",                     "NO");
@@ -145,8 +140,6 @@ void OpenNebulaTemplate::set_multiple_conf_default()
                 "NO");
 
     register_multiple_conf_default("DS_MAD_CONF");
-
-
 /*
 #*******************************************************************************
 # Marketplace Manager Configuration
@@ -155,7 +148,6 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 # s3
 #******
 */
-
     set_conf_market("one",  "");
     set_conf_market("http", "BASE_URL,PUBLIC_DIR");
     set_conf_market("s3",   "ACCESS_KEY_ID,SECRET_ACCESS_KEY,REGION,BUCKET");
@@ -169,50 +161,37 @@ void OpenNebulaTemplate::set_multiple_conf_default()
 void OpenNebulaTemplate::register_multiple_conf_default(
                                                 const std::string& conf_section)
 {
-    std::string defaults_name, attributes_name;
-
-    Attribute * defaults_value;
+    std::string d_name;
 
     bool found;
 
-    const VectorAttribute* defaults_attr;
-    const VectorAttribute* attributes_attr;
+    VectorAttribute* d_attr;
 
-    std::map<std::string, Attribute *>::iterator  iter_defaults, prev;
+    std::map<std::string, Attribute *>::iterator i, prev;
 
-    std::vector<const Attribute*>::const_iterator iter_attributes;
-    std::vector<const Attribute*> attributes_values;
+    std::vector<const VectorAttribute*>::const_iterator j;
+    std::vector<const VectorAttribute*> attrs;
 
-    get(conf_section.c_str(), attributes_values);
+    get(conf_section.c_str(), attrs);
 
-    for( iter_defaults  = conf_default.begin();
-         iter_defaults != conf_default.end(); )
+    for(i = conf_default.begin(); i != conf_default.end(); )
     {
-        if ( iter_defaults->first == conf_section )
+        if ( i->first == conf_section )
         {
             found = false;
 
-            defaults_value = iter_defaults->second;
+            d_attr = dynamic_cast<VectorAttribute*>(i->second);
 
-            defaults_attr = dynamic_cast<const VectorAttribute*>
-                            (defaults_value);
-
-            defaults_name = defaults_attr->vector_value("NAME");
-
-            for (iter_attributes = attributes_values.begin();
-                 iter_attributes != attributes_values.end(); iter_attributes++)
+            if (d_attr == 0)
             {
-                attributes_attr = dynamic_cast<const VectorAttribute*>
-                                  (*iter_attributes);
+                continue;
+            }
 
-                if (attributes_attr == 0)
-                {
-                    continue;
-                }
+            d_name = d_attr->vector_value("NAME");
 
-                attributes_name = attributes_attr->vector_value("NAME");
-
-                if ( attributes_name == defaults_name )
+            for (j = attrs.begin(); j != attrs.end(); j++)
+            {
+                if ( (*j)->vector_value("NAME") == d_name )
                 {
                     found = true;
                     break;
@@ -222,20 +201,20 @@ void OpenNebulaTemplate::register_multiple_conf_default(
             if ( !found )
             {
                 // insert into attributes
-                attributes.insert(make_pair(conf_section, defaults_value));
-                iter_defaults++;
+                attributes.insert(make_pair(conf_section, d_attr));
+                i++;
             }
             else
             {
                 // remove from conf_defaults
-                delete iter_defaults->second;
-                prev = iter_defaults++;
+                delete i->second;
+                prev = i++;
                 conf_default.erase(prev);
             }
         }
         else
         {
-            iter_defaults++;
+            i++;
         }
     }
 }
diff --git a/src/pool/PoolObjectSQL.cc b/src/pool/PoolObjectSQL.cc
index d6fceec1c3..e4e3db6860 100644
--- a/src/pool/PoolObjectSQL.cc
+++ b/src/pool/PoolObjectSQL.cc
@@ -545,7 +545,7 @@ int PoolObjectSQL::lock_db_from_xml()
 
     rc += xpath(locked_int,   "/*/LOCK/LOCKED", 0);
     rc += xpath(lock_owner,   "/*/LOCK/OWNER", "");
-    rc += xpath(lock_expires, "/*/LOCK/EXPIRES", 0);
+    rc += xpath<time_t>(lock_expires, "/*/LOCK/EXPIRES", 0);
 
     locked = locked_int;
 
diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 257d7c2cfe..44454fad46 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -289,7 +289,6 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     long long     size_mb;
     istringstream iss;
-    ostringstream oss;
 
     string ds_name;
     string ds_data;
@@ -392,7 +391,7 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
         if ( app == 0 )
         {
-            att.resp_msg = "Cannot determine image SIZE.";
+            att.resp_msg = "Cannot determine image SIZE: " + size_str;
             failure_response(INTERNAL, att);
 
             delete tmpl;
@@ -420,9 +419,6 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
         market->to_xml(extra_data);
 
         market->unlock();
-
-        oss << size_mb;
-        size_str = oss.str();
     }
     else
     {
@@ -450,6 +446,7 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
         }
     }
 
+
     if (ds_check && (size_mb > avail))
     {
         att.resp_msg = "Not enough space in datastore";
diff --git a/src/scheduler/src/pool/DatastoreXML.cc b/src/scheduler/src/pool/DatastoreXML.cc
index c01c16bed0..f39293c83b 100644
--- a/src/scheduler/src/pool/DatastoreXML.cc
+++ b/src/scheduler/src/pool/DatastoreXML.cc
@@ -53,16 +53,16 @@ void DatastoreXML::init_attributes()
     xpath(other_m, "/DATASTORE/PERMISSIONS/OTHER_M", 0);
     xpath(other_a, "/DATASTORE/PERMISSIONS/OTHER_A", 0);
 
-    xpath(free_mb,    "/DATASTORE/FREE_MB",     0);
+    xpath<long long>(free_mb, "/DATASTORE/FREE_MB", 0);
 
     long long total_mb, used_mb, limit_mb;
 
-    xpath(total_mb, "/DATASTORE/TOTAL_MB", 0);
-    xpath(used_mb,  "/DATASTORE/USED_MB",  0);
+    xpath<long long>(total_mb, "/DATASTORE/TOTAL_MB", 0);
+    xpath<long long>(used_mb,  "/DATASTORE/USED_MB",  0);
 
     monitored = (free_mb != 0 || total_mb != 0 || used_mb != 0);
 
-    int rc = xpath(limit_mb, "/DATASTORE/TEMPLATE/LIMIT_MB", 0);
+    int rc = xpath<long long>(limit_mb, "/DATASTORE/TEMPLATE/LIMIT_MB", 0);
 
     if (rc == 0)
     {
diff --git a/src/scheduler/src/pool/HostXML.cc b/src/scheduler/src/pool/HostXML.cc
index 41f5487569..da5ea49ac8 100644
--- a/src/scheduler/src/pool/HostXML.cc
+++ b/src/scheduler/src/pool/HostXML.cc
@@ -40,12 +40,12 @@ void HostXML::init_attributes()
 {
     xpath(oid,         "/HOST/ID",                     -1);
     xpath(cluster_id,  "/HOST/CLUSTER_ID",             -1);
-    xpath(mem_usage,   "/HOST/HOST_SHARE/MEM_USAGE",   0);
-    xpath(cpu_usage,   "/HOST/HOST_SHARE/CPU_USAGE",   0);
-    xpath(max_mem,     "/HOST/HOST_SHARE/MAX_MEM",     0);
-    xpath(max_cpu,     "/HOST/HOST_SHARE/MAX_CPU",     0);
-    xpath(free_disk,   "/HOST/HOST_SHARE/FREE_DISK",   0);
-    xpath(running_vms, "/HOST/HOST_SHARE/RUNNING_VMS", 0);
+    xpath<long long>(mem_usage, "/HOST/HOST_SHARE/MEM_USAGE",   0);
+    xpath<long long>(cpu_usage, "/HOST/HOST_SHARE/CPU_USAGE",   0);
+    xpath<long long>(max_mem,   "/HOST/HOST_SHARE/MAX_MEM",     0);
+    xpath<long long>(max_cpu,   "/HOST/HOST_SHARE/MAX_CPU",     0);
+    xpath<long long>(free_disk, "/HOST/HOST_SHARE/FREE_DISK",   0);
+    xpath<long long>(running_vms, "/HOST/HOST_SHARE/RUNNING_VMS", 0);
 
     string public_cloud_st;
 
diff --git a/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc
index f534f1877f..4f0f84f4da 100644
--- a/src/scheduler/src/pool/VirtualMachineXML.cc
+++ b/src/scheduler/src/pool/VirtualMachineXML.cc
@@ -36,7 +36,7 @@ void VirtualMachineXML::init_attributes()
     xpath(gid, "/VM/GID", -1);
 
     xpath(memory, "/VM/TEMPLATE/MEMORY", 0);
-    xpath(cpu,    "/VM/TEMPLATE/CPU", 0);
+    xpath<float>(cpu, "/VM/TEMPLATE/CPU", 0);
 
     // ------------------------ RANK & DS_RANK ---------------------------------
 
diff --git a/src/um/LoginToken.cc b/src/um/LoginToken.cc
index f0bfc701bf..2ae397395b 100644
--- a/src/um/LoginToken.cc
+++ b/src/um/LoginToken.cc
@@ -98,6 +98,6 @@ void LoginToken::from_xml_node(const xmlNodePtr node)
 {
     ObjectXML oxml(node);
 
-    oxml.xpath(token, "/LOGIN_TOKEN/TOKEN", "" );
-    oxml.xpath(expiration_time, "/LOGIN_TOKEN/EXPIRATION_TIME", 0 );
+    oxml.xpath(token, "/LOGIN_TOKEN/TOKEN", "");
+    oxml.xpath<time_t>(expiration_time, "/LOGIN_TOKEN/EXPIRATION_TIME", 0);
 }
diff --git a/src/vm/History.cc b/src/vm/History.cc
index 290fa40bf2..ab7fdc8b61 100644
--- a/src/vm/History.cc
+++ b/src/vm/History.cc
@@ -346,19 +346,19 @@ int History::rebuild_attributes()
     rc += xpath(hostname         , "/HISTORY/HOSTNAME",    "not_found");
     rc += xpath(hid              , "/HISTORY/HID",         -1);
     rc += xpath(cid              , "/HISTORY/CID",         -1);
-    rc += xpath(stime            , "/HISTORY/STIME",       0);
-    rc += xpath(etime            , "/HISTORY/ETIME",       0);
+    rc += xpath<time_t>(stime    , "/HISTORY/STIME",       0);
+    rc += xpath<time_t>(etime    , "/HISTORY/ETIME",       0);
     rc += xpath(vmm_mad_name     , "/HISTORY/VMMMAD",      "not_found");
           xpath(vnm_mad_name     , "/HISTORY/VNMMAD",      "dummy");
     rc += xpath(tm_mad_name      , "/HISTORY/TMMAD",       "not_found");
     rc += xpath(ds_location      , "/HISTORY/DS_LOCATION", "not_found");
     rc += xpath(ds_id            , "/HISTORY/DS_ID",       0);
-    rc += xpath(prolog_stime     , "/HISTORY/PSTIME",      0);
-    rc += xpath(prolog_etime     , "/HISTORY/PETIME",      0);
-    rc += xpath(running_stime    , "/HISTORY/RSTIME",      0);
-    rc += xpath(running_etime    , "/HISTORY/RETIME",      0);
-    rc += xpath(epilog_stime     , "/HISTORY/ESTIME",      0);
-    rc += xpath(epilog_etime     , "/HISTORY/EETIME",      0);
+    rc += xpath<time_t>(prolog_stime , "/HISTORY/PSTIME",      0);
+    rc += xpath<time_t>(prolog_etime , "/HISTORY/PETIME",      0);
+    rc += xpath<time_t>(running_stime, "/HISTORY/RSTIME",      0);
+    rc += xpath<time_t>(running_etime, "/HISTORY/RETIME",      0);
+    rc += xpath<time_t>(epilog_stime , "/HISTORY/ESTIME",      0);
+    rc += xpath<time_t>(epilog_etime , "/HISTORY/EETIME",      0);
     rc += xpath(int_reason       , "/HISTORY/REASON",      0);
     rc += xpath(int_action       , "/HISTORY/ACTION",      0);
 
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 2f99a16755..406a25067f 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -4023,11 +4023,11 @@ int VirtualMachine::from_xml(const string &xml_str)
     rc += xpath(gname,     "/VM/GNAME", "not_found");
     rc += xpath(name,      "/VM/NAME",  "not_found");
 
-    rc += xpath(last_poll, "/VM/LAST_POLL", 0);
-    rc += xpath(resched,   "/VM/RESCHED",   0);
+    rc += xpath<time_t>(last_poll, "/VM/LAST_POLL", 0);
+    rc += xpath(resched, "/VM/RESCHED", 0);
 
-    rc += xpath(stime,     "/VM/STIME",    0);
-    rc += xpath(etime,     "/VM/ETIME",    0);
+    rc += xpath<time_t>(stime, "/VM/STIME", 0);
+    rc += xpath<time_t>(etime, "/VM/ETIME", 0);
     rc += xpath(deploy_id, "/VM/DEPLOY_ID","");
 
     // Permissions
diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc
index 1dcf6ff6c8..1469382fed 100644
--- a/src/vm/VirtualMachinePool.cc
+++ b/src/vm/VirtualMachinePool.cc
@@ -799,10 +799,10 @@ int VirtualMachinePool::calculate_showback(
         history.xpath(h_stime,  "/HISTORY/STIME", 0);
         history.xpath(h_etime,  "/HISTORY/ETIME", 0);
 
-        history.xpath(cpu,  "/HISTORY/VM/TEMPLATE/CPU", 0);
+        history.xpath<float>(cpu,  "/HISTORY/VM/TEMPLATE/CPU", 0.0);
         history.xpath(mem,  "/HISTORY/VM/TEMPLATE/MEMORY", 0);
-        history.xpath(disk, "sum(/HISTORY/VM/TEMPLATE/DISK/SIZE | "
-            "/HISTORY/VM/TEMPLATE/DISK/DISK_SNAPSHOT_TOTAL_SIZE)", 0);
+        history.xpath<float>(disk, "sum(/HISTORY/VM/TEMPLATE/DISK/SIZE | "
+            "/HISTORY/VM/TEMPLATE/DISK/DISK_SNAPSHOT_TOTAL_SIZE)", 0.0);
 
         history.xpath(cpu_cost, "/HISTORY/VM/TEMPLATE/CPU_COST", _default_cpu_cost);
         history.xpath(mem_cost, "/HISTORY/VM/TEMPLATE/MEMORY_COST", _default_mem_cost);
diff --git a/src/vm_template/VMTemplate.cc b/src/vm_template/VMTemplate.cc
index 3da58faf4a..dd7e50e77b 100644
--- a/src/vm_template/VMTemplate.cc
+++ b/src/vm_template/VMTemplate.cc
@@ -220,7 +220,7 @@ int VMTemplate::from_xml(const string& xml)
     rc += xpath(uname,      "/VMTEMPLATE/UNAME",   "not_found");
     rc += xpath(gname,      "/VMTEMPLATE/GNAME",   "not_found");
     rc += xpath(name,       "/VMTEMPLATE/NAME",    "not_found");
-    rc += xpath(regtime,    "/VMTEMPLATE/REGTIME", 0);
+    rc += xpath<time_t>(regtime, "/VMTEMPLATE/REGTIME", 0);
 
     // Permissions
     rc += perms_from_xml();

From 49e87d9b442ce57f5ccfd64078abee31595731c2 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 4 Feb 2016 18:36:44 +0100
Subject: [PATCH 186/197] Feature #4217: the zie was not being set in the image
 template

(cherry picked from commit 756cd887721defc8b70474e42f1db01de20c08ae)
---
 src/rm/RequestManagerAllocate.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc
index 44454fad46..257d7c2cfe 100644
--- a/src/rm/RequestManagerAllocate.cc
+++ b/src/rm/RequestManagerAllocate.cc
@@ -289,6 +289,7 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
     long long     size_mb;
     istringstream iss;
+    ostringstream oss;
 
     string ds_name;
     string ds_data;
@@ -391,7 +392,7 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
 
         if ( app == 0 )
         {
-            att.resp_msg = "Cannot determine image SIZE: " + size_str;
+            att.resp_msg = "Cannot determine image SIZE.";
             failure_response(INTERNAL, att);
 
             delete tmpl;
@@ -419,6 +420,9 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
         market->to_xml(extra_data);
 
         market->unlock();
+
+        oss << size_mb;
+        size_str = oss.str();
     }
     else
     {
@@ -446,7 +450,6 @@ void ImageAllocate::request_execute(xmlrpc_c::paramList const& params,
         }
     }
 
-
     if (ds_check && (size_mb > avail))
     {
         att.resp_msg = "Not enough space in datastore";

From 313eb34a7be833817b67a861080cc84d92f5083b Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 5 Feb 2016 11:02:50 +0100
Subject: [PATCH 187/197] feature #4217: Fix error after merge from 4215.
 Change messages to "virtual router"

---
 src/nebula/Nebula.cc                   |  1 +
 src/rm/RequestManagerVMTemplate.cc     |  2 +-
 src/rm/RequestManagerVirtualMachine.cc | 38 +++++++-------------------
 src/rm/RequestManagerVirtualRouter.cc  |  4 +--
 4 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 266de84db1..d560626d05 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -1090,6 +1090,7 @@ int Nebula::get_conf_attribute(
 
     for (it = values.begin(); it != values.end(); it ++)
     {
+        value         = *it;
         template_name = (*it)->vector_value("NAME");
         name_upper    = name;
 
diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc
index c550690abc..e2d16efcc2 100644
--- a/src/rm/RequestManagerVMTemplate.cc
+++ b/src/rm/RequestManagerVMTemplate.cc
@@ -51,7 +51,7 @@ void VMTemplateInstantiate::request_execute(xmlrpc_c::paramList const& paramList
 
     if (is_vrouter)
     {
-        att.resp_msg = "Templates with VROUTER=YES cannot be instantiated as stand-alone VMs";
+        att.resp_msg = "Virtual router templates cannot be instantiated as stand-alone VMs";
         failure_response(ACTION, att);
         return;
     }
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index 4a3ddd749d..d90a231a14 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -548,37 +548,19 @@ void VirtualMachineAction::request_execute(xmlrpc_c::paramList const& paramList,
     {
         bool failure = true;
 
-        // Just in case, we check if the VRouter does not exist for a delete
-        // operation.
+        // Delete operation is allowed for orphan virtual router VMs.
         if (action == History::DELETE_ACTION ||
             action == History::SHUTDOWN_ACTION ||
             action == History::SHUTDOWN_HARD_ACTION)
         {
-            int vrid = vm->get_vrouter_id();
-
-            vm->unlock();
-
-            VirtualRouterPool*  vrpool = Nebula::instance().get_vrouterpool();
-            VirtualRouter *     vrouter = vrpool->get(vrid, true);
-
-            if (vrouter == 0)
-            {
-                failure = false;
-            }
-            else
-            {
-                vrouter->unlock();
-            }
-
-            if ((vm = get_vm(id, att)) == 0)
-            {
-                return;
-            }
+            VirtualRouterPool* vrpool = Nebula::instance().get_vrouterpool();
+            failure = (vrpool->get(vm->get_vrouter_id(), false) != 0);
         }
 
         if (failure)
         {
-            att.resp_msg = "Action \""+action_st+"\" is not supported for Virtual Router VMs";
+            att.resp_msg = "Action \""+action_st+"\" is not supported for "
+                "virtual router VMs";
             failure_response(ACTION, att);
 
             vm->unlock();
@@ -1049,7 +1031,7 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(action))
     {
-        att.resp_msg = "Migration is not supported for Virtual Router VMs";
+        att.resp_msg = "Migration is not supported for virtual router VMs";
         failure_response(ACTION, att);
 
         vm->unlock();
@@ -1600,7 +1582,7 @@ void VirtualMachineAttach::request_execute(xmlrpc_c::paramList const& paramList,
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::DISK_ATTACH_ACTION))
     {
-        att.resp_msg = "Action is not supported for Virtual Router VMs";
+        att.resp_msg = "Action is not supported for virtual router VMs";
         failure_response(ACTION, att);
 
         vm->unlock();
@@ -1683,7 +1665,7 @@ void VirtualMachineDetach::request_execute(xmlrpc_c::paramList const& paramList,
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_DETACH_ACTION))
     {
-        att.resp_msg = "Action is not supported for Virtual Router VMs";
+        att.resp_msg = "Action is not supported for virtual router VMs";
         failure_response(ACTION, att);
 
         vm->unlock();
@@ -2135,7 +2117,7 @@ void VirtualMachineAttachNic::request_execute(
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_ATTACH_ACTION))
     {
-        att.resp_msg = "Action is not supported for Virtual Router VMs";
+        att.resp_msg = "Action is not supported for virtual router VMs";
         failure_response(Request::ACTION, att);
 
         vm->unlock();
@@ -2272,7 +2254,7 @@ void VirtualMachineDetachNic::request_execute(
 
     if (vm->is_vrouter() && !vm->is_vrouter_action_supported(History::NIC_DETACH_ACTION))
     {
-        att.resp_msg = "Action is not supported for Virtual Router VMs";
+        att.resp_msg = "Action is not supported for virtual router VMs";
         failure_response(Request::ACTION, att);
 
         vm->unlock();
diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc
index 7841d7f229..bc5139e7e1 100644
--- a/src/rm/RequestManagerVirtualRouter.cc
+++ b/src/rm/RequestManagerVirtualRouter.cc
@@ -88,7 +88,7 @@ void VirtualRouterInstantiate::request_execute(
 
     if (has_vmids)
     {
-        att.resp_msg = "Virtual Router already has VMs. Cannot instantiate new ones";
+        att.resp_msg = "Virtual router already has VMs. Cannot instantiate new ones";
         failure_response(ACTION, att);
         return;
     }
@@ -109,7 +109,7 @@ void VirtualRouterInstantiate::request_execute(
 
     if (!is_vrouter)
     {
-        att.resp_msg = "Only Templates with VROUTER=YES are allowed";
+        att.resp_msg = "Only virtual router templates are allowed";
         failure_response(ACTION, att);
         return;
     }

From 37cc97f23d9c1cc517c9ff425832106222f9d27f Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 5 Feb 2016 12:01:42 +0100
Subject: [PATCH 188/197] Feature #4217: Fix bug in monitor

---
 src/market_mad/remotes/one/monitor | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/market_mad/remotes/one/monitor b/src/market_mad/remotes/one/monitor
index 9755865d26..6806cdd8fa 100755
--- a/src/market_mad/remotes/one/monitor
+++ b/src/market_mad/remotes/one/monitor
@@ -114,6 +114,8 @@ class OneMarket
         return if val.nil?
         return if val.class == String && val.empty?
 
+        val.gsub!('"','\"') if val.class == String
+
         str << "#{name}=\"#{val}\"\n"
     end
 
@@ -144,4 +146,3 @@ end
 #TODO get marketplace URL from MARKETPLACE Templace for other markets
 one_market = OneMarket.new
 puts one_market.get_appliances()
-

From 91c489abace55a90e0bdd9b9335327a30be553d1 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sun, 7 Feb 2016 18:01:42 +0100
Subject: [PATCH 189/197] feature #4217: Generic parse of CONTEXT attribute.
 Fix in clean up VM

---
 include/VirtualMachine.h    |  14 +--
 src/lcm/LifeCycleActions.cc |   1 -
 src/vm/VirtualMachine.cc    | 171 ++++++++++--------------------------
 3 files changed, 54 insertions(+), 132 deletions(-)

diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h
index 319252adfa..6962d602e4 100644
--- a/include/VirtualMachine.h
+++ b/include/VirtualMachine.h
@@ -2051,13 +2051,15 @@ private:
     int parse_context(string& error_str);
 
     /**
-     * Parses the current contents of the context vector attribute,
-     * without adding any attributes. Substitutes $VARIABLE,
-     * $VARIABLE[ATTR] and $VARIABLE[ATTR, ATTR = VALUE]
-     *
-     * @return 0 on success
+     * Parses the current contents of the context vector attribute, without
+     * adding any attributes. Substitutes $VARIABLE, $VARIABLE[ATTR] and
+     * $VARIABLE[ATTR, ATTR = VALUE]
+     *   @param pointer to the context attribute. It will be updated to point
+     *   to the new parsed CONTEXT
+     *   @param error_str description in case of error
+     *   @return 0 on success
      */
-    int reparse_context();
+    int parse_context_variables(VectorAttribute ** context, string& error_str);
 
     /**
      *  Parse the "SCHED_REQUIREMENTS" attribute of the template by substituting
diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc
index ab17317ad2..cef57faded 100644
--- a/src/lcm/LifeCycleActions.cc
+++ b/src/lcm/LifeCycleActions.cc
@@ -957,7 +957,6 @@ void  LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag
 
         case VirtualMachine::HOTPLUG_NIC:
             vm->attach_nic_success();
-            vm->detach_nic_success();
             vmpool->update(vm);
 
             vm->set_running_etime(the_time);
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 406a25067f..18c7e17627 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -923,50 +923,20 @@ static void clear_context_network(const char* vars[][2], int num_vars,
 
 int VirtualMachine::parse_context(string& error_str)
 {
-    int rc, num;
-
-    vector<Attribute *> array_context;
-    VectorAttribute *   context;
-    VectorAttribute *   context_parsed;
-
-    string * str;
-    string   parsed;
-    string   files_ds;
-    string   files_ds_parsed;
-    string   st;
-
-    ostringstream oss_parsed;
-
-    vector<int>  img_ids;
-
-    num = obj_template->remove("CONTEXT", array_context);
-
-    if ( num == 0 )
-    {
-        return 0;
-    }
-    else if ( num > 1 )
-    {
-        error_str = "Only one CONTEXT attribute can be defined.";
-        goto error_cleanup;
-    }
-
-    context = dynamic_cast<VectorAttribute *>(array_context[0]);
+    VectorAttribute * context = obj_template->get("CONTEXT");
 
     if ( context == 0 )
     {
-        error_str = "Wrong format for CONTEXT attribute.";
-        goto error_cleanup;
+        return 0;
     }
 
-    //Backup datastore files to parse them later
-
-    files_ds = context->vector_value("FILES_DS");
+    string files_ds = context->vector_value("FILES_DS");
 
     context->remove("FILES_DS");
 
-    // ----------- Inject Network context in marshalled string  ----------------
-
+    // -------------------------------------------------------------------------
+    // Inject Network context in marshalled string
+    // -------------------------------------------------------------------------
     bool net_context;
     context->vector_value("NETWORK", net_context);
 
@@ -989,37 +959,25 @@ int VirtualMachine::parse_context(string& error_str)
     }
 
     // -------------------------------------------------------------------------
-    // Parse CONTEXT variables & free vector attributes
+    // Parse CONTEXT variables
     // -------------------------------------------------------------------------
-
-    str = context->marshall();
-
-    if (str == 0)
+    if (parse_context_variables(&context, error_str) == -1)
     {
-        error_str = "Cannot marshall CONTEXT";
-        goto error_cleanup;
-    }
-
-    rc = parse_template_attribute(*str, parsed, error_str);
-
-    delete str;
-
-    if (rc != 0)
-    {
-        goto error_cleanup;
-    }
-
-    for (int i = 0; i < num ; i++)
-    {
-        delete array_context[i];
+        return -1;
     }
 
     // -------------------------------------------------------------------------
     // Parse FILE_DS variables
     // -------------------------------------------------------------------------
-
     if (!files_ds.empty())
     {
+        string files_ds_parsed;
+        string st;
+
+        ostringstream oss_parsed;
+
+        vector<int> img_ids;
+
         if ( parse_file_attribute(files_ds, img_ids, error_str) != 0 )
         {
             return -1;
@@ -1073,52 +1031,45 @@ int VirtualMachine::parse_context(string& error_str)
                 }
             }
         }
+
+        files_ds_parsed = oss_parsed.str();
+
+        if ( !files_ds_parsed.empty() )
+        {
+            context->replace("FILES_DS", files_ds_parsed);
+        }
     }
 
-    files_ds_parsed = oss_parsed.str();
-
-    context_parsed = new VectorAttribute("CONTEXT");
-    context_parsed->unmarshall(parsed);
-
-    if ( !files_ds_parsed.empty() )
-    {
-        context_parsed->replace("FILES_DS", files_ds_parsed);
-    }
-
-    obj_template->set(context_parsed);
-
     // -------------------------------------------------------------------------
     // OneGate URL
     // -------------------------------------------------------------------------
-
     bool token;
-    context_parsed->vector_value("TOKEN", token);
+    context->vector_value("TOKEN", token);
 
     if (token)
     {
-        string endpoint;
+        string ep;
 
-        Nebula::instance().get_configuration_attribute(
-                    "ONEGATE_ENDPOINT", endpoint);
+        Nebula::instance().get_configuration_attribute("ONEGATE_ENDPOINT", ep);
 
-        if ( endpoint.empty() )
+        if ( ep.empty() )
         {
             error_str = "CONTEXT/TOKEN set, but OneGate endpoint was not "
                 "defined in oned.conf or CONTEXT.";
             return -1;
         }
 
-        context_parsed->replace("ONEGATE_ENDPOINT", endpoint);
-        context_parsed->replace("VMID", oid);
+        context->replace("ONEGATE_ENDPOINT", ep);
+        context->replace("VMID", oid);
 
-        // The token_password is taken from the owner user's template.
-        // We store this original owner in case a chown operation is performed.
+        // Store the original owner to compute token_password in case of a chown
         add_template_attribute("CREATED_BY", uid);
     }
 
     // -------------------------------------------------------------------------
     // Virtual Router attributes
     // -------------------------------------------------------------------------
+    string st;
 
     for (int i = 0; i < NUM_VROUTER_ATTRIBUTES; i++)
     {
@@ -1126,46 +1077,23 @@ int VirtualMachine::parse_context(string& error_str)
 
         if (!st.empty())
         {
-            context_parsed->replace(VROUTER_ATTRIBUTES[i], st);
+            context->replace(VROUTER_ATTRIBUTES[i], st);
         }
     }
 
-    return rc;
-
-error_cleanup:
-    for (int i = 0; i < num ; i++)
-    {
-        delete array_context[i];
-    }
-
-    return -1;
+    return 0;
 }
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
-int VirtualMachine::reparse_context()
+int VirtualMachine::parse_context_variables(VectorAttribute ** context,
+        string& error_str)
 {
     int rc;
 
-    VectorAttribute * context_parsed;
-
-    string * str;
     string   parsed;
-    string   error_str;
-
-    const VectorAttribute * context = obj_template->get("CONTEXT");
-
-    if ( context == 0 )
-    {
-        return -1;
-    }
-
-    // -------------------------------------------------------------------------
-    // Parse CONTEXT variables & free vector attributes
-    // -------------------------------------------------------------------------
-
-    str = context->marshall();
+    string * str = (*context)->marshall();
 
     if (str == 0)
     {
@@ -1181,11 +1109,11 @@ int VirtualMachine::reparse_context()
         return -1;
     }
 
-    context_parsed = new VectorAttribute("CONTEXT");
-    context_parsed->unmarshall(parsed);
+    *context = new VectorAttribute("CONTEXT");
+    (*context)->unmarshall(parsed);
 
     obj_template->erase("CONTEXT");
-    obj_template->set(context_parsed);
+    obj_template->set(*context);
 
     return 0;
 }
@@ -2552,20 +2480,11 @@ VectorAttribute * VirtualMachine::get_attach_nic_info(
     // -------------------------------------------------------------------------
     // Get the new NIC attribute from the template
     // -------------------------------------------------------------------------
-
-    nics.clear();
-
-    if ( tmpl->get("NIC", nics) != 1 )
-    {
-        error_str = "The template must contain one NIC attribute";
-        return 0;
-    }
-
     nic = tmpl->get("NIC");
 
     if ( nic == 0 )
     {
-        error_str = "Internal error parsing NIC attribute";
+        error_str = "Wrong format or missing NIC attribute";
         return 0;
     }
 
@@ -2682,7 +2601,8 @@ VectorAttribute * VirtualMachine::attach_nic_failure()
 
 void VirtualMachine::detach_nic_failure()
 {
-    bool net_context;
+    bool   net_context;
+    string err;
 
     VectorAttribute * nic = get_attach_nic();
 
@@ -2713,7 +2633,7 @@ void VirtualMachine::detach_nic_failure()
                     context, nic);
         }
 
-        reparse_context();
+        parse_context_variables(&context, err);
     }
 }
 
@@ -2741,7 +2661,8 @@ void VirtualMachine::set_attach_nic(
         VectorAttribute *       new_nic,
         vector<VectorAttribute*> &rules)
 {
-    bool                net_context;
+    bool   net_context;
+    string err;
 
     vector<VectorAttribute*>::iterator it;
 
@@ -2774,7 +2695,7 @@ void VirtualMachine::set_attach_nic(
                     context, new_nic);
         }
 
-        reparse_context();
+        parse_context_variables(&context, err);
     }
 }
 

From 333713d1df659102ccd2cde736b69c223d0fa980 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sun, 7 Feb 2016 18:19:25 +0100
Subject: [PATCH 190/197] feature #4217: Remove cast

---
 include/VirtualRouter.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h
index da5836efc5..2a31cbdaf5 100644
--- a/include/VirtualRouter.h
+++ b/include/VirtualRouter.h
@@ -67,8 +67,7 @@ public:
      */
     Template * clone_template() const
     {
-        return new Template(
-                *(static_cast<Template *>(obj_template)));
+        return new Template(obj_template);
     };
 
     Template * get_vm_template() const;
@@ -249,7 +248,7 @@ private:
      *
      * @return 0 on success, -1 otherwise
      */
-    int release_network_leases(VectorAttribute const * nic);
+    int release_network_leases(const VectorAttribute  * nic);
 
     /**
      * Returns the nic with the giver nic_id, or 0

From b20b96e76e0d42548771bb8eb0d218f7ab435dd9 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 8 Feb 2016 10:44:01 +0100
Subject: [PATCH 191/197] Feature #4217: Add marketplaceapps-tab

---
 src/sunstone/etc/sunstone-views/admin.yaml    |  40 ++++-
 src/sunstone/etc/sunstone-views/user.yaml     |  34 ++++
 src/sunstone/public/app/main.js               |   1 +
 .../public/app/tabs/marketplaceapps-tab.js    |  58 +++++++
 .../app/tabs/marketplaceapps-tab/actions.js   |  48 ++++++
 .../app/tabs/marketplaceapps-tab/buttons.js   |  52 +++++++
 .../app/tabs/marketplaceapps-tab/datatable.js | 146 ++++++++++++++++++
 .../app/tabs/marketplaceapps-tab/tabId.js     |  19 +++
 8 files changed, 391 insertions(+), 7 deletions(-)
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab/tabId.js

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 3df41f6a2d..9159b6bd9e 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -25,6 +25,7 @@ enabled_tabs:
     - oneflow-services-tab
     - oneflow-templates-tab
     - marketplaces-tab
+    - marketplaceapps-tab
     - settings-tab
     - support-tab
 autorefresh: true
@@ -597,10 +598,35 @@ tabs:
             - 7         # Driver
             #- 8        # Labels
         actions:
-            Datastore.refresh: true
-            #Datastore.create_dialog: true
-            Datastore.rename: true
-            Datastore.chown: true
-            Datastore.chgrp: true
-            Datastore.chmod: true
-            Datastore.delete: true
+            MarketPlace.refresh: true
+            #MarketPlace.create_dialog: true
+            MarketPlace.rename: true
+            MarketPlace.chown: true
+            MarketPlace.chgrp: true
+            MarketPlace.chmod: true
+            MarketPlace.delete: true
+    marketplaceapps-tab:
+        panel_tabs:
+            #marketplaces_info_tab: true
+            #marketplaces_apps_tab: true
+        table_columns:
+            - 0         # Checkbox
+            - 1         # ID
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
+            #- 5         # Version
+            - 6         # Size
+            - 7         # State
+            #- 8         # Type
+            - 9         # Registration
+            - 10        # Marketplace
+            #- 11        # Labels
+        actions:
+            MarketPlaceApp.refresh: true
+            #MarketPlaceApp.create_dialog: true
+            MarketPlaceApp.rename: true
+            MarketPlaceApp.chown: true
+            MarketPlaceApp.chgrp: true
+            MarketPlaceApp.chmod: true
+            MarketPlaceApp.delete: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index f1bfb15061..3d253d6205 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -24,6 +24,7 @@ enabled_tabs:
     - oneflow-services-tab
     - oneflow-templates-tab
     - marketplaces-tab
+    - marketplaceapps-tab
     - settings-tab
     #- support-tab
 autorefresh: true
@@ -591,3 +592,36 @@ tabs:
             - 6         # Apps
             - 7         # Driver
             #- 8        # Labels
+        actions:
+            MarketPlace.refresh: true
+            #MarketPlace.create_dialog: true
+            MarketPlace.rename: true
+            MarketPlace.chown: true
+            MarketPlace.chgrp: true
+            MarketPlace.chmod: true
+            MarketPlace.delete: true
+    marketplaceapps-tab:
+        panel_tabs:
+            #marketplaces_info_tab: true
+            #marketplaces_apps_tab: true
+        table_columns:
+            - 0         # Checkbox
+            - 1         # ID
+            - 2         # Owner
+            - 3         # Group
+            - 4         # Name
+            #- 5         # Version
+            - 6         # Size
+            - 7         # State
+            #- 8         # Type
+            - 9         # Registration
+            - 10        # Marketplace
+            #- 11        # Labels
+        actions:
+            MarketPlaceApp.refresh: true
+            #MarketPlaceApp.create_dialog: true
+            MarketPlaceApp.rename: true
+            MarketPlaceApp.chown: true
+            MarketPlaceApp.chgrp: true
+            MarketPlaceApp.chmod: true
+            MarketPlaceApp.delete: true
diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js
index 3360e6ffe6..223b5de98f 100644
--- a/src/sunstone/public/app/main.js
+++ b/src/sunstone/public/app/main.js
@@ -143,6 +143,7 @@ require.config({
         'tabs/oneflow-services-tab',
         'tabs/oneflow-templates-tab',
         'tabs/marketplaces-tab',
+        'tabs/marketplaceapps-tab',
         'tabs/settings-tab',
         'tabs/support-tab'
       ]
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab.js b/src/sunstone/public/app/tabs/marketplaceapps-tab.js
new file mode 100644
index 0000000000..c28fee6424
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab.js
@@ -0,0 +1,58 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Locale = require('utils/locale');
+  var Buttons = require('./marketplaceapps-tab/buttons');
+  var Actions = require('./marketplaceapps-tab/actions');
+  var Table = require('./marketplaceapps-tab/datatable');
+
+  var TAB_ID = require('./marketplaceapps-tab/tabId');
+  var DATATABLE_ID = "dataTableMarketplaceApps";
+
+  var _dialogs = [
+  ];
+
+  var _panels = [
+    //require('./marketplaceapps-tab/panels/info')
+  ];
+
+  var _panelsHooks = [
+    require('../utils/hooks/header')
+  ];
+
+  var _formPanels = [
+    //require('./datastores-tab/form-panels/create')
+  ];
+
+  var Tab = {
+    tabId: TAB_ID,
+    title: '<i class="fa fa-lg fa-fw fa-shopping-cart"></i>&emsp;' + Locale.tr("Apps"),
+    listHeader: '<i class="fa fa-fw fa-shopping-cart"></i>&emsp;'+Locale.tr("Apps"),
+    infoHeader: '<i class="fa fa-fw fa-shopping-cart"></i>&emsp;'+Locale.tr("App"),
+    subheader: '<span/> <small></small>&emsp;',
+    resource: 'MarketPlace',
+    buttons: Buttons,
+    actions: Actions,
+    dataTable: new Table(DATATABLE_ID, {actions: true, info: true, oneSelection: true}),
+    panels: _panels,
+    panelsHooks: _panelsHooks,
+    formPanels: _formPanels,
+    dialogs: _dialogs
+  };
+
+  return Tab;
+});
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js
new file mode 100644
index 0000000000..b1f4e868f6
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js
@@ -0,0 +1,48 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Sunstone = require('sunstone');
+  var Notifier = require('utils/notifier');
+  var Locale = require('utils/locale');
+  var CommonActions = require('utils/common-actions');
+  var OpenNebulaResource = require('opennebula/marketplaceapp');
+
+  var RESOURCE = "MarketPlaceApp";
+  var XML_ROOT = "MARKETPLACEAPP";
+  var TAB_ID = require('./tabId');
+  //var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId');
+
+  var _commonActions = new CommonActions(OpenNebulaResource, RESOURCE, TAB_ID, XML_ROOT);
+
+  var _actions = {
+    //"MarketPlaceApp.create" : _commonActions.create(CREATE_DIALOG_ID),
+    //"MarketPlaceApp.create_dialog" : _commonActions.showCreate(CREATE_DIALOG_ID),
+    "MarketPlaceApp.list" : _commonActions.list(),
+    "MarketPlaceApp.show" : _commonActions.show(),
+    "MarketPlaceApp.refresh" : _commonActions.refresh(),
+    "MarketPlaceApp.delete" : _commonActions.del(),
+    "MarketPlaceApp.chown": _commonActions.multipleAction('chown'),
+    "MarketPlaceApp.chgrp": _commonActions.multipleAction('chgrp'),
+    "MarketPlaceApp.chmod": _commonActions.singleAction('chmod'),
+    //"MarketPlaceApp.update" : _commonActions.updateTemplate(),
+    //"MarketPlaceApp.update_template" : _commonActions.updateTemplate(),
+    //"MarketPlaceApp.append_template" : _commonActions.appendTemplate(),
+    "MarketPlaceApp.rename": _commonActions.singleAction('rename')
+  }
+
+  return _actions;
+});
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
new file mode 100644
index 0000000000..a18bf212ee
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
@@ -0,0 +1,52 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  var Locale = require('utils/locale');
+
+  var MarketPlaceAppButtons = {
+    "MarketPlaceApp.refresh" : {
+      type: "action",
+      layout: "refresh",
+      alwaysActive: true
+    },
+    //"MarketPlaceApp.create_dialog" : {
+    //  type: "create_dialog",
+    //  layout: "create"
+    //},
+    "MarketPlaceApp.chown" : {
+      type: "confirm_with_select",
+      text: Locale.tr("Change owner"),
+      select: "User",
+      layout: "user_select",
+      tip: Locale.tr("Select the new owner") + ":"
+    },
+    "MarketPlaceApp.chgrp" : {
+      type: "confirm_with_select",
+      text: Locale.tr("Change group"),
+      select: "Group",
+      layout: "user_select",
+      tip: Locale.tr("Select the new group") + ":"
+    },
+    "MarketPlaceApp.delete" : {
+      type: "confirm",
+      text: Locale.tr("Delete"),
+      layout: "del"
+    }
+  };
+
+  return MarketPlaceAppButtons;
+})
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
new file mode 100644
index 0000000000..2de164ac39
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
@@ -0,0 +1,146 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var TabDataTable = require('utils/tab-datatable');
+  var SunstoneConfig = require('sunstone-config');
+  var Locale = require('utils/locale');
+  var OpenNebulaMarketPlaceApp = require('opennebula/marketplaceapp');
+  var OpenNebulaMarketPlace = require('opennebula/marketplace');
+  var LabelsUtils = require('utils/labels/utils');
+  var Humanize = require('utils/humanize');
+
+  /*
+    CONSTANTS
+   */
+
+  var RESOURCE = "MarketPlaceApp";
+  var XML_ROOT = "MARKETPLACEAPP";
+  var TAB_NAME = require('./tabId');
+  var LABELS_COLUMN = 11;
+  var TEMPLATE_ATTR = 'TEMPLATE';
+
+  /*
+    CONSTRUCTOR
+   */
+
+  /*
+    @dataTableId
+    @param {String} dataTableId unique identifier
+    @param {Object} conf
+      conf = {
+        'info': true,     enable on click row will show the element
+        'action': true,   enable actions on row elements
+        'select': true,   enable selecting elements from the table
+        'selectOptions': {
+          'filter_fn': function(ds) { return ds.TYPE == 0; }
+        }
+      }
+    @returns {Table} A new table object
+   */
+  function Table(dataTableId, conf) {
+    this.conf = conf || {};
+    this.tabId = TAB_NAME;
+    this.dataTableId = dataTableId;
+    this.resource = RESOURCE;
+    this.xmlRoot = XML_ROOT;
+    this.labelsColumn = LABELS_COLUMN;
+
+    this.dataTableOptions = {
+      "bAutoWidth": false,
+      "bSortClasses" : false,
+      "bDeferRender": true,
+      "aoColumnDefs": [
+          {"bSortable": false, "aTargets": ["check"]},
+          {"sWidth": "35px", "aTargets": [0]},
+          {"sWidth": "250px", "aTargets": [5]},
+          {"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)},
+          {"bVisible": false, "aTargets": ['_all']}
+      ]
+    }
+
+    this.columns = [
+      Locale.tr("ID"),
+      Locale.tr("Owner"),
+      Locale.tr("Group"),
+      Locale.tr("Name"),
+      Locale.tr("Version"),
+      Locale.tr("Size"),
+      Locale.tr("State"),
+      Locale.tr("Type"),
+      Locale.tr("Registration Time"),
+      Locale.tr("Marketplace"),
+      Locale.tr("Labels")
+    ]
+
+    this.selectOptions = {
+      "id_index": 1,
+      "name_index": 4,
+      "uname_index": 2,
+      "select_resource": Locale.tr("Please select an appliance from the list"),
+      "you_selected": Locale.tr("You selected the following appliance:"),
+      "select_resource_multiple": Locale.tr("Please select one or more appliances from the list"),
+      "you_selected_multiple": Locale.tr("You selected the following appliances:")
+    }
+
+    TabDataTable.call(this);
+  };
+
+  Table.prototype = Object.create(TabDataTable.prototype);
+  Table.prototype.constructor = Table;
+  Table.prototype.elementArray = _elementArray;
+
+  return Table;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _elementArray(element_json) {
+    var element = element_json[XML_ROOT];
+
+    return [
+        '<input class="check_item" type="checkbox" id="'+RESOURCE.toLowerCase()+'_' +
+                             element.ID + '" name="selected_items" value="' +
+                             element.ID + '"/>',
+        element.ID,
+        element.UNAME,
+        element.GNAME,
+        element.NAME,
+        element.VERSION,
+        Humanize.sizeFromMB(element.SIZE),
+        OpenNebulaMarketPlaceApp.stateStr(element.STATE),
+        OpenNebulaMarketPlaceApp.typeStr(element.TYPE),
+        Humanize.prettyTime(element.REGTIME),
+        OpenNebulaMarketPlace.getName(element.MARKETPLACE_ID),
+        (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'')
+    ];
+  }
+
+  function _lengthOf(ids){
+    var l = 0;
+    if ($.isArray(ids))
+      l = ids.length;
+    else if (!$.isEmptyObject(ids))
+      l = 1;
+
+    return l;
+  }
+});
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/tabId.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/tabId.js
new file mode 100644
index 0000000000..dc659b47c1
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/tabId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'marketplaceapps-tab';
+});

From 6785e0fe02e43e8e342465b14e981a08dc7806df Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 8 Feb 2016 16:36:19 +0100
Subject: [PATCH 192/197] feature #4217: Fix checkAndShowUpdate

---
 src/sunstone/public/app/utils/common-actions.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/sunstone/public/app/utils/common-actions.js b/src/sunstone/public/app/utils/common-actions.js
index cfced4cb09..e2fb0992ea 100644
--- a/src/sunstone/public/app/utils/common-actions.js
+++ b/src/sunstone/public/app/utils/common-actions.js
@@ -188,7 +188,19 @@ define(function(require) {
 
   function _checkAndShowUpdate() {
     var that = this;
-    return _checkAndShow("show_to_update");
+    return {
+      type: 'single',
+      call: function() {
+        var selectedNodes = Sunstone.getDataTable(that.tabId).elements();
+        if (selectedNodes.length != 1) {
+          Notifier.notifyMessage('Please select one (and just one) resource to update.');
+          return false;
+        }
+
+        var resourceId = '' + selectedNodes[0];
+        Sunstone.runAction(that.resourceStr + '.show_to_update', resourceId);
+      }
+    }
   }
 
   function _checkAndShow(action) {

From fcd3206a2650bb6f1b58ce82e061f6982a50ba2b Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 8 Feb 2016 16:36:50 +0100
Subject: [PATCH 193/197] Feature #4217: Add DS_MAD_CONF to Sunstone

---
 src/sunstone/public/app/sunstone-config.js | 6 ++++++
 src/sunstone/sunstone-server.rb            | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js
index ebb8380a91..344ea28d7f 100644
--- a/src/sunstone/public/app/sunstone-config.js
+++ b/src/sunstone/public/app/sunstone-config.js
@@ -31,6 +31,7 @@ define(function(require) {
   var _imMadConf = {};
   var _vmMadConf = {};
   var _authMadConf = {};
+  var _marketMadConf = {};
 
   var Config = {
     'isTabEnabled': function(tabName) {
@@ -161,6 +162,7 @@ define(function(require) {
     'imMadConf' : _imMadConf,
     'vmMadConf' : _vmMadConf,
     'authMadConf' : _authMadConf,
+    'marketMadConf' : _marketMadConf,
     "initOnedConf" : function() {
       OpenNebulaSystem.onedconf({
         data : {},
@@ -182,6 +184,10 @@ define(function(require) {
             $.extend(true, _dsMadConf, onedconf.DS_MAD_CONF);
           }
 
+          if (onedconf.MARKET_MAD_CONF != undefined){
+            $.extend(true, _marketMadConf, onedconf.MARKET_MAD_CONF);
+          }
+
           if (onedconf.IM_MAD != undefined){
             $.extend(true, _imMadConf, onedconf.IM_MAD);
           }
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index af8065cb38..11ea98e39f 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -528,6 +528,7 @@ get '/onedconf' do
     keys = [
         :DEFAULT_COST,
         :DS_MAD_CONF,
+        :MARKET_MAD_CONF,
         :VM_MAD,
         :IM_MAD,
         :AUTH_MAD

From d299db45a8749a1d451457b2540469483a9af8ac Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 8 Feb 2016 16:37:17 +0100
Subject: [PATCH 194/197] Feature #4217: Remove SunstoneMarketplace.rb from
 install.sh

---
 install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install.sh b/install.sh
index 0536cd16cf..91da75f8c2 100755
--- a/install.sh
+++ b/install.sh
@@ -1646,7 +1646,6 @@ SUNSTONE_ETC_VIEW_FILES="src/sunstone/etc/sunstone-views/admin.yaml \
 
 SUNSTONE_MODELS_FILES="src/sunstone/models/OpenNebulaJSON.rb \
                        src/sunstone/models/SunstoneServer.rb \
-                       src/sunstone/models/SunstoneMarketplace.rb \
                        src/sunstone/models/SunstoneViews.rb"
 
 SUNSTONE_MODELS_JSON_FILES="src/sunstone/models/OpenNebulaJSON/HostJSON.rb \

From 4630a422edbc181cfe7789663231e2fe588cc504 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 8 Feb 2016 16:37:52 +0100
Subject: [PATCH 195/197] Feature #4217: Add MarketPlace create and update
 forms

---
 src/sunstone/etc/sunstone-views/admin.yaml    |   5 +-
 src/sunstone/etc/sunstone-views/user.yaml     |   3 +-
 .../marketplaceapps-tab/form-panels/create.js | 323 ++++++++++++++++++
 .../form-panels/create/advanced.hbs           |  28 ++
 .../form-panels/create/formPanelId.js         |  19 ++
 .../form-panels/create/wizard.hbs             |   0
 .../public/app/tabs/marketplaces-tab.js       |   2 +-
 .../app/tabs/marketplaces-tab/actions.js      |  14 +-
 .../app/tabs/marketplaces-tab/buttons.js      |  13 +-
 9 files changed, 393 insertions(+), 14 deletions(-)
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/advanced.hbs
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/formPanelId.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/wizard.hbs

diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 9159b6bd9e..005947e578 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -599,7 +599,8 @@ tabs:
             #- 8        # Labels
         actions:
             MarketPlace.refresh: true
-            #MarketPlace.create_dialog: true
+            MarketPlace.create_dialog: true
+            MarketPlace.update_dialog: true
             MarketPlace.rename: true
             MarketPlace.chown: true
             MarketPlace.chgrp: true
@@ -624,7 +625,7 @@ tabs:
             #- 11        # Labels
         actions:
             MarketPlaceApp.refresh: true
-            #MarketPlaceApp.create_dialog: true
+            MarketPlaceApp.create_dialog: true
             MarketPlaceApp.rename: true
             MarketPlaceApp.chown: true
             MarketPlaceApp.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 3d253d6205..c242fe0eda 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -594,7 +594,8 @@ tabs:
             #- 8        # Labels
         actions:
             MarketPlace.refresh: true
-            #MarketPlace.create_dialog: true
+            MarketPlace.create_dialog: true
+            MarketPlace.update_dialog: true
             MarketPlace.rename: true
             MarketPlace.chown: true
             MarketPlace.chgrp: true
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js
new file mode 100644
index 0000000000..db8bdc8f38
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js
@@ -0,0 +1,323 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var BaseFormPanel = require('utils/form-panels/form-panel');
+  var Sunstone = require('sunstone');
+  var Locale = require('utils/locale');
+  var Notifier = require('utils/notifier');
+  var Tips = require('utils/tips');
+  var ResourceSelect = require('utils/resource-select');
+  var Config = require('sunstone-config');
+
+  /*
+    TEMPLATES
+   */
+
+  var TemplateWizardHTML = require('hbs!./create/wizard');
+  var TemplateAdvancedHTML = require('hbs!./create/advanced');
+
+  /*
+    CONSTANTS
+   */
+
+  var FORM_PANEL_ID = require('./create/formPanelId');
+  var TAB_ID = require('../tabId');
+
+  /*
+    CONSTRUCTOR
+   */
+
+  function FormPanel() {
+    this.formPanelId = FORM_PANEL_ID;
+    this.tabId = TAB_ID;
+    this.actions = {
+      'create': {
+        'title': Locale.tr("Create MarketPlace"),
+        'buttonText': Locale.tr("Create"),
+        'resetButton': true
+      }
+    };
+
+    BaseFormPanel.call(this);
+  }
+
+  FormPanel.FORM_PANEL_ID = FORM_PANEL_ID;
+  FormPanel.prototype = Object.create(BaseFormPanel.prototype);
+  FormPanel.prototype.constructor = FormPanel;
+  FormPanel.prototype.htmlWizard = _htmlWizard;
+  FormPanel.prototype.htmlAdvanced = _htmlAdvanced;
+  FormPanel.prototype.submitWizard = _submitWizard;
+  FormPanel.prototype.submitAdvanced = _submitAdvanced;
+  FormPanel.prototype.onShow = _onShow;
+  FormPanel.prototype.setup = _setup;
+
+  return FormPanel;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _htmlWizard() {
+    return TemplateWizardHTML({
+      'formPanelId': this.formPanelId,
+    });
+  }
+
+  function _htmlAdvanced() {
+    return TemplateAdvancedHTML({formPanelId: this.formPanelId});
+  }
+
+  function _onShow(dialog) {
+    $("#name", dialog).focus();
+
+//    var cluster_id = $("div#cluster_id .resource_list_select", dialog).val();
+//    if (!cluster_id) cluster_id = "-1";
+//
+//    var cluster_id_raw = $("div#datastore_cluster_raw .resource_list_select", dialog).val();
+//    if (!cluster_id_raw) cluster_id_raw = "-1";
+//
+//    ResourceSelect.insert({
+//        context: $('#cluster_id', dialog),
+//        resourceName: 'Cluster',
+//        initValue: cluster_id,
+//        includeDefaultCluster: true
+//      });
+//
+//    ResourceSelect.insert({
+//        context: $('#datastore_cluster_raw', dialog),
+//        resourceName: 'Cluster',
+//        initValue: cluster_id_raw,
+//        includeDefaultCluster: true
+//      });
+
+    return false;
+  }
+
+  // Set up the create datastore dialog
+  function _setup(dialog) {
+    Tips.setup(dialog);
+
+    // Show custom driver input only when custom is selected in selects
+//    $('input[name="ds_tab_custom_ds_mad"],' +
+//      'input[name="ds_tab_custom_tm_mad"]', dialog).parent().hide();
+//
+//    $('select#ds_mad', dialog).change(function() {
+//      if ($(this).val() == "custom") {
+//          $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().show();
+//      } else {
+//        _setRequiredFields(dialog, $(this).val());
+//        $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().hide();
+//      }
+//    });
+//
+//    $('select#tm_mad', dialog).change(function() {
+//      if ($(this).val() == "custom")
+//          $('input[name="ds_tab_custom_tm_mad"]', dialog).parent().show();
+//      else
+//          $('input[name="ds_tab_custom_tm_mad"]', dialog).parent().hide();
+//    });
+//
+//    $('#presets', dialog).change(function() {
+//      _hideAll(dialog);
+//      var choice_str = $(this).val();
+//
+//      switch (choice_str)
+//      {
+//        case 'fs':
+//          _selectFilesystem(dialog);
+//          break;
+//        case 'vmware_vmfs':
+//          _selectVmwareVmfs(dialog);
+//          break;
+//        case 'block_lvm':
+//          _selectBlockLvm(dialog);
+//          break;
+//        case 'fs_lvm':
+//          _selectFsLvm(dialog);
+//          break;
+//        case 'ceph':
+//          _selectCeph(dialog);
+//          break;
+//        case 'gluster':
+//          _selectGluster(dialog);
+//          break;
+//        case 'dev':
+//          _selectDevices(dialog);
+//          break;
+//        case 'iscsi':
+//          _selectISCSI(dialog);
+//          break;
+//        case 'custom':
+//          _selectCustom(dialog);
+//          break;
+//      }
+//    });
+//
+//    $('#presets', dialog).change();
+//
+//    // Hide disk_type
+//    $('select#disk_type', dialog).parent().hide();
+//
+//    _hideAll(dialog);
+//    _selectFilesystem(dialog);
+  }
+
+
+  function _submitWizard(dialog) {
+//    var name            = $('#name', dialog).val();
+//    var cluster_id      = $(".resource_list_select", $('#cluster_id', dialog)).val();
+//    var ds_type         = $('input[name=ds_type]:checked', dialog).val();
+//    var ds_mad          = $('#ds_mad', dialog).val();
+//    ds_mad              = ds_mad == "custom" ? $('input[name="ds_tab_custom_ds_mad"]', dialog).val() : ds_mad;
+//    var tm_mad          = $('#tm_mad', dialog).val();
+//    tm_mad              = tm_mad == "custom" ? $('input[name="ds_tab_custom_tm_mad"]', dialog).val() : tm_mad;
+//    var type            = $('#disk_type', dialog).val();
+//
+//    var safe_dirs       = $('#safe_dirs', dialog).val();
+//    var base_path       = $('#base_path', dialog).val();
+//    var restricted_dirs = $('#restricted_dirs', dialog).val();
+//    var limit_transfer_bw = $('#limit_transfer_bw', dialog).val();
+//    var datastore_capacity_check = $('#datastore_capacity_check', dialog).is(':checked');
+//    var no_decompress   = $('#no_decompress', dialog).is(':checked');
+//
+//    var bridge_list     = $('#bridge_list', dialog).val();
+//    var ds_tmp_dir     = $('#ds_tmp_dir', dialog).val();
+//    var vg_name         = $('#vg_name', dialog).val();
+//    var limit_mb        = $('#limit_mb', dialog).val();
+//    var gluster_host    = $('#gluster_host', dialog).val();
+//    var gluster_volume  = $('#gluster_volume', dialog).val();
+//    var pool_name       = $('#pool_name', dialog).val();
+//    var ceph_host       = $('#ceph_host', dialog).val();
+//    var ceph_secret     = $('#ceph_secret', dialog).val();
+//    var ceph_user       = $('#ceph_user', dialog).val();
+//    var rbd_format      = $('#rbd_format', dialog).val();
+//    var staging_dir     = $('#staging_dir', dialog).val();
+//    var ceph_conf       = $('#ceph_conf', dialog).val();
+//    var iscsi_host      = $('#iscsi_host', dialog).val();
+//    var iscsi_user      = $('#iscsi_user', dialog).val();
+//    var iscsi_usage     = $('#iscsi_usage', dialog).val();
+//
+//    var ds_obj = {
+//      "datastore" : {
+//        "name" : name,
+//        "tm_mad" : tm_mad,
+//        "disk_type" : type,
+//        "type" : ds_type
+//      },
+//      "cluster_id" : cluster_id
+//    };
+//
+//    // If we are adding a system datastore then
+//    // we do not use ds_mad
+//    if (ds_type != "SYSTEM_DS")
+//        ds_obj.datastore.ds_mad = ds_mad;
+//
+//    if (base_path)
+//        ds_obj.datastore.base_path = base_path;
+//
+//    if (safe_dirs)
+//        ds_obj.datastore.safe_dirs = safe_dirs;
+//
+//    if (restricted_dirs)
+//        ds_obj.datastore.restricted_dirs = restricted_dirs;
+//
+//    if (limit_transfer_bw)
+//        ds_obj.datastore.limit_transfer_bw = limit_transfer_bw;
+//
+//    if (no_decompress)
+//        ds_obj.datastore.no_decompress = "YES";
+//
+//    if (datastore_capacity_check)
+//        ds_obj.datastore.datastore_capacity_check = "YES";
+//
+//    if (bridge_list)
+//        ds_obj.datastore.bridge_list = bridge_list;
+//
+//    if (ds_tmp_dir)
+//        ds_obj.datastore.ds_tmp_dir = ds_tmp_dir;
+//
+//    if (vg_name)
+//        ds_obj.datastore.vg_name = vg_name;
+//
+//    if (limit_mb)
+//        ds_obj.datastore.limit_mb = limit_mb;
+//
+//    if (gluster_host)
+//        ds_obj.datastore.gluster_host = gluster_host;
+//
+//    if (gluster_volume)
+//        ds_obj.datastore.gluster_volume = gluster_volume;
+//
+//    if (pool_name)
+//        ds_obj.datastore.pool_name = pool_name;
+//
+//    if (ceph_host)
+//        ds_obj.datastore.ceph_host = ceph_host;
+//
+//    if (ceph_secret)
+//        ds_obj.datastore.ceph_secret = ceph_secret;
+//
+//    if (ceph_user)
+//        ds_obj.datastore.ceph_user = ceph_user;
+//
+//    if (rbd_format)
+//        ds_obj.datastore.rbd_format = rbd_format;
+//
+//    if (staging_dir)
+//        ds_obj.datastore.staging_dir = staging_dir;
+//
+//    if (ceph_conf)
+//        ds_obj.datastore.ceph_conf = ceph_conf;
+//
+//    if (iscsi_host)
+//        ds_obj.datastore.iscsi_host = iscsi_host;
+//
+//    if (iscsi_user)
+//        ds_obj.datastore.iscsi_user = iscsi_user;
+//
+//    if (iscsi_usage)
+//        ds_obj.datastore.iscsi_usage = iscsi_usage;
+
+//    Sunstone.runAction("Datastore.create", ds_obj);
+    return false;
+  }
+
+  function _submitAdvanced(dialog) {
+//    var template   = $('#template', dialog).val();
+//    var cluster_id = $(".resource_list_select", $('#datastore_cluster_raw', dialog)).val();
+//
+//    if (!cluster_id) {
+//      Notifier.notifyError(Locale.tr("Please select a cluster for this datastore"));
+//      return false;
+//    }
+//
+//    var ds_obj = {
+//      "datastore" : {
+//        "datastore_raw" : template
+//      },
+//      "cluster_id" : cluster_id
+//    };
+//
+//    Sunstone.runAction("Datastore.create", ds_obj);
+    return false;
+  }
+});
+
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/advanced.hbs
new file mode 100644
index 0000000000..d7b566fc5e
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/advanced.hbs
@@ -0,0 +1,28 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<form data-abide="ajax" id="{{formPanelId}}Advanced" class="custom creation">
+  <div class="row">
+    <div class="large-12 columns">
+      <p>{{tr "Write the MarketPlace Appliance template here"}}</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-12 columns">
+      <textarea id="template" rows="15" required></textarea>
+    </div>
+  </div>
+</form>
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/formPanelId.js
new file mode 100644
index 0000000000..feae10b60f
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/formPanelId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  return 'createMarketPlaceAppForm';
+})
diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/wizard.hbs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab.js b/src/sunstone/public/app/tabs/marketplaces-tab.js
index c5bafd992a..5f277fdf36 100644
--- a/src/sunstone/public/app/tabs/marketplaces-tab.js
+++ b/src/sunstone/public/app/tabs/marketplaces-tab.js
@@ -35,7 +35,7 @@ define(function(require) {
   ];
 
   var _formPanels = [
-    //require('./datastores-tab/form-panels/create')
+    require('./marketplaces-tab/form-panels/create')
   ];
 
   var Tab = {
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/actions.js b/src/sunstone/public/app/tabs/marketplaces-tab/actions.js
index 1a7c25f254..d99647fe22 100644
--- a/src/sunstone/public/app/tabs/marketplaces-tab/actions.js
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/actions.js
@@ -24,13 +24,13 @@ define(function(require) {
   var RESOURCE = "MarketPlace";
   var XML_ROOT = "MARKETPLACE";
   var TAB_ID = require('./tabId');
-  //var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId');
+  var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId');
 
   var _commonActions = new CommonActions(OpenNebulaResource, RESOURCE, TAB_ID, XML_ROOT);
 
   var _actions = {
-    //"MarketPlace.create" : _commonActions.create(CREATE_DIALOG_ID),
-    //"MarketPlace.create_dialog" : _commonActions.showCreate(CREATE_DIALOG_ID),
+    "MarketPlace.create" : _commonActions.create(CREATE_DIALOG_ID),
+    "MarketPlace.create_dialog" : _commonActions.showCreate(CREATE_DIALOG_ID),
     "MarketPlace.list" : _commonActions.list(),
     "MarketPlace.show" : _commonActions.show(),
     "MarketPlace.refresh" : _commonActions.refresh(),
@@ -38,9 +38,11 @@ define(function(require) {
     "MarketPlace.chown": _commonActions.multipleAction('chown'),
     "MarketPlace.chgrp": _commonActions.multipleAction('chgrp'),
     "MarketPlace.chmod": _commonActions.singleAction('chmod'),
-    //"MarketPlace.update" : _commonActions.updateTemplate(),
-    //"MarketPlace.update_template" : _commonActions.updateTemplate(),
-    //"MarketPlace.append_template" : _commonActions.appendTemplate(),
+    "MarketPlace.update" : _commonActions.update(),
+    "MarketPlace.update_template" : _commonActions.updateTemplate(),
+    "MarketPlace.append_template" : _commonActions.appendTemplate(),
+    "MarketPlace.update_dialog" : _commonActions.checkAndShowUpdate(),
+    "MarketPlace.show_to_update" : _commonActions.showUpdate(CREATE_DIALOG_ID),
     "MarketPlace.rename": _commonActions.singleAction('rename')
   }
 
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js b/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js
index dbebbf948b..fa4300b9b8 100644
--- a/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js
@@ -23,10 +23,15 @@ define(function(require) {
       layout: "refresh",
       alwaysActive: true
     },
-    //"MarketPlace.create_dialog" : {
-    //  type: "create_dialog",
-    //  layout: "create"
-    //},
+    "MarketPlace.create_dialog" : {
+      type: "create_dialog",
+      layout: "create"
+    },
+    "MarketPlace.update_dialog" : {
+      type: "action",
+      layout: "main",
+      text: Locale.tr("Update")
+    },
     "MarketPlace.chown" : {
       type: "confirm_with_select",
       text: Locale.tr("Change owner"),

From 284905c9fbcfac44da6734374961a9989ef5a3a9 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 8 Feb 2016 16:54:37 +0100
Subject: [PATCH 196/197] Feature #4217: Add MarketPlace create and update
 forms 	The previous commit was MarketPlaceApp

---
 .../marketplaces-tab/form-panels/create.js    | 347 ++++++++++++++++++
 .../form-panels/create/advanced.hbs           |  32 ++
 .../form-panels/create/formPanelId.js         |  19 +
 .../form-panels/create/wizard.hbs             |  66 ++++
 4 files changed, 464 insertions(+)
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/advanced.hbs
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/formPanelId.js
 create mode 100644 src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs

diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
new file mode 100644
index 0000000000..cd0c6bf806
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
@@ -0,0 +1,347 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  /*
+    DEPENDENCIES
+   */
+
+  var BaseFormPanel = require('utils/form-panels/form-panel');
+  var Sunstone = require('sunstone');
+  var Locale = require('utils/locale');
+  var Notifier = require('utils/notifier');
+  var Tips = require('utils/tips');
+  var ResourceSelect = require('utils/resource-select');
+  var Config = require('sunstone-config');
+  var WizardFields = require('utils/wizard-fields');
+  var TemplateUtils = require('utils/template-utils');
+
+  /*
+    TEMPLATES
+   */
+
+  var TemplateWizardHTML = require('hbs!./create/wizard');
+  var TemplateAdvancedHTML = require('hbs!./create/advanced');
+
+  /*
+    CONSTANTS
+   */
+
+  var FORM_PANEL_ID = require('./create/formPanelId');
+  var TAB_ID = require('../tabId');
+  var MARKET_MAD_ATTRS = [
+    {
+      name: 'BASE_URL',
+      label: Locale.tr("Base URL"),
+      tooltip: Locale.tr("URL base to generate app end points"),
+      driver: 'http'
+    },
+    {
+      name: 'PUBLIC_DIR',
+      label: Locale.tr("Public Directory"),
+      tooltip: Locale.tr("Directory path to place images, the document root for http server"),
+      driver: 'http'
+    },
+    {
+      name: 'BRIDGE_LIST',
+      label: Locale.tr("Bridge List"),
+      tooltip: Locale.tr("Separated list of servers to access the public directory. If not defined, public directory will be local"),
+      driver: 'http'
+    },
+    {
+      name: 'ACCESS_KEY_ID',
+      label: Locale.tr("Access Key Id"),
+      tooltip: Locale.tr("Access Key Id"),
+      driver: 's3'
+    },
+    {
+      name: 'SECRET_ACCESS_KEY',
+      label: Locale.tr("Secret Access Key"),
+      tooltip: Locale.tr("Secret Access Key"),
+      driver: 's3'
+    },
+    {
+      name: 'BUCKET',
+      label: Locale.tr("Bucket"),
+      tooltip: Locale.tr("Bucket"),
+      driver: 's3'
+    },
+    {
+      name: 'REGION',
+      label: Locale.tr("Region"),
+      tooltip: Locale.tr("Region"),
+      driver: 's3'
+    },
+    {
+      name: 'TOTAL_MB',
+      label: Locale.tr("Total MB"),
+      tooltip: Locale.tr("Total MB"),
+      driver: 's3'
+    },
+    {
+      name: 'SIGNATURE_VERSION',
+      label: Locale.tr("Signature Version"),
+      tooltip: Locale.tr("Signature Version"),
+      driver: 's3'
+    },
+    {
+      name: 'ENDPOINT',
+      label: Locale.tr("Endpoint"),
+      tooltip: Locale.tr("Endpoint"),
+      driver: 's3'
+    },
+    {
+      name: 'FORCE_PATH_STYLE',
+      label: Locale.tr("Force Path Style"),
+      tooltip: Locale.tr("Force Path Style"),
+      driver: 's3'
+    }
+  ]
+  /*
+    CONSTRUCTOR
+   */
+
+  function FormPanel() {
+    var that = this;
+
+    that.formPanelId = FORM_PANEL_ID;
+    that.tabId = TAB_ID;
+    that.actions = {
+      'create': {
+        'title': Locale.tr("Create MarketPlace"),
+        'buttonText': Locale.tr("Create"),
+        'resetButton': true
+      },
+      'update': {
+        'title': Locale.tr("Update MarketPlace"),
+        'buttonText': Locale.tr("Update"),
+        'resetButton': false
+      }
+    };
+
+    that.marketMadNameList = [];
+    if (Config.marketMadConf !== undefined) {
+      $.each(Config.marketMadConf, function(index, marketMad) {
+        that.marketMadNameList.push(marketMad["NAME"]);
+      });
+    }
+
+    BaseFormPanel.call(this);
+  }
+
+  FormPanel.FORM_PANEL_ID = FORM_PANEL_ID;
+  FormPanel.prototype = Object.create(BaseFormPanel.prototype);
+  FormPanel.prototype.constructor = FormPanel;
+  FormPanel.prototype.htmlWizard = _htmlWizard;
+  FormPanel.prototype.htmlAdvanced = _htmlAdvanced;
+  FormPanel.prototype.submitWizard = _submitWizard;
+  FormPanel.prototype.submitAdvanced = _submitAdvanced;
+  FormPanel.prototype.onShow = _onShow;
+  FormPanel.prototype.fill = _fill;
+  FormPanel.prototype.setup = _setup;
+
+  return FormPanel;
+
+  /*
+    FUNCTION DEFINITIONS
+   */
+
+  function _htmlWizard() {
+    return TemplateWizardHTML({
+      'formPanelId': this.formPanelId,
+      'marketMadNameList': this.marketMadNameList,
+      'marketMadAttrs': MARKET_MAD_ATTRS
+    });
+  }
+
+  function _htmlAdvanced() {
+    return TemplateAdvancedHTML({formPanelId: this.formPanelId});
+  }
+
+  function _onShow(dialog) {
+    $("#NAME", dialog).focus();
+
+    $('#MARKET_MAD', dialog).change();
+
+//    var cluster_id = $("div#cluster_id .resource_list_select", dialog).val();
+//    if (!cluster_id) cluster_id = "-1";
+//
+//    var cluster_id_raw = $("div#datastore_cluster_raw .resource_list_select", dialog).val();
+//    if (!cluster_id_raw) cluster_id_raw = "-1";
+//
+//    ResourceSelect.insert({
+//        context: $('#cluster_id', dialog),
+//        resourceName: 'Cluster',
+//        initValue: cluster_id,
+//        includeDefaultCluster: true
+//      });
+//
+//    ResourceSelect.insert({
+//        context: $('#datastore_cluster_raw', dialog),
+//        resourceName: 'Cluster',
+//        initValue: cluster_id_raw,
+//        includeDefaultCluster: true
+//      });
+
+    return false;
+  }
+
+  function _fill(context, element) {
+    if (this.action != "update") {
+      return false;
+    }
+
+    this.resourceId = element.ID;
+
+    WizardFields.fill(context, element.TEMPLATE);
+    $('#NAME', context).val(element.NAME).
+        prop("disabled", true).
+        prop('wizard_field_disabled', true);;
+    $('#MARKET_MAD', context).val(element.MARKET_MAD).change();
+  }
+
+  // Set up the create datastore dialog
+  function _setup(dialog) {
+    Tips.setup(dialog);
+
+    dialog.on('change', '#MARKET_MAD', function() {
+      _setRequiredFields(dialog, this.value);
+    });
+
+    // Show custom driver input only when custom is selected in selects
+//    $('input[name="ds_tab_custom_ds_mad"],' +
+//      'input[name="ds_tab_custom_tm_mad"]', dialog).parent().hide();
+//
+//    $('select#ds_mad', dialog).change(function() {
+//      if ($(this).val() == "custom") {
+//          $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().show();
+//      } else {
+//        _setRequiredFields(dialog, $(this).val());
+//        $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().hide();
+//      }
+//    });
+//
+//    $('select#tm_mad', dialog).change(function() {
+//      if ($(this).val() == "custom")
+//          $('input[name="ds_tab_custom_tm_mad"]', dialog).parent().show();
+//      else
+//          $('input[name="ds_tab_custom_tm_mad"]', dialog).parent().hide();
+//    });
+//
+//    $('#presets', dialog).change(function() {
+//      _hideAll(dialog);
+//      var choice_str = $(this).val();
+//
+//      switch (choice_str)
+//      {
+//        case 'fs':
+//          _selectFilesystem(dialog);
+//          break;
+//        case 'vmware_vmfs':
+//          _selectVmwareVmfs(dialog);
+//          break;
+//        case 'block_lvm':
+//          _selectBlockLvm(dialog);
+//          break;
+//        case 'fs_lvm':
+//          _selectFsLvm(dialog);
+//          break;
+//        case 'ceph':
+//          _selectCeph(dialog);
+//          break;
+//        case 'gluster':
+//          _selectGluster(dialog);
+//          break;
+//        case 'dev':
+//          _selectDevices(dialog);
+//          break;
+//        case 'iscsi':
+//          _selectISCSI(dialog);
+//          break;
+//        case 'custom':
+//          _selectCustom(dialog);
+//          break;
+//      }
+//    });
+//
+//    $('#presets', dialog).change();
+//
+//    // Hide disk_type
+//    $('select#disk_type', dialog).parent().hide();
+//
+//    _hideAll(dialog);
+//    _selectFilesystem(dialog);
+  }
+
+
+  function _submitWizard(dialog) {
+    var that = this;
+    var marketObj = {};
+
+    $.extend(marketObj, WizardFields.retrieve(dialog));
+
+    if (this.action == "create") {
+      marketObj = {
+        "marketplace" : marketObj
+      };
+
+      Sunstone.runAction("MarketPlace.create", marketObj);
+      return false;
+    } else if (this.action == "update") {
+      Sunstone.runAction("MarketPlace.update", this.resourceId, TemplateUtils.templateToString(marketObj));
+      return false;
+    }
+  }
+
+  function _submitAdvanced(dialog) {
+    var template = $('#template', dialog).val();
+
+    if (this.action == "create") {
+      var marketObj = {
+        "marketplace" : {
+          "marketplace_raw" : template
+        }
+      };
+      Sunstone.runAction("MarketPlace.create", marketObj);
+    } else if (this.action == "update") {
+      Sunstone.runAction("Network.update", this.resourceId, template);
+      return false;
+    }
+
+    return false;
+  }
+
+  function _setRequiredFields(dialog, marketMADName) {
+    // Hide all market mad attributes and remove required
+    $('.market-mad-attr-container', dialog).hide();
+    $('.market-mad-attr-container input', dialog).removeAttr('required');
+
+    // Show attributes for the selected market mad and set the required ones
+    $('.market-mad-attr-container.' + marketMADName).show();
+    $.each(Config.marketMadConf, function(i, e){
+        if (e["NAME"] == marketMADName) {
+          if (!$.isEmptyObject(e["REQUIRED_ATTRS"])) {
+            $.each(e["REQUIRED_ATTRS"].split(","), function(i, attrName){
+              $('#' + attrName, dialog).attr('required', true);
+            });
+          }
+          return false;
+        }
+      }
+    );
+  }
+});
+
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/advanced.hbs
new file mode 100644
index 0000000000..e971338993
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/advanced.hbs
@@ -0,0 +1,32 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<form data-abide="ajax" id="{{formPanelId}}Advanced" class="custom creation">
+  <div class="row">
+    <div class="large-12 columns">
+      <p>{{tr "Write the MarketPlace template here"}}</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-12 columns">
+      <textarea id="template" rows="15" required></textarea>
+    </div>
+  </div>
+</form>
+
+
+
+
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/formPanelId.js
new file mode 100644
index 0000000000..23eda99462
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/formPanelId.js
@@ -0,0 +1,19 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* 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.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require) {
+  return 'createMarketPlaceForm';
+})
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs
new file mode 100644
index 0000000000..05eaa6d948
--- /dev/null
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs
@@ -0,0 +1,66 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! 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.                                             }}
+{{! -------------------------------------------------------------------------- }}
+<form data-abide="ajax" id="{{formPanelId}}Wizard" class="custom creation">
+  <div class="row">
+    <div class="medium-4 columns">
+      <label for="NAME">
+        {{tr "Name"}}:
+        <span class="tip">
+          {{tr "Name that the Marketplace will get for description purposes."}}
+        </span>
+      </label>
+      <input id="NAME" type="text" wizard_field="NAME" required/>
+    </div>
+    <div class="medium-2 columns">
+      <label for="MARKET_MAD">{{tr "Driver"}}</label>
+      <select id="MARKET_MAD" wizard_field="MARKET_MAD" required>
+        {{#each marketMadNameList}}
+        <option value="{{this}}">{{this}}</option>
+        {{/each}}
+      </select>
+    </div>
+    <div class="medium-6 columns hidden">
+      <label for="TYPE">{{tr "Type"}}</label>
+      <select id="TYPE" wizard_field="TYPE" required>
+        <option value="image">{{tr "Image"}}</option>
+      </select>
+    </div>
+  </div>
+  <div class="row">
+    <div class="medium-6 columns">
+      <label for="DESCRIPTION">
+        {{tr "Description"}}
+        <span class="tip">
+          {{tr "Human readable description of the MarketPlace for other users."}}
+        </span>
+      </label>
+      <textarea id="DESCRIPTION" wizard_field="DESCRIPTION" rows="2"></textarea>
+    </div>
+    <div class="small-8 medium-8 columns">
+    </div>
+  </div>
+  <div class="row">
+    {{#each marketMadAttrs}}
+    <div class="medium-6 columns market-mad-attr-container {{this.driver}}">
+      <label for="{{this.name}}">
+        {{this.label}}:
+        <span class="tip">{{this.tooltip}}</span>
+      </label>
+      <input id="{{this.name}}" type="text" wizard_field="{{this.name}}"/>
+    </div>
+    {{/each}}
+  </div>
+</form>
\ No newline at end of file

From 539342fd3a07b5257995f6f82fa667305f821cfc Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 8 Feb 2016 16:59:02 +0100
Subject: [PATCH 197/197] Feature #4217: Remove unused code

---
 .../marketplaces-tab/form-panels/create.js    | 87 -------------------
 1 file changed, 87 deletions(-)

diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
index cd0c6bf806..5496d95189 100644
--- a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
@@ -22,9 +22,7 @@ define(function(require) {
   var BaseFormPanel = require('utils/form-panels/form-panel');
   var Sunstone = require('sunstone');
   var Locale = require('utils/locale');
-  var Notifier = require('utils/notifier');
   var Tips = require('utils/tips');
-  var ResourceSelect = require('utils/resource-select');
   var Config = require('sunstone-config');
   var WizardFields = require('utils/wizard-fields');
   var TemplateUtils = require('utils/template-utils');
@@ -173,29 +171,8 @@ define(function(require) {
 
   function _onShow(dialog) {
     $("#NAME", dialog).focus();
-
     $('#MARKET_MAD', dialog).change();
 
-//    var cluster_id = $("div#cluster_id .resource_list_select", dialog).val();
-//    if (!cluster_id) cluster_id = "-1";
-//
-//    var cluster_id_raw = $("div#datastore_cluster_raw .resource_list_select", dialog).val();
-//    if (!cluster_id_raw) cluster_id_raw = "-1";
-//
-//    ResourceSelect.insert({
-//        context: $('#cluster_id', dialog),
-//        resourceName: 'Cluster',
-//        initValue: cluster_id,
-//        includeDefaultCluster: true
-//      });
-//
-//    ResourceSelect.insert({
-//        context: $('#datastore_cluster_raw', dialog),
-//        resourceName: 'Cluster',
-//        initValue: cluster_id_raw,
-//        includeDefaultCluster: true
-//      });
-
     return false;
   }
 
@@ -220,70 +197,6 @@ define(function(require) {
     dialog.on('change', '#MARKET_MAD', function() {
       _setRequiredFields(dialog, this.value);
     });
-
-    // Show custom driver input only when custom is selected in selects
-//    $('input[name="ds_tab_custom_ds_mad"],' +
-//      'input[name="ds_tab_custom_tm_mad"]', dialog).parent().hide();
-//
-//    $('select#ds_mad', dialog).change(function() {
-//      if ($(this).val() == "custom") {
-//          $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().show();
-//      } else {
-//        _setRequiredFields(dialog, $(this).val());
-//        $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().hide();
-//      }
-//    });
-//
-//    $('select#tm_mad', dialog).change(function() {
-//      if ($(this).val() == "custom")
-//          $('input[name="ds_tab_custom_tm_mad"]', dialog).parent().show();
-//      else
-//          $('input[name="ds_tab_custom_tm_mad"]', dialog).parent().hide();
-//    });
-//
-//    $('#presets', dialog).change(function() {
-//      _hideAll(dialog);
-//      var choice_str = $(this).val();
-//
-//      switch (choice_str)
-//      {
-//        case 'fs':
-//          _selectFilesystem(dialog);
-//          break;
-//        case 'vmware_vmfs':
-//          _selectVmwareVmfs(dialog);
-//          break;
-//        case 'block_lvm':
-//          _selectBlockLvm(dialog);
-//          break;
-//        case 'fs_lvm':
-//          _selectFsLvm(dialog);
-//          break;
-//        case 'ceph':
-//          _selectCeph(dialog);
-//          break;
-//        case 'gluster':
-//          _selectGluster(dialog);
-//          break;
-//        case 'dev':
-//          _selectDevices(dialog);
-//          break;
-//        case 'iscsi':
-//          _selectISCSI(dialog);
-//          break;
-//        case 'custom':
-//          _selectCustom(dialog);
-//          break;
-//      }
-//    });
-//
-//    $('#presets', dialog).change();
-//
-//    // Hide disk_type
-//    $('select#disk_type', dialog).parent().hide();
-//
-//    _hideAll(dialog);
-//    _selectFilesystem(dialog);
   }