From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/lib/provider_selection.rb | 20 ++++ src/lib/provider_selection/base.rb | 121 +++++++++++++++++++++++ src/lib/provider_selection/chainable_strategy.rb | 44 +++++++++ src/lib/provider_selection/match.rb | 50 ++++++++++ src/lib/provider_selection/priority_group.rb | 71 +++++++++++++ src/lib/provider_selection/rank.rb | 54 ++++++++++ src/lib/provider_selection/strategy.rb | 35 +++++++ 7 files changed, 395 insertions(+) create mode 100644 src/lib/provider_selection.rb create mode 100644 src/lib/provider_selection/base.rb create mode 100644 src/lib/provider_selection/chainable_strategy.rb create mode 100644 src/lib/provider_selection/match.rb create mode 100644 src/lib/provider_selection/priority_group.rb create mode 100644 src/lib/provider_selection/rank.rb create mode 100644 src/lib/provider_selection/strategy.rb diff --git a/src/lib/provider_selection.rb b/src/lib/provider_selection.rb new file mode 100644 index 0000000..375c9dc --- /dev/null +++ b/src/lib/provider_selection.rb @@ -0,0 +1,20 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Require files in lib dir +['match', 'priority_group', 'rank', 'strategy', 'base', 'chainable_strategy'].each do |file_name| + require File.join(File.dirname(__FILE__), 'provider_selection', file_name) +end diff --git a/src/lib/provider_selection/base.rb b/src/lib/provider_selection/base.rb new file mode 100644 index 0000000..84a42fa --- /dev/null +++ b/src/lib/provider_selection/base.rb @@ -0,0 +1,121 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class Base + + @strategies = [] + @view_paths = [] + + class << self + attr_reader :strategies + attr_reader :view_paths + + def register_strategy(name, lib_path, options = {}) + # TODO: this require call should be revised in the future considering security aspects + require lib_path + new_klass = "provider_selection/strategies/#{name.to_s}".classify.constantize + @strategies << Strategy.new(name, new_klass) + end + + def find_strategy_by_name(name) + @strategies.detect{ |strategy| strategy.name == name.to_s } + end + + def add_view_path(view_path) + @view_paths << view_path + end + end + + attr_reader :instances + + def initialize(instances) + @instances = instances + @strategy_chain = self + end + + def calculate + pool = @instances.first.pool + rank = Rank.new(pool) + + provider_accounts = find_common_provider_accounts.map do |provider_account| + provider_account if provider_account.quota.can_start?(@instances) + end.uniq.compact + + # Adding a priority of 100000 to the default priority group which contains + # all the available provider accounts. + # The user defined priority groups has a score between -100 and +100. + default_priority_group = PriorityGroup.new(100000) + rank.default_priority_group = default_priority_group + + provider_accounts.uniq.each do |provider_account| + # Rescale to provider account priority to the [-100, 100] interval + score = provider_account.priority + if score.present? && score > Match::UPPER_LIMIT + score = Match::UPPER_LIMIT + elsif score.present? && score < Match::LOWER_LIMIT + score = Match::LOWER_LIMIT + end + + default_priority_group.matches << Match.new(provider_account, score) + end + + rank + end + + def next_match + rank = @strategy_chain.calculate + rank.ordered_priority_groups.each do |priority_group| + random_match = priority_group.get_random_match + return random_match if random_match.present? + end + + nil + end + + def chain_strategy(name, options = {}) + @strategy = self.class.find_strategy_by_name(name) + @strategy_chain = @strategy.klass.new(@strategy_chain, options) + end + + private + + def find_common_provider_accounts + instance_matches_grouped_by_instances = @instances.map do |instance| + matches, errors = instance.matches + matches + end + + result = [] + if instance_matches_grouped_by_instances.any? + result += instance_matches_grouped_by_instances.first.map(&:provider_account) + end + + instance_matches_grouped_by_instances.each_with_index do |instance_matches, index| + if index == 0 + result += instance_matches.map(&:provider_account) + else + result &= instance_matches.map(&:provider_account) + end + end + + result + end + + end + +end diff --git a/src/lib/provider_selection/chainable_strategy.rb b/src/lib/provider_selection/chainable_strategy.rb new file mode 100644 index 0000000..9f3b974 --- /dev/null +++ b/src/lib/provider_selection/chainable_strategy.rb @@ -0,0 +1,44 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + module ChainableStrategy + + module InstanceMethods + + def initialize(strategies, options) + @strategies = strategies + @options = options + end + + def method_missing(method, *args) + args.empty? ? @strategies.send(method) : @strategies.send(method, args) + end + + end + + module ClassMethods + + def properties + @properties || {} + end + + end + + end + +end diff --git a/src/lib/provider_selection/match.rb b/src/lib/provider_selection/match.rb new file mode 100644 index 0000000..485bc3a --- /dev/null +++ b/src/lib/provider_selection/match.rb @@ -0,0 +1,50 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class Match + + UPPER_LIMIT = 100 + LOWER_LIMIT = -100 + + attr_reader :score + attr_accessor :provider_account + + def initialize(provider_account, score = nil) + @provider_account = provider_account + @score = score + end + + def score=(val) + raise ArgumentError.new("score cannot be higher than #{UPPER_LIMIT}") if val > UPPER_LIMIT + raise ArgumentError.new("score cannot be lower than #{LOWER_LIMIT}") if val < LOWER_LIMIT + + @score = val + end + + # nil values should value more then any other value + def calculated_score + if @score.nil? + UPPER_LIMIT + 1 + else + @score + end + end + + end + +end \ No newline at end of file diff --git a/src/lib/provider_selection/priority_group.rb b/src/lib/provider_selection/priority_group.rb new file mode 100644 index 0000000..c2a0c0d --- /dev/null +++ b/src/lib/provider_selection/priority_group.rb @@ -0,0 +1,71 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class PriorityGroup + + attr_accessor :matches + attr_accessor :score + + def initialize(score = nil) + @matches = [] + @score = score + end + + def self.create_from_active_record(obj, allowed_matches) + priority_group = PriorityGroup.new(obj.score) + + possible_provider_accounts = obj.all_provider_accounts + allowed_provider_accounts = allowed_matches.map do |match| + match.provider_account + end.uniq + + possible_provider_accounts &= allowed_provider_accounts + + return nil if possible_provider_accounts.empty? + + possible_provider_accounts.each do |provider_account| + priority_group.matches << Match.new(provider_account) + end + + priority_group + end + + def get_random_match + match_sum_score = @matches.sum do |match| + (Match::UPPER_LIMIT + 1) - match.calculated_score + end + + # In order to work with 'nil' scores adding the size of the @matches array + match_sum_score += @matches.length + random_value = rand(match_sum_score) + + sum = match_sum_score + matches.each do |match| + difference = (Match::UPPER_LIMIT + 1) - match.calculated_score + sum -= (difference + 1) + if random_value >= sum + return match + end + end + + nil + end + + end + +end diff --git a/src/lib/provider_selection/rank.rb b/src/lib/provider_selection/rank.rb new file mode 100644 index 0000000..7479ddf --- /dev/null +++ b/src/lib/provider_selection/rank.rb @@ -0,0 +1,54 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class Rank + + attr_accessor :priority_groups + attr_reader :pool + + def initialize(pool) + @priority_groups = [] + @pool = pool + end + + def ordered_priority_groups + @priority_groups.sort do |a, b| + if a.score.nil? && b.score.nil? + 0 + elsif a.score.nil? + 1 + elsif b.score.nil? + -1 + else + a.score <=> b.score + end + end + end + + def default_priority_group + @default_priority_group + end + + def default_priority_group=(val) + @default_priority_group = val + priority_groups << val + end + + end + +end \ No newline at end of file diff --git a/src/lib/provider_selection/strategy.rb b/src/lib/provider_selection/strategy.rb new file mode 100644 index 0000000..2706f92 --- /dev/null +++ b/src/lib/provider_selection/strategy.rb @@ -0,0 +1,35 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class Strategy + + attr_reader :name + attr_reader :klass + + def initialize(name, klass) + @name = name + @klass = klass + end + + def translated_name + I18n.t(&quot;strategies.#{(a)name}.name&quot;) + end + + end + +end \ No newline at end of file -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/lib/provider_selection.rb | 20 ++++ src/lib/provider_selection/base.rb | 117 +++++++++++++++++++++++ src/lib/provider_selection/chainable_strategy.rb | 44 +++++++++ src/lib/provider_selection/match.rb | 50 ++++++++++ src/lib/provider_selection/priority_group.rb | 71 ++++++++++++++ src/lib/provider_selection/rank.rb | 54 +++++++++++ src/lib/provider_selection/strategy.rb | 35 +++++++ 7 files changed, 391 insertions(+) create mode 100644 src/lib/provider_selection.rb create mode 100644 src/lib/provider_selection/base.rb create mode 100644 src/lib/provider_selection/chainable_strategy.rb create mode 100644 src/lib/provider_selection/match.rb create mode 100644 src/lib/provider_selection/priority_group.rb create mode 100644 src/lib/provider_selection/rank.rb create mode 100644 src/lib/provider_selection/strategy.rb diff --git a/src/lib/provider_selection.rb b/src/lib/provider_selection.rb new file mode 100644 index 0000000..375c9dc --- /dev/null +++ b/src/lib/provider_selection.rb @@ -0,0 +1,20 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Require files in lib dir +['match', 'priority_group', 'rank', 'strategy', 'base', 'chainable_strategy'].each do |file_name| + require File.join(File.dirname(__FILE__), 'provider_selection', file_name) +end diff --git a/src/lib/provider_selection/base.rb b/src/lib/provider_selection/base.rb new file mode 100644 index 0000000..b7a4300 --- /dev/null +++ b/src/lib/provider_selection/base.rb @@ -0,0 +1,117 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class Base + + @strategies = [] + @view_paths = [] + + class << self + attr_reader :strategies + attr_reader :view_paths + + def register_strategy(name, lib_path, options = {}) + # TODO: this require call should be revised in the future considering security aspects + require lib_path + new_klass = "provider_selection/strategies/#{name.to_s}".classify.constantize + @strategies << Strategy.new(name, new_klass) + end + + def find_strategy_by_name(name) + @strategies.detect{ |strategy| strategy.name == name.to_s } + end + + def add_view_path(view_path) + @view_paths << view_path + end + end + + attr_reader :instances + + def initialize(instances) + @instances = instances + @strategy_chain = self + end + + def calculate + pool = @instances.first.pool + rank = Rank.new(pool) + + provider_accounts = find_common_provider_accounts.map do |provider_account| + provider_account if provider_account.quota.can_start?(@instances) + end.uniq.compact + + # Adding a priority of 100000 to the default priority group which contains + # all the available provider accounts. + # The user defined priority groups has a score between -100 and +100. + default_priority_group = PriorityGroup.new(100000) + rank.default_priority_group = default_priority_group + + provider_accounts.each do |provider_account| + # Rescale to provider account priority to the [-100, 100] interval + score = provider_account.priority + if score.present? && score > Match::UPPER_LIMIT + score = Match::UPPER_LIMIT + elsif score.present? && score < Match::LOWER_LIMIT + score = Match::LOWER_LIMIT + end + + default_priority_group.matches << Match.new(provider_account, score) + end + + rank + end + + def next_match + rank = @strategy_chain.calculate + rank.ordered_priority_groups.each do |priority_group| + random_match = priority_group.get_random_match + return random_match if random_match.present? + end + + nil + end + + def chain_strategy(name, options = {}) + @strategy = self.class.find_strategy_by_name(name) + @strategy_chain = @strategy.klass.new(@strategy_chain, options) + end + + private + + def find_common_provider_accounts + instance_matches_grouped_by_instances = @instances.map do |instance| + matches, errors = instance.matches + matches + end + + result = [] + instance_matches_grouped_by_instances.each_with_index do |instance_matches, index| + if index == 0 + result += instance_matches.map(&:provider_account) + else + result &= instance_matches.map(&:provider_account) + end + end + + result + end + + end + +end diff --git a/src/lib/provider_selection/chainable_strategy.rb b/src/lib/provider_selection/chainable_strategy.rb new file mode 100644 index 0000000..9f3b974 --- /dev/null +++ b/src/lib/provider_selection/chainable_strategy.rb @@ -0,0 +1,44 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + module ChainableStrategy + + module InstanceMethods + + def initialize(strategies, options) + @strategies = strategies + @options = options + end + + def method_missing(method, *args) + args.empty? ? @strategies.send(method) : @strategies.send(method, args) + end + + end + + module ClassMethods + + def properties + @properties || {} + end + + end + + end + +end diff --git a/src/lib/provider_selection/match.rb b/src/lib/provider_selection/match.rb new file mode 100644 index 0000000..485bc3a --- /dev/null +++ b/src/lib/provider_selection/match.rb @@ -0,0 +1,50 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class Match + + UPPER_LIMIT = 100 + LOWER_LIMIT = -100 + + attr_reader :score + attr_accessor :provider_account + + def initialize(provider_account, score = nil) + @provider_account = provider_account + @score = score + end + + def score=(val) + raise ArgumentError.new("score cannot be higher than #{UPPER_LIMIT}") if val > UPPER_LIMIT + raise ArgumentError.new("score cannot be lower than #{LOWER_LIMIT}") if val < LOWER_LIMIT + + @score = val + end + + # nil values should value more then any other value + def calculated_score + if @score.nil? + UPPER_LIMIT + 1 + else + @score + end + end + + end + +end \ No newline at end of file diff --git a/src/lib/provider_selection/priority_group.rb b/src/lib/provider_selection/priority_group.rb new file mode 100644 index 0000000..c2a0c0d --- /dev/null +++ b/src/lib/provider_selection/priority_group.rb @@ -0,0 +1,71 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class PriorityGroup + + attr_accessor :matches + attr_accessor :score + + def initialize(score = nil) + @matches = [] + @score = score + end + + def self.create_from_active_record(obj, allowed_matches) + priority_group = PriorityGroup.new(obj.score) + + possible_provider_accounts = obj.all_provider_accounts + allowed_provider_accounts = allowed_matches.map do |match| + match.provider_account + end.uniq + + possible_provider_accounts &= allowed_provider_accounts + + return nil if possible_provider_accounts.empty? + + possible_provider_accounts.each do |provider_account| + priority_group.matches << Match.new(provider_account) + end + + priority_group + end + + def get_random_match + match_sum_score = @matches.sum do |match| + (Match::UPPER_LIMIT + 1) - match.calculated_score + end + + # In order to work with 'nil' scores adding the size of the @matches array + match_sum_score += @matches.length + random_value = rand(match_sum_score) + + sum = match_sum_score + matches.each do |match| + difference = (Match::UPPER_LIMIT + 1) - match.calculated_score + sum -= (difference + 1) + if random_value >= sum + return match + end + end + + nil + end + + end + +end diff --git a/src/lib/provider_selection/rank.rb b/src/lib/provider_selection/rank.rb new file mode 100644 index 0000000..7479ddf --- /dev/null +++ b/src/lib/provider_selection/rank.rb @@ -0,0 +1,54 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class Rank + + attr_accessor :priority_groups + attr_reader :pool + + def initialize(pool) + @priority_groups = [] + @pool = pool + end + + def ordered_priority_groups + @priority_groups.sort do |a, b| + if a.score.nil? && b.score.nil? + 0 + elsif a.score.nil? + 1 + elsif b.score.nil? + -1 + else + a.score <=> b.score + end + end + end + + def default_priority_group + @default_priority_group + end + + def default_priority_group=(val) + @default_priority_group = val + priority_groups << val + end + + end + +end \ No newline at end of file diff --git a/src/lib/provider_selection/strategy.rb b/src/lib/provider_selection/strategy.rb new file mode 100644 index 0000000..2706f92 --- /dev/null +++ b/src/lib/provider_selection/strategy.rb @@ -0,0 +1,35 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + + class Strategy + + attr_reader :name + attr_reader :klass + + def initialize(name, klass) + @name = name + @klass = klass + end + + def translated_name + I18n.t(&quot;strategies.#{(a)name}.name&quot;) + end + + end + +end \ No newline at end of file -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- .../provider_selection/provider_selection.rb | 28 +++++++++++++ .../strategies/strict_order/strict_order.rb | 48 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 src/vendor/provider_selection/provider_selection.rb create mode 100644 src/vendor/provider_selection/strategies/strict_order/strict_order.rb diff --git a/src/vendor/provider_selection/provider_selection.rb b/src/vendor/provider_selection/provider_selection.rb new file mode 100644 index 0000000..8048488 --- /dev/null +++ b/src/vendor/provider_selection/provider_selection.rb @@ -0,0 +1,28 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Require strategies +Dir['vendor/provider_selection/strategies/*/'].each do |path| + strategy_name = File.basename(path) + strategy_lib_path = File.expand_path(File.join(path, "#{strategy_name}.rb")) + ProviderSelection::Base.register_strategy(strategy_name, strategy_lib_path) +end + +# Register view path +#ProviderSelection::Base.add_view_path(File.expand_path(File.join('vendor', 'provider_selection', 'views'))) + +# Extend I18n.load_path +#I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'config', 'locales', '*.yml')] diff --git a/src/vendor/provider_selection/strategies/strict_order/strict_order.rb b/src/vendor/provider_selection/strategies/strict_order/strict_order.rb new file mode 100644 index 0000000..8847e32 --- /dev/null +++ b/src/vendor/provider_selection/strategies/strict_order/strict_order.rb @@ -0,0 +1,48 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +module ProviderSelection + module Strategies + + class StrictOrder + + include ProviderSelection::ChainableStrategy::InstanceMethods + extend ProviderSelection::ChainableStrategy::ClassMethods + + @properties = { + :edit_path => 'pool_provider_selection_provider_priority_groups_path' + } + + def calculate + rank = @strategies.calculate + + if rank.pool.provider_priority_groups.any? + rank.pool.provider_priority_groups.each do |priority_group| + new_priority_group = + ProviderSelection::PriorityGroup. + create_from_active_record(priority_group, + rank.default_priority_group.matches) + rank.priority_groups << new_priority_group if new_priority_group.present? + end + end + + rank + end + + end + + end +end -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- .../controllers/provider_selections_controller.rb | 41 ++++++++++++++++++++++ .../provider_selections/edit_strategy.html.haml | 14 ++++++++ src/app/views/provider_selections/show.html.haml | 22 ++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 src/app/controllers/provider_selections_controller.rb create mode 100644 src/app/views/provider_selections/edit_strategy.html.haml create mode 100644 src/app/views/provider_selections/show.html.haml diff --git a/src/app/controllers/provider_selections_controller.rb b/src/app/controllers/provider_selections_controller.rb new file mode 100644 index 0000000..7ae67e2 --- /dev/null +++ b/src/app/controllers/provider_selections_controller.rb @@ -0,0 +1,41 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +class ProviderSelectionsController < ApplicationController + + before_filter :require_user + before_filter :set_view_path + + def show + @pool = Pool.find(params[:pool_id]) + @environment = @pool.pool_family + end + + def edit_strategy + @pool = Pool.find(params[:pool_id]) + @strategy = ProviderSelection::Base.find_strategy_by_name(params[:name]) + @priority_groups = @pool.provider_priority_groups + end + + private + + def set_view_path + ProviderSelection::Base.view_paths.each do |view_path| + append_view_path(view_path) + end + end + +end \ No newline at end of file diff --git a/src/app/views/provider_selections/edit_strategy.html.haml b/src/app/views/provider_selections/edit_strategy.html.haml new file mode 100644 index 0000000..ae51a43 --- /dev/null +++ b/src/app/views/provider_selections/edit_strategy.html.haml @@ -0,0 +1,14 @@ += render :partial => 'layouts/admin_nav' + +%header.page-header + .obj_actions + .return_to + = t(:return_to) + = link_to t('provider_selection.edit_stategy.strategies', :pool => @pool.name), pool_provider_selection_path(@pool) + %h1.no-icon= t('provider_selection.show.provider_selection') + +%section.content-section + %header + %h2=t t('provider_selection.show.edit_strategy', :name => @strategy.translated_name) + .content + = render :partial => &quot;#{(a)strategy.name}/form&quot; diff --git a/src/app/views/provider_selections/show.html.haml b/src/app/views/provider_selections/show.html.haml new file mode 100644 index 0000000..c10014c --- /dev/null +++ b/src/app/views/provider_selections/show.html.haml @@ -0,0 +1,22 @@ += render :partial => 'layouts/admin_nav' + +%header.page-header + .obj_actions + .return_to + = t(:return_to) + = link_to t('provider_selection.show.environment', :environment => @environment.name), pool_family_path(@environment) + %h1.no-icon= t('provider_selection.show.provider_selection') + +%section.content-section + %header + %h2=t 'Available Strategies' + .content + %table.flat + %thead + %tbody + %tr + %td= link_to(t('provider_selection.show.strategies.strict_order'), pool_provider_selection_provider_priority_groups_path(@pool)) + - ProviderSelection::Base.strategies.each do |strategy| + - if strategy.include_in_listings + %tr + %td= link_to(strategy.translated_name, edit_strategy_pool_provider_selection_path(:name => strategy.name)) -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/app/models/pool.rb | 2 + src/app/models/provider.rb | 2 + src/app/models/provider_account.rb | 2 + src/app/models/provider_priority_group.rb | 50 +++++++++++++++++++++++ src/app/models/provider_priority_group_element.rb | 22 ++++++++++ 5 files changed, 78 insertions(+) create mode 100644 src/app/models/provider_priority_group.rb create mode 100644 src/app/models/provider_priority_group_element.rb diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 13baebc..23d31c6 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -66,6 +66,8 @@ class Pool < ActiveRecord::Base has_many :deployments, :dependent => :destroy + has_many :provider_priority_groups, :dependent => :destroy + before_destroy :destroyable? def cloud_accounts diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index cf2a7e7..64ddb33 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -59,6 +59,8 @@ class Provider < ActiveRecord::Base has_many :derived_permissions, :as => :permission_object, :dependent => :destroy, :include => [:role], :order => "derived_permissions.id ASC" + has_many :provider_priority_group_elements, :as => :value, :dependent => :destroy + has_many :provider_priority_groups, :through => :provider_priority_group_elements before_destroy :destroyable? diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb index 067f5cf..1e8d41c 100644 --- a/src/app/models/provider_account.rb +++ b/src/app/models/provider_account.rb @@ -58,6 +58,8 @@ class ProviderAccount < ActiveRecord::Base # eventually, this might be "has_many", but first pass is one-to-one has_one :config_server, :dependent => :destroy + has_many :provider_priority_group_elements, :as => :value, :dependent => :destroy + # Helpers attr_accessor :x509_cert_priv_file, :x509_cert_pub_file diff --git a/src/app/models/provider_priority_group.rb b/src/app/models/provider_priority_group.rb new file mode 100644 index 0000000..1e1a594 --- /dev/null +++ b/src/app/models/provider_priority_group.rb @@ -0,0 +1,50 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +class ProviderPriorityGroup < ActiveRecord::Base + + belongs_to :pool + has_many :provider_priority_group_elements, :dependent => :destroy + has_many :providers, :through => :provider_priority_group_elements, :source => :value, :source_type => 'Provider' + has_many :provider_accounts, :through => :provider_priority_group_elements, :source => :value, :source_type => 'ProviderAccount' + + validates_numericality_of :score, :only_integer => true, :greater_than_or_equal_to => -100, :less_than_or_equal_to => 100 + + def include?(element) + if element.is_a?(Provider) + providers.include?(element) + elsif element.is_a?(ProviderAccount) + providers.include?(element.provider) || provider_accounts.include?(element) + end + end + + def add_provider_accounts(selected_provider_accounts) + selected_provider_accounts.each do |provider_account| + unless providers.include?(provider_account.provider) + provider_accounts << provider_account + end + end + end + + def all_provider_accounts + result = providers.inject([]) do |result, provider| + result += provider.provider_accounts + end + + result += provider_accounts + end + +end \ No newline at end of file diff --git a/src/app/models/provider_priority_group_element.rb b/src/app/models/provider_priority_group_element.rb new file mode 100644 index 0000000..65d1c7b --- /dev/null +++ b/src/app/models/provider_priority_group_element.rb @@ -0,0 +1,22 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +class ProviderPriorityGroupElement < ActiveRecord::Base + + belongs_to :provider_priority_group + belongs_to :value, :polymorphic => true + +end \ No newline at end of file -- 1.7.11.2

