Merge pull request #806 from Kuldip-Nanda/placement_group

placement_group in openstack

Author: agrare

app/models/manageiq/providers/openstack/cloud_manager.rb

@@ -14,6 +14,7 @@ class ManageIQ::Providers::Openstack::CloudManager < ManageIQ::Providers::CloudM
   require_nested :OrchestrationStack
   require_nested :OrchestrationTemplate
   require_nested :VnfdTemplate
+  require_nested :PlacementGroup
   require_nested :Provision
   require_nested :ProvisionWorkflow
   require_nested :Refresher

app/models/manageiq/providers/openstack/cloud_manager/placement_group.rb

@@ -0,0 +1,3 @@
+class ManageIQ::Providers::Openstack::CloudManager::PlacementGroup < ::PlacementGroup
+  include ManageIQ::Providers::Openstack::HelperMethods
+end

app/models/manageiq/providers/openstack/inventory/collector.rb

@@ -31,6 +31,7 @@ class ManageIQ::Providers::Openstack::Inventory::Collector < ManageIQ::Providers
   attr_reader :cloud_volume_types
   attr_reader :servers
   attr_reader :hosts
+  attr_reader :server_groups
 
   def initialize(_manager, _target)
     super
@@ -47,6 +48,7 @@ def initialize_inventory_sources
     @flavors                    = []
     @host_aggregates            = []
     @key_pairs                  = []
+    @server_groups              = nil
     @images                     = []
     @orchestration_stacks       = nil
     @quotas                     = []

app/models/manageiq/providers/openstack/inventory/collector/cloud_manager.rb

@@ -55,6 +55,14 @@ def host_aggregates
     @host_aggregates = safe_list { compute_service.aggregates.all }
   end
 
+  def server_groups
+    @server_groups ||= compute_service.handled_list(:server_groups, {}, openstack_admin?)
+  end
+
+  def server_group_by_vm_id
+    @server_group_by_vm_id ||= server_groups.each_with_object({}) { |sg, result| sg.members.each { |vm_id| result[vm_id] = sg } }
+  end
+
   def key_pairs
     return @key_pairs if @key_pairs.any?
     @key_pairs = compute_service.handled_list(:key_pairs, {}, openstack_admin?)

app/models/manageiq/providers/openstack/inventory/collector/target_collection.rb

@@ -166,6 +166,14 @@ def key_pairs
     @key_pairs = compute_service.handled_list(:key_pairs, {}, openstack_admin?)
   end
 
+  def server_groups
+    @server_groups ||= compute_service.handled_list(:server_groups, {}, openstack_admin?)
+  end
+
+  def server_group_by_vm_id
+    @server_group_by_vm_id ||= server_groups.each_with_object({}) { |sg, result| sg.members.each { |vm_id| result[vm_id] = sg } }
+  end
+
   def flavors_by_id
     @flavors_by_id ||= {}
   end

app/models/manageiq/providers/openstack/inventory/parser/cloud_manager.rb

@@ -9,6 +9,7 @@ def parse
     auth_key_pairs
     orchestration_stacks
     quotas
+    placement_groups
     vms
     cloud_tenants
     vnfs
@@ -146,6 +147,38 @@ def host_aggregates
     end
   end
 
+  def placement_groups
+    collector.server_groups.each do |spgrp|
+      pgrp         = persister.placement_groups.find_or_build(spgrp.id)
+      pgrp.name    = spgrp.name
+      pgrp.ems_ref = spgrp.id
+      pgrp.policy  = spgrp.policies[0]
+
+      # right now not filling in pgrp.availability_zone.
+      # we are not getting any ems_ref from the webapi. We are getting
+      #
+      #
+      # For instance collector.placement_groups() returns
+      # [ <Fog::Compute::OpenStack::ServerGroup
+      #    id="a31f76c9-5ed6-43b4-86ae-7e2cbcf68302",
+      #    name="Kuldip-VM-Affinity-Rule",
+      #    policies=["affinity"],
+      #    members=["2b5fb204-34ff-445b-aea4-a903d4b6143e"]
+      #  >,
+      #   <Fog::Compute::OpenStack::ServerGroup
+      #    id="1734c483-803b-4dcf-94e3-de058a6ddb87",
+      #    name="jay-collection-rule",
+      #    policies=["anti-affinity"],
+      #    members=[]
+      #  >]
+      #
+      # however like
+      # https://github.com/ManageIQ/manageiq-providers-ibm_cloud/blob/master/app/models/manageiq/providers/ibm_cloud/inventory/parser/power_virtual_servers.rb#L183
+      # we are getting persister.cloud_manager.uid_ems as "default", which is not correctr.
+      # pgrp.availability_zone = persister.availability_zones.lazy_find(persister.cloud_manager.uid_ems),
+    end
+  end
+
   def auth_key_pairs
     collector.key_pairs.each do |kp|
       key_pair = persister.auth_key_pairs.find_or_build(kp.name)
