From 8be474c8e5a74efd847e42184cadbff20866678c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 11 Jul 2016 14:42:25 +0200
Subject: [PATCH] Feature #4614: Filter VMs by type (VR, Flow)

(cherry picked from commit e5e8004b06e61ddf78f8ae35edd93641b14a8452)
---
 .../public/app/tabs/vms-tab/datatable/search.hbs      |  9 +++++++++
 .../public/app/tabs/vms-tab/utils/datatable-common.js | 11 +++++++++++
 src/sunstone/public/app/utils/tab-datatable.js        |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/sunstone/public/app/tabs/vms-tab/datatable/search.hbs b/src/sunstone/public/app/tabs/vms-tab/datatable/search.hbs
index a0b107a752..8248398bf5 100644
--- a/src/sunstone/public/app/tabs/vms-tab/datatable/search.hbs
+++ b/src/sunstone/public/app/tabs/vms-tab/datatable/search.hbs
@@ -24,6 +24,15 @@
       <datalist search-datalist="STATUS" id="{{tableId}}-searchListSTATUS">
       </datalist>
     </label>
+    <label>
+      {{tr "VM type"}}
+      <select search-field="VM_TYPE">
+        <option value="">{{tr "Any"}}</option>
+        <option value="VM">{{tr "Regular VM"}}</option>
+        <option value="VR">{{tr "Virtual Router"}}</option>
+        <option value="FLOW">{{tr "Service"}}</option>
+      </select>
+    </label>
   </div>
   <div class="medium-6 columns">
     <label>
diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
index 7252553692..f1b681b2b3 100644
--- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
+++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
@@ -84,11 +84,22 @@ define(function(require) {
 
     var hostname = OpenNebulaVM.hostnameStr(element);
 
+    var type;
+
+    if (element.TEMPLATE.VROUTER_ID != undefined){
+      type = "VR";
+    } else if (element.USER_TEMPLATE.SERVICE_ID != undefined){
+      type = "FLOW";
+    } else {
+      type = "VM";
+    }
+
     var search = {
       NAME:         element.NAME,
       UNAME:        element.UNAME,
       GNAME:        element.GNAME,
       STATUS:       state,
+      VM_TYPE:      type,
       HOST:         hostname,
       CLUSTER:      OpenNebulaVM.clusterStr(element),
       STIME_AFTER:  element.STIME,
diff --git a/src/sunstone/public/app/utils/tab-datatable.js b/src/sunstone/public/app/utils/tab-datatable.js
index 9cfbc53021..8963a0b5c4 100644
--- a/src/sunstone/public/app/utils/tab-datatable.js
+++ b/src/sunstone/public/app/utils/tab-datatable.js
@@ -226,7 +226,7 @@ define(function(require) {
       }
 
       $("a.advanced-search-clear", context).on('click', function(){
-        $("input", context).val("").trigger("input");
+        $("input,select", context).val("").trigger("input");
 
         $("button.advanced-search", context).click();
       });