On 08/13/2012 08:26 PM, Jozef Zigmund wrote: Yeah, there is no callback *for now*. But in the future if some will be added, there will be a high chance that this would be forgotten and will resurrect in some form of BZ. :-) Also, the performance gain you can except from delete_all is just a few ms and I'm pretty sure that the user will never notice it. So, I think tolerance against future changes has much more benefit over gaining few ms in server response.

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/app/stylesheets/layout.scss | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 1f154ac..84b5494 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -1785,6 +1785,73 @@ ul.image_builds{ } /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Priority Group form +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#priority-group-form { + legend { + font-family: $font-family-primary; + font-size: 16px; + } +} + +ul.priority-groups { + li { + border: 1px solid #CCCCCC; + -webkit-border-radius: 7px 7px 7px 7px; -moz-border-radius: 7px 7px 7px 7px; border-radius: 7px 7px 7px 7px; + margin: 10px 0 20px 0px; + + .summary { + background: -moz-linear-gradient(top, #efefef 0%, #e0e0e0 100%); + background: -webkit-linear-gradient(top, #efefef 0%,#e0e0e0 100%); + display: table; + width: 100%; + + .info { + padding: 10px 10px 10px 42px; + + h3 { + font-size: 16px + } + } + + .controls { + display: table-cell; + padding: 10px; + text-align: right; + vertical-align: middle; + } + } + + .details { + background: none repeat scroll 0 0 #EEEEEE; + border-top: 1px solid #CCCCCC; + padding: 10px; + + table { + margin: 0 0 0 32px; + + th { + border-bottom: 1px solid #CCCCCC; + } + + th, td { + padding: 10px; + } + + td.center { + text-align: center; + } + } + } + } +} + +#no-provider-account { + padding-bottom: 50px; +} + + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Flat Table Component -- v.0.0.1 [flat_table] (flat_table.scss) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -2071,6 +2138,7 @@ table.pool_families{ color: white; text-decoration: none; + white-space: nowrap; padding: 3px 6px; -webkit-border-radius: 12px; -moz-border-radius: 12px; border-radius: 12px; border: 1px solid #343434; -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/config/navigation.rb | 4 ++-- src/config/routes.rb | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/config/navigation.rb b/src/config/navigation.rb index 4c37e23..14396a3 100644 --- a/src/config/navigation.rb +++ b/src/config/navigation.rb @@ -18,10 +18,10 @@ SimpleNavigation::Configuration.run do |navigation| navigation.autogenerate_item_ids = false navigation.items do |first_level| first_level.dom_class = 'container' - first_level.item :monitor, t('navigation.first_level.monitor'), pools_path, :class => 'monitor', :link => { :id => 'monitor' }, :highlights_on => /\/deployments|\/pools|\/instances|\/logs|\/\z/ + first_level.item :monitor, t('navigation.first_level.monitor'), pools_path, :class => 'monitor', :link => { :id => 'monitor' }, :highlights_on => /\/deployments|\/pools$|\/pools\/\d$|\/instances|\/logs|\/\z/ first_level.item :administer, t('navigation.first_level.administer'), users_path, :class => 'administer' do |second_level| second_level.item :users, t('navigation.second_level.users'), users_path, :link => { :class => 'users' }, :highlights_on => /\/users|\/user_groups|\/roles|\/permissions|\/account/ - second_level.item :environments, t('navigation.second_level.environments'), pool_families_path, :link => { :class => 'environments' }, :highlights_on => /\/pool_families|\/images/ + second_level.item :environments, t('navigation.second_level.environments'), pool_families_path, :link => { :class => 'environments' }, :highlights_on => /\/pool_families|\/images|\/pools\/\d\/provider_selection/ second_level.item :content, t('navigation.second_level.content'), catalogs_path, :link => { :class => 'content' }, :highlights_on => /\/catalogs|\/catalog_entries|\/realms|\/hardware_profiles|\/realm_mappings|\/deployables/ second_level.item :cloud_providers, t('navigation.second_level.cloud_providers'), providers_path, :link => { :class => 'providers' }, :highlights_on => /\/providers|\/provider_realms|\/config_servers/ second_level.item :settings, t('navigation.second_level.settings'), settings_path, :link => { :class => 'settings'}, :highlights_on => /\/settings/ diff --git a/src/config/routes.rb b/src/config/routes.rb index c13d827..8ff4f31 100644 --- a/src/config/routes.rb +++ b/src/config/routes.rb @@ -88,6 +88,7 @@ Conductor::Application.routes.draw do end end + resources :settings do collection do get :self_service @@ -96,6 +97,17 @@ Conductor::Application.routes.draw do resources :pools do delete :multi_destroy, :on => :collection post :filter, :on => :collection + + resource :provider_selection, :only => [:show] do + resources :provider_priority_groups, :except => [:show] + + collection do + get :edit_strategy + #post :update_strategy + end + + #match ':id', :to => 'provider_selections#show', :as => 'provider_selection_strategy' + end end resources :deployments do -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- .../controllers/provider_selections_controller.rb | 38 +++++++++++++++++++--- src/config/locales/en.yml | 11 ++++--- src/config/routes.rb | 7 +--- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/app/controllers/provider_selections_controller.rb b/src/app/controllers/provider_selections_controller.rb index 7ae67e2..27ea5f8 100644 --- a/src/app/controllers/provider_selections_controller.rb +++ b/src/app/controllers/provider_selections_controller.rb @@ -22,12 +22,42 @@ class ProviderSelectionsController < ApplicationController def show @pool = Pool.find(params[:pool_id]) @environment = @pool.pool_family + @available_strategies = ProviderSelection::Base.strategies end - def edit_strategy - @pool = Pool.find(params[:pool_id]) - @strategy = ProviderSelection::Base.find_strategy_by_name(params[:name]) - @priority_groups = @pool.provider_priority_groups + def toggle_strategy + pool = Pool.find(params[:pool_id]) + strategy = ProviderSelection::Base.find_strategy_by_name(params[:strategy_name]) + + if pool.provider_selection_strategies.exists?(:name => strategy.name) + provider_selection_strategy = pool.provider_selection_strategies.find_by_name(strategy.name) + provider_selection_strategy.enabled = !provider_selection_strategy.enabled + else + provider_selection_strategy = + ProviderSelectionStrategy.new(:name => strategy.name, + :enabled => true, + :pool => pool) + end + + if provider_selection_strategy.save + notice = + if provider_selection_strategy.enabled + t('provider_selection.flash.successfully_enabled', :strategy_name => strategy.translated_name) + else + t('provider_selection.flash.successfully_disabled', :strategy_name => strategy.translated_name) + end + + redirect_to :back, :notice => notice + else + notice = + if provider_selection_strategy.enabled + t('provider_selection.flash.failed_to_enable', :strategy_name => strategy.translated_name) + else + t('provider_selection.flash.failed_to_disable', :strategy_name => strategy.translated_name) + end + + redirect_to :back, :notice => notice + end end private diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml index c475094..af65ecb 100644 --- a/src/config/locales/en.yml +++ b/src/config/locales/en.yml @@ -623,10 +623,12 @@ en: provider_selection: Provider Selection Strategies environment: "Environment: %{environment}" edit_strategy: "Edit %{name} Strategy" - strategies: - strict_order: 'Strict Order' - edit_stategy: - strategies: "Provider Selection Strategies for Pool: %{pool}" + configure: "Configure" + flash: + successfully_enabled: "Successfully enabled %{strategy_name} strategy" + successfully_disabled: "Successfully disabled %{strategy_name} strategy" + failed_to_enable: "Failed to enable %{strategy_name} strategy" + failed_to_disable: "Failed to disable %{strategy_name} strategy" hardware_profiles: hardware: Hardware hardware_profile: Hardware Profile @@ -1308,6 +1310,7 @@ en: quota_percentage_used: "Quota Used" quota_maximum_running_instances: "Quota Limit" no_priority_group: 'No available priority group to display' + back_to_strategies: "Provider Selection Strategies for Pool: %{pool}" new: title: 'Add new Priority Group' back: "Provider Groups for Pool: %{pool}" diff --git a/src/config/routes.rb b/src/config/routes.rb index 8ff4f31..8ec7b68 100644 --- a/src/config/routes.rb +++ b/src/config/routes.rb @@ -101,12 +101,7 @@ Conductor::Application.routes.draw do resource :provider_selection, :only => [:show] do resources :provider_priority_groups, :except => [:show] - collection do - get :edit_strategy - #post :update_strategy - end - - #match ':id', :to => 'provider_selections#show', :as => 'provider_selection_strategy' + match ':strategy_name/toggle', :to => 'provider_selections#toggle_strategy', :as => 'toggle_strategy' end end -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/app/stylesheets/layout.scss | 105 +++++++++++++++++++++ .../images/provider_selection_strategy_toggle.png | Bin 0 -> 3015 bytes 2 files changed, 105 insertions(+) create mode 100644 src/public/images/provider_selection_strategy_toggle.png diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 84b5494..5b34ec3 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -1784,6 +1784,111 @@ ul.image_builds{ } } + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Provider Selection Strategies table +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +table.provider-selection-strategies { + + color: white; + width: 100%; + border-collapse: separate; + + td { + padding: 8px; + border-top: 1px solid #909090; + border-bottom: 1px solid #343434; + background: -moz-linear-gradient(top, #666666 0%, #535353 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #666666 0%,#535353 100%); /* Chrome10+,Safari5.1+ */ + background: linear-gradient(top, #666666 0%,#535353 100%); /* W3C */ + + &.right { + text-align: right; + } + + &.status { + width: 45px; + height: 44px; + + a.status-toggle { + @include display_inline_block; + width: 45px; + height: 21px; + padding: 0px; + border: none; + + &.on{ + background: transparent url('../../images/provider_selection_strategy_toggle.png') left center; + } + &.off{ + background: transparent url('../../images/provider_selection_strategy_toggle.png') right center; + } + } + } + + .configure_strategy_button { + @include display_inline_block; + + white-space: nowrap; + text-decoration: none; + color: white; + padding: 3px 6px; + border: 1px solid #3a3a3a; + + box-shadow: 0px 0px 1px 0px #333; + -webkit-border-radius: 12px; -moz-border-radius: 12px; border-radius: 12px; + -webkit-box-shadow: 0px 0px 1px 0px #333; + -moz-box-shadow: 0px 0px 1px 0px #333; + + background: linear-gradient(top, #535353 0%,#666666 100%); /* W3C */ + background: -moz-linear-gradient(top, #535353 0%, #666666 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #535353 0%,#666666 100%); /* Chrome10+,Safari5.1+ */ + background: #535353; /* Old browsers */ + + &:active{ + box-shadow: 0px 0px 1px 0px #333 inset; + background: linear-gradient(top, #31a500 0%,#297700 100%); /* W3C */ + background: -moz-linear-gradient(top, #31a500 0%, #297700 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #31a500 0%,#297700 100%); /* Chrome10+,Safari5.1+ */ + background: #31a500; /* Old browsers */ + } + + &:hover{ + border: 1px solid #909090; + text-decoration: none; + } + } + } + + tr:first-child { + td:first-child { + -webkit-border-top-left-radius: 7px; + -moz-border-top-left-radius: 7px; + border-top-left-radius: 7px; + } + td:last-child { + -webkit-border-top-right-radius: 7px; + -moz-border-top-right-radius: 7px; + border-top-right-radius: 7px; + } + } + + tr:last-child { + td:first-child { + -webkit-border-bottom-left-radius: 7px; + -moz-border-bottom-left-radius: 7px; + border-bottom-left-radius: 7px; + } + td:last-child { + -webkit-border-bottom-right-radius: 7px; + -moz-border-bottom-right-radius: 7px; + border-bottom-right-radius: 7px; + } + } + +} + + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Priority Group form ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ diff --git a/src/public/images/provider_selection_strategy_toggle.png b/src/public/images/provider_selection_strategy_toggle.png new file mode 100644 index 0000000000000000000000000000000000000000..057ea3e981e2dcc5c4639ce17d77c1dc27cca911 GIT binary patch literal 3015 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 D9=I(N literal 0 HcmV?d00001 -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/app/models/deployment.rb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index 277f9b3..81f1155 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -566,10 +566,6 @@ class Deployment < ActiveRecord::Base end end - # Find account (w/ highest priority) where all instances can be launched. - # 1. find all matches for each instance - # 2. for each account (ordered by priority) try to find match for each - # instance def find_match_with_common_account errors = [] all_matches = instances.map do |instance| @@ -579,17 +575,22 @@ class Deployment < ActiveRecord::Base m.select {|inst_match| !instance.includes_instance_match?(inst_match)} end - pool.pool_family.provider_accounts_by_priority.each do |account| + provider_selection_strategy = ProviderSelection::Base.new(instances) + pool.provider_selection_strategies.enabled.each do |strategy| + provider_selection_strategy.chain_strategy(strategy.name) + end + + match = provider_selection_strategy.next_match + + if match.present? + account = match.provider_account matches_by_account = all_matches.map do |m| m.find {|m| m.provider_account.id == account.id} end - next if matches_by_account.include?(nil) - unless account.quota.can_start? instances - errors << I18n.t('instances.errors.provider_account_quota_too_low', :match_provider_account => account) - next - end + return [matches_by_account, account, errors] unless matches_by_account.include?(nil) end + [nil, nil, errors] end -- 1.7.11.2

