This is completely unused now since commit 4d780212edf.
---
src/app/models/provider_type.rb | 1 -
src/app/views/provider_types/_list.xml.haml | 1 -
...4_remove_build_supported_from_provider_types.rb | 9 +++++++++
src/db/seeds.rb | 8 ++++----
src/features/provider_type.feature | 16 ++++++++--------
.../step_definitions/provider_type_steps.rb | 4 +---
6 files changed, 22 insertions(+), 17 deletions(-)
create mode 100644
src/db/migrate/20110707145144_remove_build_supported_from_provider_types.rb
diff --git a/src/app/models/provider_type.rb b/src/app/models/provider_type.rb
index e1f8668..5d9832a 100644
--- a/src/app/models/provider_type.rb
+++ b/src/app/models/provider_type.rb
@@ -8,7 +8,6 @@
# codename :string(255) not null
# ssh_user :string(255)
# home_dir :string(255)
-# build_supported :boolean
# created_at :datetime
# updated_at :datetime
#
diff --git a/src/app/views/provider_types/_list.xml.haml
b/src/app/views/provider_types/_list.xml.haml
index 6363806..c0fc65c 100644
--- a/src/app/views/provider_types/_list.xml.haml
+++ b/src/app/views/provider_types/_list.xml.haml
@@ -4,4 +4,3 @@
%provider_type
%name= p.name
%codename= p.codename
- %build_supported= p.build_supported
diff --git a/src/db/migrate/20110707145144_remove_build_supported_from_provider_types.rb
b/src/db/migrate/20110707145144_remove_build_supported_from_provider_types.rb
new file mode 100644
index 0000000..a79666c
--- /dev/null
+++ b/src/db/migrate/20110707145144_remove_build_supported_from_provider_types.rb
@@ -0,0 +1,9 @@
+class RemoveBuildSupportedFromProviderTypes < ActiveRecord::Migration
+ def self.up
+ remove_column :provider_types, :build_supported
+ end
+
+ def self.down
+ add_column :provider_types, :build_supported, :boolean
+ end
+end
diff --git a/src/db/seeds.rb b/src/db/seeds.rb
index 83a1eec..8ed5682 100644
--- a/src/db/seeds.rb
+++ b/src/db/seeds.rb
@@ -121,14 +121,14 @@ 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", :ssh_user => "root", :home_dir =>
"/root")
+ ProviderType.create!(:name => "Mock", :codename =>"mock")
+ ProviderType.create!(:name => "Amazon EC2", :codename
=>"ec2", :ssh_user => "root", :home_dir =>
"/root")
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")
- ProviderType.create!(:name => "CondorCloud", :codename
=>"condorcloud", :build_supported => 'true')
- ProviderType.create!(:name => "VMWare vSphere", :codename
=>"vsphere", :build_supported => 'true')
+ ProviderType.create!(:name => "CondorCloud", :codename
=>"condorcloud")
+ ProviderType.create!(:name => "VMWare vSphere", :codename
=>"vsphere")
end
# fill table CredentialDefinitions by default values
diff --git a/src/features/provider_type.feature b/src/features/provider_type.feature
index c1d39a1..859452d 100644
--- a/src/features/provider_type.feature
+++ b/src/features/provider_type.feature
@@ -12,11 +12,11 @@ Feature: Manage Providers
When I go to the provider types page
Then I should get a XML document
And there should be these provider types:
- | name | codename | build_supported |
- | Mock | mock | true |
- | GoGrid | gogrid | false |
- | Rackspace | rackspace | false |
- | OpenNebula | opennebula | false |
- | Amazon EC2 | ec2 | true |
- | CondorCloud | condorcloud | true |
- | RHEV-M | rhevm | false |
+ | name | codename
+ | Mock | mock
+ | GoGrid | gogrid
+ | Rackspace | rackspace
+ | OpenNebula | opennebula
+ | Amazon EC2 | ec2
+ | CondorCloud | condorcloud
+ | RHEV-M | rhevm
diff --git a/src/features/step_definitions/provider_type_steps.rb
b/src/features/step_definitions/provider_type_steps.rb
index 0b0760a..e65e78a 100644
--- a/src/features/step_definitions/provider_type_steps.rb
+++ b/src/features/step_definitions/provider_type_steps.rb
@@ -1,13 +1,11 @@
Then /^there should be these provider types:$/ do |table|
types = @xml_response.root.xpath('/provider_types/provider_type').map do |n|
{:name => n.xpath('name').text,
- :codename => n.xpath('codename').text,
- :build_supported => n.xpath('build_supported').text}
+ :codename => n.xpath('codename').text}
end
table.hashes.each do |hash|
p = types.find {|n| n[:name] == hash[:name]}
p.should_not be_nil
p[:codename].should == hash[:codename]
- p[:build_supported].should == hash[:build_supported]
end
end
--
1.7.4.4