From a90007b7d4cc8c5f608df2001ae28a66c33a3a40 Mon Sep 17 00:00:00 2001 From: geemus Date: Mon, 29 Aug 2011 10:37:01 -0500 Subject: [PATCH] [dns|rackspace] move rackspace dns to its own shared area (namespacing should probably be corrected) --- lib/fog/dns.rb | 2 +- lib/fog/rackspace.rb | 2 +- lib/fog/{dns/rackspace.rb => rackspace/dns.rb} | 4 ++-- .../models/rackspace => rackspace/models/dns}/callback.rb | 0 .../{dns/models/rackspace => rackspace/models/dns}/record.rb | 2 +- .../{dns/models/rackspace => rackspace/models/dns}/records.rb | 2 +- .../{dns/models/rackspace => rackspace/models/dns}/zone.rb | 2 +- .../{dns/models/rackspace => rackspace/models/dns}/zones.rb | 2 +- .../rackspace => rackspace/requests/dns}/add_records.rb | 0 .../requests/rackspace => rackspace/requests/dns}/callback.rb | 0 .../rackspace => rackspace/requests/dns}/create_domains.rb | 0 .../requests/dns}/list_domain_details.rb | 0 .../rackspace => rackspace/requests/dns}/list_domains.rb | 0 .../requests/dns}/list_record_details.rb | 0 .../rackspace => rackspace/requests/dns}/list_records.rb | 0 .../rackspace => rackspace/requests/dns}/list_subdomains.rb | 0 .../rackspace => rackspace/requests/dns}/modify_domain.rb | 0 .../rackspace => rackspace/requests/dns}/modify_record.rb | 0 .../rackspace => rackspace/requests/dns}/remove_domain.rb | 0 .../rackspace => rackspace/requests/dns}/remove_domains.rb | 0 .../rackspace => rackspace/requests/dns}/remove_record.rb | 0 .../rackspace => rackspace/requests/dns}/remove_records.rb | 0 22 files changed, 8 insertions(+), 8 deletions(-) rename lib/fog/{dns/rackspace.rb => rackspace/dns.rb} (97%) rename lib/fog/{dns/models/rackspace => rackspace/models/dns}/callback.rb (100%) rename lib/fog/{dns/models/rackspace => rackspace/models/dns}/record.rb (97%) rename lib/fog/{dns/models/rackspace => rackspace/models/dns}/records.rb (95%) rename lib/fog/{dns/models/rackspace => rackspace/models/dns}/zone.rb (97%) rename lib/fog/{dns/models/rackspace => rackspace/models/dns}/zones.rb (94%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/add_records.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/callback.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/create_domains.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/list_domain_details.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/list_domains.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/list_record_details.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/list_records.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/list_subdomains.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/modify_domain.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/modify_record.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/remove_domain.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/remove_domains.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/remove_record.rb (100%) rename lib/fog/{dns/requests/rackspace => rackspace/requests/dns}/remove_records.rb (100%) diff --git a/lib/fog/dns.rb b/lib/fog/dns.rb index b064d676e..951aeb34e 100644 --- a/lib/fog/dns.rb +++ b/lib/fog/dns.rb @@ -33,7 +33,7 @@ module Fog require 'fog/zerigo/dns' Fog::DNS::Zerigo.new(attributes) when :rackspace - require 'fog/dns/rackspace' + require 'fog/rackspace/dns' Fog::DNS::Rackspace.new(attributes) else raise ArgumentError.new("#{provider} is not a recognized dns provider") diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index 5565dc8e4..8dd03495a 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -44,9 +44,9 @@ module Fog service(:cdn, 'rackspace/cdn') service(:compute, 'rackspace/compute') + service(:dns, 'rackspace/dns') service(:storage, 'rackspace/storage') service(:load_balancers, 'rackspace/load_balancers') - service(:dns, 'dns/rackspace') def self.authenticate(options) rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com" diff --git a/lib/fog/dns/rackspace.rb b/lib/fog/rackspace/dns.rb similarity index 97% rename from lib/fog/dns/rackspace.rb rename to lib/fog/rackspace/dns.rb index 79f0a2b09..9b3916979 100644 --- a/lib/fog/dns/rackspace.rb +++ b/lib/fog/rackspace/dns.rb @@ -9,13 +9,13 @@ module Fog recognizes :rackspace_auth_url recognizes :rackspace_auth_token - model_path 'fog/dns/models/rackspace' + model_path 'fog/rackspace/models/dns' model :record collection :records model :zone collection :zones - request_path 'fog/dns/requests/rackspace' + request_path 'fog/rackspace/requests/dns' #TODO - Import/Export, modify multiple domains, modify multiple records request :callback request :list_domains diff --git a/lib/fog/dns/models/rackspace/callback.rb b/lib/fog/rackspace/models/dns/callback.rb similarity index 100% rename from lib/fog/dns/models/rackspace/callback.rb rename to lib/fog/rackspace/models/dns/callback.rb diff --git a/lib/fog/dns/models/rackspace/record.rb b/lib/fog/rackspace/models/dns/record.rb similarity index 97% rename from lib/fog/dns/models/rackspace/record.rb rename to lib/fog/rackspace/models/dns/record.rb index f04e5893d..0fa54b10e 100644 --- a/lib/fog/dns/models/rackspace/record.rb +++ b/lib/fog/rackspace/models/dns/record.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -require 'fog/dns/models/rackspace/callback' +require 'fog/rackspace/models/dns/callback' module Fog module DNS diff --git a/lib/fog/dns/models/rackspace/records.rb b/lib/fog/rackspace/models/dns/records.rb similarity index 95% rename from lib/fog/dns/models/rackspace/records.rb rename to lib/fog/rackspace/models/dns/records.rb index 02ca0c5a7..eccfc9eb6 100644 --- a/lib/fog/dns/models/rackspace/records.rb +++ b/lib/fog/rackspace/models/dns/records.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/dns/models/rackspace/record' +require 'fog/rackspace/models/dns/record' module Fog module DNS diff --git a/lib/fog/dns/models/rackspace/zone.rb b/lib/fog/rackspace/models/dns/zone.rb similarity index 97% rename from lib/fog/dns/models/rackspace/zone.rb rename to lib/fog/rackspace/models/dns/zone.rb index 3275c0ce3..193b927a5 100644 --- a/lib/fog/dns/models/rackspace/zone.rb +++ b/lib/fog/rackspace/models/dns/zone.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -require 'fog/dns/models/rackspace/records' +require 'fog/rackspace/models/dns/records' module Fog module DNS diff --git a/lib/fog/dns/models/rackspace/zones.rb b/lib/fog/rackspace/models/dns/zones.rb similarity index 94% rename from lib/fog/dns/models/rackspace/zones.rb rename to lib/fog/rackspace/models/dns/zones.rb index ffc97f027..9b253d7fa 100644 --- a/lib/fog/dns/models/rackspace/zones.rb +++ b/lib/fog/rackspace/models/dns/zones.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/dns/models/rackspace/zone' +require 'fog/rackspace/models/dns/zone' module Fog module DNS diff --git a/lib/fog/dns/requests/rackspace/add_records.rb b/lib/fog/rackspace/requests/dns/add_records.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/add_records.rb rename to lib/fog/rackspace/requests/dns/add_records.rb diff --git a/lib/fog/dns/requests/rackspace/callback.rb b/lib/fog/rackspace/requests/dns/callback.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/callback.rb rename to lib/fog/rackspace/requests/dns/callback.rb diff --git a/lib/fog/dns/requests/rackspace/create_domains.rb b/lib/fog/rackspace/requests/dns/create_domains.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/create_domains.rb rename to lib/fog/rackspace/requests/dns/create_domains.rb diff --git a/lib/fog/dns/requests/rackspace/list_domain_details.rb b/lib/fog/rackspace/requests/dns/list_domain_details.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/list_domain_details.rb rename to lib/fog/rackspace/requests/dns/list_domain_details.rb diff --git a/lib/fog/dns/requests/rackspace/list_domains.rb b/lib/fog/rackspace/requests/dns/list_domains.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/list_domains.rb rename to lib/fog/rackspace/requests/dns/list_domains.rb diff --git a/lib/fog/dns/requests/rackspace/list_record_details.rb b/lib/fog/rackspace/requests/dns/list_record_details.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/list_record_details.rb rename to lib/fog/rackspace/requests/dns/list_record_details.rb diff --git a/lib/fog/dns/requests/rackspace/list_records.rb b/lib/fog/rackspace/requests/dns/list_records.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/list_records.rb rename to lib/fog/rackspace/requests/dns/list_records.rb diff --git a/lib/fog/dns/requests/rackspace/list_subdomains.rb b/lib/fog/rackspace/requests/dns/list_subdomains.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/list_subdomains.rb rename to lib/fog/rackspace/requests/dns/list_subdomains.rb diff --git a/lib/fog/dns/requests/rackspace/modify_domain.rb b/lib/fog/rackspace/requests/dns/modify_domain.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/modify_domain.rb rename to lib/fog/rackspace/requests/dns/modify_domain.rb diff --git a/lib/fog/dns/requests/rackspace/modify_record.rb b/lib/fog/rackspace/requests/dns/modify_record.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/modify_record.rb rename to lib/fog/rackspace/requests/dns/modify_record.rb diff --git a/lib/fog/dns/requests/rackspace/remove_domain.rb b/lib/fog/rackspace/requests/dns/remove_domain.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/remove_domain.rb rename to lib/fog/rackspace/requests/dns/remove_domain.rb diff --git a/lib/fog/dns/requests/rackspace/remove_domains.rb b/lib/fog/rackspace/requests/dns/remove_domains.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/remove_domains.rb rename to lib/fog/rackspace/requests/dns/remove_domains.rb diff --git a/lib/fog/dns/requests/rackspace/remove_record.rb b/lib/fog/rackspace/requests/dns/remove_record.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/remove_record.rb rename to lib/fog/rackspace/requests/dns/remove_record.rb diff --git a/lib/fog/dns/requests/rackspace/remove_records.rb b/lib/fog/rackspace/requests/dns/remove_records.rb similarity index 100% rename from lib/fog/dns/requests/rackspace/remove_records.rb rename to lib/fog/rackspace/requests/dns/remove_records.rb