---
src/app/controllers/providers_controller.rb | 2 ++
src/app/views/providers/_form.haml | 3 +++
src/app/views/providers/_list.haml | 2 ++
src/app/views/providers/_list.xml.haml | 1 +
src/app/views/providers/_properties.haml | 10 ++++++++++
src/config/locales/en.yml | 2 ++
...11141500_add_deltacloud_provider_to_provider.rb | 9 +++++++++
src/spec/factories/provider.rb | 2 ++
8 files changed, 31 insertions(+), 0 deletions(-)
create mode 100644 src/db/migrate/20110811141500_add_deltacloud_provider_to_provider.rb
diff --git a/src/app/controllers/providers_controller.rb
b/src/app/controllers/providers_controller.rb
index 32d698b..6119f96 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -145,6 +145,8 @@ class ProvidersController < ApplicationController
{:name => t("providers.index.provider_name"), :sort_attr =>
:name},
{:name => t("providers.index.provider_url"), :sort_attr => :name},
{:name => t("providers.index.provider_type"), :sort_attr =>
:name},
+ {:name => t("providers.index.x_deltacloud_driver"), :sort_attr =>
:name},
+ {:name => t("providers.index.x_deltacloud_provider"), :sort_attr =>
:name},
]
end
diff --git a/src/app/views/providers/_form.haml b/src/app/views/providers/_form.haml
index f07ed24..835df22 100644
--- a/src/app/views/providers/_form.haml
+++ b/src/app/views/providers/_form.haml
@@ -9,6 +9,9 @@
%p
= form.label :provider_type
= form.select(:provider_type_id, ProviderType.all.collect {|provider_type|
[provider_type.name,provider_type.id] }, :prompt => "Select type of
provider")
+ %p
+ = form.label :url, 'X-Deltacloud-Provider:'
+ = form.text_field :deltacloud_provider, :title => 'deltacloud_provider',
:value => @provider.deltacloud_provider, :class => 'long'
%fieldset.options
= form.submit "Save", :class => "submit button"
diff --git a/src/app/views/providers/_list.haml b/src/app/views/providers/_list.haml
index 14da47a..c832ef8 100644
--- a/src/app/views/providers/_list.haml
+++ b/src/app/views/providers/_list.haml
@@ -15,3 +15,5 @@
%td= link_to provider.name, provider_path(provider)
%td= provider.url
%td= provider.provider_type.name
+ %td= provider.provider_type.deltacloud_driver
+ %td= provider.deltacloud_provider
diff --git a/src/app/views/providers/_list.xml.haml
b/src/app/views/providers/_list.xml.haml
index 3e4c1bb..bec069b 100644
--- a/src/app/views/providers/_list.xml.haml
+++ b/src/app/views/providers/_list.xml.haml
@@ -5,3 +5,4 @@
%name= p.name
%url= p.url
%provider_type= p.provider_type.deltacloud_driver
+ %deltacloud_provider= p.deltacloud_provider
diff --git a/src/app/views/providers/_properties.haml
b/src/app/views/providers/_properties.haml
index ace0998..ee8a768 100644
--- a/src/app/views/providers/_properties.haml
+++ b/src/app/views/providers/_properties.haml
@@ -21,3 +21,13 @@
%label Provider Type
%td
= @provider.provider_type.name
+ %tr
+ %td
+ %label X-Deltacloud-Driver
+ %td
+ = @provider.provider_type.deltacloud_driver
+ %tr
+ %td
+ %label X-Deltacloud-Provider
+ %td
+ = @provider.deltacloud_provider
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 26e6887..0333da0 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -211,6 +211,8 @@ en:
provider_name: Provider Name
provider_url: Provider URL
provider_type: Provider Type
+ x_deltacloud_driver: X-Deltacloud-Driver
+ x_deltacloud_provider: X-Deltacloud-Provider
form:
provider_name: Provider Name
provider_url: Provider URL
diff --git a/src/db/migrate/20110811141500_add_deltacloud_provider_to_provider.rb
b/src/db/migrate/20110811141500_add_deltacloud_provider_to_provider.rb
new file mode 100644
index 0000000..fd11ac3
--- /dev/null
+++ b/src/db/migrate/20110811141500_add_deltacloud_provider_to_provider.rb
@@ -0,0 +1,9 @@
+class AddDeltacloudProviderToProvider < ActiveRecord::Migration
+ def self.up
+ add_column :providers, :deltacloud_provider, :string
+ end
+
+ def self.down
+ remove_column :providers, :deltacloud_provider
+ end
+end
diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb
index df0d3f1..f599d57 100644
--- a/src/spec/factories/provider.rb
+++ b/src/spec/factories/provider.rb
@@ -17,6 +17,7 @@ FactoryGirl.define do
name 'mock2'
provider_type { ProviderType.find_by_deltacloud_driver("mock") }
url 'http://localhost:3002/api'
+ deltacloud_provider 'mock'
after_create { |p| p.realms << FactoryGirl.create(:realm3, :provider => p)
}
end
@@ -24,6 +25,7 @@ FactoryGirl.define do
name 'amazon-ec2'
provider_type { ProviderType.find_by_deltacloud_driver("ec2") }
url 'http://localhost:3002/api'
+ deltacloud_provider 'ec2-us-east-1'
hardware_profiles { |hp| [hp.association(:ec2_hwp1)] }
after_create { |p| p.realms << FactoryGirl.create(:realm4, :provider => p)
}
end
--
1.7.6