@@ -307,6 +340,7 @@ def parse_vm(vm, hosts)
     end
 
     availability_zone = vm.availability_zone.blank? ? "null_az" : vm.availability_zone
+    placement_group   = collector.server_group_by_vm_id[vm.id]
     miq_template_lazy = persister.miq_templates.lazy_find(vm.image["id"])
 
     server = persister.vms.find_or_build(vm.id.to_s)
@@ -318,6 +352,7 @@ def parse_vm(vm, hosts)
     server.host = parent_host
     server.ems_cluster = parent_cluster
     server.availability_zone = persister.availability_zones.lazy_find(availability_zone)
+    server.placement_group = persister.placement_groups.lazy_find(placement_group.id) if placement_group
     server.key_pairs = [persister.auth_key_pairs.lazy_find(vm.key_name)].compact
     server.cloud_tenant = persister.cloud_tenants.lazy_find(vm.tenant_id.to_s)
     server.genealogy_parent = miq_template_lazy unless vm.image["id"].nil?

app/models/manageiq/providers/openstack/inventory/persister/definitions/cloud_collections.rb

@@ -19,6 +19,7 @@ def initialize_cloud_inventory_collections
     add_cloud_collection(:flavors)
     add_cloud_collection(:hardwares)
     add_cloud_collection(:operating_systems)
+    add_cloud_collection(:placement_groups)
     add_cloud_collection(:disks)
     add_cloud_collection(:snapshots)
     add_cloud_collection(:networks)

spec/models/manageiq/providers/openstack/cloud_manager/stubbed_refresher_spec.rb

@@ -179,6 +179,7 @@ def setup_mocked_collector
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:availability_zones_volume).and_return(mocked_availability_zones)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:cloud_services).and_return(mocked_cloud_services)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:flavors).and_return(mocked_flavors)
+      allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:server_groups).and_return(mocked_server_groups)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:host_aggregates).and_return(mocked_host_aggregates)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:images).and_return(mocked_miq_templates)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:key_pairs).and_return(mocked_key_pairs)
@@ -200,6 +201,7 @@ def setup_mocked_collector
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:cloud_volume_backups).and_return(mocked_cloud_volume_backups)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:key_pairs).and_return(mocked_key_pairs)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:cloud_subnets).and_return([])
+      allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:server_groups).and_return([])
     end
 
     def assert_ems

spec/models/manageiq/providers/openstack/network_manager/cloud_subnet_refresh_spec.rb

@@ -126,6 +126,7 @@ def setup_mocked_collector
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:cloud_services).and_return([])
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:vms).and_return([])
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:tenants).and_return([])
+      allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::CloudManager).to receive(:server_groups).and_return([])
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::NetworkManager).to receive(:orchestration_stacks).and_return([])
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::NetworkManager).to receive(:cloud_networks).and_return(mocked_cloud_networks)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::NetworkManager).to receive(:cloud_subnets).and_return(mocked_cloud_subnets)
@@ -141,6 +142,7 @@ def setup_mocked_targeted_collector
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:cloud_services).and_return([])
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:vms).and_return([])
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:tenants).and_return([])
+      allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:server_groups).and_return([])
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:orchestration_stacks).and_return([])
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:cloud_networks).and_return(mocked_cloud_networks)
       allow_any_instance_of(ManageIQ::Providers::Openstack::Inventory::Collector::TargetCollection).to receive(:cloud_subnets).and_return(mocked_cloud_subnets)

spec/models/manageiq/providers/openstack/openstack_stubs.rb

@@ -90,6 +90,10 @@ def mocked_flavors
     mocked_flavors
   end
 
+  def mocked_server_groups
+    []
+  end
+
   def mocked_host_aggregates
     mocked_host_aggregates = []
     test_counts[:host_aggregates_count].times do |i|