Save host 'maintenance' value

The host 'maintenance' attribute was added to provision vm dialog by ManageIQ/manageiq#16464 RHV should store this information which is already available during host refresh. https://bugzilla.redhat.com/show_bug.cgi?id=1513413
masayag · Nov 16, 2017 · ab73cb1 · ab73cb1
1 parent 42bb088
commit ab73cb1
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1 deletion.
diff --git a/app/models/manageiq/providers/redhat/infra_manager/refresh/parse/parser.rb b/app/models/manageiq/providers/redhat/infra_manager/refresh/parse/parser.rb
@@ -138,6 +138,7 @@ def self.host_inv_to_hashes(inv, ems_inv, cluster_uids, _storage_uids)
         :vmm_buildnumber  => (host_os_version[:build] if host_os_version),
         :connection_state => connection_state,
         :power_state      => power_state,
+        :maintenance      => power_state == 'maintenance',
 
         :operating_system => host_inv_to_os_hash(host_inv, hostname),
 

diff --git a/...models/manageiq/providers/redhat/infra_manager/refresh/parse/strategies/host_inventory.rb b/...models/manageiq/providers/redhat/infra_manager/refresh/parse/strategies/host_inventory.rb
@@ -68,6 +68,7 @@ def host_inv_to_hashes(inv, ems_inv, cluster_uids, _storage_uids)
           :vmm_buildnumber  => (host_os_version.build if host_os_version),
           :connection_state => connection_state,
           :power_state      => power_state,
+          :maintenance      => power_state == 'maintenance',
           :operating_system => host_inv_to_os_hash(host_inv, hostname),
           :ems_cluster      => cluster_uids[host_inv.dig(:cluster, :id)],
           :hardware         => hardware,

diff --git a/app/models/manageiq/providers/redhat/inventory/parser/infra_manager.rb b/app/models/manageiq/providers/redhat/inventory/parser/infra_manager.rb
@@ -151,6 +151,7 @@ def hosts
         :vmm_buildnumber  => (host_os_version.build if host_os_version),
         :connection_state => connection_state,
         :power_state      => power_state,
+        :maintenance      => power_state == 'maintenance',
         :ems_cluster      => persister.ems_clusters.lazy_find(ManageIQ::Providers::Redhat::InfraManager.make_ems_ref(cluster.href)),
         :ipmi_address     => ipmi_address,
       )

diff --git a/app/models/manageiq/providers/redhat/inventory_collection_default/infra_manager.rb b/app/models/manageiq/providers/redhat/inventory_collection_default/infra_manager.rb
@@ -328,7 +328,8 @@ def hosts(extra_attributes = {})
           :connection_state,
           :power_state,
           :ems_cluster,
-          :ipmi_address
+          :ipmi_address,
+          :maintenance
         ]
       }
 

diff --git a/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_3_1_spec.rb b/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_3_1_spec.rb
@@ -185,6 +185,7 @@ def assert_specific_host
       :vmm_product      => "rhel",
       :vmm_buildnumber  => nil,
       :power_state      => "on",
+      :maintenance      => false,
       :connection_state => "connected"
     )
 

diff --git a/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_4_async_graph_spec.rb b/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_4_async_graph_spec.rb
@@ -193,6 +193,7 @@ def assert_specific_host
         :vmm_product      => "rhel",
         :vmm_buildnumber  => nil,
         :power_state      => "on",
+        :maintenance      => false,
         :connection_state => "connected"
       )
 

diff --git a/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_4_async_spec.rb b/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_4_async_spec.rb
@@ -192,6 +192,7 @@ def assert_specific_host
         :vmm_product      => "rhel",
         :vmm_buildnumber  => nil,
         :power_state      => "on",
+        :maintenance      => false,
         :connection_state => "connected"
       )