ManageIQ · aufi · Jan 31, 2018 · Jan 27, 2018 · Jan 29, 2018 · Jan 29, 2018
@@ -86,11 +86,11 @@ def child_manager_fetch_path(collection, ems_ref)
     end
 
     def servers
-      @servers ||= @connection.handled_list(:servers, {}, openstack_admin?)
+      @servers ||= uniques(@connection.handled_list(:servers, {}, openstack_admin?))
     end
 
     def vnfs
-      @vnfs ||= @nfv_service.handled_list(:vnfs, {}, openstack_admin?)
+      @vnfs ||= uniques(@nfv_service.handled_list(:vnfs, {}, openstack_admin?))
     end
 
     def availability_zones_compute
@@ -108,7 +108,7 @@ def availability_zones
     def volumes
       # TODO: support volumes through :nova as well?
       return [] unless @volume_service.name == :cinder
-      @volumes ||= @volume_service.handled_list(:volumes)
+      @volumes ||= uniques(@volume_service.handled_list(:volumes))
     end
 
     def get_availability_zones
@@ -137,7 +137,7 @@ def get_quotas
     end
 
     def get_key_pairs
-      kps = @connection.handled_list(:key_pairs, {}, openstack_admin?)
+      kps = uniques(@connection.handled_list(:key_pairs, {}, openstack_admin?))
       process_collection(kps, :key_pairs) { |kp| parse_key_pair(kp) }
     end
 
@@ -149,7 +149,8 @@ def get_servers
     def get_vnfds
       return unless @nfv_service
 
-      process_collection(@nfv_service.handled_list(:vnfds, {}, openstack_admin?), :orchestration_templates_catalog) { |vnfd| parse_vnfd(vnfd) }
+      unique_vnfds = uniques(@nfv_service.handled_list(:vnfds, {}, openstack_admin?))
+      process_collection(unique_vnfds, :orchestration_templates_catalog) { |vnfd| parse_vnfd(vnfd) }
     end
 
     def get_vnfs
@@ -432,7 +433,7 @@ def add_instance_disk(disks, size, location, name)
     def get_cloud_services
       # TODO(pblaho): repeat for each posible service (compute, identity, ...)
       source = 'compute'
-      services = @compute_service.handled_list(:services, {}, openstack_admin?)
+      services = uniques(@compute_service.handled_list(:services, {}, openstack_admin?))
       process_collection(services, :cloud_services) { |service| parse_cloud_service(service, source) }
     end
 

@@ -115,11 +115,11 @@ def stack_server_resources
       end
 
       def servers
-        @servers ||= @connection.handled_list(:servers)
+        @servers ||= uniques(@connection.handled_list(:servers))
       end
 
       def hosts
-        @hosts ||= @baremetal_service.handled_list(:nodes)
+        @hosts ||= uniques(@baremetal_service.handled_list(:nodes))
       end
 
       def clouds

@@ -64,23 +64,23 @@ def parent_manager_find_device_connected_to_network_port(ems_ref)
     end
 
     def security_groups
-      @security_groups ||= @network_service.handled_list(:security_groups, {}, openstack_network_admin?)
+      @security_groups ||= uniques(@network_service.handled_list(:security_groups, {}, openstack_network_admin?))
     end
 
     def networks
-      @networks ||= @network_service.handled_list(:networks, {}, openstack_network_admin?)
+      @networks ||= uniques(@network_service.handled_list(:networks, {}, openstack_network_admin?))
     end
 
     def network_ports
-      @network_ports ||= @network_service.handled_list(:ports, {}, openstack_network_admin?)
+      @network_ports ||= uniques(@network_service.handled_list(:ports, {}, openstack_network_admin?))
     end
 
     def network_routers
-      @network_routers ||= @network_service.handled_list(:routers, {}, openstack_network_admin?)
+      @network_routers ||= uniques(@network_service.handled_list(:routers, {}, openstack_network_admin?))
     end
 
     def floating_ips
-      @floating_ips ||= @network_service.handled_list(:floating_ips, {}, openstack_network_admin?)
+      @floating_ips ||= uniques(@network_service.handled_list(:floating_ips, {}, openstack_network_admin?))
     end
 
     def get_networks

@@ -9,6 +9,7 @@ def get_flavors
                   else
                     @connection.handled_list(:flavors)
                   end
+        flavors = uniques(flavors)
         process_collection(flavors, :flavors) { |flavor| parse_flavor(flavor) }
       end
 

@@ -2,6 +2,18 @@ module ManageIQ::Providers
   module Openstack
     module RefreshParserCommon
       module HelperMethods
+        def uniques(collection)
+          unique_objs = []
+          # caling uniq on a fog collection makes it lose
+          # properties from fog that it will attempt to use
+          # during iteration, resulting in an exeption.
+          # to avoid that, turn it into an array first.
+          unique_objs.concat(collection)
+          # uniquify via identity if these are fog objects
+          unique_objs.uniq!(&:identity) if (unique_objs.size > 0 && unique_objs[0].respond_to?(:identity))
+          unique_objs
+        end
+
         def openstack_admin?
           ::Settings.ems_refresh.openstack.try(:is_admin)
         end

@@ -9,6 +9,7 @@ def get_images
                  else
                    @image_service.handled_list(:images)
                  end
+        images = uniques(images)
         process_collection(images, :vms) { |image| parse_image(image) }
       end
 

@@ -18,11 +18,11 @@ def load_orchestration_stacks
         private
 
         def stacks
-          @stacks ||= detailed_stacks
+          @stacks ||= uniques(detailed_stacks)
         end
 
         def root_stacks
-          @root_stacks ||= detailed_stacks(false)
+          @root_stacks ||= uniques(detailed_stacks(false))
         end
 
         def detailed_stacks(show_nested = true)

@@ -7,13 +7,18 @@ def list
         all_objects = objects_on_page = call_list_method(@collection_type, @options, @method)
 
         while more_pages?(objects_on_page)
+          last_page_count = objects_on_page.length
           objects_on_page = call_list_method(@collection_type,
                                              @options,
                                              @method,
                                              :marker => marker(objects_on_page),
                                              :limit  => @service.default_pagination_limit)
           break if pagination_break?(all_objects, objects_on_page)
           all_objects.concat(objects_on_page)
+          # Break after adding this page if it contained less elements than the previous page.
+          # having less elements should indicate that this is the last page in the set.
+          # This is a sanity test to prevent timing-related looping or repetition
+          break if objects_on_page.length < last_page_count
         end
 
         all_objects
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ def get_flavors @@
                       else
                         @connection.handled_list(:flavors)
                       end
+            flavors = uniques(flavors)
             process_collection(flavors, :flavors) { |flavor| parse_flavor(flavor) }
           end
@@ Expand Down @@