On 08/13/2012 08:26 PM, Jozef Zigmund wrote: As we discussed, it is not breaking the probability distribution since with filtering the sampled data in a way which is not based on the outcome of the random selection (like here: using only every other) you still have the same probability distribution.

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/spec/lib/provider_selection_spec.rb | 64 +++++++++++++++++++++++++++++++++ src/spec/models/deployment_spec.rb | 27 -------------- 2 files changed, 64 insertions(+), 27 deletions(-) create mode 100644 src/spec/lib/provider_selection_spec.rb diff --git a/src/spec/lib/provider_selection_spec.rb b/src/spec/lib/provider_selection_spec.rb new file mode 100644 index 0000000..cf1c252 --- /dev/null +++ b/src/spec/lib/provider_selection_spec.rb @@ -0,0 +1,64 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +require 'spec_helper' + +describe ProviderSelection do + + before(:each) do + @account1 = FactoryGirl.create(:mock_provider_account, :label => "test_account1") + @account2 = FactoryGirl.create(:mock_provider_account, :label => "test_account2") + @account3 = FactoryGirl.create(:mock_provider_account, :label => "test_account3") + + possible1 = FactoryGirl.build(:instance_match, :provider_account => @account1) + possible2 = FactoryGirl.build(:instance_match, :provider_account => @account2) + possible3 = FactoryGirl.build(:instance_match, :provider_account => @account2) + possible4 = FactoryGirl.build(:instance_match, :provider_account => @account3) + possible5 = FactoryGirl.build(:instance_match, :provider_account => @account2) + + instance1 = Factory.build(:instance) + instance1.stub!(:matches).and_return([[possible1, possible2], []]) + instance2 = Factory.build(:instance) + instance2.stub!(:matches).and_return([[possible3, possible4], []]) + instance3 = Factory.build(:instance) + instance3.stub!(:matches).and_return([[possible5], []]) + + instances = [instance1, instance2, instance3] + @provider_selection = ProviderSelection::Base.new(instances) + end + + it "should give back valid match" do + match = @provider_selection.next_match + match.provider_account.should eql(@account2) + end + + it "should find common provider account" do + common_provider_accounts = @provider_selection.send(:find_common_provider_accounts) + common_provider_accounts.should eql([@account2]) + end + + it "should calculate initial rank" do + rank = @provider_selection.calculate + rank.priority_groups.length.should eql(1) + + priority_group = rank.priority_groups.first + priority_group.matches.length.should eql(1) + + match = priority_group.matches.first + match.provider_account.should eql(@account2) + end + +end \ No newline at end of file diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 9b2a37e..23addf1 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -266,31 +266,6 @@ describe Deployment do @deployment.instances.count.should == 2 end - it "should match provider accounts according to priority when launching deployment" do - @deployment.save! - @deployment.instances.should be_empty - - Instance.any_instance.stub(:provider_images_for_match).and_return([@provider_image]) - Taskomatic.stub!(:create_dcloud_instance).and_return(true) - Taskomatic.stub!(:handle_dcloud_error).and_return(true) - Taskomatic.stub!(:handle_instance_state).and_return(true) - @deployment.create_and_launch(@session_id, @user_for_launch) - @deployment.errors.should be_empty - @deployment.reload - @deployment.instances.count.should == 2 - @deployment.instances[0].provider_account.should == @provider_account1 - @deployment.instances[1].provider_account.should == @provider_account1 - @provider_account1.priority = 30 - @provider_account1.save! - deployment2 = Factory.create(:deployment, :pool_id => @pool.id) - deployment2.create_and_launch(@session_id, @user_for_launch) - deployment2.errors.should be_empty - deployment2.reload - deployment2.instances.count.should == 2 - deployment2.instances[0].provider_account.should == @provider_account2 - deployment2.instances[1].provider_account.should == @provider_account2 - end - it "should not fail to launch if a provider account has a nil priority" do @deployment.save! @deployment.instances.should be_empty @@ -306,8 +281,6 @@ describe Deployment do @deployment.errors.should be_empty @deployment.reload @deployment.instances.count.should == 2 - @deployment.instances[0].provider_account.should == @provider_account2 - @deployment.instances[1].provider_account.should == @provider_account2 end it "should not create deployment with instances if match not found" do -- 1.7.11.2

