From: Jozef Zigmund <jzigmund(a)redhat.com&gt; It will create new table in DB and fill in it with predefined provider's types. Also it changes provider_type column for providers table, and transform it to provider_type_id.The same in images table, but name of id is target_id. --- src/app/models/image.rb | 43 +++++++++---------- src/app/models/provider.rb | 35 +++++----------- src/app/models/provider_account.rb | 4 +- src/app/models/provider_account_observer.rb | 2 +- src/app/models/provider_type.rb | 25 +++++++++++ .../20110217110836_create_provider_types.rb | 16 +++++++ ...10217133104_add_provider_type_id_to_provider.rb | 43 ++++++++++++++++++++ ...0110223132404_add_target_id_column_to_images.rb | 28 +++++++++++++ src/db/seeds.rb | 10 +++++ src/test/fixtures/images.yml | 22 +++++----- 10 files changed, 167 insertions(+), 61 deletions(-) create mode 100644 src/app/models/provider_type.rb create mode 100644 src/db/migrate/20110217110836_create_provider_types.rb create mode 100644 src/db/migrate/20110217133104_add_provider_type_id_to_provider.rb create mode 100644 src/db/migrate/20110223132404_add_target_id_column_to_images.rb diff --git a/src/app/models/image.rb b/src/app/models/image.rb index 7d71089..cfa15e4 100644 --- a/src/app/models/image.rb +++ b/src/app/models/image.rb @@ -1,18 +1,18 @@ # == Schema Information -# Schema version: 20110207110131 +# Schema version: 20110223132404 # # Table name: images # -# id :integer not null, primary key -# uuid :string(255) -# name :string(255) not null -# build_id :string(255) -# uri :string(255) -# status :string(255) -# template_id :integer -# created_at :datetime -# updated_at :datetime -# target :integer +# id :integer not null, primary key +# uuid :string(255) +# name :string(255) not null +# build_id :string(255) +# uri :string(255) +# status :string(255) +# template_id :integer +# created_at :datetime +# updated_at :datetime +# provider_type_id :integer default(100), not null # # @@ -49,12 +49,13 @@ class Image < ActiveRecord::Base belongs_to :template, :counter_cache => true has_many :provider_images, :dependent => :destroy has_many :providers, :through => :provider_images + belongs_to :provider_type validates_presence_of :name validates_length_of :name, :maximum => 1024 validates_presence_of :status - validates_presence_of :target validates_presence_of :template_id + validates_presence_of :provider_type_id SEARCHABLE_COLUMNS = %w(name) @@ -68,10 +69,6 @@ class Image < ActiveRecord::Base ACTIVE_STATES = [ STATE_QUEUED, STATE_CREATED, STATE_BUILDING ] INACTIVE_STATES = [STATE_COMPLETE, STATE_FAILED, STATE_CANCELED] - def self.available_targets - Provider::PROVIDER_BUILD_TARGETS - end - def generate_uuid self.uuid ||= "image-#{self.template_id}-#{Time.now.to_f.to_s}" end @@ -79,19 +76,19 @@ class Image < ActiveRecord::Base def self.build(template, target) # FIXME: This will need to be enhanced to handle multiple # providers of same type, only one is supported right now - if Image.find_by_template_id_and_target(template.id, target) - raise ImageExistsError, "An attempted build of this template for the target '#{target}' already exists" + if Image.find_by_template_id_and_provider_type_id(template.id, target.id) + raise ImageExistsError, "An attempted build of this template for the target '#{target.name}' already exists" end - unless provider = Provider.find_by_target_with_account(target) - raise "There is no provider for '#{target}' type with valid account." + unless provider = Provider.find_by_target_with_account(target.id) + raise "There is no provider for '#{target.name}' type with valid account." end img = nil Image.transaction do img = Image.create!( - :name => "#{template.name}/#{target}", - :target => target, + :name => "#{template.name}/#{target.codename}", + :provider_type_id => target.id, :template_id => template.id, :status => Image::STATE_QUEUED ) @@ -146,7 +143,7 @@ class Image < ActiveRecord::Base image = Image.new( :name => raw_image.name, :status => 'complete', - :target => account.provider.provider_type, + :provider_type_id => account.provider.provider_type_id, :template_id => template.id ) image.save! diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index 9a6e89c..541a1af 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -1,15 +1,15 @@ # == Schema Information -# Schema version: 20110207110131 +# Schema version: 20110223132404 # # Table name: providers # -# id :integer not null, primary key -# name :string(255) not null -# url :string(255) not null -# lock_version :integer default(0) -# created_at :datetime -# updated_at :datetime -# provider_type :integer +# id :integer not null, primary key +# name :string(255) not null +# url :string(255) not null +# lock_version :integer default(0) +# created_at :datetime +# updated_at :datetime +# provider_type_id :integer default(100), not null # # @@ -43,33 +43,20 @@ class Provider < ActiveRecord::Base require 'util/conductor' include PermissionedObject - MOCK = 0 - AWS = 1 - GOGRID = 2 - RACKSPACE = 3 - RHEVM = 4 - OPENNEBULA = 5 - - PROVIDER_TYPES = { MOCK => "mock", AWS => "AWS", - GOGRID => "GoGrid", RACKSPACE => "Rackspace", RHEVM => "RHEVM", - OPENNEBULA => "OpenNebula" } - - PROVIDER_BUILD_TARGETS = { AWS => 'ec2', MOCK => 'mock' } - has_many :provider_accounts, :dependent => :destroy has_many :hardware_profiles, :dependent => :destroy has_many :provider_images, :dependent => :destroy has_many :realms, :dependent => :destroy + belongs_to :provider_type validates_presence_of :name validates_uniqueness_of :name - + validates_presence_of :provider_type_id validates_presence_of :url validates_format_of :name, :with => /^[\w -]*$/n, :message => "must only contain: numbers, letters, spaces, '_' and '-'" validates_length_of :name, :maximum => 255 - validates_inclusion_of :provider_type, :in => PROVIDER_TYPES has_many :permissions, :as => :permission_object, :dependent => :destroy, :include => [:role], @@ -142,7 +129,7 @@ class Provider < ActiveRecord::Base # returns first provider of provider_type which has at least one cloud account def self.find_by_target_with_account(provider_type) - Provider.all(:conditions => {:provider_type => provider_type}).each do |p| + Provider.all(:conditions => {:provider_type_id => provider_type}).each do |p| return p unless p.provider_accounts.empty? end nil diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb index 14162ee..9616f6e 100644 --- a/src/app/models/provider_account.rb +++ b/src/app/models/provider_account.rb @@ -69,14 +69,14 @@ class ProviderAccount < ActiveRecord::Base validates_presence_of :username validates_uniqueness_of :username, :scope => :provider_id validates_presence_of :password - validates_presence_of :account_number,:if => Proc.new{ |account| account.provider.provider_type == Provider::AWS} + validates_presence_of :account_number,:if => Proc.new{ |account| account.provider.provider_type_id == ProviderType.find_by_codename("ec2").id} validate :validate_presence_of_x509_certs validate :validate_credentials # We're using this instead of <tt>validates_presence_of</tt> helper because # we want to show errors on different attributes ending with '_file'. def validate_presence_of_x509_certs - if self.provider.provider_type == Provider::AWS + if self.provider.provider_type_id == ProviderType.find_by_codename("ec2").id errors.add(:x509_cert_pub_file, "can't be blank") if x509_cert_pub.blank? errors.add(:x509_cert_priv_file, "can't be blank") if x509_cert_priv.blank? end diff --git a/src/app/models/provider_account_observer.rb b/src/app/models/provider_account_observer.rb index 8d3ca9e..396743c 100644 --- a/src/app/models/provider_account_observer.rb +++ b/src/app/models/provider_account_observer.rb @@ -3,7 +3,7 @@ class ProviderAccountObserver < ActiveRecord::Observer # FIXME: new boxgrinder doesn't create bucket for amis automatically, # for now we create bucket from conductor # remove this hotfix when fixed on boxgrinder side - if account.provider.provider_type == Provider::AWS + if account.provider.provider_type_id == ProviderType.find_by_codename("ec2").id create_bucket(account) end if key = account.generate_auth_key diff --git a/src/app/models/provider_type.rb b/src/app/models/provider_type.rb new file mode 100644 index 0000000..1f1f58f --- /dev/null +++ b/src/app/models/provider_type.rb @@ -0,0 +1,25 @@ +# == Schema Information +# Schema version: 20110223132404 +# +# Table name: provider_types +# +# id :integer not null, primary key +# name :string(255) not null +# ssh_user :string(255) +# home_dir :string(255) +# build_supported :boolean +# created_at :datetime +# updated_at :datetime +# + +class ProviderType < ActiveRecord::Base + + has_many :providers + has_many :images + + validates_presence_of :name + validates_uniqueness_of :name + validates_presence_of :codename + validates_uniqueness_of :codename + +end diff --git a/src/db/migrate/20110217110836_create_provider_types.rb b/src/db/migrate/20110217110836_create_provider_types.rb new file mode 100644 index 0000000..0cadc8e --- /dev/null +++ b/src/db/migrate/20110217110836_create_provider_types.rb @@ -0,0 +1,16 @@ +class CreateProviderTypes < ActiveRecord::Migration + def self.up + create_table :provider_types do |t| + t.string :name, :null => false + t.string :codename, :null => false + t.string :ssh_user + t.string :home_dir + t.boolean :build_supported, :default => false + t.timestamps + end + end + + def self.down + drop_table :provider_types + end +end diff --git a/src/db/migrate/20110217133104_add_provider_type_id_to_provider.rb b/src/db/migrate/20110217133104_add_provider_type_id_to_provider.rb new file mode 100644 index 0000000..3a87ec1 --- /dev/null +++ b/src/db/migrate/20110217133104_add_provider_type_id_to_provider.rb @@ -0,0 +1,43 @@ +class AddProviderTypeIdToProvider < ActiveRecord::Migration + + PROVIDER_TYPES = { 0 => "Mock", 1 => "Amazon EC2", 2 => "GoGrid", 3 => "Rackspace", 4 => "RHEV-M", 5 => "OpenNebula" } + INVERTED_PROVIDER_TYPES = PROVIDER_TYPES.invert + + def self.up + load_provider_types + add_column :providers, :provider_type_id, :integer, :null => false, :default => 100 + rename_column :providers, :provider_type, :provider_type_int + transform_provider_type_column + remove_column :providers, :provider_type_int + end + + def self.down + add_column :providers, :provider_type_temporary, :integer + transform_provider_type_column_back + rename_column :providers, :provider_type_temporary, :provider_type + remove_column :providers, :provider_type_id + end + + def self.load_provider_types + if ProviderType.all.empty? + ProviderType.create!(:name => "Mock", :build_supported => true, :codename =>"mock") + ProviderType.create!(:name => "Amazon EC2", :build_supported => true, :codename =>"ec2") + ProviderType.create!(:name => "GoGrid", :codename =>"gogrid") + ProviderType.create!(:name => "Rackspace", :codename =>"rackspace") + ProviderType.create!(:name => "RHEV-M", :codename =>"rhevm") + ProviderType.create!(:name => "OpenNebula", :codename =>"opennebula") + end + end + + def self.transform_provider_type_column + Provider.all.each do |provider| + provider.update_attribute(:provider_type_id, ProviderType.first(:conditions => {:name => PROVIDER_TYPES[provider.provider_type_int]}).id) + end + end + + def self.transform_provider_type_column_back + Provider.all.each do |provider| + provider.update_attribute(:provider_type_temporary, INVERTED_PROVIDER_TYPES[provider.provider_type.name]) + end + end +end diff --git a/src/db/migrate/20110223132404_add_target_id_column_to_images.rb b/src/db/migrate/20110223132404_add_target_id_column_to_images.rb new file mode 100644 index 0000000..c88953d --- /dev/null +++ b/src/db/migrate/20110223132404_add_target_id_column_to_images.rb @@ -0,0 +1,28 @@ +class AddTargetIdColumnToImages < ActiveRecord::Migration + + PROVIDER_TYPES = { 0 => "Mock", 1 => "Amazon EC2", 2 => "GoGrid", 3 => "Rackspace", 4 => "RHEV-M", 5 => "OpenNebula" } + INVERTED_PROVIDER_TYPES = PROVIDER_TYPES.invert + + def self.up + add_column :images, :provider_type_id, :integer, :null => false, :default => 100 + transform_target_column + remove_column :images, :target end + + def self.down + add_column :images, :target, :integer + transform_target_column_back + remove_column :images, :provider_type_id + end + + def self.transform_target_column + Image.all.each do |image| + image.update_attribute(:provider_type_id, ProviderType.first(:conditions => {:name => PROVIDER_TYPES[image.target] }).id) + end + end + + def self.transform_target_column_back + Image.all.each do |image| + image.update_attribute(:target, INVERTED_PROVIDER_TYPES[image.provider_type.name]) + end + end +end diff --git a/src/db/seeds.rb b/src/db/seeds.rb index f1f04f5..89d98d7 100644 --- a/src/db/seeds.rb +++ b/src/db/seeds.rb @@ -103,3 +103,13 @@ settings = {"allow_self_service_logins" => "true", settings.each_pair do |key, value| MetadataObject.set(key, value) end + +# Provider types actually supported +if ProviderType.all.empty? + ProviderType.create!(:name => "Mock", :build_supported => true, :codename =>"mock") + ProviderType.create!(:name => "Amazon EC2", :build_supported => true, :codename =>"ec2") + ProviderType.create!(:name => "GoGrid", :codename =>"gogrid") + ProviderType.create!(:name => "Rackspace", :codename =>"rackspace") + ProviderType.create!(:name => "RHEV-M", :codename =>"rhevm") + ProviderType.create!(:name => "OpenNebula", :codename =>"opennebula") + end diff --git a/src/test/fixtures/images.yml b/src/test/fixtures/images.yml index 3b800ac..cf4fe55 100644 --- a/src/test/fixtures/images.yml +++ b/src/test/fixtures/images.yml @@ -1,18 +1,18 @@ # == Schema Information -# Schema version: 20110207110131 +# Schema version: 20110223132404 # # Table name: images # -# id :integer not null, primary key -# uuid :string(255) -# name :string(255) not null -# build_id :string(255) -# uri :string(255) -# status :string(255) -# template_id :integer -# created_at :datetime -# updated_at :datetime -# target :integer +# id :integer not null, primary key +# uuid :string(255) +# name :string(255) not null +# build_id :string(255) +# uri :string(255) +# status :string(255) +# template_id :integer +# created_at :datetime +# updated_at :datetime +# provider_type_id :integer default(100), not null # # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -- 1.7.4

