Merge pull request #114 from dberg1/labels

hmc groups as vm labels

app/models/manageiq/providers/ibm_power_hmc/inventory/collector/infra_manager.rb

@@ -17,6 +17,13 @@ def hmc
     end
   end
 
+  def groups
+    @groups ||= connection.groups.index_by(&:uuid)
+  rescue => e
+    $ibm_power_hmc_log.error("groups query failed: #{e}")
+    raise
+  end
+
   def ssps
     @ssps ||= begin
       connection.ssps

app/models/manageiq/providers/ibm_power_hmc/inventory/parser/infra_manager.rb

@@ -237,6 +237,7 @@ def parse_lpar_common(lpar, type)
     )
     parse_vm_operating_system(vm, lpar)
     parse_vm_advanced_settings(vm, lpar)
+    parse_vm_labels(vm, lpar)
 
     hardware = parse_vm_hardware(vm, lpar)
     parse_vm_networks(lpar, hardware)
@@ -245,6 +246,23 @@ def parse_lpar_common(lpar, type)
     [vm, hardware]
   end
 
+  def parse_vm_labels(vm, lpar)
+    # Common code for LPARs and VIOSes.
+    lpar.group_uuids.each do |uuid|
+      next unless collector.groups.key?(uuid)
+
+      group = collector.groups[uuid]
+      persister.vm_and_template_labels.build(
+        :resource    => vm,
+        :name        => group.name,
+        :section     => "labels",
+        :source      => "ibm_power_hmc",
+        :value       => "",
+        :description => group.description
+      )
+    end
+  end
+
   def parse_vm_hardware(vm, lpar)
     # Common code for LPARs, VIOSes and templates.
     persister.hardwares.build(

app/models/manageiq/providers/ibm_power_hmc/inventory/persister/infra_manager.rb

@@ -33,5 +33,6 @@ def initialize_inventory_collections
     add_collection(infra, :resource_pools)
     add_collection(infra, :vm_resource_pools)
     add_collection(infra, :parent_blue_folders)
+    add_collection(infra, :vm_and_template_labels)
   end
 end

spec/models/manageiq/providers/ibm_power_hmc/infra_manager/refresher_spec.rb

@@ -210,6 +210,9 @@ def assert_specific_vios
       :read_only => true
     )
 
+    expect(vios.labels.count).to eq(1)
+    expect(vios.labels.first.name).to eq("ManageIQ")
+
     expect(vios.host).not_to be_nil
     expect(vios.host.name).to eq("aramis")
 
@@ -271,6 +274,9 @@ def assert_specific_lpar
       :read_only => true
     )
 
+    expect(lpar.labels.count).to eq(1)
+    expect(lpar.labels.first.name).to eq("ManageIQ")
+
     expect(lpar.host).not_to be_nil
     expect(lpar.host.ems_ref).to eq(host_uuid)