From: Imre Farkas <ifarkas(a)redhat.com&gt; --- src/app/helpers/application_helper.rb | 2 +- src/app/helpers/provider_accounts_helper.rb | 23 +++++++--------------- .../_add_provider_accounts_form.html.haml | 2 +- .../pool_families/_provider_accounts.html.haml | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 8480508..6ddee96 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -67,7 +67,7 @@ module ApplicationHelper end end - def filter_table(columns, rows, options={}, &block) + def filter_table(columns, rows, options = {}, &block) _class = rows.first.try(:class) || Object render :partial => 'layouts/filter_table', :locals => { :form_header => options[:form_header] || :form_header, diff --git a/src/app/helpers/provider_accounts_helper.rb b/src/app/helpers/provider_accounts_helper.rb index 49d96ff..ab5cf80 100644 --- a/src/app/helpers/provider_accounts_helper.rb +++ b/src/app/helpers/provider_accounts_helper.rb @@ -14,23 +14,14 @@ # limitations under the License. # module ProviderAccountsHelper - def provider_accounts_header - [ - { :name => 'checkbox', :sortable => false, :class => 'checkbox' }, - { :name => '', :sortable => false, :class => 'alert' }, - { :name => t("provider_accounts.index.provider_account_name"), :sortable => false }, - { :name => t("provider_accounts.index.username"), :sortable => false}, - { :name => t("provider_accounts.index.provider_name"), :sortable => false }, - { :name => t("provider_accounts.index.provider_type"), :sortable => false }, - { :name => t("provider_accounts.index.priority"), :sortable => false, :class => 'center' }, - { :name => t("quota_used"), :sortable => false, :class => 'center' }, - { :name => t("provider_accounts.index.quota_limit"), :sortable => false, :class => 'center' } - ] - end + def provider_accounts_header(options = {}) + columns = [{ :name => 'checkbox', :sortable => false, :class => 'checkbox' }] + + unless options[:without_alert] + columns << { :name => '', :sortable => false, :class => 'alert' } + end - def no_alerts_provider_accounts_header - [ - { :name => 'checkbox', :sortable => false, :class => 'checkbox' }, + columns += [ { :name => t("provider_accounts.index.provider_account_name"), :sortable => false }, { :name => t("provider_accounts.index.username"), :sortable => false}, { :name => t("provider_accounts.index.provider_name"), :sortable => false }, diff --git a/src/app/views/pool_families/_add_provider_accounts_form.html.haml b/src/app/views/pool_families/_add_provider_accounts_form.html.haml index bdb4680..e596960 100644 --- a/src/app/views/pool_families/_add_provider_accounts_form.html.haml +++ b/src/app/views/pool_families/_add_provider_accounts_form.html.haml @@ -1,7 +1,7 @@ - content_for :form_footer do = link_to t('cancel'), pool_family_path(@pool_family, :details_tab => 'provider_accounts'), :class => 'button danger' = restful_submit_tag t('provider_accounts.add_provider_account'), "create", add_provider_accounts_pool_family_path(@pool_family), 'POST', :id => 'save_button', :class => 'button' -= filter_table(no_alerts_provider_accounts_header, @provider_accounts) do |account| += filter_table(provider_accounts_header(:without_alert => true), @provider_accounts) do |account| %tr{:class => cycle('nostripe','stripe')} %td{:class => 'checkbox'} - if check_privilege(Privilege::MODIFY) diff --git a/src/app/views/pool_families/_provider_accounts.html.haml b/src/app/views/pool_families/_provider_accounts.html.haml index b892a79..cfda880 100644 --- a/src/app/views/pool_families/_provider_accounts.html.haml +++ b/src/app/views/pool_families/_provider_accounts.html.haml @@ -3,7 +3,7 @@ %li= link_to t('provider_accounts.add_provider_account'), add_provider_accounts_pool_family_path(@pool_family), { :class => 'button primary', :id => 'add_provider_accounts_button'} %li= restful_submit_tag t('provider_accounts.remove_provider_accounts'), "destroy", remove_provider_accounts_pool_family_path(@pool_family), 'POST', :id => 'remove_button', :class => 'button danger' -= filter_table(no_alerts_provider_accounts_header, @pool_family.provider_accounts) do |account| += filter_table(provider_accounts_header(:without_alert => true), @pool_family.provider_accounts) do |account| %tr{:class => cycle('nostripe','stripe')} %td{:class => 'checkbox'} - if check_privilege(Privilege::MODIFY) -- 1.7.11.2