From: Jozef Zigmund <jzigmund(a)redhat.com&gt; --- src/app/views/admin/providers/_form.haml | 2 +- src/features/provider.feature | 2 +- src/features/step_definitions/template_steps.rb | 2 +- src/features/template.feature | 6 ++-- src/spec/controllers/builds_controller_spec.rb | 4 +- src/spec/factories/image.rb | 2 +- src/spec/factories/provider.rb | 8 ++-- src/spec/factories/provider_type.rb | 10 ++++++ src/spec/models/image_spec.rb | 4 +- src/spec/models/provider_spec.rb | 6 +-- src/test/fixtures/providers.yml | 20 ------------- src/test/unit/provider_test.rb | 35 ----------------------- 12 files changed, 27 insertions(+), 74 deletions(-) create mode 100644 src/spec/factories/provider_type.rb delete mode 100644 src/test/fixtures/providers.yml delete mode 100644 src/test/unit/provider_test.rb diff --git a/src/app/views/admin/providers/_form.haml b/src/app/views/admin/providers/_form.haml index fd6a779..5dc27f1 100644 --- a/src/app/views/admin/providers/_form.haml +++ b/src/app/views/admin/providers/_form.haml @@ -13,7 +13,7 @@ ) %fieldset.clear = form.label :provider_type - = form.select(:provider_type, ProviderType.all.collect {|provider_type| [t(provider_type.name),provider_type.id] }, :prompt => "Select type of provider") + = form.select(:provider_type_id, ProviderType.all.collect {|provider_type| [t(provider_type.name),provider_type.id] }, :prompt => "Select type of provider") %fieldset.clear = form.submit "Save", :class => "submit formbutton" diff --git a/src/features/provider.feature b/src/features/provider.feature index 7566e61..4b6c50c 100644 --- a/src/features/provider.feature +++ b/src/features/provider.feature @@ -34,7 +34,7 @@ Feature: Manage Providers Then I should be on the new admin provider page When I fill in "provider[name]" with "testprovider" And I fill in "provider[url]" with "http://localhost:3001/api" - And I select "Amazon EC2" from "Provider type" + And I select "Amazon EC2" from "provider_provider_type_id" And I press "Save" Then I should be on the admin providers page And I should see "Provider added" diff --git a/src/features/step_definitions/template_steps.rb b/src/features/step_definitions/template_steps.rb index 921e47f..3491eb4 100644 --- a/src/features/step_definitions/template_steps.rb +++ b/src/features/step_definitions/template_steps.rb @@ -98,7 +98,7 @@ Given /^there is Amazon AWS provider account$/ do end Given /^there is Amazon AWS build for this template$/ do - Image.build(@template, Provider::AWS) + Image.build(@template, ProviderType.find_by_codename("ec2")) end Given /^there is an imported template$/ do diff --git a/src/features/template.feature b/src/features/template.feature index e0e58d4..336b194 100644 --- a/src/features/template.feature +++ b/src/features/template.feature @@ -113,7 +113,7 @@ Feature: Manage Templates And I follow "Build" Then I should be on the new image factory build page And I should see "Build Request" - When I check "Ec2" + When I check "Amazon EC2" And I press "Submit to Build" Then I should be on the image factory template page And I should see "mock1" @@ -128,11 +128,11 @@ Feature: Manage Templates And I follow "Build" Then I should be on the new image factory build page And I should see "Build Request" - When I check "Ec2" + When I check "Amazon EC2" And I press "Submit to Build" Then I should be on the image factory template page And I should see "mock1" - And I should see "An attempted build of this template for the target '1' already exists" + And I should see "An attempted build of this template for the target 'Amazon EC2' already exists" Scenario: Build imported template Given there is an imported template diff --git a/src/spec/controllers/builds_controller_spec.rb b/src/spec/controllers/builds_controller_spec.rb index 79eaa17..b0f1885 100644 --- a/src/spec/controllers/builds_controller_spec.rb +++ b/src/spec/controllers/builds_controller_spec.rb @@ -24,13 +24,13 @@ describe ImageFactory::BuildsController do it "should create a new Image" do lambda do - post :create, :template_id => @template.id, :targets => ["0"] + post :create, :template_id => @template.id, :targets => ProviderType.find_by_codename("mock").id end.should change(Image, :count).by(1) end it "should create a new ProviderImage" do lambda do - post :create, :template_id => @template.id, :targets => ["0"] + post :create, :template_id => @template.id, :targets => ProviderType.find_by_codename("mock").id end.should change(ProviderImage, :count).by(1) end end diff --git a/src/spec/factories/image.rb b/src/spec/factories/image.rb index 293ac22..c8b34e3 100644 --- a/src/spec/factories/image.rb +++ b/src/spec/factories/image.rb @@ -4,6 +4,6 @@ Factory.define :image do |i| i.sequence(:name) { |n| "image#{n}" } i.status 'queued' - i.target 'ec2' + i.provider_type_id { ProviderType.find_by_codename("ec2").id } i.association(:template) end diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb index f6288dc..03f8773 100644 --- a/src/spec/factories/provider.rb +++ b/src/spec/factories/provider.rb @@ -1,11 +1,11 @@ Factory.define :provider do |p| p.sequence(:name) { |n| "provider#{n}" } - p.provider_type '0' + p.provider_type { ProviderType.find_by_codename("mock") } p.url { |p| "http://www." + p.name + ".com/api" } end Factory.define :mock_provider, :parent => :provider do |p| - p.provider_type '0' + p.provider_type { ProviderType.find_by_codename("mock") } p.url 'http://localhost:3001/api' p.hardware_profiles { |hp| [hp.association(:mock_hwp1), hp.association(:mock_hwp2)] } p.after_create { |p| p.realms << Factory(:realm1, :provider => p) << Factory(:realm2, :provider => p) } @@ -13,14 +13,14 @@ end Factory.define :mock_provider2, :parent => :provider do |p| p.name 'mock2' - p.provider_type '0' + p.provider_type { ProviderType.find_by_codename("mock") } p.url 'http://localhost:3001/api' p.after_create { |p| p.realms << Factory(:realm3, :provider => p) } end Factory.define :ec2_provider, :parent => :provider do |p| p.name 'amazon-ec2' - p.provider_type '1' + p.provider_type { ProviderType.find_by_codename("ec2") } p.url 'http://localhost:3001/api' p.hardware_profiles { |hp| [hp.association(:ec2_hwp1)] } p.after_create { |p| p.realms << Factory(:realm4, :provider => p) } diff --git a/src/spec/factories/provider_type.rb b/src/spec/factories/provider_type.rb new file mode 100644 index 0000000..0fed927 --- /dev/null +++ b/src/spec/factories/provider_type.rb @@ -0,0 +1,10 @@ +Factory.define :provider_type do |p| +end + +Factory.define :mock_provider_type, :parent => :provider_type do |p| + p.name 'Mock' +end + +Factory.define :ec2_provider_type, :parent => :provider_type do |p| + p.name 'Amazon EC2' +end diff --git a/src/spec/models/image_spec.rb b/src/spec/models/image_spec.rb index 63b11dc..a5c3534 100644 --- a/src/spec/models/image_spec.rb +++ b/src/spec/models/image_spec.rb @@ -38,7 +38,7 @@ describe Image do it "should not build image if image already exists for specified target" do old = Factory.build(:image) old.save! - lambda {Image.build(old.template, old.target)}.should raise_error(ImageExistsError) + lambda {Image.build(old.template, old.provider_type)}.should raise_error(ImageExistsError) end it "should build image if there is provider and cloud account for specified target" do @@ -47,7 +47,7 @@ describe Image do acc.save! tpl = Factory.build(:template) tpl.save! - img = Image.build(tpl, '0') + img = Image.build(tpl, ProviderType.find_by_codename("mock")) Image.find(img).should == img ProviderImage.find_by_image_id(img.id).should_not be_nil end diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb index a9cde6b..0771c9a 100644 --- a/src/spec/models/provider_spec.rb +++ b/src/spec/models/provider_spec.rb @@ -28,10 +28,8 @@ describe Provider do end it "should require a valid provider_type" do - [nil, ""].each do |invalid_value| - @provider.provider_type = invalid_value + @provider.provider_type = nil @provider.should_not be_valid - end end it "should require a valid url" do @@ -67,7 +65,7 @@ describe Provider do it "should set valid cloud type" do @client.driver_name = @provider.provider_type @provider.provider_type = nil - @provider.provider_type = 0 + @provider.provider_type = ProviderType.find_by_codename "mock" @provider.should be_valid end diff --git a/src/test/fixtures/providers.yml b/src/test/fixtures/providers.yml deleted file mode 100644 index 85d3c9d..0000000 --- a/src/test/fixtures/providers.yml +++ /dev/null @@ -1,20 +0,0 @@ -# == Schema Information -# Schema version: 20110207110131 -# -# Table name: providers -# -# id :integer not null, primary key -# name :string(255) not null -# url :string(255) not null -# lock_version :integer default(0) -# created_at :datetime -# updated_at :datetime -# provider_type :integer -# - -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html - -mock_provider: - name: mock - provider_type: Mock - url: http://localhost:3001/api diff --git a/src/test/unit/provider_test.rb b/src/test/unit/provider_test.rb deleted file mode 100644 index 5029a3d..0000000 --- a/src/test/unit/provider_test.rb +++ /dev/null @@ -1,35 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class ProviderTest < ActiveSupport::TestCase - fixtures :providers - - def setup - @provider = Provider.new(:name => "my_ec2", - :provider_type => "EC2") - end - # The following three tests assume you have the deltacloud-framework - # running and configured on localhost:3000 - - test "is valid with good url" do - @provider.url = "http://localhost:3000/api" - flunk "That URL should have worked. Is framework running?" if @provider.invalid? - end - - test "requires url" do - flunk "Providers require a url" if @provider.valid? - end - - test "fails with invalid provider url" do - @provider.url = "http://conductor.awesome/api" - flunk "Invalid url passed validation" unless @provider.invalid? - end - - test "should return nil if no connection" do - assert_equal(nil, @provider.connect) - end - - test "should return DeltaCloud if successful connection" do - @provider.url = "http://localhost:3000/api" - assert_instance_of(DeltaCloud, @provider.connect) - end -end -- 1.7.4