From 9907d4ed590456178b831ac2e4b936fa24aac187 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Mon, 17 May 2010 03:16:05 +0800 Subject: [PATCH] move vcloud models to its directory since the format is common to both --- lib/fog/terremark/shared.rb | 13 +++---------- lib/fog/vcloud.rb | 4 ++++ .../models/shared/address.rb | 2 +- .../models/shared/addresses.rb | 8 ++++---- .../models/shared/network.rb | 2 +- .../models/shared/networks.rb | 8 ++++---- .../models/shared/server.rb | 2 +- .../models/shared/servers.rb | 10 +++++----- .../models/shared/task.rb | 2 +- .../models/shared/tasks.rb | 10 +++++----- .../{terremark => vcloud}/models/shared/vdc.rb | 2 +- .../models/shared/vdcs.rb | 8 ++++---- lib/fog/vcloud/shared.rb | 18 ++++++++++++++++++ 13 files changed, 52 insertions(+), 37 deletions(-) rename lib/fog/{terremark => vcloud}/models/shared/address.rb (95%) rename lib/fog/{terremark => vcloud}/models/shared/addresses.rb (76%) rename lib/fog/{terremark => vcloud}/models/shared/network.rb (96%) rename lib/fog/{terremark => vcloud}/models/shared/networks.rb (79%) rename lib/fog/{terremark => vcloud}/models/shared/server.rb (99%) rename lib/fog/{terremark => vcloud}/models/shared/servers.rb (77%) rename lib/fog/{terremark => vcloud}/models/shared/task.rb (97%) rename lib/fog/{terremark => vcloud}/models/shared/tasks.rb (82%) rename lib/fog/{terremark => vcloud}/models/shared/vdc.rb (96%) rename lib/fog/{terremark => vcloud}/models/shared/vdcs.rb (80%) create mode 100644 lib/fog/vcloud/shared.rb diff --git a/lib/fog/terremark/shared.rb b/lib/fog/terremark/shared.rb index 0e4f475fb..8b007c4b9 100644 --- a/lib/fog/terremark/shared.rb +++ b/lib/fog/terremark/shared.rb @@ -221,16 +221,9 @@ module Fog end def shared_requires - require 'fog/terremark/models/shared/address' - require 'fog/terremark/models/shared/addresses' - require 'fog/terremark/models/shared/network' - require 'fog/terremark/models/shared/networks' - require 'fog/terremark/models/shared/server' - require 'fog/terremark/models/shared/servers' - require 'fog/terremark/models/shared/task' - require 'fog/terremark/models/shared/tasks' - require 'fog/terremark/models/shared/vdc' - require 'fog/terremark/models/shared/vdcs' + include Fog::Vcloud::Shared + shared_requires + require 'fog/terremark/parsers/shared/get_catalog' require 'fog/terremark/parsers/shared/get_catalog_item' require 'fog/terremark/parsers/shared/get_internet_services' diff --git a/lib/fog/vcloud.rb b/lib/fog/vcloud.rb index ef5174ba9..796571ee7 100644 --- a/lib/fog/vcloud.rb +++ b/lib/fog/vcloud.rb @@ -250,6 +250,10 @@ module Fog class < self)) + Fog::Vcloud::Shared::Addresses.new(options.merge(:connection => self)) end end module Real def addresses(options = {}) - Fog::Terremark::Shared::Addresses.new(options.merge(:connection => self)) + Fog::Vcloud::Shared::Addresses.new(options.merge(:connection => self)) end end class Addresses < Fog::Collection - model Fog::Terremark::Shared::Address + model Fog::Vcloud::Shared::Address def all load(connection.get_public_ips(vdc_id).body['PublicIpAddresses']) diff --git a/lib/fog/terremark/models/shared/network.rb b/lib/fog/vcloud/models/shared/network.rb similarity index 96% rename from lib/fog/terremark/models/shared/network.rb rename to lib/fog/vcloud/models/shared/network.rb index eb067272f..c33b7c302 100644 --- a/lib/fog/terremark/models/shared/network.rb +++ b/lib/fog/vcloud/models/shared/network.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Terremark + module Vcloud module Shared class Network < Fog::Model diff --git a/lib/fog/terremark/models/shared/networks.rb b/lib/fog/vcloud/models/shared/networks.rb similarity index 79% rename from lib/fog/terremark/models/shared/networks.rb rename to lib/fog/vcloud/models/shared/networks.rb index 6e39c3003..d05e32f7f 100644 --- a/lib/fog/terremark/models/shared/networks.rb +++ b/lib/fog/vcloud/models/shared/networks.rb @@ -1,22 +1,22 @@ module Fog - module Terremark + module Vcloud module Shared module Mock def networks(options = {}) - Fog::Terremark::Shared::Networks.new(options.merge(:connection => self)) + Fog::Vcloud::Shared::Networks.new(options.merge(:connection => self)) end end module Real def networks(options = {}) - Fog::Terremark::Shared::Networks.new(options.merge(:connection => self)) + Fog::Vcloud::Shared::Networks.new(options.merge(:connection => self)) end end class Networks < Fog::Collection - model Fog::Terremark::Shared::Network + model Fog::Vcloud::Shared::Network def all data = connection.get_vdc(vdc_id).body['AvailableNetworks'].map do |network| diff --git a/lib/fog/terremark/models/shared/server.rb b/lib/fog/vcloud/models/shared/server.rb similarity index 99% rename from lib/fog/terremark/models/shared/server.rb rename to lib/fog/vcloud/models/shared/server.rb index 4e6562664..06d745299 100644 --- a/lib/fog/terremark/models/shared/server.rb +++ b/lib/fog/vcloud/models/shared/server.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Terremark + module Vcloud module Shared class Server < Fog::Model diff --git a/lib/fog/terremark/models/shared/servers.rb b/lib/fog/vcloud/models/shared/servers.rb similarity index 77% rename from lib/fog/terremark/models/shared/servers.rb rename to lib/fog/vcloud/models/shared/servers.rb index 8d4668f82..222dc45a6 100644 --- a/lib/fog/terremark/models/shared/servers.rb +++ b/lib/fog/vcloud/models/shared/servers.rb @@ -1,25 +1,25 @@ require 'fog/collection' -require 'fog/terremark/models/shared/server' +require 'fog/vcloud/models/shared/server' module Fog - module Terremark + module Vcloud module Shared module Mock def servers(options = {}) - Fog::Terremark::Shared::Servers.new(options.merge(:connection => self)) + Fog::Vcloud::Shared::Servers.new(options.merge(:connection => self)) end end module Real def servers(options = {}) - Fog::Terremark::Shared::Servers.new(options.merge(:connection => self)) + Fog::Vcloud::Shared::Servers.new(options.merge(:connection => self)) end end class Servers < Fog::Collection - model Fog::Terremark::Shared::Server + model Fog::Vcloud::Shared::Server def all data = connection.get_vdc(vdc_id).body['ResourceEntities'].select do |entity| diff --git a/lib/fog/terremark/models/shared/task.rb b/lib/fog/vcloud/models/shared/task.rb similarity index 97% rename from lib/fog/terremark/models/shared/task.rb rename to lib/fog/vcloud/models/shared/task.rb index d97eb2867..fb4863a8a 100644 --- a/lib/fog/terremark/models/shared/task.rb +++ b/lib/fog/vcloud/models/shared/task.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Terremark + module Vcloud module Shared class Task < Fog::Model diff --git a/lib/fog/terremark/models/shared/tasks.rb b/lib/fog/vcloud/models/shared/tasks.rb similarity index 82% rename from lib/fog/terremark/models/shared/tasks.rb rename to lib/fog/vcloud/models/shared/tasks.rb index 79e601761..3f305e955 100644 --- a/lib/fog/terremark/models/shared/tasks.rb +++ b/lib/fog/vcloud/models/shared/tasks.rb @@ -1,25 +1,25 @@ require 'fog/collection' -require 'fog/terremark/models/shared/server' +require 'fog/vcloud/models/shared/server' module Fog - module Terremark + module Vcloud module Shared module Mock def tasks - Fog::Terremark::Shared::Tasks.new(:connection => self) + Fog::Vcloud::Shared::Tasks.new(:connection => self) end end module Real def tasks - Fog::Terremark::Shared::Tasks.new(:connection => self) + Fog::Vcloud::Shared::Tasks.new(:connection => self) end end class Tasks < Fog::Collection - model Fog::Terremark::Shared::Task + model Fog::Vcloud::Shared::Task def all data = connection.get_tasks_list(task_list_id).body['Tasks'] diff --git a/lib/fog/terremark/models/shared/vdc.rb b/lib/fog/vcloud/models/shared/vdc.rb similarity index 96% rename from lib/fog/terremark/models/shared/vdc.rb rename to lib/fog/vcloud/models/shared/vdc.rb index 317ffb2c7..f0d5fb1b6 100644 --- a/lib/fog/terremark/models/shared/vdc.rb +++ b/lib/fog/vcloud/models/shared/vdc.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Terremark + module Vcloud module Shared class Vdc < Fog::Model diff --git a/lib/fog/terremark/models/shared/vdcs.rb b/lib/fog/vcloud/models/shared/vdcs.rb similarity index 80% rename from lib/fog/terremark/models/shared/vdcs.rb rename to lib/fog/vcloud/models/shared/vdcs.rb index d47793f5d..6aced2f1a 100644 --- a/lib/fog/terremark/models/shared/vdcs.rb +++ b/lib/fog/vcloud/models/shared/vdcs.rb @@ -1,22 +1,22 @@ module Fog - module Terremark + module Vcloud module Shared module Mock def vdcs(options = {}) - Fog::Terremark::Shared::Vdcs.new(options.merge(:connection => self)) + Fog::Vcloud::Shared::Vdcs.new(options.merge(:connection => self)) end end module Real def vdcs(options = {}) - Fog::Terremark::Shared::Vdcs.new(options.merge(:connection => self)) + Fog::Vcloud::Shared::Vdcs.new(options.merge(:connection => self)) end end class Vdcs < Fog::Collection - model Fog::Terremark::Shared::Vdc + model Fog::Vcloud::Shared::Vdc def all data = connection.get_organization(organization_id).body['Links'].select do |entity| diff --git a/lib/fog/vcloud/shared.rb b/lib/fog/vcloud/shared.rb new file mode 100644 index 000000000..283cc068f --- /dev/null +++ b/lib/fog/vcloud/shared.rb @@ -0,0 +1,18 @@ +module Fog + module Vcloud + module Shared + def shared_requires + require 'fog/vcloud/models/shared/address' + require 'fog/vcloud/models/shared/addresses' + require 'fog/vcloud/models/shared/network' + require 'fog/vcloud/models/shared/networks' + require 'fog/vcloud/models/shared/server' + require 'fog/vcloud/models/shared/servers' + require 'fog/vcloud/models/shared/task' + require 'fog/vcloud/models/shared/tasks' + require 'fog/vcloud/models/shared/vdc' + require 'fog/vcloud/models/shared/vdcs' + end + end + end +end