[PATCH conductor 3/3] BZ 717987 (3) - Fixed error message when realm mapping not found

jprovazn at redhat.com jprovazn at redhat.com
Fri Feb 3 15:10:04 UTC 2012


From: Jan Provaznik <jprovazn at redhat.com>

Added provider account name
---
 src/app/models/provider_account.rb |    2 +-
 src/config/locales/en.yml          |    2 +-
 src/spec/models/instance_spec.rb   |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb
index 82b44c4..e15b67f 100644
--- a/src/app/models/provider_account.rb
+++ b/src/app/models/provider_account.rb
@@ -354,7 +354,7 @@ class ProviderAccount < ActiveRecord::Base
         if not instance.frontend_realm.nil?
           brealms = instance.frontend_realm.realm_backend_targets.select {|brealm_target| brealm_target.target_provider == provider and brealm_target.target_provider.available}
           if brealms.empty?
-            errors << I18n.t('instances.errors.realm_not_mapped', :frontend_realm_name => instance.frontend_realm.name)
+            errors << I18n.t('instances.errors.realm_not_mapped', :account_name => name, :frontend_realm_name => instance.frontend_realm.name)
             next
           end
           brealms.each do |brealm_target|
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index d76e0ef..96d31c0 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -369,7 +369,7 @@ en:
       image_not_pushed_to_provider: "%{account_name}: image is not pushed to this provider account"
       provider_account_quota_reached:  "%{account_name}: provider account quota reached"
       no_config_server_available: "%{account_name}: no config server available for provider account"
-      realm_not_mapped: "Realm %{frontend_realm_name} is not mapped to any applicable provider or provider realm"
+      realm_not_mapped: "%{account_name}: realm %{frontend_realm_name} is not mapped to any applicable provider or provider realm"
       provider_account_quota_too_low: "%{match_provider_account} quota limit too low to launch deployable"
       stop_invalid: "stop is an invalid action."
       stop_not_be_performed: "stop cannot be performed on this instance."
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index 7bcef6f..2e56bfc 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
@@ -211,7 +211,7 @@ describe Instance do
     realm_target = FactoryGirl.create(:realm_backend_target, :realm_or_provider => provider)
     @instance.frontend_realm = realm_target.frontend_realm
     @pool.pool_family.provider_accounts = [FactoryGirl.create(:mock_provider_account, :label => 'testaccount', :provider => provider)]
-    @instance.matches.last.should include(I18n.t('instances.errors.realm_not_mapped', :frontend_realm_name => @instance.frontend_realm.name))
+    @instance.matches.last.should include(I18n.t('instances.errors.realm_not_mapped', :account_name => 'testaccount', :frontend_realm_name => @instance.frontend_realm.name))
   end
 
   it "shouldn't match frontend realms mapped to unavailable realms" do
@@ -220,7 +220,7 @@ describe Instance do
     realm_target = FactoryGirl.create(:realm_backend_target, :realm_or_provider => provider.realms.first)
     @instance.frontend_realm = realm_target.frontend_realm
     @pool.pool_family.provider_accounts = [FactoryGirl.create(:mock_provider_account, :label => 'testaccount', :provider => provider)]
-    @instance.matches.last.should include(I18n.t('instances.errors.realm_not_mapped', :frontend_realm_name => @instance.frontend_realm.name))
+    @instance.matches.last.should include(I18n.t('instances.errors.realm_not_mapped', :account_name => 'testaccount', :frontend_realm_name => @instance.frontend_realm.name))
   end
 
 
-- 
1.7.7.5




More information about the aeolus-devel mailing list