In the case of RHEV-M and VMWare, Conductor provider codenames differ
from deltacloud driver names. These different names were chosen because
they are what image factory uses.
However, in future, this will cause problems for conductor when we use
a single deltacloud instance because we will need to map our codenames
to deltacloud driver names.
We should take the opportunity and cut out all confusion by
standardising on deltacloud driver names. Obviously, we should only
do this in Conductor if the change is also made in image factory.
---
.../image_factory/aeolus-image/lib/list_command.rb | 3 ++-
...110707082304_rename_rhevm_and_vmware_targets.rb | 19 +++++++++++++++++++
src/db/seeds.rb | 4 ++--
src/features/provider_type.feature | 2 +-
4 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 src/db/migrate/20110707082304_rename_rhevm_and_vmware_targets.rb
diff --git a/services/image_factory/aeolus-image/lib/list_command.rb
b/services/image_factory/aeolus-image/lib/list_command.rb
index 5e5d62a..6e01529 100644
--- a/services/image_factory/aeolus-image/lib/list_command.rb
+++ b/services/image_factory/aeolus-image/lib/list_command.rb
@@ -37,7 +37,8 @@ module Aeolus
targets = [["NAME", "TARGET CODE"]]
targets << ["Mock", "mock"]
targets << ["Amazon EC2", "ec2"]
- targets << ["VMWare VSphere", "vmware"]
+ targets << ["RHEV-M", "rhevm"]
+ targets << ["VMWare VSphere", "vsphere"]
targets << ["Condor Cloud", "condor_cloud"]
format_print(targets)
quit(0)
diff --git a/src/db/migrate/20110707082304_rename_rhevm_and_vmware_targets.rb
b/src/db/migrate/20110707082304_rename_rhevm_and_vmware_targets.rb
new file mode 100644
index 0000000..4394253
--- /dev/null
+++ b/src/db/migrate/20110707082304_rename_rhevm_and_vmware_targets.rb
@@ -0,0 +1,19 @@
+class RenameRhevmAndVmwareTargets < ActiveRecord::Migration
+
+ def self.up
+ rename_type("rhev-m", "rhevm")
+ rename_type("vmware", "vsphere")
+ end
+
+ def self.down
+ rename_type("rhevm", "rhev-m")
+ rename_type("vsphere", "vmware")
+ end
+
+ def self.rename_type(old, new)
+ type = ProviderType.find_by_codename(old)
+ type.codename = new
+ type.save
+ end
+
+end
diff --git a/src/db/seeds.rb b/src/db/seeds.rb
index f184377..83a1eec 100644
--- a/src/db/seeds.rb
+++ b/src/db/seeds.rb
@@ -125,10 +125,10 @@ if ProviderType.all.empty?
ProviderType.create!(:name => "Amazon EC2", :build_supported => true,
: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
=>"rhev-m")
+ 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
=>"vmware", :build_supported => 'true')
+ ProviderType.create!(:name => "VMWare vSphere", :codename
=>"vsphere", :build_supported => 'true')
end
# fill table CredentialDefinitions by default values
diff --git a/src/features/provider_type.feature b/src/features/provider_type.feature
index 5948533..c1d39a1 100644
--- a/src/features/provider_type.feature
+++ b/src/features/provider_type.feature
@@ -19,4 +19,4 @@ Feature: Manage Providers
| OpenNebula | opennebula | false |
| Amazon EC2 | ec2 | true |
| CondorCloud | condorcloud | true |
- | RHEV-M | rhev-m | false |
+ | RHEV-M | rhevm | false |
--
1.7.4.4