From 487046d85b486ee295893b63eb67cc86f7e57eca Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 20:00:45 -0500 Subject: [PATCH] [dns|aws] move aws dns to its own shared area (namespacing should probably be corrected) --- lib/fog/aws.rb | 2 +- lib/fog/{dns/aws.rb => aws/dns.rb} | 4 ++-- lib/fog/{dns/models/aws => aws/models/dns}/record.rb | 0 lib/fog/{dns/models/aws => aws/models/dns}/records.rb | 2 +- lib/fog/{dns/models/aws => aws/models/dns}/zone.rb | 2 +- lib/fog/{dns/models/aws => aws/models/dns}/zones.rb | 2 +- .../{dns => aws}/parsers/aws/change_resource_record_sets.rb | 0 lib/fog/{dns => aws}/parsers/aws/create_hosted_zone.rb | 0 lib/fog/{dns => aws}/parsers/aws/delete_hosted_zone.rb | 0 lib/fog/{dns => aws}/parsers/aws/get_change.rb | 0 lib/fog/{dns => aws}/parsers/aws/get_hosted_zone.rb | 0 lib/fog/{dns => aws}/parsers/aws/list_hosted_zones.rb | 0 lib/fog/{dns => aws}/parsers/aws/list_resource_record_sets.rb | 0 .../aws => aws/requests/dns}/change_resource_record_sets.rb | 2 +- .../requests/aws => aws/requests/dns}/create_hosted_zone.rb | 2 +- .../requests/aws => aws/requests/dns}/delete_hosted_zone.rb | 2 +- lib/fog/{dns/requests/aws => aws/requests/dns}/get_change.rb | 2 +- .../{dns/requests/aws => aws/requests/dns}/get_hosted_zone.rb | 2 +- .../requests/aws => aws/requests/dns}/list_hosted_zones.rb | 2 +- .../aws => aws/requests/dns}/list_resource_record_sets.rb | 2 +- 20 files changed, 13 insertions(+), 13 deletions(-) rename lib/fog/{dns/aws.rb => aws/dns.rb} (97%) rename lib/fog/{dns/models/aws => aws/models/dns}/record.rb (100%) rename lib/fog/{dns/models/aws => aws/models/dns}/records.rb (97%) rename lib/fog/{dns/models/aws => aws/models/dns}/zone.rb (97%) rename lib/fog/{dns/models/aws => aws/models/dns}/zones.rb (95%) rename lib/fog/{dns => aws}/parsers/aws/change_resource_record_sets.rb (100%) rename lib/fog/{dns => aws}/parsers/aws/create_hosted_zone.rb (100%) rename lib/fog/{dns => aws}/parsers/aws/delete_hosted_zone.rb (100%) rename lib/fog/{dns => aws}/parsers/aws/get_change.rb (100%) rename lib/fog/{dns => aws}/parsers/aws/get_hosted_zone.rb (100%) rename lib/fog/{dns => aws}/parsers/aws/list_hosted_zones.rb (100%) rename lib/fog/{dns => aws}/parsers/aws/list_resource_record_sets.rb (100%) rename lib/fog/{dns/requests/aws => aws/requests/dns}/change_resource_record_sets.rb (98%) rename lib/fog/{dns/requests/aws => aws/requests/dns}/create_hosted_zone.rb (97%) rename lib/fog/{dns/requests/aws => aws/requests/dns}/delete_hosted_zone.rb (95%) rename lib/fog/{dns/requests/aws => aws/requests/dns}/get_change.rb (95%) rename lib/fog/{dns/requests/aws => aws/requests/dns}/get_hosted_zone.rb (95%) rename lib/fog/{dns/requests/aws => aws/requests/dns}/list_hosted_zones.rb (96%) rename lib/fog/{dns/requests/aws => aws/requests/dns}/list_resource_record_sets.rb (96%) diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb index 25a077368..f0748af1a 100644 --- a/lib/fog/aws.rb +++ b/lib/fog/aws.rb @@ -10,7 +10,7 @@ module Fog service(:compute, 'compute/aws') service(:cloud_formation, 'aws/cloud_formation') service(:cloud_watch, 'aws/cloud_watch') - service(:dns, 'dns/aws') + service(:dns, 'aws/dns') service(:elb, 'aws/elb') service(:iam, 'aws/iam') service(:rds, 'aws/rds') diff --git a/lib/fog/dns/aws.rb b/lib/fog/aws/dns.rb similarity index 97% rename from lib/fog/dns/aws.rb rename to lib/fog/aws/dns.rb index c68a90068..67fbbfa73 100644 --- a/lib/fog/dns/aws.rb +++ b/lib/fog/aws/dns.rb @@ -5,13 +5,13 @@ module Fog requires :aws_access_key_id, :aws_secret_access_key recognizes :host, :path, :port, :scheme, :version, :persistent - model_path 'fog/dns/models/aws' + model_path 'fog/aws/models/dns' model :record collection :records model :zone collection :zones - request_path 'fog/dns/requests/aws' + request_path 'fog/aws/requests/dns' request :create_hosted_zone request :get_hosted_zone request :delete_hosted_zone diff --git a/lib/fog/dns/models/aws/record.rb b/lib/fog/aws/models/dns/record.rb similarity index 100% rename from lib/fog/dns/models/aws/record.rb rename to lib/fog/aws/models/dns/record.rb diff --git a/lib/fog/dns/models/aws/records.rb b/lib/fog/aws/models/dns/records.rb similarity index 97% rename from lib/fog/dns/models/aws/records.rb rename to lib/fog/aws/models/dns/records.rb index c529312ba..87913a710 100644 --- a/lib/fog/dns/models/aws/records.rb +++ b/lib/fog/aws/models/dns/records.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/dns/models/aws/record' +require 'fog/aws/models/dns/record' module Fog module DNS diff --git a/lib/fog/dns/models/aws/zone.rb b/lib/fog/aws/models/dns/zone.rb similarity index 97% rename from lib/fog/dns/models/aws/zone.rb rename to lib/fog/aws/models/dns/zone.rb index e17a4522c..a324a011a 100644 --- a/lib/fog/dns/models/aws/zone.rb +++ b/lib/fog/aws/models/dns/zone.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -# require 'fog/dns/models/aws/records' +# require 'fog/aws/models/dns/records' module Fog module DNS diff --git a/lib/fog/dns/models/aws/zones.rb b/lib/fog/aws/models/dns/zones.rb similarity index 95% rename from lib/fog/dns/models/aws/zones.rb rename to lib/fog/aws/models/dns/zones.rb index 70ebc3fad..484711478 100644 --- a/lib/fog/dns/models/aws/zones.rb +++ b/lib/fog/aws/models/dns/zones.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/dns/models/aws/zone' +require 'fog/aws/models/dns/zone' module Fog module DNS diff --git a/lib/fog/dns/parsers/aws/change_resource_record_sets.rb b/lib/fog/aws/parsers/aws/change_resource_record_sets.rb similarity index 100% rename from lib/fog/dns/parsers/aws/change_resource_record_sets.rb rename to lib/fog/aws/parsers/aws/change_resource_record_sets.rb diff --git a/lib/fog/dns/parsers/aws/create_hosted_zone.rb b/lib/fog/aws/parsers/aws/create_hosted_zone.rb similarity index 100% rename from lib/fog/dns/parsers/aws/create_hosted_zone.rb rename to lib/fog/aws/parsers/aws/create_hosted_zone.rb diff --git a/lib/fog/dns/parsers/aws/delete_hosted_zone.rb b/lib/fog/aws/parsers/aws/delete_hosted_zone.rb similarity index 100% rename from lib/fog/dns/parsers/aws/delete_hosted_zone.rb rename to lib/fog/aws/parsers/aws/delete_hosted_zone.rb diff --git a/lib/fog/dns/parsers/aws/get_change.rb b/lib/fog/aws/parsers/aws/get_change.rb similarity index 100% rename from lib/fog/dns/parsers/aws/get_change.rb rename to lib/fog/aws/parsers/aws/get_change.rb diff --git a/lib/fog/dns/parsers/aws/get_hosted_zone.rb b/lib/fog/aws/parsers/aws/get_hosted_zone.rb similarity index 100% rename from lib/fog/dns/parsers/aws/get_hosted_zone.rb rename to lib/fog/aws/parsers/aws/get_hosted_zone.rb diff --git a/lib/fog/dns/parsers/aws/list_hosted_zones.rb b/lib/fog/aws/parsers/aws/list_hosted_zones.rb similarity index 100% rename from lib/fog/dns/parsers/aws/list_hosted_zones.rb rename to lib/fog/aws/parsers/aws/list_hosted_zones.rb diff --git a/lib/fog/dns/parsers/aws/list_resource_record_sets.rb b/lib/fog/aws/parsers/aws/list_resource_record_sets.rb similarity index 100% rename from lib/fog/dns/parsers/aws/list_resource_record_sets.rb rename to lib/fog/aws/parsers/aws/list_resource_record_sets.rb diff --git a/lib/fog/dns/requests/aws/change_resource_record_sets.rb b/lib/fog/aws/requests/dns/change_resource_record_sets.rb similarity index 98% rename from lib/fog/dns/requests/aws/change_resource_record_sets.rb rename to lib/fog/aws/requests/dns/change_resource_record_sets.rb index b4d9ec1cd..23728e62c 100644 --- a/lib/fog/dns/requests/aws/change_resource_record_sets.rb +++ b/lib/fog/aws/requests/dns/change_resource_record_sets.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/dns/parsers/aws/change_resource_record_sets' + require 'fog/aws/parsers/dns/change_resource_record_sets' # Use this action to create or change your authoritative DNS information for a zone # diff --git a/lib/fog/dns/requests/aws/create_hosted_zone.rb b/lib/fog/aws/requests/dns/create_hosted_zone.rb similarity index 97% rename from lib/fog/dns/requests/aws/create_hosted_zone.rb rename to lib/fog/aws/requests/dns/create_hosted_zone.rb index 1203c6d1f..4a26142cd 100644 --- a/lib/fog/dns/requests/aws/create_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/create_hosted_zone.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/dns/parsers/aws/create_hosted_zone' + require 'fog/aws/parsers/dns/create_hosted_zone' # Creates a new hosted zone # diff --git a/lib/fog/dns/requests/aws/delete_hosted_zone.rb b/lib/fog/aws/requests/dns/delete_hosted_zone.rb similarity index 95% rename from lib/fog/dns/requests/aws/delete_hosted_zone.rb rename to lib/fog/aws/requests/dns/delete_hosted_zone.rb index 350bad9a7..9b860695a 100644 --- a/lib/fog/dns/requests/aws/delete_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/delete_hosted_zone.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/dns/parsers/aws/delete_hosted_zone' + require 'fog/aws/parsers/dns/delete_hosted_zone' # Delete a hosted zone # diff --git a/lib/fog/dns/requests/aws/get_change.rb b/lib/fog/aws/requests/dns/get_change.rb similarity index 95% rename from lib/fog/dns/requests/aws/get_change.rb rename to lib/fog/aws/requests/dns/get_change.rb index 4d3eeb7ed..2910d2237 100644 --- a/lib/fog/dns/requests/aws/get_change.rb +++ b/lib/fog/aws/requests/dns/get_change.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/dns/parsers/aws/get_change' + require 'fog/aws/parsers/dns/get_change' # returns the current state of a change request # diff --git a/lib/fog/dns/requests/aws/get_hosted_zone.rb b/lib/fog/aws/requests/dns/get_hosted_zone.rb similarity index 95% rename from lib/fog/dns/requests/aws/get_hosted_zone.rb rename to lib/fog/aws/requests/dns/get_hosted_zone.rb index 0e40b7880..b9ea88b93 100644 --- a/lib/fog/dns/requests/aws/get_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/get_hosted_zone.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/dns/parsers/aws/get_hosted_zone' + require 'fog/aws/parsers/dns/get_hosted_zone' # retrieve information about a hosted zone # diff --git a/lib/fog/dns/requests/aws/list_hosted_zones.rb b/lib/fog/aws/requests/dns/list_hosted_zones.rb similarity index 96% rename from lib/fog/dns/requests/aws/list_hosted_zones.rb rename to lib/fog/aws/requests/dns/list_hosted_zones.rb index 8f9530cb9..8b4d28c66 100644 --- a/lib/fog/dns/requests/aws/list_hosted_zones.rb +++ b/lib/fog/aws/requests/dns/list_hosted_zones.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/dns/parsers/aws/list_hosted_zones' + require 'fog/aws/parsers/dns/list_hosted_zones' # Describe all or specified instances # diff --git a/lib/fog/dns/requests/aws/list_resource_record_sets.rb b/lib/fog/aws/requests/dns/list_resource_record_sets.rb similarity index 96% rename from lib/fog/dns/requests/aws/list_resource_record_sets.rb rename to lib/fog/aws/requests/dns/list_resource_record_sets.rb index 90f7ec80f..1c16046ca 100644 --- a/lib/fog/dns/requests/aws/list_resource_record_sets.rb +++ b/lib/fog/aws/requests/dns/list_resource_record_sets.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/dns/parsers/aws/list_resource_record_sets' + require 'fog/aws/parsers/dns/list_resource_record_sets' # list your resource record sets #