Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core changes for azure targeted refresh #17070

Merged
merged 2 commits into from
Mar 1, 2018
Merged

Core changes for azure targeted refresh #17070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
431dd0e
Do not change passed extra attributes
Ladas Feb 28, 2018
55c7163
Correct targeted_arel joined with load_balancer
Ladas Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/models/load_balancer_pool.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class LoadBalancerPool < ApplicationRecord

has_many :load_balancer_listener_pools, :dependent => :destroy
has_many :load_balancer_listeners, :through => :load_balancer_listener_pools
has_many :load_balancers, :through => :load_balancer_listeners
has_many :load_balancer_pool_member_pools, :dependent => :destroy
has_many :load_balancer_pool_members, :through => :load_balancer_pool_member_pools

Expand Down
62 changes: 38 additions & 24 deletions app/models/manager_refresh/inventory_collection_default/network_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def cloud_subnet_network_ports(extra_attributes = {})
:parent_inventory_collections => [:vms, :network_ports, :load_balancers],
}

extra_attributes[:targeted_arel] = lambda do |inventory_collection|
attributes[:targeted_arel] = lambda do |inventory_collection|
manager_uuids = inventory_collection.parent_inventory_collections.flat_map { |c| c.manager_uuids.to_a }
inventory_collection.parent.cloud_subnet_network_ports.references(:network_ports).where(
:network_ports => {:ems_ref => manager_uuids}
Expand Down Expand Up @@ -114,9 +114,12 @@ def load_balancer_pools(extra_attributes = {})
}
}

extra_attributes[:targeted_arel] = lambda do |inventory_collection|
attributes[:targeted_arel] = lambda do |inventory_collection|
manager_uuids = inventory_collection.parent_inventory_collections.flat_map { |c| c.manager_uuids.to_a }
inventory_collection.parent.load_balancer_pools.where(:ems_ref => manager_uuids)
inventory_collection.parent.load_balancer_pools
.joins(:load_balancers)
.where(:load_balancers => {:ems_ref => manager_uuids})
.distinct
end

attributes.merge!(extra_attributes)
Expand All @@ -132,12 +135,17 @@ def load_balancer_pool_members(extra_attributes = {})
}
}

extra_attributes[:targeted_arel] = lambda do |inventory_collection|
attributes[:targeted_arel] = lambda do |inventory_collection|
manager_uuids = inventory_collection.parent_inventory_collections.flat_map { |c| c.manager_uuids.to_a }
inventory_collection.parent.load_balancer_pool_members
.joins(:load_balancer_pool_member_pools => :load_balancer_pool)
.where(:load_balancer_pool_member_pools => {'load_balancer_pools' => {:ems_ref => manager_uuids}})
.distinct
.joins(:load_balancer_pool_member_pools => [:load_balancer_pool => :load_balancers])
.where(:load_balancer_pool_member_pools => {
'load_balancer_pools' => {
'load_balancers' => {
:ems_ref => manager_uuids
}
}
}).distinct
end

attributes.merge!(extra_attributes)
Expand All @@ -151,11 +159,11 @@ def load_balancer_pool_member_pools(extra_attributes = {})
:parent_inventory_collections => [:load_balancers]
}

extra_attributes[:targeted_arel] = lambda do |inventory_collection|
attributes[:targeted_arel] = lambda do |inventory_collection|
manager_uuids = inventory_collection.parent_inventory_collections.flat_map { |c| c.manager_uuids.to_a }
inventory_collection.parent.load_balancer_pool_member_pools
.references(:load_balancer_pools)
.where(:load_balancer_pools => {:ems_ref => manager_uuids})
.joins(:load_balancer_pool => :load_balancers)
.where(:load_balancer_pools => {'load_balancers' => {:ems_ref => manager_uuids}})
.distinct
end

Expand All @@ -173,11 +181,12 @@ def load_balancer_listeners(extra_attributes = {})
}
}

extra_attributes[:targeted_arel] = lambda do |inventory_collection|
attributes[:targeted_arel] = lambda do |inventory_collection|
manager_uuids = inventory_collection.parent_inventory_collections.flat_map { |c| c.manager_uuids.to_a }
inventory_collection.parent.load_balancer_listeners.joins(:load_balancer).where(
:load_balancers => {:ems_ref => manager_uuids}
)
inventory_collection.parent.load_balancer_listeners
.joins(:load_balancer)
.where(:load_balancers => {:ems_ref => manager_uuids})
.distinct
end

attributes.merge!(extra_attributes)
Expand All @@ -191,11 +200,12 @@ def load_balancer_listener_pools(extra_attributes = {})
:parent_inventory_collections => [:load_balancers]
}

extra_attributes[:targeted_arel] = lambda do |inventory_collection|
attributes[:targeted_arel] = lambda do |inventory_collection|
manager_uuids = inventory_collection.parent_inventory_collections.flat_map { |c| c.manager_uuids.to_a }
inventory_collection.parent.load_balancer_listener_pools.joins(:load_balancer_pool).where(
:load_balancer_pools => {:ems_ref => manager_uuids}
)
inventory_collection.parent.load_balancer_listener_pools
.joins(:load_balancer_pool => :load_balancers)
.where(:load_balancer_pools => {'load_balancers' => {:ems_ref => manager_uuids}})
.distinct
end

attributes.merge!(extra_attributes)
Expand All @@ -211,9 +221,12 @@ def load_balancer_health_checks(extra_attributes = {})
}
}

extra_attributes[:targeted_arel] = lambda do |inventory_collection|
attributes[:targeted_arel] = lambda do |inventory_collection|
manager_uuids = inventory_collection.parent_inventory_collections.flat_map { |c| c.manager_uuids.to_a }
inventory_collection.parent.load_balancer_health_checks.where(:ems_ref => manager_uuids)
inventory_collection.parent.load_balancer_health_checks
.joins(:load_balancer)
.where(:load_balancers => {:ems_ref => manager_uuids})
.distinct
end

attributes.merge!(extra_attributes)
Expand All @@ -227,11 +240,12 @@ def load_balancer_health_check_members(extra_attributes = {})
:parent_inventory_collections => [:load_balancers],
}

extra_attributes[:targeted_arel] = lambda do |inventory_collection|
attributes[:targeted_arel] = lambda do |inventory_collection|
manager_uuids = inventory_collection.parent_inventory_collections.flat_map { |c| c.manager_uuids.to_a }
inventory_collection.parent.load_balancer_health_check_members.references(:load_balancer_health_checks).where(
:load_balancer_health_checks => {:ems_ref => manager_uuids}
)
inventory_collection.parent.load_balancer_health_check_members
.joins(:load_balancer_health_check => :load_balancer)
.where(:load_balancer_health_checks => {'load_balancers' => {:ems_ref => manager_uuids}})
.distinct
end

attributes.merge!(extra_attributes)
Expand Down