[PATCH conductor] Fixed provider's valid_framework check
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
This patch fixes wrong logical check (made by me in an older patch)
which swaped true/false when teting valid connection to dc-core.
This patch also removes monkey patch for tests which always returned true
for 'valid_framework?' method.
---
src/app/models/provider.rb | 20 ++++++++++----------
src/spec/controllers/providers_controller_spec.rb | 2 ++
src/spec/factories/provider.rb | 17 +++++++++++++----
src/spec/models/provider_spec.rb | 11 ++++++++++-
src/spec/spec_helper.rb | 4 ----
5 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index 05ff0e4..474041b 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
@@ -247,6 +247,16 @@ class Provider < ActiveRecord::Base
end
+ def valid_framework?
+ begin
+ connect!.nil? ? false : true
+ rescue Exception => e
+ logger.error("Error connecting to framework: #{e.message}")
+ logger.error("Backtrace: #{e.backtrace.join("\n")}")
+ e.message =~ /401 : Not authorized/ ? true : false
+ end
+ end
+
protected
def stop_instances(user)
@@ -281,16 +291,6 @@ class Provider < ActiveRecord::Base
private
- def valid_framework?
- begin
- connect!.nil?
- rescue Exception => e
- logger.error("Error connecting to framework: #{e.message}")
- logger.error("Backtrace: #{e.backtrace.join("\n")}")
- e.message =~ /401 : Not authorized/ ? true : false
- end
- end
-
def valid_provider?
if !nil_or_empty(deltacloud_provider)
client = connect
diff --git a/src/spec/controllers/providers_controller_spec.rb b/src/spec/controllers/providers_controller_spec.rb
index 2249ee7..65e73c4 100644
--- a/src/spec/controllers/providers_controller_spec.rb
+++ b/src/spec/controllers/providers_controller_spec.rb
@@ -199,6 +199,7 @@ describe ProvidersController do
describe "#create" do
before(:each) do
+ Provider.any_instance.stub(:valid_framework?).and_return(true)
post :create, :provider => { :name => provider.name,
:url => provider.url,
:provider_type => {
@@ -293,6 +294,7 @@ describe ProvidersController do
context "existing provider" do
before(:each) do
+ Provider.any_instance.stub(:valid_framework?).and_return(true)
put :update, :id => orig_provider.id, :provider => provider_data
end
diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb
index c607540..3f27e9b 100644
--- a/src/spec/factories/provider.rb
+++ b/src/spec/factories/provider.rb
@@ -20,13 +20,16 @@ FactoryGirl.define do
sequence(:name) { |n| "mock#{n}" }
provider_type { Factory.build :provider_type }
url { |p| "http://www." + p.name + ".com/api" }
+ end
+
+ factory :valid_provider, :parent => :provider do
after_build do |p|
p.stub(:valid_framework?).and_return(true)
p.stub(:valid_provider?).and_return(true)
end
end
- factory :mock_provider, :parent => :provider do
+ factory :mock_provider, :parent => :valid_provider do
provider_type {ProviderType.find_by_deltacloud_driver("mock")}
url 'http://localhost:3002/api'
hardware_profiles { |hp| [hp.association(:mock_hwp1), hp.association(:mock_hwp2)] }
@@ -37,21 +40,21 @@ FactoryGirl.define do
name { '' }
end
- factory :mock_provider2, :parent => :provider do
+ factory :mock_provider2, :parent => :valid_provider do
name 'mock2'
provider_type { ProviderType.find_by_deltacloud_driver("mock") }
url 'http://localhost:3002/api'
after_create { |p| p.realms << FactoryGirl.create(:realm3, :provider => p) }
end
- factory :mock_provider_with_unavailable_realm, :parent => :provider do
+ factory :mock_provider_with_unavailable_realm, :parent => :valid_provider do
provider_type {ProviderType.find_by_deltacloud_driver("mock")}
url 'http://localhost:3002/api'
hardware_profiles { |hp| [hp.association(:mock_hwp1), hp.association(:mock_hwp2)] }
after_create { |p| p.realms << FactoryGirl.create(:realm1, :provider => p, :available => false) }
end
- factory :ec2_provider, :parent => :provider do
+ factory :ec2_provider, :parent => :valid_provider do
name 'ec2-amazon'
provider_type { ProviderType.find_by_deltacloud_driver("ec2") }
url 'http://localhost:3002/api'
@@ -72,4 +75,10 @@ FactoryGirl.define do
factory :unavailable_mock_provider, :parent => :mock_provider do
available false
end
+
+ factory :inaccessible_provider, :parent => :provider do
+ after_build do |p|
+ p.stub(:connect!).and_return(nil)
+ end
+ end
end
diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb
index dac9da2..5624ae0 100644
--- a/src/spec/models/provider_spec.rb
+++ b/src/spec/models/provider_spec.rb
@@ -114,7 +114,6 @@ describe Provider do
errs.should_not be_empty
provider1.enabled.should be_true
end
-
end
context "(using original connect method)" do
@@ -165,4 +164,14 @@ describe Provider do
end
end
+ context "inaccessible deltacloud server" do
+ before(:each) do
+ @provider = FactoryGirl.create(:inaccessible_provider)
+ end
+
+ it "should not be valid framework" do
+ @provider.valid_framework?.should be_false
+ end
+ end
+
end
diff --git a/src/spec/spec_helper.rb b/src/spec/spec_helper.rb
index f9e2840..c24af51 100644
--- a/src/spec/spec_helper.rb
+++ b/src/spec/spec_helper.rb
@@ -74,10 +74,6 @@ end
# Without these here, controller specs fail. These 2 class_evals can
# be removed once stubs work and/or are added to the right place.
Provider.class_eval do
- def valid_framework?
- true
- end
-
def valid_provider?
true
end
--
1.7.11.4
11 years, 6 months
[ANNOUCE] Some call me... Tim
by Jason Guiditta
I would like to introduce Tim (Template and Image Management)[1], the new
names for 'Image Management Engine', which was always meant as a
placeholder name. Thanks to everyone for the votes, but after a
couple failed attempts due to names being taken already, and most
recently the runner up being "I don't care", we decided to just come up
with something Martyn and I liked. The process was simply taking too
long (much like this email!). Anyway, if you are already tinkering
with ime, simply update the name and any overrides you may have to
reference the new name.
Special thanks to both hewbrocca and eck for the subject, we may even
use it as our tag line (Monty Python reference, for anyone who missed
it).
-j
[1] https://github.com/aeolus-incubator/tim
11 years, 6 months
[PATCH conductor] bug 861483: Fix default quota
by Scott Seago
https://bugzilla.redhat.com/show_bug.cgi?id=861483
Default quota now shows itself in two ways:
1) for admin-created users, the default quota is set as the default
for the user quota in the new user form. It can still be edited
before submitting, of course.
2) For ldap users, when a new conductor user is created, we now
create the user with a quota value taken from the default.
---
src/app/controllers/users_controller.rb | 2 +-
src/app/models/quota.rb | 6 ++++++
src/app/models/user.rb | 4 ++--
src/config/locales/en.yml | 6 +++---
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb
index 4a2868f..1aab7fe 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -39,7 +39,7 @@ class UsersController < ApplicationController
require_privilege(Privilege::CREATE, User)
@title = t'users.new.new_user'
@user = User.new
- @user.quota = Quota.new
+ @user.quota = Quota.new_for_user
end
def create
diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb
index 2c8dcee..6615f3e 100644
--- a/src/app/models/quota.rb
+++ b/src/app/models/quota.rb
@@ -157,4 +157,10 @@ class Quota < ActiveRecord::Base
end
return false
end
+
+ def self.new_for_user
+ self.new(:maximum_running_instances =>
+ MetadataObject.lookup("self_service_default_quota").
+ maximum_running_instances)
+ end
end
diff --git a/src/app/models/user.rb b/src/app/models/user.rb
index ee7ba1f..5db8e95 100644
--- a/src/app/models/user.rb
+++ b/src/app/models/user.rb
@@ -199,11 +199,11 @@ class User < ActiveRecord::Base
end
def self.create_ldap_user!(username)
- User.create!(:username => username, :quota => Quota.new, :ignore_password => true)
+ User.create!(:username => username, :quota => Quota.new_for_user, :ignore_password => true)
end
def self.create_krb_user!(username)
- User.create!(:username => username, :quota => Quota.new, :ignore_password => true)
+ User.create!(:username => username, :quota => Quota.new_for_user, :ignore_password => true)
end
def ensure_not_running_any_instances
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 1955d2d..8a1dd24 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1146,10 +1146,10 @@ en:
settings:
settings: Settings
index:
- permissions: Permissions
- permissions_desc: Modify self-service default quota.
+ permissions: User defaults
+ permissions_desc: Modify default user settings
self_service:
- self_service_default: 'User Treatment: Self-service default'
+ self_service_default: 'Default user settings'
account: Account
instances_quota: "Instances Quota:"
self_service_settings: "Self-service Settings"
--
1.7.11.4
11 years, 6 months
[PATCH] BZ859954 - Don't display buttons on instance card if actions are not supported
by Tomas Hrcka
https://bugzilla.redhat.com/show_bug.cgi?id=859954
---
src/app/stylesheets/_buttons.scss | 8 ++++----
src/app/views/instances/_instance_card.html.mustache | 12 ------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/app/stylesheets/_buttons.scss b/src/app/stylesheets/_buttons.scss
index 91055b2..ac39977 100644
--- a/src/app/stylesheets/_buttons.scss
+++ b/src/app/stylesheets/_buttons.scss
@@ -94,9 +94,9 @@ Application Button Set
color: #900;
}
-.button.danger:hover,
-.button.danger:focus,
-.button.danger:active {
+.button.danger:hover:not(.disable),
+.button.danger:not(.disable):focus,
+.button.danger:not(.disable):active {
border-color: #b53f3a;
border-bottom-color: #a0302a;
color: #fff;
@@ -108,7 +108,7 @@ Application Button Set
background-image: linear-gradient(#dc5f59, #b33630);
}
-.button.danger:active,
+.button.danger:not(.disable):active,
.button.danger.active {
border-color: #a0302a;
border-bottom-color: #bf4843;
diff --git a/src/app/views/instances/_instance_card.html.mustache b/src/app/views/instances/_instance_card.html.mustache
index 1cb651b..2745fbc 100644
--- a/src/app/views/instances/_instance_card.html.mustache
+++ b/src/app/views/instances/_instance_card.html.mustache
@@ -34,12 +34,6 @@
:disabled => false, :class => 'button danger') %>
</li>
{{/stop_enabled}}
- {{^stop_enabled}}
- <li>
- <%= button_to(t('deployments.pretty_view_show.stop'), stop_instance_path('replace_id').sub('replace_id', '{{id}}'),
- :disabled => true, :class => 'button danger') %>
- </li>
- {{/stop_enabled}}
{{#reboot_enabled}}
<li>
@@ -47,12 +41,6 @@
:disabled => false, :class => 'button danger') %>
</li>
{{/reboot_enabled}}
- {{^reboot_enabled}}
- <li>
- <%= button_to(t('deployments.pretty_view_show.reboot'), reboot_instance_path('replace_id').sub('replace_id', '{{id}}'),
- :disabled => true, :class => 'button danger') %>
- </li>
- {{/reboot_enabled}}
</ul>
</div>
</li>
--
1.7.11.4
11 years, 6 months
[aeolus-incubator/image-management-engine] ff5484: Renamed to Tim
by Jason Guiditta
Branch: refs/heads/master
Home: https://github.com/aeolus-incubator/image-management-engine
Commit: ff5484369505c63c7250070945c7891935908261
https://github.com/aeolus-incubator/image-management-engine/commit/ff5484...
Author: Martyn Taylor <mtaylor(a)redhat.com>
Date: 2012-10-04 (Thu, 04 Oct 2012)
Changed paths:
M Gemfile
M Gemfile.lock
M README.rdoc
M Rakefile
R app/assets/images/image_management/.gitkeep
A app/assets/images/tim/.gitkeep
R app/assets/javascripts/image_management/application.js
A app/assets/javascripts/tim/application.js
R app/assets/stylesheets/image_management/application.css
A app/assets/stylesheets/tim/application.css
R app/controllers/image_management/application_controller.rb
R app/controllers/image_management/base_images_controller.rb
R app/controllers/image_management/image_versions_controller.rb
R app/controllers/image_management/provider_images_controller.rb
R app/controllers/image_management/target_images_controller.rb
R app/controllers/image_management/templates_controller.rb
A app/controllers/tim/application_controller.rb
A app/controllers/tim/base_images_controller.rb
A app/controllers/tim/image_versions_controller.rb
A app/controllers/tim/provider_images_controller.rb
A app/controllers/tim/target_images_controller.rb
A app/controllers/tim/templates_controller.rb
R app/filters/image_management/user_keys_filter.rb
A app/filters/tim/user_keys_filter.rb
R app/helpers/image_management/application_helper.rb
A app/helpers/tim/application_helper.rb
R app/models/image_management/base.rb
R app/models/image_management/base_image.rb
R app/models/image_management/image_version.rb
R app/models/image_management/provider_image.rb
R app/models/image_management/target_image.rb
R app/models/image_management/template.rb
A app/models/tim/base.rb
A app/models/tim/base_image.rb
A app/models/tim/image_version.rb
A app/models/tim/provider_image.rb
A app/models/tim/target_image.rb
A app/models/tim/template.rb
R app/responders/image_management/responder.rb
A app/responders/tim/responder.rb
R app/views/image_management/base_images/_base_image.xml.haml
R app/views/image_management/base_images/_base_image_minimal.xml.haml
R app/views/image_management/base_images/_form.html.erb
R app/views/image_management/base_images/edit.html.erb
R app/views/image_management/base_images/index.html.erb
R app/views/image_management/base_images/index.xml.haml
R app/views/image_management/base_images/new.html.erb
R app/views/image_management/base_images/show.html.erb
R app/views/image_management/base_images/show.xml.haml
R app/views/image_management/image_versions/_form.html.erb
R app/views/image_management/image_versions/_image_version.xml.haml
R app/views/image_management/image_versions/_image_version_minimal.xml.haml
R app/views/image_management/image_versions/edit.html.erb
R app/views/image_management/image_versions/index.html.erb
R app/views/image_management/image_versions/index.xml.haml
R app/views/image_management/image_versions/new.html.erb
R app/views/image_management/image_versions/show.html.erb
R app/views/image_management/image_versions/show.xml.haml
R app/views/image_management/images/_form.html.erb
R app/views/image_management/images/edit.html.erb
R app/views/image_management/images/index.html.erb
R app/views/image_management/images/new.html.erb
R app/views/image_management/images/show.html.erb
R app/views/image_management/layouts/application.html.erb
R app/views/image_management/provider_images/_form.html.erb
R app/views/image_management/provider_images/_provider_image.xml.haml
R app/views/image_management/provider_images/_provider_image_minimal.xml.haml
R app/views/image_management/provider_images/edit.html.erb
R app/views/image_management/provider_images/index.html.erb
R app/views/image_management/provider_images/index.xml.haml
R app/views/image_management/provider_images/new.html.erb
R app/views/image_management/provider_images/show.html.erb
R app/views/image_management/provider_images/show.xml.haml
R app/views/image_management/target_images/_form.html.erb
R app/views/image_management/target_images/_target_image.xml.haml
R app/views/image_management/target_images/_target_image_minimal.xml.haml
R app/views/image_management/target_images/edit.html.erb
R app/views/image_management/target_images/index.html.erb
R app/views/image_management/target_images/index.xml.haml
R app/views/image_management/target_images/new.html.erb
R app/views/image_management/target_images/show.html.erb
R app/views/image_management/target_images/show.xml.haml
R app/views/image_management/templates/_form.html.erb
R app/views/image_management/templates/_template.xml.haml
R app/views/image_management/templates/_template_minimal.xml.haml
R app/views/image_management/templates/edit.html.erb
R app/views/image_management/templates/index.html.erb
R app/views/image_management/templates/index.xml.haml
R app/views/image_management/templates/new.html.erb
R app/views/image_management/templates/show.html.erb
R app/views/image_management/templates/show.xml.haml
R app/views/layouts/image_management/application.html.erb
A app/views/layouts/tim/application.html.erb
A app/views/tim/base_images/_base_image.xml.haml
A app/views/tim/base_images/_base_image_minimal.xml.haml
A app/views/tim/base_images/_form.html.erb
A app/views/tim/base_images/edit.html.erb
A app/views/tim/base_images/index.html.erb
A app/views/tim/base_images/index.xml.haml
A app/views/tim/base_images/new.html.erb
A app/views/tim/base_images/show.html.erb
A app/views/tim/base_images/show.xml.haml
A app/views/tim/image_versions/_form.html.erb
A app/views/tim/image_versions/_image_version.xml.haml
A app/views/tim/image_versions/_image_version_minimal.xml.haml
A app/views/tim/image_versions/edit.html.erb
A app/views/tim/image_versions/index.html.erb
A app/views/tim/image_versions/index.xml.haml
A app/views/tim/image_versions/new.html.erb
A app/views/tim/image_versions/show.html.erb
A app/views/tim/image_versions/show.xml.haml
A app/views/tim/images/_form.html.erb
A app/views/tim/images/edit.html.erb
A app/views/tim/images/index.html.erb
A app/views/tim/images/new.html.erb
A app/views/tim/images/show.html.erb
A app/views/tim/layouts/application.html.erb
A app/views/tim/provider_images/_form.html.erb
A app/views/tim/provider_images/_provider_image.xml.haml
A app/views/tim/provider_images/_provider_image_minimal.xml.haml
A app/views/tim/provider_images/edit.html.erb
A app/views/tim/provider_images/index.html.erb
A app/views/tim/provider_images/index.xml.haml
A app/views/tim/provider_images/new.html.erb
A app/views/tim/provider_images/show.html.erb
A app/views/tim/provider_images/show.xml.haml
A app/views/tim/target_images/_form.html.erb
A app/views/tim/target_images/_target_image.xml.haml
A app/views/tim/target_images/_target_image_minimal.xml.haml
A app/views/tim/target_images/edit.html.erb
A app/views/tim/target_images/index.html.erb
A app/views/tim/target_images/index.xml.haml
A app/views/tim/target_images/new.html.erb
A app/views/tim/target_images/show.html.erb
A app/views/tim/target_images/show.xml.haml
A app/views/tim/templates/_form.html.erb
A app/views/tim/templates/_template.xml.haml
A app/views/tim/templates/_template_minimal.xml.haml
A app/views/tim/templates/edit.html.erb
A app/views/tim/templates/index.html.erb
A app/views/tim/templates/index.xml.haml
A app/views/tim/templates/new.html.erb
A app/views/tim/templates/show.html.erb
A app/views/tim/templates/show.xml.haml
M config/routes.rb
R db/migrate/20120906180351_create_image_management_base_images.rb
A db/migrate/20120906180351_create_tim_base_images.rb
R db/migrate/20120906210106_create_image_management_image_versions.rb
A db/migrate/20120906210106_create_tim_image_versions.rb
R db/migrate/20120910175233_create_image_management_templates.rb
A db/migrate/20120910175233_create_tim_templates.rb
R db/migrate/20120911202321_create_image_management_target_images.rb
A db/migrate/20120911202321_create_tim_target_images.rb
R db/migrate/20120911204329_create_image_management_provider_images.rb
A db/migrate/20120911204329_create_tim_provider_images.rb
R image_management.gemspec
M lib/image_factory/model/base.rb
M lib/image_factory/model/provider_image.rb
M lib/image_factory/model/target_image.rb
R lib/image_management.rb
R lib/image_management/engine.rb
R lib/image_management/version.rb
R lib/tasks/image_management_tasks.rake
A lib/tasks/tim_tasks.rake
A lib/tim.rb
A lib/tim/engine.rb
A lib/tim/version.rb
M script/rails
M spec/controllers/base_images_controller_spec.rb
M spec/controllers/image_versions_controller_spec.rb
M spec/controllers/provider_images_controller_spec.rb
M spec/controllers/target_images_controller_spec.rb
M spec/controllers/templates_controller_spec.rb
M spec/decorators/controllers/templates_controller_decorator_spec.rb
R spec/factories/image_management/base_image.rb
R spec/factories/image_management/image_factory/provider_image.rb
R spec/factories/image_management/image_factory/status_detail.rb
R spec/factories/image_management/image_factory/target_image.rb
R spec/factories/image_management/image_version.rb
R spec/factories/image_management/provider_image.rb
R spec/factories/image_management/target_image.rb
R spec/factories/image_management/template.rb
A spec/factories/tim/base_image.rb
A spec/factories/tim/image_factory/provider_image.rb
A spec/factories/tim/image_factory/status_detail.rb
A spec/factories/tim/image_factory/target_image.rb
A spec/factories/tim/image_version.rb
A spec/factories/tim/provider_image.rb
A spec/factories/tim/target_image.rb
A spec/factories/tim/template.rb
M spec/filters/user_keys_filter_spec.rb
M spec/models/base_image_spec.rb
M spec/models/dummy/pool_family_spec.rb
M spec/models/dummy/provider_account_spec.rb
M spec/models/dummy/provider_type_spec.rb
M spec/models/dummy/user_spec.rb
M spec/models/image_version_spec.rb
M spec/models/provider_image_spec.rb
M spec/models/target_image_spec.rb
M spec/models/template_spec.rb
M spec/support/routes.rb
M spec/views/base_images_spec.rb
M spec/views/image_versions_spec.rb
M spec/views/provider_images_spec.rb
M spec/views/target_images_spec.rb
M spec/views/templates_spec.rb
R test/dummy/app/decorators/image_management/controllers/templates_controller_decorator.rb
A test/dummy/app/decorators/tim/controllers/templates_controller_decorator.rb
R test/dummy/app/models/image_management/base_image.rb
M test/dummy/app/models/pool_family.rb
M test/dummy/app/models/provider_account.rb
M test/dummy/app/models/provider_type.rb
A test/dummy/app/models/tim/base_image.rb
M test/dummy/app/models/user.rb
R test/dummy/app/views/image_management/base_images/_custom.xml.haml
R test/dummy/app/views/image_management/image_versions/_custom.xml.haml
R test/dummy/app/views/image_management/layouts/application.html.erb
R test/dummy/app/views/image_management/provider_images/_custom.xml.haml
R test/dummy/app/views/image_management/target_images/_custom.xml.haml
R test/dummy/app/views/image_management/templates/_custom.xml.haml
A test/dummy/app/views/tim/base_images/_custom.xml.haml
A test/dummy/app/views/tim/image_versions/_custom.xml.haml
A test/dummy/app/views/tim/layouts/application.html.erb
A test/dummy/app/views/tim/provider_images/_custom.xml.haml
A test/dummy/app/views/tim/target_images/_custom.xml.haml
A test/dummy/app/views/tim/templates/_custom.xml.haml
M test/dummy/config/application.rb
R test/dummy/config/initializers/image_management.rb
A test/dummy/config/initializers/tim.rb
M test/dummy/config/routes.rb
R test/dummy/db/migrate/20120911182850_add_pool_family_id_to_image_management_base_image.rb
A test/dummy/db/migrate/20120911182850_add_pool_family_id_to_tim_base_image.rb
R test/dummy/db/migrate/20120911202845_add_provider_type_id_to_image_management_target_image.rb
A test/dummy/db/migrate/20120911202845_add_provider_type_id_to_tim_target_image.rb
M test/dummy/db/schema.rb
A tim.gemspec
Log Message:
-----------
Renamed to Tim
Commit: 82d9509510d59ba46b4b17bf9ee05f0e2412cf2c
https://github.com/aeolus-incubator/image-management-engine/commit/82d950...
Author: jguiditta <jguiditt(a)redhat.com>
Date: 2012-10-04 (Thu, 04 Oct 2012)
Changed paths:
M Gemfile
M Gemfile.lock
M README.rdoc
M Rakefile
R app/assets/images/image_management/.gitkeep
A app/assets/images/tim/.gitkeep
R app/assets/javascripts/image_management/application.js
A app/assets/javascripts/tim/application.js
R app/assets/stylesheets/image_management/application.css
A app/assets/stylesheets/tim/application.css
R app/controllers/image_management/application_controller.rb
R app/controllers/image_management/base_images_controller.rb
R app/controllers/image_management/image_versions_controller.rb
R app/controllers/image_management/provider_images_controller.rb
R app/controllers/image_management/target_images_controller.rb
R app/controllers/image_management/templates_controller.rb
A app/controllers/tim/application_controller.rb
A app/controllers/tim/base_images_controller.rb
A app/controllers/tim/image_versions_controller.rb
A app/controllers/tim/provider_images_controller.rb
A app/controllers/tim/target_images_controller.rb
A app/controllers/tim/templates_controller.rb
R app/filters/image_management/user_keys_filter.rb
A app/filters/tim/user_keys_filter.rb
R app/helpers/image_management/application_helper.rb
A app/helpers/tim/application_helper.rb
R app/models/image_management/base.rb
R app/models/image_management/base_image.rb
R app/models/image_management/image_version.rb
R app/models/image_management/provider_image.rb
R app/models/image_management/target_image.rb
R app/models/image_management/template.rb
A app/models/tim/base.rb
A app/models/tim/base_image.rb
A app/models/tim/image_version.rb
A app/models/tim/provider_image.rb
A app/models/tim/target_image.rb
A app/models/tim/template.rb
R app/responders/image_management/responder.rb
A app/responders/tim/responder.rb
R app/views/image_management/base_images/_base_image.xml.haml
R app/views/image_management/base_images/_base_image_minimal.xml.haml
R app/views/image_management/base_images/_form.html.erb
R app/views/image_management/base_images/edit.html.erb
R app/views/image_management/base_images/index.html.erb
R app/views/image_management/base_images/index.xml.haml
R app/views/image_management/base_images/new.html.erb
R app/views/image_management/base_images/show.html.erb
R app/views/image_management/base_images/show.xml.haml
R app/views/image_management/image_versions/_form.html.erb
R app/views/image_management/image_versions/_image_version.xml.haml
R app/views/image_management/image_versions/_image_version_minimal.xml.haml
R app/views/image_management/image_versions/edit.html.erb
R app/views/image_management/image_versions/index.html.erb
R app/views/image_management/image_versions/index.xml.haml
R app/views/image_management/image_versions/new.html.erb
R app/views/image_management/image_versions/show.html.erb
R app/views/image_management/image_versions/show.xml.haml
R app/views/image_management/images/_form.html.erb
R app/views/image_management/images/edit.html.erb
R app/views/image_management/images/index.html.erb
R app/views/image_management/images/new.html.erb
R app/views/image_management/images/show.html.erb
R app/views/image_management/layouts/application.html.erb
R app/views/image_management/provider_images/_form.html.erb
R app/views/image_management/provider_images/_provider_image.xml.haml
R app/views/image_management/provider_images/_provider_image_minimal.xml.haml
R app/views/image_management/provider_images/edit.html.erb
R app/views/image_management/provider_images/index.html.erb
R app/views/image_management/provider_images/index.xml.haml
R app/views/image_management/provider_images/new.html.erb
R app/views/image_management/provider_images/show.html.erb
R app/views/image_management/provider_images/show.xml.haml
R app/views/image_management/target_images/_form.html.erb
R app/views/image_management/target_images/_target_image.xml.haml
R app/views/image_management/target_images/_target_image_minimal.xml.haml
R app/views/image_management/target_images/edit.html.erb
R app/views/image_management/target_images/index.html.erb
R app/views/image_management/target_images/index.xml.haml
R app/views/image_management/target_images/new.html.erb
R app/views/image_management/target_images/show.html.erb
R app/views/image_management/target_images/show.xml.haml
R app/views/image_management/templates/_form.html.erb
R app/views/image_management/templates/_template.xml.haml
R app/views/image_management/templates/_template_minimal.xml.haml
R app/views/image_management/templates/edit.html.erb
R app/views/image_management/templates/index.html.erb
R app/views/image_management/templates/index.xml.haml
R app/views/image_management/templates/new.html.erb
R app/views/image_management/templates/show.html.erb
R app/views/image_management/templates/show.xml.haml
R app/views/layouts/image_management/application.html.erb
A app/views/layouts/tim/application.html.erb
A app/views/tim/base_images/_base_image.xml.haml
A app/views/tim/base_images/_base_image_minimal.xml.haml
A app/views/tim/base_images/_form.html.erb
A app/views/tim/base_images/edit.html.erb
A app/views/tim/base_images/index.html.erb
A app/views/tim/base_images/index.xml.haml
A app/views/tim/base_images/new.html.erb
A app/views/tim/base_images/show.html.erb
A app/views/tim/base_images/show.xml.haml
A app/views/tim/image_versions/_form.html.erb
A app/views/tim/image_versions/_image_version.xml.haml
A app/views/tim/image_versions/_image_version_minimal.xml.haml
A app/views/tim/image_versions/edit.html.erb
A app/views/tim/image_versions/index.html.erb
A app/views/tim/image_versions/index.xml.haml
A app/views/tim/image_versions/new.html.erb
A app/views/tim/image_versions/show.html.erb
A app/views/tim/image_versions/show.xml.haml
A app/views/tim/images/_form.html.erb
A app/views/tim/images/edit.html.erb
A app/views/tim/images/index.html.erb
A app/views/tim/images/new.html.erb
A app/views/tim/images/show.html.erb
A app/views/tim/layouts/application.html.erb
A app/views/tim/provider_images/_form.html.erb
A app/views/tim/provider_images/_provider_image.xml.haml
A app/views/tim/provider_images/_provider_image_minimal.xml.haml
A app/views/tim/provider_images/edit.html.erb
A app/views/tim/provider_images/index.html.erb
A app/views/tim/provider_images/index.xml.haml
A app/views/tim/provider_images/new.html.erb
A app/views/tim/provider_images/show.html.erb
A app/views/tim/provider_images/show.xml.haml
A app/views/tim/target_images/_form.html.erb
A app/views/tim/target_images/_target_image.xml.haml
A app/views/tim/target_images/_target_image_minimal.xml.haml
A app/views/tim/target_images/edit.html.erb
A app/views/tim/target_images/index.html.erb
A app/views/tim/target_images/index.xml.haml
A app/views/tim/target_images/new.html.erb
A app/views/tim/target_images/show.html.erb
A app/views/tim/target_images/show.xml.haml
A app/views/tim/templates/_form.html.erb
A app/views/tim/templates/_template.xml.haml
A app/views/tim/templates/_template_minimal.xml.haml
A app/views/tim/templates/edit.html.erb
A app/views/tim/templates/index.html.erb
A app/views/tim/templates/index.xml.haml
A app/views/tim/templates/new.html.erb
A app/views/tim/templates/show.html.erb
A app/views/tim/templates/show.xml.haml
M config/routes.rb
R db/migrate/20120906180351_create_image_management_base_images.rb
A db/migrate/20120906180351_create_tim_base_images.rb
R db/migrate/20120906210106_create_image_management_image_versions.rb
A db/migrate/20120906210106_create_tim_image_versions.rb
R db/migrate/20120910175233_create_image_management_templates.rb
A db/migrate/20120910175233_create_tim_templates.rb
R db/migrate/20120911202321_create_image_management_target_images.rb
A db/migrate/20120911202321_create_tim_target_images.rb
R db/migrate/20120911204329_create_image_management_provider_images.rb
A db/migrate/20120911204329_create_tim_provider_images.rb
R image_management.gemspec
M lib/image_factory/model/base.rb
M lib/image_factory/model/provider_image.rb
M lib/image_factory/model/target_image.rb
R lib/image_management.rb
R lib/image_management/engine.rb
R lib/image_management/version.rb
R lib/tasks/image_management_tasks.rake
A lib/tasks/tim_tasks.rake
A lib/tim.rb
A lib/tim/engine.rb
A lib/tim/version.rb
M script/rails
M spec/controllers/base_images_controller_spec.rb
M spec/controllers/image_versions_controller_spec.rb
M spec/controllers/provider_images_controller_spec.rb
M spec/controllers/target_images_controller_spec.rb
M spec/controllers/templates_controller_spec.rb
M spec/decorators/controllers/templates_controller_decorator_spec.rb
R spec/factories/image_management/base_image.rb
R spec/factories/image_management/image_factory/provider_image.rb
R spec/factories/image_management/image_factory/status_detail.rb
R spec/factories/image_management/image_factory/target_image.rb
R spec/factories/image_management/image_version.rb
R spec/factories/image_management/provider_image.rb
R spec/factories/image_management/target_image.rb
R spec/factories/image_management/template.rb
A spec/factories/tim/base_image.rb
A spec/factories/tim/image_factory/provider_image.rb
A spec/factories/tim/image_factory/status_detail.rb
A spec/factories/tim/image_factory/target_image.rb
A spec/factories/tim/image_version.rb
A spec/factories/tim/provider_image.rb
A spec/factories/tim/target_image.rb
A spec/factories/tim/template.rb
M spec/filters/user_keys_filter_spec.rb
M spec/models/base_image_spec.rb
M spec/models/dummy/pool_family_spec.rb
M spec/models/dummy/provider_account_spec.rb
M spec/models/dummy/provider_type_spec.rb
M spec/models/dummy/user_spec.rb
M spec/models/image_version_spec.rb
M spec/models/provider_image_spec.rb
M spec/models/target_image_spec.rb
M spec/models/template_spec.rb
M spec/support/routes.rb
M spec/views/base_images_spec.rb
M spec/views/image_versions_spec.rb
M spec/views/provider_images_spec.rb
M spec/views/target_images_spec.rb
M spec/views/templates_spec.rb
R test/dummy/app/decorators/image_management/controllers/templates_controller_decorator.rb
A test/dummy/app/decorators/tim/controllers/templates_controller_decorator.rb
R test/dummy/app/models/image_management/base_image.rb
M test/dummy/app/models/pool_family.rb
M test/dummy/app/models/provider_account.rb
M test/dummy/app/models/provider_type.rb
A test/dummy/app/models/tim/base_image.rb
M test/dummy/app/models/user.rb
R test/dummy/app/views/image_management/base_images/_custom.xml.haml
R test/dummy/app/views/image_management/image_versions/_custom.xml.haml
R test/dummy/app/views/image_management/layouts/application.html.erb
R test/dummy/app/views/image_management/provider_images/_custom.xml.haml
R test/dummy/app/views/image_management/target_images/_custom.xml.haml
R test/dummy/app/views/image_management/templates/_custom.xml.haml
A test/dummy/app/views/tim/base_images/_custom.xml.haml
A test/dummy/app/views/tim/image_versions/_custom.xml.haml
A test/dummy/app/views/tim/layouts/application.html.erb
A test/dummy/app/views/tim/provider_images/_custom.xml.haml
A test/dummy/app/views/tim/target_images/_custom.xml.haml
A test/dummy/app/views/tim/templates/_custom.xml.haml
M test/dummy/config/application.rb
R test/dummy/config/initializers/image_management.rb
A test/dummy/config/initializers/tim.rb
M test/dummy/config/routes.rb
R test/dummy/db/migrate/20120911182850_add_pool_family_id_to_image_management_base_image.rb
A test/dummy/db/migrate/20120911182850_add_pool_family_id_to_tim_base_image.rb
R test/dummy/db/migrate/20120911202845_add_provider_type_id_to_image_management_target_image.rb
A test/dummy/db/migrate/20120911202845_add_provider_type_id_to_tim_target_image.rb
M test/dummy/db/schema.rb
A tim.gemspec
Log Message:
-----------
Merge pull request #36 from mtaylor/rename
Rename
Compare: https://github.com/aeolus-incubator/image-management-engine/compare/3bda4...
11 years, 6 months
[PATCH 0/2 conductor] initial implementation of basic notifications
by Tzu-Mainn Chen
This patchset implements basic notifications. The implementation is based on the katello implementation, with a few modifications:
a) instead of having a notification relate to an organization, we have it relate to a polymorphic source
b) we use a simplified notifier.rb, which currently does not accomodate flash popups. This may be updated in a future sprint.
Mainn
11 years, 6 months