Merge pull request #17183 from yrudman/filer-out-not-active-vms-in-ru…

…nning-filter Filter out archived and orphaned VMs in 'Running VMs' filter
ManageIQ · Apr 10, 2018 · 5e9fc1c · 5e9fc1c
2 parents 447f26e + 74bb818
commit 5e9fc1c
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/db/fixtures/miq_searches.yml b/db/fixtures/miq_searches.yml
@@ -67,9 +67,13 @@
     description: Status / Running
     filter: !ruby/object:MiqExpression
       exp:
-        "=":
-          field: Vm-power_state
-          value: "on"
+        and:
+        - "=":
+            field: Vm-power_state
+            value: "on"
+        - "=":
+            field: Vm-active
+            value: "true"
     search_type: default
     db: Vm
 - attributes:
@@ -673,9 +677,13 @@
     description: Status / Running
     filter: !ruby/object:MiqExpression
       exp:
-        "=":
-          field: TemplateInfra-power_state
-          value: "on"
+        and:
+        - "=":
+            field: TemplateInfra-power_state
+            value: "on"
+        - "=":
+            field: VTemplateInfra-active
+            value: "true"
     search_type: default
     db: ManageIQ::Providers::InfraManager::Template
 - attributes:
@@ -1125,9 +1133,13 @@
     description: Status / Running
     filter: !ruby/object:MiqExpression
       exp:
-        "=":
-          field: VmInfra-power_state
-          value: "on"
+        and:
+        - "=":
+            field: VmInfra-power_state
+            value: "on"
+        - "=":
+            field: VmInfra-active
+            value: "true"
     search_type: default
     db: ManageIQ::Providers::InfraManager::Vm
 - attributes: