From 20d10c7b12a868d34d21a0e3419bfaca3b2a8d41 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 5 Jan 2017 00:32:14 +0100
Subject: [PATCH] F #2347: Fixes some bugs to VMGroups

---
 src/vm/VirtualMachine.cc | 2 +-
 src/vm_group/VMGroup.cc  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index c697190062..5b12f85604 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -2949,7 +2949,7 @@ int VirtualMachine::get_vmgroup(string& error)
             vmg_uid = get_uid();
         }
 
-        vmgroup = vmgrouppool->get(gname, vmg_uid, true);
+        vmgroup = vmgrouppool->get(vmg_name, vmg_uid, true);
     }
     else if ( thegroup->vector_value("VMGROUP_ID", vmg_id) == 0 )
     {
diff --git a/src/vm_group/VMGroup.cc b/src/vm_group/VMGroup.cc
index 21c01460d7..e18a298f60 100644
--- a/src/vm_group/VMGroup.cc
+++ b/src/vm_group/VMGroup.cc
@@ -63,6 +63,12 @@ void VMGroupRole::del_vm(int vm_id)
 
 void VMGroupRole::set_vms()
 {
+    if ( vms.empty() )
+    {
+        va->remove("VMS");
+        return;
+    }
+
     std::string vms_str = one_util::join(vms.begin(), vms.end(), ',');
 
     va->replace("VMS", vms_str);
@@ -521,6 +527,8 @@ int VMGroup::post_update_template(string& error)
         return -1;
     }
 
+    obj_template->erase("ROLE");
+
     if ( check_affinity("AFFINED", error) == -1 )
     {
         return -1;