diff --git a/benchs/parse_vs_push.rb b/benchs/parse_vs_push.rb index 01bd998c0..b700a3161 100644 --- a/benchs/parse_vs_push.rb +++ b/benchs/parse_vs_push.rb @@ -3,7 +3,6 @@ require 'rubygems' require 'nokogiri' class Parser < Nokogiri::XML::SAX::Document - attr_reader :response def initialize @@ -37,7 +36,6 @@ class Parser < Nokogiri::XML::SAX::Document def value @value.dup end - end data = <<-DATA diff --git a/lib/fog/atmos/core.rb b/lib/fog/atmos/core.rb index cd9833372..aff4700a1 100644 --- a/lib/fog/atmos/core.rb +++ b/lib/fog/atmos/core.rb @@ -2,10 +2,8 @@ require 'fog/core' module Fog module Atmos - extend Fog::Provider service(:storage, 'Storage') - end end diff --git a/lib/fog/atmos/models/storage/directories.rb b/lib/fog/atmos/models/storage/directories.rb index a7f22d1af..28b984d5b 100644 --- a/lib/fog/atmos/models/storage/directories.rb +++ b/lib/fog/atmos/models/storage/directories.rb @@ -4,9 +4,7 @@ require 'fog/atmos/models/storage/directory' module Fog module Storage class Atmos - class Directories < Fog::Collection - attribute :directory model Fog::Storage::Atmos::Directory @@ -40,9 +38,7 @@ module Fog attributes = {:directory => directory}.merge(attributes) if directory super(attributes) end - end - end end end diff --git a/lib/fog/atmos/models/storage/directory.rb b/lib/fog/atmos/models/storage/directory.rb index e26a5ba04..f212b909b 100644 --- a/lib/fog/atmos/models/storage/directory.rb +++ b/lib/fog/atmos/models/storage/directory.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Storage class Atmos - class Directory < Fog::Model - identity :key, :aliases => :Filename attribute :objectid, :aliases => :ObjectID @@ -44,10 +42,7 @@ module Fog end service.delete_namespace key end - - end - end end end diff --git a/lib/fog/atmos/models/storage/file.rb b/lib/fog/atmos/models/storage/file.rb index 782746e77..7507b640b 100644 --- a/lib/fog/atmos/models/storage/file.rb +++ b/lib/fog/atmos/models/storage/file.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Storage class Atmos - class File < Fog::Model - identity :key, :aliases => :Filename attribute :content_length, :aliases => ['bytes', 'Content-Length'], :type => :integer @@ -104,9 +102,7 @@ module Fog def directory=(new_directory) @directory = new_directory end - end - end end end diff --git a/lib/fog/atmos/models/storage/files.rb b/lib/fog/atmos/models/storage/files.rb index 7b800b96f..4250c0adf 100644 --- a/lib/fog/atmos/models/storage/files.rb +++ b/lib/fog/atmos/models/storage/files.rb @@ -4,9 +4,7 @@ require 'fog/atmos/models/storage/file' module Fog module Storage class Atmos - class Files < Fog::Collection - attribute :directory attribute :limit attribute :marker @@ -70,9 +68,7 @@ module Fog requires :directory super({ :directory => directory }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/atmos/requests/storage/delete_namespace.rb b/lib/fog/atmos/requests/storage/delete_namespace.rb index 623538025..b97738867 100644 --- a/lib/fog/atmos/requests/storage/delete_namespace.rb +++ b/lib/fog/atmos/requests/storage/delete_namespace.rb @@ -2,7 +2,6 @@ module Fog module Storage class Atmos class Real - def delete_namespace(namespace = '', options = {}) options = options.reject {|key, value| value.nil?} request({ @@ -12,7 +11,6 @@ module Fog :query => options }.merge(options)) end - end end end diff --git a/lib/fog/atmos/requests/storage/get_namespace.rb b/lib/fog/atmos/requests/storage/get_namespace.rb index e133963e7..b0c57a2ad 100644 --- a/lib/fog/atmos/requests/storage/get_namespace.rb +++ b/lib/fog/atmos/requests/storage/get_namespace.rb @@ -2,7 +2,6 @@ module Fog module Storage class Atmos class Real - def get_namespace(namespace = '', options = {}) options = options.reject {|key, value| value.nil?} request({ @@ -13,7 +12,6 @@ module Fog :parse => true }.merge(options)) end - end end end diff --git a/lib/fog/atmos/requests/storage/head_namespace.rb b/lib/fog/atmos/requests/storage/head_namespace.rb index 82b7b9c16..b797cbf44 100644 --- a/lib/fog/atmos/requests/storage/head_namespace.rb +++ b/lib/fog/atmos/requests/storage/head_namespace.rb @@ -2,7 +2,6 @@ module Fog module Storage class Atmos class Real - def head_namespace(namespace = '', options = {}) options = options.reject {|key, value| value.nil?} request({ @@ -13,7 +12,6 @@ module Fog :parse => true }.merge(options)) end - end end end diff --git a/lib/fog/atmos/requests/storage/post_namespace.rb b/lib/fog/atmos/requests/storage/post_namespace.rb index f8d611767..97aba5d88 100644 --- a/lib/fog/atmos/requests/storage/post_namespace.rb +++ b/lib/fog/atmos/requests/storage/post_namespace.rb @@ -2,7 +2,6 @@ module Fog module Storage class Atmos class Real - def post_namespace(namespace = '', options = {}) options = options.reject {|key, value| value.nil?} request({ @@ -13,7 +12,6 @@ module Fog :parse => true }.merge(options)) end - end end end diff --git a/lib/fog/atmos/requests/storage/put_namespace.rb b/lib/fog/atmos/requests/storage/put_namespace.rb index cc7a42ee6..85098561b 100644 --- a/lib/fog/atmos/requests/storage/put_namespace.rb +++ b/lib/fog/atmos/requests/storage/put_namespace.rb @@ -2,7 +2,6 @@ module Fog module Storage class Atmos class Real - def put_namespace(namespace = '', options = {}) options = options.reject {|key, value| value.nil?} request({ @@ -13,7 +12,6 @@ module Fog :parse => true }.merge(options)) end - end end end diff --git a/lib/fog/atmos/storage.rb b/lib/fog/atmos/storage.rb index 3ef915023..2a9713aa6 100644 --- a/lib/fog/atmos/storage.rb +++ b/lib/fog/atmos/storage.rb @@ -71,7 +71,6 @@ module Fog def request(options) raise "Atmos Storage mocks not implemented" end - end class Real @@ -179,7 +178,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/auto_scaling.rb b/lib/fog/aws/auto_scaling.rb index 2ec273c64..85b456731 100644 --- a/lib/fog/aws/auto_scaling.rb +++ b/lib/fog/aws/auto_scaling.rb @@ -177,7 +177,6 @@ module Fog end end - class Mock include Fog::AWS::CredentialFetcher::ConnectionMethods @@ -274,9 +273,7 @@ module Fog def setup_credentials(options) @aws_access_key_id = options[:aws_access_key_id] end - end - end end end diff --git a/lib/fog/aws/beanstalk.rb b/lib/fog/aws/beanstalk.rb index eb7ca48ad..1f8e96b68 100644 --- a/lib/fog/aws/beanstalk.rb +++ b/lib/fog/aws/beanstalk.rb @@ -56,11 +56,9 @@ module Fog collection :versions class Mock - def initialize(options={}) Fog::Mock.not_implemented end - end class Real @@ -140,11 +138,8 @@ module Fog Fog::AWS::ElasticBeanstalk::Error.slurp(error, "#{match[:code]} => #{match[:message]}") end end - end end - - end end end diff --git a/lib/fog/aws/cdn.rb b/lib/fog/aws/cdn.rb index 911f3cbc9..02b6090b8 100644 --- a/lib/fog/aws/cdn.rb +++ b/lib/fog/aws/cdn.rb @@ -30,7 +30,6 @@ module Fog request 'put_streaming_distribution_config' class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { diff --git a/lib/fog/aws/cloud_formation.rb b/lib/fog/aws/cloud_formation.rb index 35c6fad96..502824a64 100644 --- a/lib/fog/aws/cloud_formation.rb +++ b/lib/fog/aws/cloud_formation.rb @@ -21,11 +21,9 @@ module Fog request :list_stack_resources class Mock - def initialize(options={}) Fog::Mock.not_implemented end - end class Real @@ -116,9 +114,7 @@ module Fog Fog::AWS::CloudFormation::Error.slurp(error, "#{match[:code]} => #{match[:message]}") end end - end - end end end diff --git a/lib/fog/aws/cloud_watch.rb b/lib/fog/aws/cloud_watch.rb index 17c4c7d66..06692af84 100644 --- a/lib/fog/aws/cloud_watch.rb +++ b/lib/fog/aws/cloud_watch.rb @@ -35,7 +35,6 @@ module Fog collection :alarms class Mock - def self.data @data ||= Hash.new do |hash, region| hash[region] = Hash.new do |region_hash, key| @@ -159,7 +158,6 @@ module Fog :parser => parser }) end - end end end diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb index fde5a9e00..c848ac1c3 100644 --- a/lib/fog/aws/compute.rb +++ b/lib/fog/aws/compute.rb @@ -154,7 +154,6 @@ module Fog # deprecation class Real - def modify_image_attributes(*params) Fog::Logger.deprecation("modify_image_attributes is deprecated, use modify_image_attribute instead [light_black](#{caller.first})[/]") modify_image_attribute(*params) @@ -478,7 +477,6 @@ module Fog Fog::Compute::AWS::Error.slurp(error, "#{match[:code]} => #{match[:message]}") end end - end end end diff --git a/lib/fog/aws/core.rb b/lib/fog/aws/core.rb index 635fcba43..34ff08170 100644 --- a/lib/fog/aws/core.rb +++ b/lib/fog/aws/core.rb @@ -121,7 +121,6 @@ module Fog end class Mock - def self.arn(vendor, account_id, path, region = nil) "arn:aws:#{vendor}:#{region}:#{account_id}:#{path}" end diff --git a/lib/fog/aws/credential_fetcher.rb b/lib/fog/aws/credential_fetcher.rb index 1fb6dda86..fe23625cf 100644 --- a/lib/fog/aws/credential_fetcher.rb +++ b/lib/fog/aws/credential_fetcher.rb @@ -32,7 +32,6 @@ module Fog end module ConnectionMethods - def refresh_credentials_if_expired refresh_credentials if credentials_expired? end diff --git a/lib/fog/aws/dns.rb b/lib/fog/aws/dns.rb index 5af807fe6..8072bf29f 100644 --- a/lib/fog/aws/dns.rb +++ b/lib/fog/aws/dns.rb @@ -24,7 +24,6 @@ module Fog request :get_change class Mock - def self.data @data ||= Hash.new do |hash, region| hash[region] = Hash.new do |region_hash, key| diff --git a/lib/fog/aws/dynamodb.rb b/lib/fog/aws/dynamodb.rb index 2812b06e9..f425505fe 100644 --- a/lib/fog/aws/dynamodb.rb +++ b/lib/fog/aws/dynamodb.rb @@ -24,7 +24,6 @@ module Fog request :update_table class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -134,7 +133,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/elasticache.rb b/lib/fog/aws/elasticache.rb index 45dd5988a..5e0c64b6e 100644 --- a/lib/fog/aws/elasticache.rb +++ b/lib/fog/aws/elasticache.rb @@ -124,9 +124,7 @@ module Fog Fog::AWS::Elasticache::Error.slurp(error, "#{match[:code]} => #{match[:message]}") end end - end - end class Mock @@ -199,8 +197,6 @@ module Fog end end end - - end end end diff --git a/lib/fog/aws/elb.rb b/lib/fog/aws/elb.rb index 3004d7b05..b5b199fb2 100644 --- a/lib/fog/aws/elb.rb +++ b/lib/fog/aws/elb.rb @@ -56,7 +56,6 @@ module Fog collection :backend_server_descriptions class Mock - require 'fog/aws/elb/policy_types' def self.data diff --git a/lib/fog/aws/emr.rb b/lib/fog/aws/emr.rb index ea06bf5e9..30d089d35 100644 --- a/lib/fog/aws/emr.rb +++ b/lib/fog/aws/emr.rb @@ -35,11 +35,9 @@ module Fog # collection :security_groups class Mock - def initialize(options={}) Fog::Mock.not_implemented end - end class Real @@ -126,7 +124,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/glacier.rb b/lib/fog/aws/glacier.rb index 93b2d2d76..6f74eb685 100644 --- a/lib/fog/aws/glacier.rb +++ b/lib/fog/aws/glacier.rb @@ -37,7 +37,6 @@ module Fog MEGABYTE = 1024*1024 class TreeHash - def self.digest(body) new.add_part(body) end @@ -92,11 +91,9 @@ module Fog end class Mock - def initialize(options={}) Fog::Mock.not_implemented end - end class Real @@ -120,7 +117,6 @@ module Fog # ==== Returns # * Glacier object with connection to AWS. def initialize(options={}) - @use_iam_profile = options[:use_iam_profile] @region = options[:region] || 'us-east-1' @@ -137,7 +133,6 @@ module Fog @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end - private def setup_credentials(options) @aws_access_key_id = options[:aws_access_key_id] diff --git a/lib/fog/aws/iam.rb b/lib/fog/aws/iam.rb index 2cb8a6a89..b1210b90d 100644 --- a/lib/fog/aws/iam.rb +++ b/lib/fog/aws/iam.rb @@ -84,7 +84,6 @@ module Fog model :role collection :roles - class Mock def self.data @data ||= Hash.new do |hash, key| @@ -249,7 +248,6 @@ module Fog Fog::AWS::IAM::Error.slurp(error, "#{match[:code]} => #{match[:message]}") end end - end end end diff --git a/lib/fog/aws/models/auto_scaling/activities.rb b/lib/fog/aws/models/auto_scaling/activities.rb index 6dfc4f707..32c548f2f 100644 --- a/lib/fog/aws/models/auto_scaling/activities.rb +++ b/lib/fog/aws/models/auto_scaling/activities.rb @@ -31,7 +31,6 @@ module Fog data = service.describe_scaling_activities('ActivityId' => identity).body['DescribeScalingActivitiesResult']['Activities'].first new(data) unless data.nil? end - end end end diff --git a/lib/fog/aws/models/auto_scaling/activity.rb b/lib/fog/aws/models/auto_scaling/activity.rb index 1316475f8..032f4e6fb 100644 --- a/lib/fog/aws/models/auto_scaling/activity.rb +++ b/lib/fog/aws/models/auto_scaling/activity.rb @@ -4,7 +4,6 @@ module Fog module AWS class AutoScaling class Activity < Fog::Model - identity :id, :aliases => 'ActivityId' attribute :auto_scaling_group_name, :aliases => 'AutoScalingGroupName' attribute :cause, :aliases => 'Cause' @@ -22,7 +21,6 @@ module Fog def save raise "Operation not supported" end - end end end diff --git a/lib/fog/aws/models/auto_scaling/configuration.rb b/lib/fog/aws/models/auto_scaling/configuration.rb index 5a8246e40..c51ad6a69 100644 --- a/lib/fog/aws/models/auto_scaling/configuration.rb +++ b/lib/fog/aws/models/auto_scaling/configuration.rb @@ -4,7 +4,6 @@ module Fog module AWS class AutoScaling class Configuration < Fog::Model - identity :id, :aliases => 'LaunchConfigurationName' attribute :arn, :aliases => 'LaunchConfigurationARN' attribute :associate_public_ip, :aliases => 'AssociatePublicIpAddress' @@ -62,7 +61,6 @@ module Fog requires :id service.delete_launch_configuration(id) end - end end end diff --git a/lib/fog/aws/models/auto_scaling/configurations.rb b/lib/fog/aws/models/auto_scaling/configurations.rb index 2f95669de..a62c6e9a8 100644 --- a/lib/fog/aws/models/auto_scaling/configurations.rb +++ b/lib/fog/aws/models/auto_scaling/configurations.rb @@ -4,7 +4,6 @@ module Fog module AWS class AutoScaling class Configurations < Fog::Collection - model Fog::AWS::AutoScaling::Configuration # Creates a new launch configuration @@ -28,7 +27,6 @@ module Fog data = service.describe_launch_configurations('LaunchConfigurationNames' => identity).body['DescribeLaunchConfigurationsResult']['LaunchConfigurations'].first new(data) unless data.nil? end - end end end diff --git a/lib/fog/aws/models/auto_scaling/groups.rb b/lib/fog/aws/models/auto_scaling/groups.rb index 9b1a41977..49cbf3eae 100644 --- a/lib/fog/aws/models/auto_scaling/groups.rb +++ b/lib/fog/aws/models/auto_scaling/groups.rb @@ -31,7 +31,6 @@ module Fog data = service.describe_auto_scaling_groups('AutoScalingGroupNames' => identity).body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].first new(data) unless data.nil? end - end end end diff --git a/lib/fog/aws/models/auto_scaling/instance.rb b/lib/fog/aws/models/auto_scaling/instance.rb index d2f9894eb..db9344d20 100644 --- a/lib/fog/aws/models/auto_scaling/instance.rb +++ b/lib/fog/aws/models/auto_scaling/instance.rb @@ -4,7 +4,6 @@ module Fog module AWS class AutoScaling class Instance < Fog::Model - identity :id, :aliases => 'InstanceId' attribute :auto_scaling_group_name, :aliases => 'AutoScalingGroupName' attribute :availability_zone, :aliases => 'AvailabilityZone' @@ -53,7 +52,6 @@ module Fog # requires :id # service.delete_auto_scaling_group(id) #end - end end end diff --git a/lib/fog/aws/models/auto_scaling/instances.rb b/lib/fog/aws/models/auto_scaling/instances.rb index b19485bda..c04765e70 100644 --- a/lib/fog/aws/models/auto_scaling/instances.rb +++ b/lib/fog/aws/models/auto_scaling/instances.rb @@ -4,7 +4,6 @@ module Fog module AWS class AutoScaling class Instances < Fog::Collection - model Fog::AWS::AutoScaling::Instance def all @@ -23,7 +22,6 @@ module Fog data = service.describe_auto_scaling_instances('InstanceIds' => identity).body['DescribeAutoScalingInstancesResult']['AutoScalingInstances'].first new(data) unless data.nil? end - end end end diff --git a/lib/fog/aws/models/beanstalk/application.rb b/lib/fog/aws/models/beanstalk/application.rb index 296603bdc..a59db50a6 100644 --- a/lib/fog/aws/models/beanstalk/application.rb +++ b/lib/fog/aws/models/beanstalk/application.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class ElasticBeanstalk - class Application < Fog::Model identity :name, :aliases => 'ApplicationName' attribute :template_names, :aliases => 'ConfigurationTemplates' @@ -54,9 +53,7 @@ module Fog merge_attributes(data) true end - end - end end end diff --git a/lib/fog/aws/models/beanstalk/applications.rb b/lib/fog/aws/models/beanstalk/applications.rb index e465ab4fc..f37fe6a71 100644 --- a/lib/fog/aws/models/beanstalk/applications.rb +++ b/lib/fog/aws/models/beanstalk/applications.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/application' module Fog module AWS class ElasticBeanstalk - class Applications < Fog::Collection model Fog::AWS::ElasticBeanstalk::Application @@ -18,7 +17,6 @@ module Fog new(data) end end - end end end diff --git a/lib/fog/aws/models/beanstalk/environment.rb b/lib/fog/aws/models/beanstalk/environment.rb index 82400a2a2..786579916 100644 --- a/lib/fog/aws/models/beanstalk/environment.rb +++ b/lib/fog/aws/models/beanstalk/environment.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class ElasticBeanstalk - class Environment < Fog::Model identity :name, :aliases => 'EnvironmentName' attribute :id, :aliases => 'EnvironmentId' @@ -47,7 +46,6 @@ module Fog # Returns the load balancer object associated with the environment. def load_balancer(elb_connection = Fog::AWS[:elb]) - if resources.nil? elb_connection.load_balancers.get(live_resources['LoadBalancers'].first['Name']) else @@ -141,9 +139,7 @@ module Fog merge_attributes(data) true end - end - end end end diff --git a/lib/fog/aws/models/beanstalk/environments.rb b/lib/fog/aws/models/beanstalk/environments.rb index 5bac15e7b..9f3a3dcd2 100644 --- a/lib/fog/aws/models/beanstalk/environments.rb +++ b/lib/fog/aws/models/beanstalk/environments.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/environment' module Fog module AWS class ElasticBeanstalk - class Environments < Fog::Collection model Fog::AWS::ElasticBeanstalk::Environment @@ -22,7 +21,6 @@ module Fog new(data) end end - end end end diff --git a/lib/fog/aws/models/beanstalk/event.rb b/lib/fog/aws/models/beanstalk/event.rb index 4280df4e3..cb2ec2515 100644 --- a/lib/fog/aws/models/beanstalk/event.rb +++ b/lib/fog/aws/models/beanstalk/event.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class ElasticBeanstalk - class Event < Fog::Model attribute :application_name, :aliases => 'ApplicationName' attribute :environment_name, :aliases => 'EnvironmentName' @@ -14,7 +13,6 @@ module Fog attribute :template_name, :aliases => 'TemplateName' attribute :version_label, :aliases => 'VersionLabel' end - end end end \ No newline at end of file diff --git a/lib/fog/aws/models/beanstalk/events.rb b/lib/fog/aws/models/beanstalk/events.rb index a1a4dfaab..0eb77eeef 100644 --- a/lib/fog/aws/models/beanstalk/events.rb +++ b/lib/fog/aws/models/beanstalk/events.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/event' module Fog module AWS class ElasticBeanstalk - class Events < Fog::Collection model Fog::AWS::ElasticBeanstalk::Event @@ -12,7 +11,6 @@ module Fog data = service.describe_events(options).body['DescribeEventsResult']['Events'] load(data) # data is an array of attribute hashes end - end end end diff --git a/lib/fog/aws/models/beanstalk/template.rb b/lib/fog/aws/models/beanstalk/template.rb index 0d56b89c5..eee306b76 100644 --- a/lib/fog/aws/models/beanstalk/template.rb +++ b/lib/fog/aws/models/beanstalk/template.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class ElasticBeanstalk - class Template < Fog::Model attribute :name, :aliases => 'TemplateName' attribute :application_name, :aliases => 'ApplicationName' @@ -72,7 +71,6 @@ module Fog true end end - end end end diff --git a/lib/fog/aws/models/beanstalk/templates.rb b/lib/fog/aws/models/beanstalk/templates.rb index 8e26e7d18..f862b14c6 100644 --- a/lib/fog/aws/models/beanstalk/templates.rb +++ b/lib/fog/aws/models/beanstalk/templates.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/template' module Fog module AWS class ElasticBeanstalk - class Templates < Fog::Collection model Fog::AWS::ElasticBeanstalk::Template @@ -63,7 +62,6 @@ module Fog end result end - end end end diff --git a/lib/fog/aws/models/beanstalk/version.rb b/lib/fog/aws/models/beanstalk/version.rb index c67cf5a6d..98c5708a8 100644 --- a/lib/fog/aws/models/beanstalk/version.rb +++ b/lib/fog/aws/models/beanstalk/version.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class ElasticBeanstalk - class Version < Fog::Model attribute :label, :aliases => 'VersionLabel' attribute :application_name, :aliases => 'ApplicationName' @@ -73,7 +72,6 @@ module Fog merge_attributes(data) end end - end end end diff --git a/lib/fog/aws/models/beanstalk/versions.rb b/lib/fog/aws/models/beanstalk/versions.rb index c13daf7c8..be56a0537 100644 --- a/lib/fog/aws/models/beanstalk/versions.rb +++ b/lib/fog/aws/models/beanstalk/versions.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/version' module Fog module AWS class ElasticBeanstalk - class Versions < Fog::Collection model Fog::AWS::ElasticBeanstalk::Version @@ -24,7 +23,6 @@ module Fog end end - end end end diff --git a/lib/fog/aws/models/cdn/distribution.rb b/lib/fog/aws/models/cdn/distribution.rb index 76e8218b8..1c99bfd3d 100644 --- a/lib/fog/aws/models/cdn/distribution.rb +++ b/lib/fog/aws/models/cdn/distribution.rb @@ -5,7 +5,6 @@ require 'fog/aws/models/cdn/distribution_helper' module Fog module CDN class AWS - class Distribution < Fog::Model include Fog::CDN::AWS::DistributionHelper @@ -85,9 +84,7 @@ module Fog def distribution_config_to_attributes(new_attributes = {}) new_attributes.merge(new_attributes.delete('DistributionConfig') || {}) end - end - end end end diff --git a/lib/fog/aws/models/cdn/distribution_helper.rb b/lib/fog/aws/models/cdn/distribution_helper.rb index 10f21bcca..3095c7e76 100644 --- a/lib/fog/aws/models/cdn/distribution_helper.rb +++ b/lib/fog/aws/models/cdn/distribution_helper.rb @@ -3,9 +3,7 @@ require 'fog/core/collection' module Fog module CDN class AWS - module DistributionHelper - def destroy requires :identity, :etag, :caller_reference raise "Distribution must be disabled to be deleted" unless disabled? @@ -56,9 +54,7 @@ module Fog end true end - end - end end end \ No newline at end of file diff --git a/lib/fog/aws/models/cdn/distributions.rb b/lib/fog/aws/models/cdn/distributions.rb index dd76c5726..458a3b6ea 100644 --- a/lib/fog/aws/models/cdn/distributions.rb +++ b/lib/fog/aws/models/cdn/distributions.rb @@ -5,7 +5,6 @@ require 'fog/aws/models/cdn/distributions_helper' module Fog module CDN class AWS - class Distributions < Fog::Collection include Fog::CDN::AWS::DistributionsHelper @@ -25,9 +24,7 @@ module Fog alias_method :each_distribution_this_page, :each alias_method :each, :each_distribution - end - end end end diff --git a/lib/fog/aws/models/cdn/distributions_helper.rb b/lib/fog/aws/models/cdn/distributions_helper.rb index 76bb9a177..fcc1df3bd 100644 --- a/lib/fog/aws/models/cdn/distributions_helper.rb +++ b/lib/fog/aws/models/cdn/distributions_helper.rb @@ -3,7 +3,6 @@ require 'fog/core/collection' module Fog module CDN class AWS - module DistributionsHelper def all(options = {}) @@ -40,9 +39,7 @@ module Fog self end end - end - end end end \ No newline at end of file diff --git a/lib/fog/aws/models/cdn/invalidation.rb b/lib/fog/aws/models/cdn/invalidation.rb index faa65e039..1b1d4d5ab 100644 --- a/lib/fog/aws/models/cdn/invalidation.rb +++ b/lib/fog/aws/models/cdn/invalidation.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module CDN class AWS - class Invalidation < Fog::Model - identity :id, :aliases => 'Id' attribute :status, :aliases => 'Status' @@ -56,9 +54,7 @@ module Fog end new_attributes end - end - end end end diff --git a/lib/fog/aws/models/cdn/invalidations.rb b/lib/fog/aws/models/cdn/invalidations.rb index 050b8dccf..2d9be24c7 100644 --- a/lib/fog/aws/models/cdn/invalidations.rb +++ b/lib/fog/aws/models/cdn/invalidations.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/cdn/invalidation' module Fog module CDN class AWS - class Invalidations < Fog::Collection - attribute :is_truncated, :aliases => ['IsTruncated'] attribute :max_items, :aliases => ['MaxItems'] attribute :next_marker, :aliases => ['NextMarker'] @@ -46,9 +44,7 @@ module Fog requires :distribution super({ :distribution => distribution }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/aws/models/cdn/streaming_distribution.rb b/lib/fog/aws/models/cdn/streaming_distribution.rb index 7008d64b9..15f4e0f7b 100644 --- a/lib/fog/aws/models/cdn/streaming_distribution.rb +++ b/lib/fog/aws/models/cdn/streaming_distribution.rb @@ -5,7 +5,6 @@ require 'fog/aws/models/cdn/distribution_helper' module Fog module CDN class AWS - class StreamingDistribution < Fog::Model include Fog::CDN::AWS::DistributionHelper @@ -69,9 +68,7 @@ module Fog def distribution_config_to_attributes(new_attributes = {}) new_attributes.merge(new_attributes.delete('StreamingDistributionConfig') || {}) end - end - end end end diff --git a/lib/fog/aws/models/cdn/streaming_distributions.rb b/lib/fog/aws/models/cdn/streaming_distributions.rb index cc307f178..1c2e27036 100644 --- a/lib/fog/aws/models/cdn/streaming_distributions.rb +++ b/lib/fog/aws/models/cdn/streaming_distributions.rb @@ -5,7 +5,6 @@ require 'fog/aws/models/cdn/distributions_helper' module Fog module CDN class AWS - class StreamingDistributions < Fog::Collection include Fog::CDN::AWS::DistributionsHelper @@ -25,9 +24,7 @@ module Fog alias_method :each_distribution_this_page, :each alias_method :each, :each_distribution - end - end end end diff --git a/lib/fog/aws/models/cloud_watch/alarm_data.rb b/lib/fog/aws/models/cloud_watch/alarm_data.rb index add59bf60..fe83c9b9d 100644 --- a/lib/fog/aws/models/cloud_watch/alarm_data.rb +++ b/lib/fog/aws/models/cloud_watch/alarm_data.rb @@ -32,7 +32,6 @@ module Fog data = service.describe_alarms_for_metric(list_opts).body['DescribeAlarmsForMetricResult']['MetricAlarms'] load(data) end - end end end diff --git a/lib/fog/aws/models/cloud_watch/alarm_datum.rb b/lib/fog/aws/models/cloud_watch/alarm_datum.rb index 76ca09f18..ae20e81dc 100644 --- a/lib/fog/aws/models/cloud_watch/alarm_datum.rb +++ b/lib/fog/aws/models/cloud_watch/alarm_datum.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class CloudWatch - class AlarmDatum < Fog::Model attribute :alarm_name, :aliases => 'AlarmName' attribute :metric_name, :aliases => 'MetricName' diff --git a/lib/fog/aws/models/cloud_watch/alarm_histories.rb b/lib/fog/aws/models/cloud_watch/alarm_histories.rb index 93d357d4e..7a00d016a 100644 --- a/lib/fog/aws/models/cloud_watch/alarm_histories.rb +++ b/lib/fog/aws/models/cloud_watch/alarm_histories.rb @@ -11,7 +11,6 @@ module Fog data = service.describe_alarm_history(conditions).body['DescribeAlarmHistoryResult']['AlarmHistoryItems'] load(data) # data is an array of attribute hashes end - end end end diff --git a/lib/fog/aws/models/cloud_watch/alarm_history.rb b/lib/fog/aws/models/cloud_watch/alarm_history.rb index 5fb4c6b4f..4c16db39c 100644 --- a/lib/fog/aws/models/cloud_watch/alarm_history.rb +++ b/lib/fog/aws/models/cloud_watch/alarm_history.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class CloudWatch - class AlarmHistory < Fog::Model attribute :alarm_name, :aliases => 'AlarmName' attribute :end_date, :aliases => 'EndDate' diff --git a/lib/fog/aws/models/cloud_watch/alarms.rb b/lib/fog/aws/models/cloud_watch/alarms.rb index 7b1ac1968..47bb1629f 100644 --- a/lib/fog/aws/models/cloud_watch/alarms.rb +++ b/lib/fog/aws/models/cloud_watch/alarms.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/cloud_watch/alarm' module Fog module AWS class CloudWatch - class Alarms < Fog::Collection model Fog::AWS::CloudWatch::Alarm @@ -40,7 +39,6 @@ module Fog service.enable_alarm_actions(alarm_names) true end - end end end diff --git a/lib/fog/aws/models/cloud_watch/metric.rb b/lib/fog/aws/models/cloud_watch/metric.rb index d15ae8417..ff88ef1ec 100644 --- a/lib/fog/aws/models/cloud_watch/metric.rb +++ b/lib/fog/aws/models/cloud_watch/metric.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class CloudWatch - class Metric < Fog::Model attribute :name, :aliases => 'MetricName' attribute :namespace, :aliases => 'Namespace' diff --git a/lib/fog/aws/models/cloud_watch/metric_statistic.rb b/lib/fog/aws/models/cloud_watch/metric_statistic.rb index 5e304567d..eddd6d7ca 100644 --- a/lib/fog/aws/models/cloud_watch/metric_statistic.rb +++ b/lib/fog/aws/models/cloud_watch/metric_statistic.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class CloudWatch - class MetricStatistic < Fog::Model attribute :label, :aliases => 'Label' attribute :minimum, :aliases => 'Minimum' diff --git a/lib/fog/aws/models/cloud_watch/metric_statistics.rb b/lib/fog/aws/models/cloud_watch/metric_statistics.rb index fc0bc95e1..5d097d419 100644 --- a/lib/fog/aws/models/cloud_watch/metric_statistics.rb +++ b/lib/fog/aws/models/cloud_watch/metric_statistics.rb @@ -16,7 +16,6 @@ module Fog data.collect! { |datum| datum.merge('MetricName' => metricName, 'Namespace' => namespace, 'Dimensions' => dimensions) } load(data) # data is an array of attribute hashes end - end end end diff --git a/lib/fog/aws/models/cloud_watch/metrics.rb b/lib/fog/aws/models/cloud_watch/metrics.rb index 9df9780f1..4f932849c 100644 --- a/lib/fog/aws/models/cloud_watch/metrics.rb +++ b/lib/fog/aws/models/cloud_watch/metrics.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/cloud_watch/metric' module Fog module AWS class CloudWatch - class Metrics < Fog::Collection attribute :next_token, :aliases => 'NextToken' @@ -45,7 +44,6 @@ module Fog new(data) end end - end end end diff --git a/lib/fog/aws/models/compute/address.rb b/lib/fog/aws/models/compute/address.rb index 0ba13918f..c35b87245 100644 --- a/lib/fog/aws/models/compute/address.rb +++ b/lib/fog/aws/models/compute/address.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class Address < Fog::Model - identity :public_ip, :aliases => 'publicIp' attribute :allocation_id, :aliases => 'allocationId' @@ -70,9 +68,7 @@ module Fog service.disassociate_address(public_ip) end end - end - end end end diff --git a/lib/fog/aws/models/compute/addresses.rb b/lib/fog/aws/models/compute/addresses.rb index 5563aa956..e54622d64 100644 --- a/lib/fog/aws/models/compute/addresses.rb +++ b/lib/fog/aws/models/compute/addresses.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/address' module Fog module Compute class AWS - class Addresses < Fog::Collection - attribute :filters attribute :server @@ -92,9 +90,7 @@ module Fog super(attributes) end end - end - end end end diff --git a/lib/fog/aws/models/compute/dhcp_option.rb b/lib/fog/aws/models/compute/dhcp_option.rb index 1969f38e3..fb5e39b76 100644 --- a/lib/fog/aws/models/compute/dhcp_option.rb +++ b/lib/fog/aws/models/compute/dhcp_option.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class DhcpOption < Fog::Model - identity :id, :aliases => 'dhcpOptionsId' attribute :dhcp_configuration_set, :aliases => 'dhcpConfigurationSet' attribute :tag_set, :aliases => 'tagSet' diff --git a/lib/fog/aws/models/compute/dhcp_options.rb b/lib/fog/aws/models/compute/dhcp_options.rb index 5e67f8b45..8ed4e7ea1 100644 --- a/lib/fog/aws/models/compute/dhcp_options.rb +++ b/lib/fog/aws/models/compute/dhcp_options.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/dhcp_option' module Fog module Compute class AWS - class DhcpOptions < Fog::Collection - attribute :filters model Fog::Compute::AWS::DhcpOption @@ -83,9 +81,7 @@ module Fog self.class.new(:service => service).all('dhcp-options-id' => dhcp_options_id).first end end - end - end end end diff --git a/lib/fog/aws/models/compute/flavor.rb b/lib/fog/aws/models/compute/flavor.rb index 1c25116af..e305e18fe 100644 --- a/lib/fog/aws/models/compute/flavor.rb +++ b/lib/fog/aws/models/compute/flavor.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class Flavor < Fog::Model - identity :id attribute :bits @@ -15,9 +13,7 @@ module Fog attribute :ram attribute :ebs_optimized_available attribute :instance_store_volumes - end - end end end diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb index 2937b2f97..24fad694d 100644 --- a/lib/fog/aws/models/compute/flavors.rb +++ b/lib/fog/aws/models/compute/flavors.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/compute/flavor' module Fog module Compute class AWS - FLAVORS = [ { :id => 't1.micro', @@ -309,7 +308,6 @@ module Fog ] class Flavors < Fog::Collection - model Fog::Compute::AWS::Flavor # Returns an array of all flavors that have been created @@ -522,9 +520,7 @@ module Fog def get(flavor_id) self.class.new(:service => service).all.detect {|flavor| flavor.id == flavor_id} end - end - end end end diff --git a/lib/fog/aws/models/compute/image.rb b/lib/fog/aws/models/compute/image.rb index 783a4d71e..c75f4404b 100644 --- a/lib/fog/aws/models/compute/image.rb +++ b/lib/fog/aws/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class Image < Fog::Model - identity :id, :aliases => 'imageId' attribute :architecture @@ -40,9 +38,7 @@ module Fog def ready? state == 'available' end - end - end end end diff --git a/lib/fog/aws/models/compute/images.rb b/lib/fog/aws/models/compute/images.rb index ece512e8a..8a3d16a7a 100644 --- a/lib/fog/aws/models/compute/images.rb +++ b/lib/fog/aws/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/image' module Fog module Compute class AWS - class Images < Fog::Collection - attribute :filters model Fog::Compute::AWS::Image @@ -56,7 +54,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/models/compute/internet_gateway.rb b/lib/fog/aws/models/compute/internet_gateway.rb index 3dc416d47..0c923d320 100644 --- a/lib/fog/aws/models/compute/internet_gateway.rb +++ b/lib/fog/aws/models/compute/internet_gateway.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class InternetGateway < Fog::Model - identity :id, :aliases => 'internetGatewayId' attribute :attachment_set, :aliases => 'attachmentSet' attribute :tag_set, :aliases => 'tagSet' @@ -42,7 +40,6 @@ module Fog reload end - # Removes an existing internet gateway # # internet_gateway.destroy diff --git a/lib/fog/aws/models/compute/internet_gateways.rb b/lib/fog/aws/models/compute/internet_gateways.rb index cc687f3d9..1f2d2ca10 100644 --- a/lib/fog/aws/models/compute/internet_gateways.rb +++ b/lib/fog/aws/models/compute/internet_gateways.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/internet_gateway' module Fog module Compute class AWS - class InternetGateways < Fog::Collection - attribute :filters model Fog::Compute::AWS::InternetGateway @@ -83,9 +81,7 @@ module Fog self.class.new(:service => service).all('internet-gateway-id' => internet_gateway_id).first end end - end - end end end diff --git a/lib/fog/aws/models/compute/key_pair.rb b/lib/fog/aws/models/compute/key_pair.rb index 3cc35d39b..f5f397296 100644 --- a/lib/fog/aws/models/compute/key_pair.rb +++ b/lib/fog/aws/models/compute/key_pair.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class KeyPair < Fog::Model - identity :name, :aliases => 'keyName' attribute :fingerprint, :aliases => 'keyFingerprint' @@ -31,11 +29,9 @@ module Fog new_attributes = data.reject {|key,value| !['keyFingerprint', 'keyMaterial', 'keyName'].include?(key)} merge_attributes(new_attributes) true - end def write(path="#{ENV['HOME']}/.ssh/fog_#{Fog.credential.to_s}_#{name}.pem") - if writable? split_private_key = private_key.split(/\n/) File.open(path, "w") do |f| @@ -51,9 +47,7 @@ module Fog def writable? !!(private_key && ENV.has_key?('HOME')) end - end - end end end diff --git a/lib/fog/aws/models/compute/key_pairs.rb b/lib/fog/aws/models/compute/key_pairs.rb index 2e326606c..b189b4fc4 100644 --- a/lib/fog/aws/models/compute/key_pairs.rb +++ b/lib/fog/aws/models/compute/key_pairs.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/key_pair' module Fog module Compute class AWS - class KeyPairs < Fog::Collection - attribute :filters attribute :key_name @@ -80,9 +78,7 @@ module Fog self.class.new(:service => service).all('key-name' => key_name).first end end - end - end end end diff --git a/lib/fog/aws/models/compute/network_acl.rb b/lib/fog/aws/models/compute/network_acl.rb index 16cf735fc..d452115ba 100644 --- a/lib/fog/aws/models/compute/network_acl.rb +++ b/lib/fog/aws/models/compute/network_acl.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class AWS - class NetworkAcl < Fog::Model ICMP = 1 TCP = 6 diff --git a/lib/fog/aws/models/compute/network_acls.rb b/lib/fog/aws/models/compute/network_acls.rb index 8d743a510..717668023 100644 --- a/lib/fog/aws/models/compute/network_acls.rb +++ b/lib/fog/aws/models/compute/network_acls.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/network_acl' module Fog module Compute class AWS - class NetworkAcls < Fog::Collection - attribute :filters model Fog::Compute::AWS::NetworkAcl diff --git a/lib/fog/aws/models/compute/network_interface.rb b/lib/fog/aws/models/compute/network_interface.rb index 0f3c649ce..0b2c83aaa 100644 --- a/lib/fog/aws/models/compute/network_interface.rb +++ b/lib/fog/aws/models/compute/network_interface.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class NetworkInterface < Fog::Model - identity :network_interface_id, :aliases => 'networkInterfaceId' attribute :state attribute :request_id, :aliases => 'requestId' @@ -27,7 +25,6 @@ module Fog attribute :association, :aliases => 'association' attribute :tag_set, :aliases => 'tagSet' - # Removes an existing network interface # # network_interface.destroy @@ -69,7 +66,6 @@ module Fog merge_attributes(new_attributes) true end - end end end diff --git a/lib/fog/aws/models/compute/network_interfaces.rb b/lib/fog/aws/models/compute/network_interfaces.rb index 8e022dc7a..f998bc91f 100644 --- a/lib/fog/aws/models/compute/network_interfaces.rb +++ b/lib/fog/aws/models/compute/network_interfaces.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/network_interface' module Fog module Compute class AWS - class NetworkInterfaces < Fog::Collection - attribute :filters model Fog::Compute::AWS::NetworkInterface @@ -130,7 +128,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/models/compute/route_table.rb b/lib/fog/aws/models/compute/route_table.rb index bd70096c7..151ec9cf3 100755 --- a/lib/fog/aws/models/compute/route_table.rb +++ b/lib/fog/aws/models/compute/route_table.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class RouteTable < Fog::Model - identity :id, :aliases => 'routeTableId' attribute :vpc_id, :aliases => 'vpcId' @@ -62,7 +60,6 @@ module Fog def routeSet=(new_route_set) merge_attributes(new_route_set || {}) end - end end end diff --git a/lib/fog/aws/models/compute/route_tables.rb b/lib/fog/aws/models/compute/route_tables.rb index b5fe400b9..a792d0ed5 100755 --- a/lib/fog/aws/models/compute/route_tables.rb +++ b/lib/fog/aws/models/compute/route_tables.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/route_table' module Fog module Compute class AWS - class RouteTables < Fog::Collection - attribute :filters model Fog::Compute::AWS::RouteTable @@ -84,9 +82,7 @@ module Fog self.class.new(:service => service).all('route-table-id' => route_table_id).first end end - end - end end end diff --git a/lib/fog/aws/models/compute/security_group.rb b/lib/fog/aws/models/compute/security_group.rb index 94043dde4..5bf95f499 100644 --- a/lib/fog/aws/models/compute/security_group.rb +++ b/lib/fog/aws/models/compute/security_group.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class SecurityGroup < Fog::Model - identity :name, :aliases => 'groupName' attribute :description, :aliases => 'groupDescription' attribute :group_id, :aliases => 'groupId' @@ -277,9 +275,7 @@ module Fog info end - end - end end end diff --git a/lib/fog/aws/models/compute/security_groups.rb b/lib/fog/aws/models/compute/security_groups.rb index 263ecc81a..36dfd98d9 100644 --- a/lib/fog/aws/models/compute/security_groups.rb +++ b/lib/fog/aws/models/compute/security_groups.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/security_group' module Fog module Compute class AWS - class SecurityGroups < Fog::Collection - attribute :filters model Fog::Compute::AWS::SecurityGroup @@ -114,7 +112,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/models/compute/server.rb b/lib/fog/aws/models/compute/server.rb index 0a9294ee0..28c37326b 100644 --- a/lib/fog/aws/models/compute/server.rb +++ b/lib/fog/aws/models/compute/server.rb @@ -3,7 +3,6 @@ require 'fog/compute/models/server' module Fog module Compute class AWS - class Server < Fog::Compute::Server extend Fog::Deprecation deprecate :ip_address, :public_ip_address @@ -57,7 +56,6 @@ module Fog attr_accessor :password attr_writer :iam_instance_profile_name, :iam_instance_profile_arn - def initialize(attributes={}) self.groups ||= ["default"] unless (attributes[:subnet_id] || attributes[:security_group_ids] || attributes[:network_interfaces]) self.flavor_id ||= 't1.micro' @@ -275,9 +273,7 @@ module Fog self.attributes[:placement] = new_placement end end - end - end end end diff --git a/lib/fog/aws/models/compute/servers.rb b/lib/fog/aws/models/compute/servers.rb index 107761cb9..ae6926b55 100644 --- a/lib/fog/aws/models/compute/servers.rb +++ b/lib/fog/aws/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/server' module Fog module Compute class AWS - class Servers < Fog::Collection - attribute :filters model Fog::Compute::AWS::Server @@ -156,9 +154,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/aws/models/compute/snapshot.rb b/lib/fog/aws/models/compute/snapshot.rb index c496fb81c..7b512f1e8 100644 --- a/lib/fog/aws/models/compute/snapshot.rb +++ b/lib/fog/aws/models/compute/snapshot.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class Snapshot < Fog::Model - identity :id, :aliases => 'snapshotId' attribute :description @@ -49,9 +47,7 @@ module Fog def volume=(new_volume) self.volume_id = new_volume.volume_id end - end - end end end diff --git a/lib/fog/aws/models/compute/snapshots.rb b/lib/fog/aws/models/compute/snapshots.rb index 0b97dbba4..e3d3e7e6f 100644 --- a/lib/fog/aws/models/compute/snapshots.rb +++ b/lib/fog/aws/models/compute/snapshots.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/snapshot' module Fog module Compute class AWS - class Snapshots < Fog::Collection - attribute :filters attribute :volume @@ -44,9 +42,7 @@ module Fog super end end - end - end end end diff --git a/lib/fog/aws/models/compute/spot_request.rb b/lib/fog/aws/models/compute/spot_request.rb index cfa46d833..cd7879d35 100644 --- a/lib/fog/aws/models/compute/spot_request.rb +++ b/lib/fog/aws/models/compute/spot_request.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class AWS - class SpotRequest < Fog::Compute::Server - identity :id, :aliases => 'spotInstanceRequestId' attribute :price, :aliases => 'spotPrice' @@ -115,7 +113,6 @@ module Fog spot_instance_request.merge(options) merge_attributes( spot_instance_request ) end - end end end diff --git a/lib/fog/aws/models/compute/spot_requests.rb b/lib/fog/aws/models/compute/spot_requests.rb index e7323b170..dfce719cb 100644 --- a/lib/fog/aws/models/compute/spot_requests.rb +++ b/lib/fog/aws/models/compute/spot_requests.rb @@ -5,7 +5,6 @@ module Fog module Compute class AWS class SpotRequests < Fog::Collection - attribute :filters model Fog::Compute::AWS::SpotRequest @@ -81,7 +80,6 @@ module Fog rescue Fog::Errors::NotFound nil end - end end end diff --git a/lib/fog/aws/models/compute/subnet.rb b/lib/fog/aws/models/compute/subnet.rb index 9e5ab4300..5b976be20 100644 --- a/lib/fog/aws/models/compute/subnet.rb +++ b/lib/fog/aws/models/compute/subnet.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class Subnet < Fog::Model - identity :subnet_id, :aliases => 'subnetId' attribute :state attribute :vpc_id, :aliases => 'vpcId' @@ -56,7 +54,6 @@ module Fog true end - end end end diff --git a/lib/fog/aws/models/compute/subnets.rb b/lib/fog/aws/models/compute/subnets.rb index 0b74d98cb..cc7fb743f 100644 --- a/lib/fog/aws/models/compute/subnets.rb +++ b/lib/fog/aws/models/compute/subnets.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/subnet' module Fog module Compute class AWS - class Subnets < Fog::Collection - attribute :filters model Fog::Compute::AWS::Subnet @@ -91,9 +89,7 @@ module Fog self.class.new(:service => service).all('subnet-id' => subnet_id).first end end - end - end end end diff --git a/lib/fog/aws/models/compute/tag.rb b/lib/fog/aws/models/compute/tag.rb index c41423cf6..e9eae788b 100644 --- a/lib/fog/aws/models/compute/tag.rb +++ b/lib/fog/aws/models/compute/tag.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class Tag < Fog::Model - identity :key attribute :value @@ -27,7 +25,6 @@ module Fog service.create_tags(resource_id, key => value) true end - end end end diff --git a/lib/fog/aws/models/compute/tags.rb b/lib/fog/aws/models/compute/tags.rb index 632e40cf7..4574da55d 100644 --- a/lib/fog/aws/models/compute/tags.rb +++ b/lib/fog/aws/models/compute/tags.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/tag' module Fog module Compute class AWS - class Tags < Fog::Collection - attribute :filters model Fog::Compute::AWS::Tag @@ -28,7 +26,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/models/compute/volume.rb b/lib/fog/aws/models/compute/volume.rb index 165162120..5b587377f 100644 --- a/lib/fog/aws/models/compute/volume.rb +++ b/lib/fog/aws/models/compute/volume.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class Volume < Fog::Model - identity :id, :aliases => 'volumeId' attribute :attached_at, :aliases => 'attachTime' @@ -122,7 +120,6 @@ module Fog reload end end - end end end diff --git a/lib/fog/aws/models/compute/volumes.rb b/lib/fog/aws/models/compute/volumes.rb index 15e87b4fd..bb47b4a80 100644 --- a/lib/fog/aws/models/compute/volumes.rb +++ b/lib/fog/aws/models/compute/volumes.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/volume' module Fog module Compute class AWS - class Volumes < Fog::Collection - attribute :filters attribute :server @@ -113,9 +111,7 @@ module Fog super end end - end - end end end diff --git a/lib/fog/aws/models/compute/vpc.rb b/lib/fog/aws/models/compute/vpc.rb index aa484ebab..d384bea2e 100644 --- a/lib/fog/aws/models/compute/vpc.rb +++ b/lib/fog/aws/models/compute/vpc.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class AWS - class VPC < Fog::Model - identity :id, :aliases => 'vpcId' attribute :state @@ -60,9 +58,7 @@ module Fog merge_attributes(new_attributes) true end - end - end end end diff --git a/lib/fog/aws/models/compute/vpcs.rb b/lib/fog/aws/models/compute/vpcs.rb index 612a90cd1..da17710a0 100644 --- a/lib/fog/aws/models/compute/vpcs.rb +++ b/lib/fog/aws/models/compute/vpcs.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/compute/vpc' module Fog module Compute class AWS - class Vpcs < Fog::Collection - attribute :filters model Fog::Compute::AWS::VPC @@ -85,9 +83,7 @@ module Fog self.class.new(:service => service).all('vpc-id' => vpc_id).first end end - end - end end end diff --git a/lib/fog/aws/models/data_pipeline/pipeline.rb b/lib/fog/aws/models/data_pipeline/pipeline.rb index 03931d152..e321bba3e 100644 --- a/lib/fog/aws/models/data_pipeline/pipeline.rb +++ b/lib/fog/aws/models/data_pipeline/pipeline.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class DataPipeline - class Pipeline < Fog::Model - identity :id, :aliases => 'pipelineId' attribute :name attribute :description @@ -15,7 +13,6 @@ module Fog attribute :unique_id, :aliases => 'uniqueId' def initialize(attributes={}) - # Extract the 'fields' portion of a response to attributes if attributes.include?('fields') string_fields = attributes['fields'].select { |f| f.include?('stringValue') } @@ -59,9 +56,7 @@ module Fog true end - end - end end end diff --git a/lib/fog/aws/models/data_pipeline/pipelines.rb b/lib/fog/aws/models/data_pipeline/pipelines.rb index 332380af4..5ef0420db 100644 --- a/lib/fog/aws/models/data_pipeline/pipelines.rb +++ b/lib/fog/aws/models/data_pipeline/pipelines.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/data_pipeline/pipeline' module Fog module AWS class DataPipeline - class Pipelines < Fog::Collection - model Fog::AWS::DataPipeline::Pipeline def all @@ -29,7 +27,6 @@ module Fog nil end - end end end diff --git a/lib/fog/aws/models/dns/record.rb b/lib/fog/aws/models/dns/record.rb index f2398e901..32bd6b795 100644 --- a/lib/fog/aws/models/dns/record.rb +++ b/lib/fog/aws/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class AWS - class Record < Fog::Model extend Fog::Deprecation deprecate :ip, :value @@ -105,9 +104,7 @@ module Fog end options end - end - end end end diff --git a/lib/fog/aws/models/dns/records.rb b/lib/fog/aws/models/dns/records.rb index f0cffb87b..d7fd6d2ba 100644 --- a/lib/fog/aws/models/dns/records.rb +++ b/lib/fog/aws/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/dns/record' module Fog module DNS class AWS - class Records < Fog::Collection - attribute :is_truncated, :aliases => ['IsTruncated'] attribute :max_items, :aliases => ['MaxItems'] attribute :name @@ -116,9 +114,7 @@ module Fog requires :zone super({ :zone => zone }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/aws/models/dns/zone.rb b/lib/fog/aws/models/dns/zone.rb index 31508d552..aee0edefd 100644 --- a/lib/fog/aws/models/dns/zone.rb +++ b/lib/fog/aws/models/dns/zone.rb @@ -4,9 +4,7 @@ require 'fog/core/model' module Fog module DNS class AWS - class Zone < Fog::Model - identity :id, :aliases => 'Id' attribute :caller_reference, :aliases => 'CallerReference' @@ -45,9 +43,7 @@ module Fog define_method(:HostedZone=) do |new_hosted_zone| merge_attributes(new_hosted_zone) end - end - end end end diff --git a/lib/fog/aws/models/dns/zones.rb b/lib/fog/aws/models/dns/zones.rb index 29a221681..cffccbca1 100644 --- a/lib/fog/aws/models/dns/zones.rb +++ b/lib/fog/aws/models/dns/zones.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/dns/zone' module Fog module DNS class AWS - class Zones < Fog::Collection - attribute :marker, :aliases => 'Marker' attribute :max_items, :aliases => 'MaxItems' @@ -25,9 +23,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/aws/models/elasticache/cluster.rb b/lib/fog/aws/models/elasticache/cluster.rb index 1d12440ae..235607d40 100644 --- a/lib/fog/aws/models/elasticache/cluster.rb +++ b/lib/fog/aws/models/elasticache/cluster.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class Elasticache - class Cluster < Fog::Model # simple attributes identity :id, :aliases => 'CacheClusterId' @@ -72,9 +71,7 @@ module Fog } ) end - end - end end end diff --git a/lib/fog/aws/models/elasticache/clusters.rb b/lib/fog/aws/models/elasticache/clusters.rb index 0ef7490fe..41f8dcd7c 100644 --- a/lib/fog/aws/models/elasticache/clusters.rb +++ b/lib/fog/aws/models/elasticache/clusters.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/elasticache/cluster' module Fog module AWS class Elasticache - class Clusters < Fog::Collection model Fog::AWS::Elasticache::Cluster @@ -25,7 +24,6 @@ module Fog rescue Fog::AWS::Elasticache::NotFound end end - end end end diff --git a/lib/fog/aws/models/elasticache/parameter_group.rb b/lib/fog/aws/models/elasticache/parameter_group.rb index 93c44a3c5..2d31c0130 100644 --- a/lib/fog/aws/models/elasticache/parameter_group.rb +++ b/lib/fog/aws/models/elasticache/parameter_group.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class Elasticache - class ParameterGroup < Fog::Model - identity :id, :aliases => 'CacheParameterGroupName' attribute :description, :aliases => 'Description' attribute :family, :aliases => 'CacheParameterGroupFamily' @@ -24,9 +22,7 @@ module Fog family = 'memcached1.4' ) end - end - end end end diff --git a/lib/fog/aws/models/elasticache/parameter_groups.rb b/lib/fog/aws/models/elasticache/parameter_groups.rb index 3b9848cb7..caa8c1f98 100644 --- a/lib/fog/aws/models/elasticache/parameter_groups.rb +++ b/lib/fog/aws/models/elasticache/parameter_groups.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/elasticache/parameter_group' module Fog module AWS class Elasticache - class ParameterGroups < Fog::Collection model Fog::AWS::Elasticache::ParameterGroup @@ -24,7 +23,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/aws/models/elasticache/security_group.rb b/lib/fog/aws/models/elasticache/security_group.rb index d216625f4..45623b8b4 100644 --- a/lib/fog/aws/models/elasticache/security_group.rb +++ b/lib/fog/aws/models/elasticache/security_group.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class Elasticache - class SecurityGroup < Fog::Model - identity :id, :aliases => 'CacheSecurityGroupName' attribute :description, :aliases => 'Description' attribute :ec2_groups, :aliases => 'EC2SecurityGroups', :type => :array @@ -44,9 +42,7 @@ module Fog ) merge_attributes(data.body['CacheSecurityGroup']) end - end - end end end diff --git a/lib/fog/aws/models/elasticache/security_groups.rb b/lib/fog/aws/models/elasticache/security_groups.rb index 6a76db55c..e2d81f10b 100644 --- a/lib/fog/aws/models/elasticache/security_groups.rb +++ b/lib/fog/aws/models/elasticache/security_groups.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/elasticache/security_group' module Fog module AWS class Elasticache - class SecurityGroups < Fog::Collection model Fog::AWS::Elasticache::SecurityGroup @@ -24,7 +23,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/aws/models/elasticache/subnet_group.rb b/lib/fog/aws/models/elasticache/subnet_group.rb index fc354a6cd..589a31f40 100644 --- a/lib/fog/aws/models/elasticache/subnet_group.rb +++ b/lib/fog/aws/models/elasticache/subnet_group.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class Elasticache - class SubnetGroup < Fog::Model - identity :id, :aliases => ['CacheSubnetGroupName', :name] attribute :description, :aliases => 'CacheSubnetGroupDescription' attribute :vpc_id, :aliases => 'VpcId' @@ -28,7 +26,6 @@ module Fog service.delete_cache_subnet_group(id) true end - end end end diff --git a/lib/fog/aws/models/elasticache/subnet_groups.rb b/lib/fog/aws/models/elasticache/subnet_groups.rb index bd07838af..e457a0f07 100644 --- a/lib/fog/aws/models/elasticache/subnet_groups.rb +++ b/lib/fog/aws/models/elasticache/subnet_groups.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/elasticache/subnet_group' module Fog module AWS class Elasticache - class SubnetGroups < Fog::Collection - model Fog::AWS::Elasticache::SubnetGroup def all @@ -20,7 +18,6 @@ module Fog rescue Fog::AWS::Elasticache::NotFound nil end - end end end diff --git a/lib/fog/aws/models/elb/backend_server_descriptions.rb b/lib/fog/aws/models/elb/backend_server_descriptions.rb index 2f8ffd793..c92c9b669 100644 --- a/lib/fog/aws/models/elb/backend_server_descriptions.rb +++ b/lib/fog/aws/models/elb/backend_server_descriptions.rb @@ -3,7 +3,6 @@ module Fog module AWS class ELB class BackendServerDescriptions < Fog::Collection - model Fog::AWS::ELB::BackendServerDescription attr_accessor :data, :load_balancer @@ -15,7 +14,6 @@ module Fog def get(instance_port) all.detect{|e| e.instance_port == instance_port} end - end end end diff --git a/lib/fog/aws/models/elb/listener.rb b/lib/fog/aws/models/elb/listener.rb index fced39787..d99950989 100644 --- a/lib/fog/aws/models/elb/listener.rb +++ b/lib/fog/aws/models/elb/listener.rb @@ -3,7 +3,6 @@ module Fog module AWS class ELB class Listener < Fog::Model - attribute :policy_names, :aliases => 'PolicyNames' attribute :instance_port, :aliases => 'InstancePort' attribute :instance_protocol, :aliases => 'InstanceProtocol' @@ -51,9 +50,7 @@ module Fog 'SSLCertificateId' => ssl_id } end - end - end end end diff --git a/lib/fog/aws/models/elb/listeners.rb b/lib/fog/aws/models/elb/listeners.rb index 4da392d1b..ae28168f0 100644 --- a/lib/fog/aws/models/elb/listeners.rb +++ b/lib/fog/aws/models/elb/listeners.rb @@ -3,7 +3,6 @@ module Fog module AWS class ELB class Listeners < Fog::Collection - model Fog::AWS::ELB::Listener attr_accessor :data, :load_balancer @@ -25,7 +24,6 @@ module Fog description['Listener'].merge('PolicyNames' => description['PolicyNames']) } end - end end end diff --git a/lib/fog/aws/models/elb/load_balancer.rb b/lib/fog/aws/models/elb/load_balancer.rb index aa4c7d936..36c547433 100644 --- a/lib/fog/aws/models/elb/load_balancer.rb +++ b/lib/fog/aws/models/elb/load_balancer.rb @@ -2,9 +2,7 @@ require 'fog/core/model' module Fog module AWS class ELB - class LoadBalancer < Fog::Model - identity :id, :aliases => 'LoadBalancerName' attribute :availability_zones, :aliases => 'AvailabilityZones' attribute :created_at, :aliases => 'CreatedTime' @@ -206,7 +204,6 @@ module Fog requires :id service.delete_load_balancer(id) end - end end end diff --git a/lib/fog/aws/models/elb/load_balancers.rb b/lib/fog/aws/models/elb/load_balancers.rb index ec6354302..889e44a52 100644 --- a/lib/fog/aws/models/elb/load_balancers.rb +++ b/lib/fog/aws/models/elb/load_balancers.rb @@ -31,7 +31,6 @@ module Fog rescue Fog::AWS::ELB::NotFound nil end - end end end diff --git a/lib/fog/aws/models/elb/policies.rb b/lib/fog/aws/models/elb/policies.rb index d8de70d60..56e509827 100644 --- a/lib/fog/aws/models/elb/policies.rb +++ b/lib/fog/aws/models/elb/policies.rb @@ -3,7 +3,6 @@ module Fog module AWS class ELB class Policies < Fog::Collection - model Fog::AWS::ELB::Policy attr_accessor :data, :load_balancer @@ -47,9 +46,7 @@ module Fog m } end - end - end end end diff --git a/lib/fog/aws/models/elb/policy.rb b/lib/fog/aws/models/elb/policy.rb index a38fde295..5a289dc1d 100644 --- a/lib/fog/aws/models/elb/policy.rb +++ b/lib/fog/aws/models/elb/policy.rb @@ -2,7 +2,6 @@ require 'fog/core/model' module Fog module AWS class ELB - class Policy < Fog::Model identity :id, :aliases => 'PolicyName' @@ -54,9 +53,7 @@ module Fog def load_balancer collection.load_balancer end - end - end end end diff --git a/lib/fog/aws/models/glacier/archive.rb b/lib/fog/aws/models/glacier/archive.rb index 06505e0ea..3a8946ace 100644 --- a/lib/fog/aws/models/glacier/archive.rb +++ b/lib/fog/aws/models/glacier/archive.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class Glacier - class Archive < Fog::Model - identity :id attribute :description attribute :body @@ -62,9 +60,7 @@ module Fog # Complete the upload service.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id'] end - end - end end end diff --git a/lib/fog/aws/models/glacier/archives.rb b/lib/fog/aws/models/glacier/archives.rb index 5ac9105c4..59c058ee9 100644 --- a/lib/fog/aws/models/glacier/archives.rb +++ b/lib/fog/aws/models/glacier/archives.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/glacier/archive' module Fog module AWS class Glacier - class Archives < Fog::Collection - model Fog::AWS::Glacier::Archive attribute :vault #you can't list a vault's archives @@ -22,9 +20,7 @@ module Fog requires :vault super({ :vault => vault }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/aws/models/glacier/job.rb b/lib/fog/aws/models/glacier/job.rb index df29e2baa..54caa5118 100644 --- a/lib/fog/aws/models/glacier/job.rb +++ b/lib/fog/aws/models/glacier/job.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class Glacier - class Job < Fog::Model - ARCHIVE = 'archive-retrieval' INVENTORY = 'inventory-retrieval' @@ -26,7 +24,6 @@ module Fog attribute :format attribute :type - def ready? completed end @@ -58,7 +55,6 @@ module Fog def vault=(new_vault) @vault = new_vault end - end end end diff --git a/lib/fog/aws/models/glacier/jobs.rb b/lib/fog/aws/models/glacier/jobs.rb index b40586da8..724b8a3d3 100644 --- a/lib/fog/aws/models/glacier/jobs.rb +++ b/lib/fog/aws/models/glacier/jobs.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/glacier/job' module Fog module AWS class Glacier - class Jobs < Fog::Collection - model Fog::AWS::Glacier::Job attribute :vault attribute :filters @@ -36,10 +34,7 @@ module Fog requires :vault super({ :vault => vault }.merge!(attributes)) end - - end - end end end diff --git a/lib/fog/aws/models/glacier/vault.rb b/lib/fog/aws/models/glacier/vault.rb index 0349350e3..120966885 100644 --- a/lib/fog/aws/models/glacier/vault.rb +++ b/lib/fog/aws/models/glacier/vault.rb @@ -5,9 +5,7 @@ require 'fog/aws/models/glacier/jobs' module Fog module AWS class Glacier - class Vault < Fog::Model - identity :id, :aliases => 'VaultName' attribute :created_at, :aliases => 'CreationDate', :type => :time attribute :last_inventory_at, :aliases => 'LastInventoryDate', :type => :time @@ -46,7 +44,6 @@ module Fog requires :id service.delete_vault(id) end - end end end diff --git a/lib/fog/aws/models/glacier/vaults.rb b/lib/fog/aws/models/glacier/vaults.rb index 186f15e89..de7629b9a 100644 --- a/lib/fog/aws/models/glacier/vaults.rb +++ b/lib/fog/aws/models/glacier/vaults.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/glacier/vault' module Fog module AWS class Glacier - class Vaults < Fog::Collection - model Fog::AWS::Glacier::Vault def all @@ -20,9 +18,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/aws/models/iam/access_key.rb b/lib/fog/aws/models/iam/access_key.rb index 1ced5dd51..d3928eff2 100644 --- a/lib/fog/aws/models/iam/access_key.rb +++ b/lib/fog/aws/models/iam/access_key.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class IAM - class AccessKey < Fog::Model - identity :id, :aliases => 'AccessKeyId' attribute :username, :aliases => 'UserName' attribute :secret_access_key, :aliases => 'SecretAccessKey' @@ -35,7 +33,6 @@ module Fog requires :username service.users.get(username) end - end end end diff --git a/lib/fog/aws/models/iam/access_keys.rb b/lib/fog/aws/models/iam/access_keys.rb index 4b5181c82..8031f0889 100644 --- a/lib/fog/aws/models/iam/access_keys.rb +++ b/lib/fog/aws/models/iam/access_keys.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/iam/access_key' module Fog module AWS class IAM - class AccessKeys < Fog::Collection - model Fog::AWS::IAM::AccessKey def initialize(attributes = {}) @@ -28,7 +26,6 @@ module Fog def new(attributes = {}) super({ :username => @username }.merge!(attributes)) end - end end end diff --git a/lib/fog/aws/models/iam/policies.rb b/lib/fog/aws/models/iam/policies.rb index 87d05be1f..8c80e7e06 100644 --- a/lib/fog/aws/models/iam/policies.rb +++ b/lib/fog/aws/models/iam/policies.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/iam/policy' module Fog module AWS class IAM - class Policies < Fog::Collection - model Fog::AWS::IAM::Policy def initialize(attributes = {}) @@ -15,7 +13,6 @@ module Fog super end - def all # AWS method get_user_policy only returns an array of policy names, this is kind of useless, # that's why it has to loop through the list to get the details of each element. I don't like it because it makes this method slow @@ -37,7 +34,6 @@ module Fog def new(attributes = {}) super({ :username => @username }.merge!(attributes)) end - end end end diff --git a/lib/fog/aws/models/iam/policy.rb b/lib/fog/aws/models/iam/policy.rb index 11b4d698c..652b691bf 100644 --- a/lib/fog/aws/models/iam/policy.rb +++ b/lib/fog/aws/models/iam/policy.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class IAM - class Policy < Fog::Model - identity :id, :aliases => 'PolicyName' attribute :username, :aliases => 'UserName' attribute :document, :aliases => 'PolicyDocument' @@ -32,7 +30,6 @@ module Fog requires :username service.users.get(username) end - end end end diff --git a/lib/fog/aws/models/iam/role.rb b/lib/fog/aws/models/iam/role.rb index d0abea26c..3fb270eca 100644 --- a/lib/fog/aws/models/iam/role.rb +++ b/lib/fog/aws/models/iam/role.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module AWS class IAM - class Role < Fog::Model identity :id, :aliases => 'RoleId' @@ -29,7 +28,6 @@ module Fog service.delete_role(rolename) true end - end end end diff --git a/lib/fog/aws/models/iam/roles.rb b/lib/fog/aws/models/iam/roles.rb index 906d528b4..f8a580af7 100644 --- a/lib/fog/aws/models/iam/roles.rb +++ b/lib/fog/aws/models/iam/roles.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/iam/role' module Fog module AWS class IAM - class Roles < Fog::Collection - model Fog::AWS::IAM::Role def initialize(attributes = {}) @@ -33,7 +31,6 @@ module Fog end super end - end end end diff --git a/lib/fog/aws/models/iam/user.rb b/lib/fog/aws/models/iam/user.rb index 3a2011f01..04695abdf 100644 --- a/lib/fog/aws/models/iam/user.rb +++ b/lib/fog/aws/models/iam/user.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class IAM - class User < Fog::Model - identity :id, :aliases => 'UserName' attribute :path, :aliases => 'Path' attribute :arn, :aliases => 'Arn' @@ -34,7 +32,6 @@ module Fog requires :id service.access_keys(:username => id) end - end end end diff --git a/lib/fog/aws/models/iam/users.rb b/lib/fog/aws/models/iam/users.rb index 343ded06c..377b9705d 100644 --- a/lib/fog/aws/models/iam/users.rb +++ b/lib/fog/aws/models/iam/users.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/iam/user' module Fog module AWS class IAM - class Users < Fog::Collection - attribute :is_truncated, :aliases => 'IsTruncated' attribute :marker, :aliases => 'Marker' diff --git a/lib/fog/aws/models/rds/instance_option.rb b/lib/fog/aws/models/rds/instance_option.rb index 4db63e75d..e38abde52 100644 --- a/lib/fog/aws/models/rds/instance_option.rb +++ b/lib/fog/aws/models/rds/instance_option.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class RDS - class InstanceOption < Fog::Model - attribute :multi_az_capable, :aliases => 'MultiAZCapable', :type => :boolean attribute :engine, :aliases => 'Engine' attribute :license_model, :aliases => 'LicenseModel' @@ -14,7 +12,6 @@ module Fog attribute :availability_zones, :aliases => 'AvailabilityZones', :type => :array attribute :db_instance_class, :aliases => 'DBInstanceClass' attribute :vpc, :aliases => 'Vpc', :type => :boolean - end end end diff --git a/lib/fog/aws/models/rds/instance_options.rb b/lib/fog/aws/models/rds/instance_options.rb index ededf6590..12b3a326b 100644 --- a/lib/fog/aws/models/rds/instance_options.rb +++ b/lib/fog/aws/models/rds/instance_options.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/rds/instance_option' module Fog module AWS class RDS - class InstanceOptions < Fog::PagedCollection attribute :filters attribute :engine @@ -23,7 +22,6 @@ module Fog self.filters[:marker] = result['Marker'] load(result['OrderableDBInstanceOptions']) end - end end end diff --git a/lib/fog/aws/models/rds/log_file.rb b/lib/fog/aws/models/rds/log_file.rb index 2b9e0aaf4..58a66ec54 100644 --- a/lib/fog/aws/models/rds/log_file.rb +++ b/lib/fog/aws/models/rds/log_file.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class RDS - class LogFile < Fog::Model - attribute :rds_id, :aliases => 'DBInstanceIdentifier' attribute :name, :aliases => 'LogFileName' attribute :size, :aliases => 'Size', :type => :integer @@ -18,9 +16,7 @@ module Fog result = service.download_db_logfile_portion(self.rds_id, self.name, {:marker => marker}) merge_attributes(result.body['DownloadDBLogFilePortionResult']) end - end - end end end diff --git a/lib/fog/aws/models/rds/log_files.rb b/lib/fog/aws/models/rds/log_files.rb index ea0c88466..7d5bbb223 100644 --- a/lib/fog/aws/models/rds/log_files.rb +++ b/lib/fog/aws/models/rds/log_files.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/rds/log_file' module Fog module AWS class RDS - class LogFiles < Fog::Collection attribute :filters attribute :rds_id @@ -43,7 +42,6 @@ module Fog end rescue Fog::AWS::RDS::NotFound end - end end end diff --git a/lib/fog/aws/models/rds/parameter.rb b/lib/fog/aws/models/rds/parameter.rb index f7bb3af6f..23b539fbd 100644 --- a/lib/fog/aws/models/rds/parameter.rb +++ b/lib/fog/aws/models/rds/parameter.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class RDS - class Parameter < Fog::Model - attribute :name, :aliases => ['ParameterName'] attribute :data_type, :aliases => 'DataType' attribute :description, :aliases => 'Description' @@ -14,7 +12,6 @@ module Fog attribute :modifiable, :aliases => 'IsModifiable' attribute :apply_type, :aliases => 'ApplyType' attribute :value, :aliases => 'ParameterValue' - end end end diff --git a/lib/fog/aws/models/rds/parameter_group.rb b/lib/fog/aws/models/rds/parameter_group.rb index e96c8ac15..5c12f08b4 100644 --- a/lib/fog/aws/models/rds/parameter_group.rb +++ b/lib/fog/aws/models/rds/parameter_group.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class RDS - class ParameterGroup < Fog::Model - identity :id, :aliases => ['DBParameterGroupName', :name] attribute :family, :aliases => 'DBParameterGroupFamily' attribute :description, :aliases => 'Description' diff --git a/lib/fog/aws/models/rds/parameter_groups.rb b/lib/fog/aws/models/rds/parameter_groups.rb index d1c002c0a..8e74d9d3f 100644 --- a/lib/fog/aws/models/rds/parameter_groups.rb +++ b/lib/fog/aws/models/rds/parameter_groups.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/rds/parameter_group' module Fog module AWS class RDS - class ParameterGroups < Fog::Collection - model Fog::AWS::RDS::ParameterGroup def all @@ -20,7 +18,6 @@ module Fog rescue Fog::AWS::RDS::NotFound nil end - end end end diff --git a/lib/fog/aws/models/rds/parameters.rb b/lib/fog/aws/models/rds/parameters.rb index 7af8447a0..c6a5e3599 100644 --- a/lib/fog/aws/models/rds/parameters.rb +++ b/lib/fog/aws/models/rds/parameters.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/rds/parameter' module Fog module AWS class RDS - class Parameters < Fog::Collection attribute :group attribute :filters diff --git a/lib/fog/aws/models/rds/security_group.rb b/lib/fog/aws/models/rds/security_group.rb index 47d9946f5..4ab35b06e 100644 --- a/lib/fog/aws/models/rds/security_group.rb +++ b/lib/fog/aws/models/rds/security_group.rb @@ -4,9 +4,7 @@ require 'fog/core/current_machine' module Fog module AWS class RDS - class SecurityGroup < Fog::Model - identity :id, :aliases => ['DBSecurityGroupName'] attribute :description, :aliases => 'DBSecurityGroupDescription' attribute :ec2_security_groups, :aliases => 'EC2SecurityGroups', :type => :array @@ -75,7 +73,6 @@ module Fog data = service.revoke_db_security_group_ingress(id, opts).body['RevokeDBSecurityGroupIngressResult']['DBSecurityGroup'] merge_attributes(data) end - end end end diff --git a/lib/fog/aws/models/rds/security_groups.rb b/lib/fog/aws/models/rds/security_groups.rb index 0000a221c..199235659 100644 --- a/lib/fog/aws/models/rds/security_groups.rb +++ b/lib/fog/aws/models/rds/security_groups.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/rds/security_group' module Fog module AWS class RDS - class SecurityGroups < Fog::Collection attribute :server attribute :filters @@ -36,7 +35,6 @@ module Fog def new(attributes = {}) super end - end end end diff --git a/lib/fog/aws/models/rds/server.rb b/lib/fog/aws/models/rds/server.rb index 82a156eef..8d3bd1d2f 100644 --- a/lib/fog/aws/models/rds/server.rb +++ b/lib/fog/aws/models/rds/server.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class RDS - class Server < Fog::Model - identity :id, :aliases => 'DBInstanceIdentifier' attribute :engine, :aliases => 'Engine' attribute :engine_version, :aliases => 'EngineVersion' diff --git a/lib/fog/aws/models/rds/servers.rb b/lib/fog/aws/models/rds/servers.rb index 59cb9d478..d2925dd35 100644 --- a/lib/fog/aws/models/rds/servers.rb +++ b/lib/fog/aws/models/rds/servers.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/rds/server' module Fog module AWS class RDS - class Servers < Fog::Collection - model Fog::AWS::RDS::Server def all @@ -20,7 +18,6 @@ module Fog rescue Fog::AWS::RDS::NotFound nil end - end end end diff --git a/lib/fog/aws/models/rds/snapshot.rb b/lib/fog/aws/models/rds/snapshot.rb index 50b980b3b..0b809a76d 100644 --- a/lib/fog/aws/models/rds/snapshot.rb +++ b/lib/fog/aws/models/rds/snapshot.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class RDS - class Snapshot < Fog::Model - identity :id, :aliases => ['DBSnapshotIdentifier', :name] attribute :instance_id, :aliases => 'DBInstanceIdentifier' attribute :created_at, :aliases => 'SnapshotCreateTime', :type => :time @@ -45,7 +43,6 @@ module Fog requires :instance_id service.servers.get(instance_id) end - end end end diff --git a/lib/fog/aws/models/rds/snapshots.rb b/lib/fog/aws/models/rds/snapshots.rb index 2a1d5edd1..3d6a187d6 100644 --- a/lib/fog/aws/models/rds/snapshots.rb +++ b/lib/fog/aws/models/rds/snapshots.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/rds/snapshot' module Fog module AWS class RDS - class Snapshots < Fog::Collection attribute :server attribute :filters @@ -64,7 +63,6 @@ module Fog super end end - end end end diff --git a/lib/fog/aws/models/rds/subnet_group.rb b/lib/fog/aws/models/rds/subnet_group.rb index b8a48ebdd..37735f386 100644 --- a/lib/fog/aws/models/rds/subnet_group.rb +++ b/lib/fog/aws/models/rds/subnet_group.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module AWS class RDS - class SubnetGroup < Fog::Model - identity :id, :aliases => ['DBSubnetGroupName', :name] attribute :description, :aliases => 'DBSubnetGroupDescription' attribute :status, :aliases => 'SubnetGroupStatus' @@ -27,7 +25,6 @@ module Fog requires :id service.delete_db_subnet_group(id) end - end end end diff --git a/lib/fog/aws/models/rds/subnet_groups.rb b/lib/fog/aws/models/rds/subnet_groups.rb index 6b5ad6ed0..b1c76e1f0 100644 --- a/lib/fog/aws/models/rds/subnet_groups.rb +++ b/lib/fog/aws/models/rds/subnet_groups.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/rds/subnet_group' module Fog module AWS class RDS - class SubnetGroups < Fog::Collection - model Fog::AWS::RDS::SubnetGroup def all @@ -20,7 +18,6 @@ module Fog rescue Fog::AWS::RDS::NotFound nil end - end end end diff --git a/lib/fog/aws/models/storage/directories.rb b/lib/fog/aws/models/storage/directories.rb index 5485d2ddd..cf1c0f0aa 100644 --- a/lib/fog/aws/models/storage/directories.rb +++ b/lib/fog/aws/models/storage/directories.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/storage/directory' module Fog module Storage class AWS - class Directories < Fog::Collection - model Fog::Storage::AWS::Directory def all @@ -35,9 +33,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/aws/models/storage/directory.rb b/lib/fog/aws/models/storage/directory.rb index cd8b564c5..6e3c88389 100644 --- a/lib/fog/aws/models/storage/directory.rb +++ b/lib/fog/aws/models/storage/directory.rb @@ -5,7 +5,6 @@ require 'fog/aws/models/storage/versions' module Fog module Storage class AWS - class Directory < Fog::Model VALID_ACLS = ['private', 'public-read', 'public-read-write', 'authenticated-read'] @@ -121,9 +120,7 @@ module Fog data = service.get_bucket_location(key) data.body['LocationConstraint'] end - end - end end end diff --git a/lib/fog/aws/models/storage/file.rb b/lib/fog/aws/models/storage/file.rb index d5396f99b..7ba1373c3 100644 --- a/lib/fog/aws/models/storage/file.rb +++ b/lib/fog/aws/models/storage/file.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/storage/versions' module Fog module Storage class AWS - class File < Fog::Model # @see AWS Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html @@ -30,7 +29,6 @@ module Fog # Use small chunk sizes to minimize memory. E.g. 5242880 = 5mb attr_accessor :multipart_chunk_size - # Set file's access control list (ACL). # # valid acls: private, public-read, public-read-write, authenticated-read, bucket-owner-read, bucket-owner-full-control @@ -46,7 +44,6 @@ module Fog @acl = new_acl end - # Get file's body if exists, else ' '. # # @return [File] @@ -59,7 +56,6 @@ module Fog end end - # Set body attribute. # # @param [File] new_body @@ -69,7 +65,6 @@ module Fog attributes[:body] = new_body end - # Get the file instance's directory. # # @return [Fog::AWS::Storage::Directory] @@ -78,7 +73,6 @@ module Fog @directory end - # Copy object from one bucket to other bucket. # # required attributes: directory, key @@ -95,7 +89,6 @@ module Fog target_directory.files.head(target_file_key) end - # Destroy file via http DELETE. # # required attributes: directory, key @@ -111,19 +104,16 @@ module Fog true end - remove_method :metadata def metadata attributes.reject {|key, value| !(key.to_s =~ /^x-amz-/)} end - remove_method :metadata= def metadata=(new_metadata) merge_attributes(new_metadata) end - remove_method :owner= def owner=(new_owner) if new_owner @@ -134,7 +124,6 @@ module Fog end end - # Set Access-Control-List permissions. # # valid new_publics: public_read, private @@ -151,7 +140,6 @@ module Fog new_public end - # Get pubically acessible url via http GET. # Checks persmissions before creating. # Defaults to s3 subdomain or compliant bucket name @@ -217,7 +205,6 @@ module Fog true end - # Get a url for file. # # required attributes: key @@ -231,7 +218,6 @@ module Fog collection.get_url(key, expires, options) end - # File version if exists or creates new version. # @return [Fog::Storage::AWS::Version] # @@ -277,9 +263,7 @@ module Fog # Complete the upload service.complete_multipart_upload(directory.key, key, upload_id, part_tags) end - end - end end end diff --git a/lib/fog/aws/models/storage/files.rb b/lib/fog/aws/models/storage/files.rb index c23cbf834..b61c269c7 100644 --- a/lib/fog/aws/models/storage/files.rb +++ b/lib/fog/aws/models/storage/files.rb @@ -4,7 +4,6 @@ require 'fog/aws/models/storage/file' module Fog module Storage class AWS - class Files < Fog::Collection extend Fog::Deprecation deprecate :get_url, :get_https_url @@ -114,9 +113,7 @@ module Fog data.headers['Last-Modified'] = Time.parse(data.get_header('Last-Modified')) data.headers['ETag'] = data.get_header('ETag').gsub('"','') end - end - end end end diff --git a/lib/fog/aws/models/storage/version.rb b/lib/fog/aws/models/storage/version.rb index 38b355ca6..9186394ff 100644 --- a/lib/fog/aws/models/storage/version.rb +++ b/lib/fog/aws/models/storage/version.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Storage class AWS - class Version < Fog::Model - identity :version, :aliases => 'VersionId' attribute :key, :aliases => 'Key' @@ -30,7 +28,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/models/storage/versions.rb b/lib/fog/aws/models/storage/versions.rb index 0d3e59fb4..2a400d8c2 100644 --- a/lib/fog/aws/models/storage/versions.rb +++ b/lib/fog/aws/models/storage/versions.rb @@ -4,9 +4,7 @@ require 'fog/aws/models/storage/version' module Fog module Storage class AWS - class Versions < Fog::Collection - attribute :file attribute :directory @@ -30,9 +28,7 @@ module Fog model end - end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/basic.rb b/lib/fog/aws/parsers/auto_scaling/basic.rb index df99c5470..0f1518760 100644 --- a/lib/fog/aws/parsers/auto_scaling/basic.rb +++ b/lib/fog/aws/parsers/auto_scaling/basic.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class Basic < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -19,9 +17,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_adjustment_types.rb b/lib/fog/aws/parsers/auto_scaling/describe_adjustment_types.rb index 32bce7f48..e50e79a47 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_adjustment_types.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_adjustment_types.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeAdjustmentTypes < Fog::Parsers::Base - def reset reset_adjustment_type @results = { 'AdjustmentTypes' => [] } @@ -44,7 +42,6 @@ module Fog @response['DescribeAdjustmentTypesResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb b/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb index 25435e4fb..79c48ce67 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeAutoScalingGroups < Fog::Parsers::Base - def reset reset_auto_scaling_group reset_enabled_metric @@ -151,7 +149,6 @@ module Fog @response['DescribeAutoScalingGroupsResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_instances.rb b/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_instances.rb index 905576ae7..8866bba76 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_instances.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_instances.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeAutoScalingInstances < Fog::Parsers::Base - def reset reset_auto_scaling_instance @results = { 'AutoScalingInstances' => [] } @@ -35,7 +33,6 @@ module Fog @response['DescribeAutoScalingInstancesResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_notification_types.rb b/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_notification_types.rb index 739b297b9..2b2b6df05 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_notification_types.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_notification_types.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeAutoScalingNotificationTypes < Fog::Parsers::Base - def reset @results = { 'AutoScalingNotificationTypes' => [] } @response = { 'DescribeAutoScalingNotificationTypesResult' => {}, 'ResponseMetadata' => {} } @@ -35,7 +33,6 @@ module Fog @response['DescribeAutoScalingNotificationTypesResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb b/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb index b01daa99a..ab14f7c6a 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeLaunchConfigurations < Fog::Parsers::Base - def reset reset_launch_configuration reset_block_device_mapping @@ -92,7 +90,6 @@ module Fog @response['DescribeLaunchConfigurationsResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_metric_collection_types.rb b/lib/fog/aws/parsers/auto_scaling/describe_metric_collection_types.rb index d6bc4fc48..6e5581543 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_metric_collection_types.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_metric_collection_types.rb @@ -2,15 +2,14 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeMetricCollectionTypes < Fog::Parsers::Base - def reset reset_granularity reset_metric @results = { 'Granularities' => [], 'Metrics' => [] } @response = { 'DescribeMetricCollectionTypesResult' => {}, 'ResponseMetadata' => {} } end + def reset_granularity @granularity = {} end @@ -58,7 +57,6 @@ module Fog @response[name] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_notification_configurations.rb b/lib/fog/aws/parsers/auto_scaling/describe_notification_configurations.rb index 09aab36aa..9792aeb61 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_notification_configurations.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_notification_configurations.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeNotificationConfigurations < Fog::Parsers::Base - def reset reset_notification_configuration @results = { 'NotificationConfigurations' => [] } @@ -34,7 +32,6 @@ module Fog @response['DescribeNotificationConfigurationsResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_policies.rb b/lib/fog/aws/parsers/auto_scaling/describe_policies.rb index d27b86806..a8357c5e7 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_policies.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_policies.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribePolicies < Fog::Parsers::Base - def reset reset_scaling_policy reset_alarm @@ -60,7 +58,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_scaling_activities.rb b/lib/fog/aws/parsers/auto_scaling/describe_scaling_activities.rb index 14a67db0b..0c52abb54 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_scaling_activities.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_scaling_activities.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeScalingActivities < Fog::Parsers::Base - def reset reset_activity @results = { 'Activities' => [] } @@ -39,7 +37,6 @@ module Fog @response['DescribeScalingActivitiesResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_scaling_process_types.rb b/lib/fog/aws/parsers/auto_scaling/describe_scaling_process_types.rb index 4c9dc6bf9..0d3feaff0 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_scaling_process_types.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_scaling_process_types.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeScalingProcessTypes < Fog::Parsers::Base - def reset reset_process_type @results = { 'Processes' => [] } @@ -44,7 +42,6 @@ module Fog @response['DescribeScalingProcessTypesResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_scheduled_actions.rb b/lib/fog/aws/parsers/auto_scaling/describe_scheduled_actions.rb index f783ad6cd..ed9265792 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_scheduled_actions.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_scheduled_actions.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeScheduledActions < Fog::Parsers::Base - def reset reset_scheduled_update_group_action @results = { 'ScheduledUpdateGroupActions' => [] } @@ -38,7 +36,6 @@ module Fog @response['DescribeScheduledActionsResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_tags.rb b/lib/fog/aws/parsers/auto_scaling/describe_tags.rb index eaf6ed3cb..27a550027 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_tags.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_tags.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeTags < Fog::Parsers::Base - def reset reset_tag @results = { 'Tags' => [] } @@ -37,9 +35,7 @@ module Fog end end - end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/describe_termination_policy_types.rb b/lib/fog/aws/parsers/auto_scaling/describe_termination_policy_types.rb index 4bd572d7b..9b2cc2c55 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_termination_policy_types.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_termination_policy_types.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class DescribeTerminationPolicyTypes < Fog::Parsers::Base - def reset @results = { 'TerminationPolicyTypes' => [] } @response = { 'DescribeTerminationPolicyTypesResult' => {}, 'ResponseMetadata' => {} } @@ -35,9 +33,7 @@ module Fog @response['DescribeTerminationPolicyTypesResult'] = @results end end - end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/put_notification_configuration.rb b/lib/fog/aws/parsers/auto_scaling/put_notification_configuration.rb index 605a99e6a..b63a1b309 100644 --- a/lib/fog/aws/parsers/auto_scaling/put_notification_configuration.rb +++ b/lib/fog/aws/parsers/auto_scaling/put_notification_configuration.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class PutNotificationConfiguration < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -19,7 +17,6 @@ module Fog @response['ResponseMetadata'][name] = value end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/put_scaling_policy.rb b/lib/fog/aws/parsers/auto_scaling/put_scaling_policy.rb index c9ca0cb83..4a0b53126 100644 --- a/lib/fog/aws/parsers/auto_scaling/put_scaling_policy.rb +++ b/lib/fog/aws/parsers/auto_scaling/put_scaling_policy.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class PutScalingPolicy < Fog::Parsers::Base - def reset @results = {} @response = { 'PutScalingPolicyResult' => {}, 'ResponseMetadata' => {} } @@ -22,7 +20,6 @@ module Fog @response['PutScalingPolicyResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/auto_scaling/terminate_instance_in_auto_scaling_group.rb b/lib/fog/aws/parsers/auto_scaling/terminate_instance_in_auto_scaling_group.rb index 9c4b918c0..ebc63aa50 100644 --- a/lib/fog/aws/parsers/auto_scaling/terminate_instance_in_auto_scaling_group.rb +++ b/lib/fog/aws/parsers/auto_scaling/terminate_instance_in_auto_scaling_group.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module AutoScaling - class TerminateInstanceInAutoScalingGroup < Fog::Parsers::Base - def reset @results = { 'Activity' => {} } @response = { 'TerminateInstanceInAutoScalingGroupResult' => {}, 'ResponseMetadata' => {} } @@ -27,7 +25,6 @@ module Fog @response['TerminateInstanceInAutoScalingGroupResult'] = @results end end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/check_dns_availability.rb b/lib/fog/aws/parsers/beanstalk/check_dns_availability.rb index a996c8f9e..a215b6357 100644 --- a/lib/fog/aws/parsers/beanstalk/check_dns_availability.rb +++ b/lib/fog/aws/parsers/beanstalk/check_dns_availability.rb @@ -2,17 +2,14 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class CheckDNSAvailability < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("CheckDNSAvailabilityResult") tag 'FullyQualifiedCNAME', :string tag 'Available', :boolean end end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/create_application.rb b/lib/fog/aws/parsers/beanstalk/create_application.rb index 0eee6459a..81bdd6d8c 100644 --- a/lib/fog/aws/parsers/beanstalk/create_application.rb +++ b/lib/fog/aws/parsers/beanstalk/create_application.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class CreateApplication < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("CreateApplicationResult") tag 'Application', :object @@ -16,7 +14,6 @@ module Fog tag 'DateCreated', :datetime tag 'DateUpdated', :datetime end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/create_application_version.rb b/lib/fog/aws/parsers/beanstalk/create_application_version.rb index 968fe3c55..d1001f599 100644 --- a/lib/fog/aws/parsers/beanstalk/create_application_version.rb +++ b/lib/fog/aws/parsers/beanstalk/create_application_version.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class CreateApplicationVersion < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("CreateApplicationVersionResult") tag 'ApplicationVersion', :object @@ -18,7 +16,6 @@ module Fog tag 'S3Key', :string tag 'VersionLabel', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/create_configuration_template.rb b/lib/fog/aws/parsers/beanstalk/create_configuration_template.rb index 6518784b1..563768ba3 100644 --- a/lib/fog/aws/parsers/beanstalk/create_configuration_template.rb +++ b/lib/fog/aws/parsers/beanstalk/create_configuration_template.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class CreateConfigurationTemplate < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("CreateConfigurationTemplateResult") tag 'ApplicationName', :string @@ -21,7 +19,6 @@ module Fog tag 'SolutionStackName', :string tag 'TemplateName', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/create_environment.rb b/lib/fog/aws/parsers/beanstalk/create_environment.rb index a2dd2f416..3ff53f777 100644 --- a/lib/fog/aws/parsers/beanstalk/create_environment.rb +++ b/lib/fog/aws/parsers/beanstalk/create_environment.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class CreateEnvironment < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("CreateEnvironmentResult") tag 'ApplicationName', :string @@ -29,7 +27,6 @@ module Fog tag 'TemplateName', :string tag 'VersionLabel', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/create_storage_location.rb b/lib/fog/aws/parsers/beanstalk/create_storage_location.rb index 47475cf8a..9530a88d4 100644 --- a/lib/fog/aws/parsers/beanstalk/create_storage_location.rb +++ b/lib/fog/aws/parsers/beanstalk/create_storage_location.rb @@ -2,15 +2,12 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class CreateStorageLocation < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("CreateStorageLocationResult") tag 'S3Bucket', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/describe_application_versions.rb b/lib/fog/aws/parsers/beanstalk/describe_application_versions.rb index 0f6ae5cb9..6da6f5b07 100644 --- a/lib/fog/aws/parsers/beanstalk/describe_application_versions.rb +++ b/lib/fog/aws/parsers/beanstalk/describe_application_versions.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class DescribeApplicationVersions < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("DescribeApplicationVersionsResult") tag 'ApplicationVersions', :object, :list @@ -18,7 +16,6 @@ module Fog tag 'S3Key', :string tag 'VersionLabel', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/describe_applications.rb b/lib/fog/aws/parsers/beanstalk/describe_applications.rb index c6849f304..55a6efb74 100644 --- a/lib/fog/aws/parsers/beanstalk/describe_applications.rb +++ b/lib/fog/aws/parsers/beanstalk/describe_applications.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class DescribeApplications < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("DescribeApplicationsResult") tag 'Applications', :object, :list @@ -16,7 +14,6 @@ module Fog tag 'DateCreated', :datetime tag 'DateUpdated', :datetime end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/describe_configuration_options.rb b/lib/fog/aws/parsers/beanstalk/describe_configuration_options.rb index 2c7115370..5400a0946 100644 --- a/lib/fog/aws/parsers/beanstalk/describe_configuration_options.rb +++ b/lib/fog/aws/parsers/beanstalk/describe_configuration_options.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class DescribeConfigurationOptions < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("DescribeConfigurationOptionsResult") tag 'SolutionStackName', :string @@ -24,7 +22,6 @@ module Fog tag 'ValueOptions', :string, :list tag 'ValueType', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/describe_configuration_settings.rb b/lib/fog/aws/parsers/beanstalk/describe_configuration_settings.rb index ff38b6231..78fc145b0 100644 --- a/lib/fog/aws/parsers/beanstalk/describe_configuration_settings.rb +++ b/lib/fog/aws/parsers/beanstalk/describe_configuration_settings.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class DescribeConfigurationSettings < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("DescribeConfigurationSettingsResult") tag 'ConfigurationSettings', :object, :list @@ -22,7 +20,6 @@ module Fog tag 'SolutionStackName', :string tag 'TemplateName', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/describe_environment_resources.rb b/lib/fog/aws/parsers/beanstalk/describe_environment_resources.rb index 92a5ddf33..e3b1bec1d 100644 --- a/lib/fog/aws/parsers/beanstalk/describe_environment_resources.rb +++ b/lib/fog/aws/parsers/beanstalk/describe_environment_resources.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class DescribeEnvironmentResources < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("DescribeEnvironmentResourcesResult") tag 'EnvironmentResources', :object @@ -29,7 +27,6 @@ module Fog tag 'VersionLabel', :string tag 'Triggers', :object, :list end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/describe_environments.rb b/lib/fog/aws/parsers/beanstalk/describe_environments.rb index 168e9848e..f6908254d 100644 --- a/lib/fog/aws/parsers/beanstalk/describe_environments.rb +++ b/lib/fog/aws/parsers/beanstalk/describe_environments.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class DescribeEnvironments < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("DescribeEnvironmentsResult") tag 'Environments', :object, :list @@ -30,7 +28,6 @@ module Fog tag 'TemplateName', :string tag 'VersionLabel', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/describe_events.rb b/lib/fog/aws/parsers/beanstalk/describe_events.rb index 8055a43e0..6c60d4f55 100644 --- a/lib/fog/aws/parsers/beanstalk/describe_events.rb +++ b/lib/fog/aws/parsers/beanstalk/describe_events.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class DescribeEvents < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("DescribeEventsResult") tag 'Events', :object, :list @@ -19,7 +17,6 @@ module Fog tag 'VersionLabel', :string tag 'NextToken', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/empty.rb b/lib/fog/aws/parsers/beanstalk/empty.rb index 19cd7accd..e9d6aa51c 100644 --- a/lib/fog/aws/parsers/beanstalk/empty.rb +++ b/lib/fog/aws/parsers/beanstalk/empty.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ElasticBeanstalk - class Empty < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -15,8 +13,6 @@ module Fog @response['ResponseMetadata'][name] = value end end - - end end end diff --git a/lib/fog/aws/parsers/beanstalk/list_available_solution_stacks.rb b/lib/fog/aws/parsers/beanstalk/list_available_solution_stacks.rb index 1faa51005..1b453415e 100644 --- a/lib/fog/aws/parsers/beanstalk/list_available_solution_stacks.rb +++ b/lib/fog/aws/parsers/beanstalk/list_available_solution_stacks.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class ListAvailableSolutionStacks < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("ListAvailableSolutionStacksResult") tag 'SolutionStackDetails', :object, :list @@ -13,7 +11,6 @@ module Fog tag 'SolutionStackName', :string tag 'SolutionStacks', :string, :list end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/parser.rb b/lib/fog/aws/parsers/beanstalk/parser.rb index 60a214289..691d681c6 100644 --- a/lib/fog/aws/parsers/beanstalk/parser.rb +++ b/lib/fog/aws/parsers/beanstalk/parser.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ElasticBeanstalk - class BaseParser < Fog::Parsers::Base - def initialize(result_name) @result_name = result_name # Set before super, since super calls reset super() @@ -18,7 +16,6 @@ module Fog @parse_stack = [ { :type => :object, :value => @response[@result_name]} ] end - def tag name, *traits if traits.delete(:list) @list_tags[name] = true @@ -29,7 +26,6 @@ module Fog else raise "Too many traits specified, only specify :list or a type" end - end def start_element(name, attrs = []) @@ -62,7 +58,6 @@ module Fog set_value(name, value, @tags[name]) end end - end def get_parent @@ -82,7 +77,6 @@ module Fog get_parent[name] = value end end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/retrieve_environment_info.rb b/lib/fog/aws/parsers/beanstalk/retrieve_environment_info.rb index 7dadf2063..0a2868326 100644 --- a/lib/fog/aws/parsers/beanstalk/retrieve_environment_info.rb +++ b/lib/fog/aws/parsers/beanstalk/retrieve_environment_info.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class RetrieveEnvironmentInfo < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("RetrieveEnvironmentInfoResult") tag 'EnvironmentInfo', :object, :list @@ -14,7 +12,6 @@ module Fog tag 'Message', :string tag 'SampleTimestamp', :datetime end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/terminate_environment.rb b/lib/fog/aws/parsers/beanstalk/terminate_environment.rb index 73efc09b6..cf0be2b2e 100644 --- a/lib/fog/aws/parsers/beanstalk/terminate_environment.rb +++ b/lib/fog/aws/parsers/beanstalk/terminate_environment.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class TerminateEnvironment < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("TerminateEnvironmentResult") tag 'ApplicationName', :string @@ -29,7 +27,6 @@ module Fog tag 'TemplateName', :string tag 'VersionLabel', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/update_application.rb b/lib/fog/aws/parsers/beanstalk/update_application.rb index 98e1055cc..bc63aa5a3 100644 --- a/lib/fog/aws/parsers/beanstalk/update_application.rb +++ b/lib/fog/aws/parsers/beanstalk/update_application.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class UpdateApplication < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("UpdateApplicationResult") tag 'Application', :object @@ -16,7 +14,6 @@ module Fog tag 'DateCreated', :datetime tag 'DateUpdated', :datetime end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/update_application_version.rb b/lib/fog/aws/parsers/beanstalk/update_application_version.rb index 16843ea3f..212cca414 100644 --- a/lib/fog/aws/parsers/beanstalk/update_application_version.rb +++ b/lib/fog/aws/parsers/beanstalk/update_application_version.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class UpdateApplicationVersion < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("UpdateApplicationVersionResult") tag 'ApplicationVersion', :object @@ -18,7 +16,6 @@ module Fog tag 'S3Key', :string tag 'VersionLabel', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/update_configuration_template.rb b/lib/fog/aws/parsers/beanstalk/update_configuration_template.rb index fa97f739f..a0bad2ba7 100644 --- a/lib/fog/aws/parsers/beanstalk/update_configuration_template.rb +++ b/lib/fog/aws/parsers/beanstalk/update_configuration_template.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class UpdateConfigurationTemplate < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("UpdateConfigurationTemplateResult") tag 'ApplicationName', :string @@ -21,7 +19,6 @@ module Fog tag 'SolutionStackName', :string tag 'TemplateName', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/update_environment.rb b/lib/fog/aws/parsers/beanstalk/update_environment.rb index a81bb6186..df6259b97 100644 --- a/lib/fog/aws/parsers/beanstalk/update_environment.rb +++ b/lib/fog/aws/parsers/beanstalk/update_environment.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class UpdateEnvironment < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("UpdateEnvironmentResult") tag 'ApplicationName', :string @@ -29,7 +27,6 @@ module Fog tag 'TemplateName', :string tag 'VersionLabel', :string end - end end end diff --git a/lib/fog/aws/parsers/beanstalk/validate_configuration_settings.rb b/lib/fog/aws/parsers/beanstalk/validate_configuration_settings.rb index d11d19146..a279eac0c 100644 --- a/lib/fog/aws/parsers/beanstalk/validate_configuration_settings.rb +++ b/lib/fog/aws/parsers/beanstalk/validate_configuration_settings.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module ElasticBeanstalk - require 'fog/aws/parsers/beanstalk/parser' class ValidateConfigurationSettings < Fog::Parsers::AWS::ElasticBeanstalk::BaseParser - def initialize super("ValidateConfigurationSettingsResult") tag 'Messages', :object, :list @@ -14,7 +12,6 @@ module Fog tag 'OptionName', :string tag 'Severity', :string end - end end end diff --git a/lib/fog/aws/parsers/cdn/distribution.rb b/lib/fog/aws/parsers/cdn/distribution.rb index c733d86e0..e9caa9890 100644 --- a/lib/fog/aws/parsers/cdn/distribution.rb +++ b/lib/fog/aws/parsers/cdn/distribution.rb @@ -2,9 +2,7 @@ module Fog module Parsers module CDN module AWS - class Distribution < Fog::Parsers::Base - def reset @response = { 'DistributionConfig' => { 'CNAME' => [], 'Logging' => {}, 'TrustedSigners' => [] } } end @@ -50,9 +48,7 @@ module Fog @response['DistributionConfig']['TrustedSigners'] << 'Self' end end - end - end end end diff --git a/lib/fog/aws/parsers/cdn/get_distribution_list.rb b/lib/fog/aws/parsers/cdn/get_distribution_list.rb index c98c0c0de..fdd3df6d1 100644 --- a/lib/fog/aws/parsers/cdn/get_distribution_list.rb +++ b/lib/fog/aws/parsers/cdn/get_distribution_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module CDN module AWS - class GetDistributionList < Fog::Parsers::Base - def reset @distribution_summary = { 'CNAME' => [], 'TrustedSigners' => [] } @response = { 'DistributionSummary' => [] } @@ -52,9 +50,7 @@ module Fog @response[name] = value.to_i end end - end - end end end diff --git a/lib/fog/aws/parsers/cdn/get_invalidation.rb b/lib/fog/aws/parsers/cdn/get_invalidation.rb index 1ac738f42..54d41811b 100644 --- a/lib/fog/aws/parsers/cdn/get_invalidation.rb +++ b/lib/fog/aws/parsers/cdn/get_invalidation.rb @@ -2,9 +2,7 @@ module Fog module Parsers module CDN module AWS - class GetInvalidation < Fog::Parsers::Base - def reset @response = { 'InvalidationBatch' => { 'Path' => [] } } end @@ -23,9 +21,7 @@ module Fog @response['InvalidationBatch'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/cdn/get_invalidation_list.rb b/lib/fog/aws/parsers/cdn/get_invalidation_list.rb index 3706211fb..44e425ef5 100644 --- a/lib/fog/aws/parsers/cdn/get_invalidation_list.rb +++ b/lib/fog/aws/parsers/cdn/get_invalidation_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module CDN module AWS - class GetInvalidationList < Fog::Parsers::Base - def reset @invalidation_summary = { } @response = { 'InvalidationSummary' => [] } @@ -33,9 +31,7 @@ module Fog @response[name] = @value.to_i end end - end - end end end diff --git a/lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb b/lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb index 5a3537d61..6b51c1b56 100644 --- a/lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb +++ b/lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module CDN module AWS - class GetStreamingDistributionList < Fog::Parsers::Base - def reset @distribution_summary = { 'CNAME' => [], 'TrustedSigners' => [] } @response = { 'StreamingDistributionSummary' => [] } @@ -50,9 +48,7 @@ module Fog @response[name] = @value.to_i end end - end - end end end diff --git a/lib/fog/aws/parsers/cdn/post_invalidation.rb b/lib/fog/aws/parsers/cdn/post_invalidation.rb index 567daba60..1ad0efe3c 100644 --- a/lib/fog/aws/parsers/cdn/post_invalidation.rb +++ b/lib/fog/aws/parsers/cdn/post_invalidation.rb @@ -2,9 +2,7 @@ module Fog module Parsers module CDN module AWS - class PostInvalidation < Fog::Parsers::Base - def reset @response = { 'InvalidationBatch' => { 'Path' => [] } } end @@ -19,9 +17,7 @@ module Fog @response['InvalidationBatch'][name] << value end end - end - end end end diff --git a/lib/fog/aws/parsers/cdn/streaming_distribution.rb b/lib/fog/aws/parsers/cdn/streaming_distribution.rb index fb6cd5ba9..200b7588b 100644 --- a/lib/fog/aws/parsers/cdn/streaming_distribution.rb +++ b/lib/fog/aws/parsers/cdn/streaming_distribution.rb @@ -4,7 +4,6 @@ module Fog module AWS class StreamingDistribution < Fog::Parsers::Base - def reset @response = { 'StreamingDistributionConfig' => { 'CNAME' => [], 'Logging' => {}, 'TrustedSigners' => [] } } end @@ -50,9 +49,7 @@ module Fog @response['StreamingDistributionConfig']['TrustedSigners'] << 'Self' end end - end - end end end diff --git a/lib/fog/aws/parsers/cloud_formation/basic.rb b/lib/fog/aws/parsers/cloud_formation/basic.rb index b73b5d4a2..92761e5bf 100644 --- a/lib/fog/aws/parsers/cloud_formation/basic.rb +++ b/lib/fog/aws/parsers/cloud_formation/basic.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudFormation - class Basic < Fog::Parsers::Base - end end end diff --git a/lib/fog/aws/parsers/cloud_formation/create_stack.rb b/lib/fog/aws/parsers/cloud_formation/create_stack.rb index 002321423..953593809 100644 --- a/lib/fog/aws/parsers/cloud_formation/create_stack.rb +++ b/lib/fog/aws/parsers/cloud_formation/create_stack.rb @@ -2,16 +2,13 @@ module Fog module Parsers module AWS module CloudFormation - class CreateStack < Fog::Parsers::Base - def end_element(name) case name when 'RequestId', 'StackId' @response[name] = value end end - end end end diff --git a/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb b/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb index 0348f6f4f..018f47daf 100644 --- a/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb +++ b/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudFormation - class DescribeStackEvents < Fog::Parsers::Base - def reset @event = {} @response = { 'StackEvents' => [] } @@ -23,7 +21,6 @@ module Fog @event[name] = Time.parse(value) end end - end end end diff --git a/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb b/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb index 8b913662c..b8a697ec4 100644 --- a/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb +++ b/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudFormation - class DescribeStackResources < Fog::Parsers::Base - def reset @resource = {} @response = { 'StackResources' => [] } @@ -23,7 +21,6 @@ module Fog @resource[name] = Time.parse(value) end end - end end end diff --git a/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb b/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb index 0e79890e5..79ec1b1ff 100644 --- a/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb +++ b/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudFormation - class DescribeStacks < Fog::Parsers::Base - def reset @stack = { 'Outputs' => [], 'Parameters' => [], 'Capabilities' => [] } @output = {} @@ -73,7 +71,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/cloud_formation/get_template.rb b/lib/fog/aws/parsers/cloud_formation/get_template.rb index 55830ede7..80acd6ec4 100644 --- a/lib/fog/aws/parsers/cloud_formation/get_template.rb +++ b/lib/fog/aws/parsers/cloud_formation/get_template.rb @@ -2,16 +2,13 @@ module Fog module Parsers module AWS module CloudFormation - class GetTemplate < Fog::Parsers::Base - def end_element(name) case name when 'RequestId', 'TemplateBody' @response[name] = value end end - end end end diff --git a/lib/fog/aws/parsers/cloud_formation/list_stack_resources.rb b/lib/fog/aws/parsers/cloud_formation/list_stack_resources.rb index 4f72c73bd..a1d50803c 100644 --- a/lib/fog/aws/parsers/cloud_formation/list_stack_resources.rb +++ b/lib/fog/aws/parsers/cloud_formation/list_stack_resources.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudFormation - class ListStackResources < Fog::Parsers::Base - def reset @resource = {} @response = { 'StackResourceSummaries' => [] } diff --git a/lib/fog/aws/parsers/cloud_formation/list_stacks.rb b/lib/fog/aws/parsers/cloud_formation/list_stacks.rb index 5e41b4c7f..47ec99539 100644 --- a/lib/fog/aws/parsers/cloud_formation/list_stacks.rb +++ b/lib/fog/aws/parsers/cloud_formation/list_stacks.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudFormation - class ListStacks < Fog::Parsers::Base - def reset @stack = {} @response = { 'StackSummaries' => [] } diff --git a/lib/fog/aws/parsers/cloud_formation/update_stack.rb b/lib/fog/aws/parsers/cloud_formation/update_stack.rb index 3e3f528ab..0e3c3115d 100644 --- a/lib/fog/aws/parsers/cloud_formation/update_stack.rb +++ b/lib/fog/aws/parsers/cloud_formation/update_stack.rb @@ -2,16 +2,13 @@ module Fog module Parsers module AWS module CloudFormation - class UpdateStack < Fog::Parsers::Base - def end_element(name) case name when 'RequestId', 'StackId' @response[name] = value end end - end end end diff --git a/lib/fog/aws/parsers/cloud_formation/validate_template.rb b/lib/fog/aws/parsers/cloud_formation/validate_template.rb index 0db472247..fa16430bc 100644 --- a/lib/fog/aws/parsers/cloud_formation/validate_template.rb +++ b/lib/fog/aws/parsers/cloud_formation/validate_template.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudFormation - class ValidateTemplate < Fog::Parsers::Base - def reset @parameter = {} @response = { 'Parameters' => [] } @@ -44,7 +42,6 @@ module Fog @in_parameters = false end end - end end end diff --git a/lib/fog/aws/parsers/cloud_watch/delete_alarms.rb b/lib/fog/aws/parsers/cloud_watch/delete_alarms.rb index 8a0999b96..ba76119fb 100644 --- a/lib/fog/aws/parsers/cloud_watch/delete_alarms.rb +++ b/lib/fog/aws/parsers/cloud_watch/delete_alarms.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class DeleteAlarms < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end diff --git a/lib/fog/aws/parsers/cloud_watch/describe_alarm_history.rb b/lib/fog/aws/parsers/cloud_watch/describe_alarm_history.rb index 35aa113bf..aae0f8a49 100644 --- a/lib/fog/aws/parsers/cloud_watch/describe_alarm_history.rb +++ b/lib/fog/aws/parsers/cloud_watch/describe_alarm_history.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class DescribeAlarmHistory < Fog::Parsers::Base - def reset @response = { 'DescribeAlarmHistoryResult' => {'AlarmHistoryItems' => []}, 'ResponseMetadata' => {} } reset_alarm_history_item diff --git a/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb b/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb index 99ad477a6..6276c2e76 100644 --- a/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb +++ b/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class DescribeAlarms < Fog::Parsers::Base - def reset @response = { 'DescribeAlarmsResult' => {'MetricAlarms' => []}, 'ResponseMetadata' => {} } reset_metric_alarms diff --git a/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb b/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb index a8358c4da..1d882339c 100644 --- a/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb +++ b/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class DescribeAlarmsForMetric < Fog::Parsers::Base - def reset @response = { 'DescribeAlarmsForMetricResult' => {'MetricAlarms' => []}, 'ResponseMetadata' => {} } reset_metric_alarms diff --git a/lib/fog/aws/parsers/cloud_watch/disable_alarm_actions.rb b/lib/fog/aws/parsers/cloud_watch/disable_alarm_actions.rb index 7700e0698..f6e4e96e9 100644 --- a/lib/fog/aws/parsers/cloud_watch/disable_alarm_actions.rb +++ b/lib/fog/aws/parsers/cloud_watch/disable_alarm_actions.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class DisableAlarmActions < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end diff --git a/lib/fog/aws/parsers/cloud_watch/enable_alarm_actions.rb b/lib/fog/aws/parsers/cloud_watch/enable_alarm_actions.rb index f14dc362e..979b9ca7f 100644 --- a/lib/fog/aws/parsers/cloud_watch/enable_alarm_actions.rb +++ b/lib/fog/aws/parsers/cloud_watch/enable_alarm_actions.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class EnableAlarmActions < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end diff --git a/lib/fog/aws/parsers/cloud_watch/get_metric_statistics.rb b/lib/fog/aws/parsers/cloud_watch/get_metric_statistics.rb index 167303d7f..8736f73fe 100644 --- a/lib/fog/aws/parsers/cloud_watch/get_metric_statistics.rb +++ b/lib/fog/aws/parsers/cloud_watch/get_metric_statistics.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class GetMetricStatistics < Fog::Parsers::Base - def reset @response = { 'GetMetricStatisticsResult' => {'Datapoints' => []}, 'ResponseMetadata' => {} } reset_datapoint diff --git a/lib/fog/aws/parsers/cloud_watch/list_metrics.rb b/lib/fog/aws/parsers/cloud_watch/list_metrics.rb index 0a6167b9f..fd701e543 100644 --- a/lib/fog/aws/parsers/cloud_watch/list_metrics.rb +++ b/lib/fog/aws/parsers/cloud_watch/list_metrics.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class ListMetrics < Fog::Parsers::Base - def reset @response = { 'ListMetricsResult' => {'Metrics' => []}, 'ResponseMetadata' => {} } reset_metric diff --git a/lib/fog/aws/parsers/cloud_watch/put_metric_alarm.rb b/lib/fog/aws/parsers/cloud_watch/put_metric_alarm.rb index f5c3d2cb4..075b5aac1 100644 --- a/lib/fog/aws/parsers/cloud_watch/put_metric_alarm.rb +++ b/lib/fog/aws/parsers/cloud_watch/put_metric_alarm.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class PutMetricAlarm < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end diff --git a/lib/fog/aws/parsers/cloud_watch/put_metric_data.rb b/lib/fog/aws/parsers/cloud_watch/put_metric_data.rb index b8b7b0d74..97707dd99 100644 --- a/lib/fog/aws/parsers/cloud_watch/put_metric_data.rb +++ b/lib/fog/aws/parsers/cloud_watch/put_metric_data.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class PutMetricData < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end diff --git a/lib/fog/aws/parsers/cloud_watch/set_alarm_state.rb b/lib/fog/aws/parsers/cloud_watch/set_alarm_state.rb index 3b3564395..648244496 100644 --- a/lib/fog/aws/parsers/cloud_watch/set_alarm_state.rb +++ b/lib/fog/aws/parsers/cloud_watch/set_alarm_state.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module CloudWatch - class SetAlarmState < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end diff --git a/lib/fog/aws/parsers/compute/allocate_address.rb b/lib/fog/aws/parsers/compute/allocate_address.rb index af690d6ff..0216f1817 100644 --- a/lib/fog/aws/parsers/compute/allocate_address.rb +++ b/lib/fog/aws/parsers/compute/allocate_address.rb @@ -2,16 +2,13 @@ module Fog module Parsers module Compute module AWS - class AllocateAddress < Fog::Parsers::Base - def end_element(name) case name when 'publicIp', 'requestId', 'domain', 'allocationId' @response[name] = value end end - end end end diff --git a/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb b/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb index 714b29bcd..122f8dde0 100644 --- a/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb +++ b/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class AssignPrivateIpAddresses < Fog::Parsers::Base - def end_element(name) case name when 'requestId' @@ -17,7 +15,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/compute/associate_address.rb b/lib/fog/aws/parsers/compute/associate_address.rb index 5a21eb130..236a281ad 100644 --- a/lib/fog/aws/parsers/compute/associate_address.rb +++ b/lib/fog/aws/parsers/compute/associate_address.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class AssociateAddress < Fog::Parsers::Base - def end_element(name) case name when 'requestId', 'associationId' @@ -17,7 +15,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/compute/associate_route_table.rb b/lib/fog/aws/parsers/compute/associate_route_table.rb index 1e559d6f2..5a2143f04 100755 --- a/lib/fog/aws/parsers/compute/associate_route_table.rb +++ b/lib/fog/aws/parsers/compute/associate_route_table.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Compute module AWS - class AssociateRouteTable < Fog::Parsers::Base - def end_element(name) case name when 'requestId', 'associationId' @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/attach_network_interface.rb b/lib/fog/aws/parsers/compute/attach_network_interface.rb index 11cfce0bf..8dee1f70e 100644 --- a/lib/fog/aws/parsers/compute/attach_network_interface.rb +++ b/lib/fog/aws/parsers/compute/attach_network_interface.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class AttachNetworkInterface < Fog::Parsers::Base - def end_element(name) case name when 'requestId', 'attachmentId' diff --git a/lib/fog/aws/parsers/compute/attach_volume.rb b/lib/fog/aws/parsers/compute/attach_volume.rb index f6a118690..dcb5d690c 100644 --- a/lib/fog/aws/parsers/compute/attach_volume.rb +++ b/lib/fog/aws/parsers/compute/attach_volume.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class AttachVolume < Fog::Parsers::Base - def end_element(name) case name when 'attachTime' @@ -13,9 +11,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/basic.rb b/lib/fog/aws/parsers/compute/basic.rb index 0201a829b..d8e638e28 100644 --- a/lib/fog/aws/parsers/compute/basic.rb +++ b/lib/fog/aws/parsers/compute/basic.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class Basic < Fog::Parsers::Base - def end_element(name) case name when 'requestId' @@ -17,7 +15,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb b/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb index 2e5018188..f03e7300c 100644 --- a/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb +++ b/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CancelSpotInstanceRequests < Fog::Parsers::Base - def reset @spot_instance_request = {} @response = { 'spotInstanceRequestSet' => [] } @@ -21,9 +19,7 @@ module Fog @spot_instance_request[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/copy_image.rb b/lib/fog/aws/parsers/compute/copy_image.rb index 1d854e85b..96e21ea91 100644 --- a/lib/fog/aws/parsers/compute/copy_image.rb +++ b/lib/fog/aws/parsers/compute/copy_image.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CopyImage < Fog::Parsers::Base - def end_element(name) case name when 'imageId' @@ -13,9 +11,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/copy_snapshot.rb b/lib/fog/aws/parsers/compute/copy_snapshot.rb index 25f1d4039..f57be2d94 100644 --- a/lib/fog/aws/parsers/compute/copy_snapshot.rb +++ b/lib/fog/aws/parsers/compute/copy_snapshot.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CopySnapshot < Fog::Parsers::Base - def end_element(name) case name when 'snapshotId' @@ -13,9 +11,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/create_dhcp_options.rb b/lib/fog/aws/parsers/compute/create_dhcp_options.rb index b4e0df1cf..acd75c5af 100644 --- a/lib/fog/aws/parsers/compute/create_dhcp_options.rb +++ b/lib/fog/aws/parsers/compute/create_dhcp_options.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CreateDhcpOptions < Fog::Parsers::Base - def reset @dhcp_options = { 'dhcpConfigurationSet' => {}, 'tagSet' => {} } @response = { 'dhcpOptionsSet' => [] } diff --git a/lib/fog/aws/parsers/compute/create_image.rb b/lib/fog/aws/parsers/compute/create_image.rb index 3629854f8..880f1bc29 100644 --- a/lib/fog/aws/parsers/compute/create_image.rb +++ b/lib/fog/aws/parsers/compute/create_image.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Compute module AWS - class CreateImage < Fog::Parsers::Base - def end_element(name) case name when 'instanceId', 'requestId', 'name', 'description', 'noReboot', 'imageId' @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/create_internet_gateway.rb b/lib/fog/aws/parsers/compute/create_internet_gateway.rb index 452b5c622..ed137ed57 100644 --- a/lib/fog/aws/parsers/compute/create_internet_gateway.rb +++ b/lib/fog/aws/parsers/compute/create_internet_gateway.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CreateInternetGateway < Fog::Parsers::Base - def reset @internet_gateway = { 'attachmentSet' => {}, 'tagSet' => {} } @response = { 'internetGatewaySet' => [] } diff --git a/lib/fog/aws/parsers/compute/create_key_pair.rb b/lib/fog/aws/parsers/compute/create_key_pair.rb index 475392ccb..678e375cc 100644 --- a/lib/fog/aws/parsers/compute/create_key_pair.rb +++ b/lib/fog/aws/parsers/compute/create_key_pair.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Compute module AWS - class CreateKeyPair < Fog::Parsers::Base - def end_element(name) case name when 'keyFingerprint', 'keyMaterial', 'keyName', 'requestId' @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/create_route_table.rb b/lib/fog/aws/parsers/compute/create_route_table.rb index 2d3387249..9f9188c9f 100755 --- a/lib/fog/aws/parsers/compute/create_route_table.rb +++ b/lib/fog/aws/parsers/compute/create_route_table.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CreateRouteTable < Fog::Parsers::Base - def reset @in_route_set = false @in_association_set = false diff --git a/lib/fog/aws/parsers/compute/create_security_group.rb b/lib/fog/aws/parsers/compute/create_security_group.rb index 22f887320..c64dd8d06 100644 --- a/lib/fog/aws/parsers/compute/create_security_group.rb +++ b/lib/fog/aws/parsers/compute/create_security_group.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CreateSecurityGroup < Fog::Parsers::Base - def end_element(name) case name when 'return' diff --git a/lib/fog/aws/parsers/compute/create_snapshot.rb b/lib/fog/aws/parsers/compute/create_snapshot.rb index bd4af11ed..4535b2343 100644 --- a/lib/fog/aws/parsers/compute/create_snapshot.rb +++ b/lib/fog/aws/parsers/compute/create_snapshot.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CreateSnapshot < Fog::Parsers::Base - def end_element(name) case name when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId' @@ -17,9 +15,7 @@ module Fog @response[name] = value.to_i end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/create_subnet.rb b/lib/fog/aws/parsers/compute/create_subnet.rb index b01dd75de..1f2aec13b 100644 --- a/lib/fog/aws/parsers/compute/create_subnet.rb +++ b/lib/fog/aws/parsers/compute/create_subnet.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CreateSubnet < Fog::Parsers::Base - def reset @subnet = { 'tagSet' => {} } @response = { 'subnet' => [] } diff --git a/lib/fog/aws/parsers/compute/create_volume.rb b/lib/fog/aws/parsers/compute/create_volume.rb index ac3eeba85..f1d8aea2c 100644 --- a/lib/fog/aws/parsers/compute/create_volume.rb +++ b/lib/fog/aws/parsers/compute/create_volume.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CreateVolume < Fog::Parsers::Base - def end_element(name) case name when 'availabilityZone', 'requestId', 'snapshotId', 'status', 'volumeId', 'volumeType' @@ -17,9 +15,7 @@ module Fog @response[name] = (value == 'true') end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/create_vpc.rb b/lib/fog/aws/parsers/compute/create_vpc.rb index 20e66419b..a2fcb0fe5 100644 --- a/lib/fog/aws/parsers/compute/create_vpc.rb +++ b/lib/fog/aws/parsers/compute/create_vpc.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class CreateVpc < Fog::Parsers::Base - def reset @vpc = { 'tagSet' => {} } @response = { 'vpcSet' => [] } diff --git a/lib/fog/aws/parsers/compute/deregister_image.rb b/lib/fog/aws/parsers/compute/deregister_image.rb index 8ed6cc1a5..176f3eb12 100644 --- a/lib/fog/aws/parsers/compute/deregister_image.rb +++ b/lib/fog/aws/parsers/compute/deregister_image.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Compute module AWS - class DeregisterImage < Fog::Parsers::Base - def end_element(name) case name when 'return', 'requestId', 'imageId' @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_account_attributes.rb b/lib/fog/aws/parsers/compute/describe_account_attributes.rb index 119f6a8e0..29ca5ec17 100644 --- a/lib/fog/aws/parsers/compute/describe_account_attributes.rb +++ b/lib/fog/aws/parsers/compute/describe_account_attributes.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Compute module AWS - class DescribeAccountAttributes < Fog::Parsers::Base def reset @attribute = { 'values' => []} diff --git a/lib/fog/aws/parsers/compute/describe_addresses.rb b/lib/fog/aws/parsers/compute/describe_addresses.rb index 686ec4151..9b9515e87 100644 --- a/lib/fog/aws/parsers/compute/describe_addresses.rb +++ b/lib/fog/aws/parsers/compute/describe_addresses.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeAddresses < Fog::Parsers::Base - def reset @address = {} @response = { 'addressesSet' => [] } @@ -21,9 +19,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_availability_zones.rb b/lib/fog/aws/parsers/compute/describe_availability_zones.rb index e85612404..16484e870 100644 --- a/lib/fog/aws/parsers/compute/describe_availability_zones.rb +++ b/lib/fog/aws/parsers/compute/describe_availability_zones.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Compute module AWS - class DescribeAvailabilityZones < Fog::Parsers::Base def start_element(name, attrs = []) case name @@ -34,9 +33,7 @@ module Fog @in_message_set = false end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_dhcp_options.rb b/lib/fog/aws/parsers/compute/describe_dhcp_options.rb index ee200021b..1101ab0d2 100644 --- a/lib/fog/aws/parsers/compute/describe_dhcp_options.rb +++ b/lib/fog/aws/parsers/compute/describe_dhcp_options.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeDhcpOptions < Fog::Parsers::Base - def reset @dhcp_options = { 'dhcpConfigurationSet' => {}, 'tagSet' => {} } @response = { 'dhcpOptionsSet' => [] } diff --git a/lib/fog/aws/parsers/compute/describe_images.rb b/lib/fog/aws/parsers/compute/describe_images.rb index d17c9df3a..bcd9fd81f 100644 --- a/lib/fog/aws/parsers/compute/describe_images.rb +++ b/lib/fog/aws/parsers/compute/describe_images.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeImages < Fog::Parsers::Base - def reset @block_device_mapping = {} @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} } diff --git a/lib/fog/aws/parsers/compute/describe_instance_status.rb b/lib/fog/aws/parsers/compute/describe_instance_status.rb index f5606f5e0..502d6a126 100644 --- a/lib/fog/aws/parsers/compute/describe_instance_status.rb +++ b/lib/fog/aws/parsers/compute/describe_instance_status.rb @@ -3,7 +3,6 @@ module Fog module Compute module AWS class DescribeInstanceStatus < Fog::Parsers::Base - def new_instance! @instance = { 'instanceState' => {}, 'systemStatus' => { 'details' => [] }, 'instanceStatus' => { 'details' => [] }, 'eventsSet' => [] } end diff --git a/lib/fog/aws/parsers/compute/describe_instances.rb b/lib/fog/aws/parsers/compute/describe_instances.rb index a1fb88dbd..214aa74f5 100644 --- a/lib/fog/aws/parsers/compute/describe_instances.rb +++ b/lib/fog/aws/parsers/compute/describe_instances.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeInstances < Fog::Parsers::Base - def reset @block_device_mapping = {} @network_interface = {} @@ -117,9 +115,7 @@ module Fog @instance['instanceState']['name'] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_internet_gateways.rb b/lib/fog/aws/parsers/compute/describe_internet_gateways.rb index 28169c395..07b7255b5 100644 --- a/lib/fog/aws/parsers/compute/describe_internet_gateways.rb +++ b/lib/fog/aws/parsers/compute/describe_internet_gateways.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeInternetGateways < Fog::Parsers::Base - def reset @internet_gateway = { 'attachmentSet' => {}, 'tagSet' => {} } @response = { 'internetGatewaySet' => [] } diff --git a/lib/fog/aws/parsers/compute/describe_key_pairs.rb b/lib/fog/aws/parsers/compute/describe_key_pairs.rb index 01e75838b..21be7ab20 100644 --- a/lib/fog/aws/parsers/compute/describe_key_pairs.rb +++ b/lib/fog/aws/parsers/compute/describe_key_pairs.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeKeyPairs < Fog::Parsers::Base - def reset @key = {} @response = { 'keySet' => [] } @@ -21,9 +19,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb b/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb index bbb011649..966a17475 100644 --- a/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb +++ b/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Compute module AWS - class DescribeNetworkInterfaceAttribute < NetworkInterfaceParser def reset @response = { } diff --git a/lib/fog/aws/parsers/compute/describe_placement_groups.rb b/lib/fog/aws/parsers/compute/describe_placement_groups.rb index 8d94f6cac..7901081a8 100644 --- a/lib/fog/aws/parsers/compute/describe_placement_groups.rb +++ b/lib/fog/aws/parsers/compute/describe_placement_groups.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribePlacementGroups < Fog::Parsers::Base - def reset @placement_group = {} @response = { 'placementGroupSet' => [] } @@ -21,9 +19,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_regions.rb b/lib/fog/aws/parsers/compute/describe_regions.rb index efb0c99ac..f0147269d 100644 --- a/lib/fog/aws/parsers/compute/describe_regions.rb +++ b/lib/fog/aws/parsers/compute/describe_regions.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeRegions < Fog::Parsers::Base - def reset @region = {} @response = { 'regionInfo' => [] } @@ -21,9 +19,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_reserved_instances.rb b/lib/fog/aws/parsers/compute/describe_reserved_instances.rb index 26038dd75..3546abf66 100644 --- a/lib/fog/aws/parsers/compute/describe_reserved_instances.rb +++ b/lib/fog/aws/parsers/compute/describe_reserved_instances.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeReservedInstances < Fog::Parsers::Base - def get_default_item {'tagSet' => {}, 'recurringCharges' => {}} end @@ -52,11 +50,8 @@ module Fog when 'start','end' @reserved_instance[name] = Time.parse(value) end - end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb b/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb index 3cfac71d7..3f9e6c8ff 100644 --- a/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb +++ b/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeReservedInstancesOfferings < Fog::Parsers::Base - def reset @reserved_instances_offering = {} @response = { 'reservedInstancesOfferingsSet' => [] } @@ -25,9 +23,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_route_tables.rb b/lib/fog/aws/parsers/compute/describe_route_tables.rb index c32ee37ac..924a51f1f 100755 --- a/lib/fog/aws/parsers/compute/describe_route_tables.rb +++ b/lib/fog/aws/parsers/compute/describe_route_tables.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeRouteTables < Fog::Parsers::Base - def reset @association = { 'routeTableAssociationId' => nil, 'routeTableId' => nil, 'subnetId' => nil, 'main' => false } @in_association_set = false @@ -76,9 +74,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_security_groups.rb b/lib/fog/aws/parsers/compute/describe_security_groups.rb index 059e396f9..b253ad580 100644 --- a/lib/fog/aws/parsers/compute/describe_security_groups.rb +++ b/lib/fog/aws/parsers/compute/describe_security_groups.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeSecurityGroups < Fog::Parsers::Base - def reset @group = {} @ip_permission = { 'groups' => [], 'ipRanges' => []} @@ -91,9 +89,7 @@ module Fog @group[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_snapshots.rb b/lib/fog/aws/parsers/compute/describe_snapshots.rb index 0d8f5fb0f..7057d59dd 100644 --- a/lib/fog/aws/parsers/compute/describe_snapshots.rb +++ b/lib/fog/aws/parsers/compute/describe_snapshots.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeSnapshots < Fog::Parsers::Base - def reset @response = { 'snapshotSet' => [] } @snapshot = { 'tagSet' => {} } @@ -47,9 +45,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_spot_price_history.rb b/lib/fog/aws/parsers/compute/describe_spot_price_history.rb index 3cb7af50c..53ab50d74 100644 --- a/lib/fog/aws/parsers/compute/describe_spot_price_history.rb +++ b/lib/fog/aws/parsers/compute/describe_spot_price_history.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeSpotPriceHistory < Fog::Parsers::Base - def reset @spot_price = {} @response = { 'spotPriceHistorySet' => [] } @@ -25,9 +23,7 @@ module Fog @spot_price[name] = Time.parse(value) end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_subnets.rb b/lib/fog/aws/parsers/compute/describe_subnets.rb index 55057e0a5..269233b45 100644 --- a/lib/fog/aws/parsers/compute/describe_subnets.rb +++ b/lib/fog/aws/parsers/compute/describe_subnets.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeSubnets < Fog::Parsers::Base - def reset @subnet = { 'tagSet' => {} } @response = { 'subnetSet' => [] } diff --git a/lib/fog/aws/parsers/compute/describe_tags.rb b/lib/fog/aws/parsers/compute/describe_tags.rb index c071076c5..7859f88c5 100644 --- a/lib/fog/aws/parsers/compute/describe_tags.rb +++ b/lib/fog/aws/parsers/compute/describe_tags.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeTags < Fog::Parsers::Base - def reset @tag = {} @response = { 'tagSet' => [] } @@ -21,9 +19,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_volumes.rb b/lib/fog/aws/parsers/compute/describe_volumes.rb index 77ac8b740..266e75987 100644 --- a/lib/fog/aws/parsers/compute/describe_volumes.rb +++ b/lib/fog/aws/parsers/compute/describe_volumes.rb @@ -64,9 +64,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb b/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb index 450cb68f5..db11470c3 100644 --- a/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb +++ b/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Compute module AWS - class DescribeVpcAttribute < Fog::Parsers::Base def reset @response = { } diff --git a/lib/fog/aws/parsers/compute/describe_vpcs.rb b/lib/fog/aws/parsers/compute/describe_vpcs.rb index 387f40f61..3e5f4642d 100644 --- a/lib/fog/aws/parsers/compute/describe_vpcs.rb +++ b/lib/fog/aws/parsers/compute/describe_vpcs.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DescribeVpcs < Fog::Parsers::Base - def reset @vpc = { 'tagSet' => {} } @response = { 'vpcSet' => [] } diff --git a/lib/fog/aws/parsers/compute/detach_volume.rb b/lib/fog/aws/parsers/compute/detach_volume.rb index 920f84558..5def4620c 100644 --- a/lib/fog/aws/parsers/compute/detach_volume.rb +++ b/lib/fog/aws/parsers/compute/detach_volume.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class DetachVolume < Fog::Parsers::Base - def end_element(name) case name when 'attachTime' @@ -13,9 +11,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/get_console_output.rb b/lib/fog/aws/parsers/compute/get_console_output.rb index 43a22b7fc..e7533de6c 100644 --- a/lib/fog/aws/parsers/compute/get_console_output.rb +++ b/lib/fog/aws/parsers/compute/get_console_output.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class GetConsoleOutput < Fog::Parsers::Base - def reset @response = {} end @@ -19,9 +17,7 @@ module Fog @response[name] = Time.parse(value) end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/get_password_data.rb b/lib/fog/aws/parsers/compute/get_password_data.rb index 981c99491..688ba5c3e 100644 --- a/lib/fog/aws/parsers/compute/get_password_data.rb +++ b/lib/fog/aws/parsers/compute/get_password_data.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class GetPasswordData < Fog::Parsers::Base - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response[name] = Time.parse(@value) end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/import_key_pair.rb b/lib/fog/aws/parsers/compute/import_key_pair.rb index 2c0d85021..9d8a68792 100644 --- a/lib/fog/aws/parsers/compute/import_key_pair.rb +++ b/lib/fog/aws/parsers/compute/import_key_pair.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Compute module AWS - class ImportKeyPair < Fog::Parsers::Base - def end_element(name) case name when 'keyFingerprint', 'keyName', 'requestId' @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb b/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb index f6964b254..3065401e0 100644 --- a/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb +++ b/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class MonitorUnmonitorInstances < Fog::Parsers::Base - def reset @response = {} @instance_set = [] @@ -26,9 +24,7 @@ module Fog @response['instancesSet'] = @instance_set end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/network_acl_parser.rb b/lib/fog/aws/parsers/compute/network_acl_parser.rb index fda3ea845..a4e519a93 100644 --- a/lib/fog/aws/parsers/compute/network_acl_parser.rb +++ b/lib/fog/aws/parsers/compute/network_acl_parser.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Compute module AWS - class NetworkAclParser < Fog::Parsers::Base def reset_nacl @network_acl = { 'associationSet' => [], 'entrySet' => [], 'tagSet' => {} } @@ -97,7 +96,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/compute/network_interface_parser.rb b/lib/fog/aws/parsers/compute/network_interface_parser.rb index 96c89502a..bd7568eec 100644 --- a/lib/fog/aws/parsers/compute/network_interface_parser.rb +++ b/lib/fog/aws/parsers/compute/network_interface_parser.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class NetworkInterfaceParser < Fog::Parsers::Base - def reset_nic @nic = { 'groupSet' => {}, 'attachment' => {}, 'association' => {}, 'tagSet' => {} } @in_tag_set = false diff --git a/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb b/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb index 09c42a18d..7f42ff433 100644 --- a/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb +++ b/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class PurchaseReservedInstancesOffering < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/register_image.rb b/lib/fog/aws/parsers/compute/register_image.rb index 1c8eb9ad2..efdf1ab46 100644 --- a/lib/fog/aws/parsers/compute/register_image.rb +++ b/lib/fog/aws/parsers/compute/register_image.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Compute module AWS - class RegisterImage < Fog::Parsers::Base - def end_element(name) case name when 'requestId', 'imageId' @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/run_instances.rb b/lib/fog/aws/parsers/compute/run_instances.rb index 7bce583c6..5e188053e 100644 --- a/lib/fog/aws/parsers/compute/run_instances.rb +++ b/lib/fog/aws/parsers/compute/run_instances.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class RunInstances < Fog::Parsers::Base - def reset @block_device_mapping = {} @network_interfaces = {} @@ -85,9 +83,7 @@ module Fog @instance['associatePublicIP'] = (value == 'true') end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb b/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb index e5154aea1..314c6f322 100644 --- a/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb +++ b/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class SpotDatafeedSubscription < Fog::Parsers::Base - def reset @response = { 'spotDatafeedSubscription' => {} } end @@ -20,9 +18,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/spot_instance_requests.rb b/lib/fog/aws/parsers/compute/spot_instance_requests.rb index 53454a0cb..0e6f3c37d 100644 --- a/lib/fog/aws/parsers/compute/spot_instance_requests.rb +++ b/lib/fog/aws/parsers/compute/spot_instance_requests.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class SpotInstanceRequests < Fog::Parsers::Base - def reset @block_device_mapping = {} @context = [] @@ -62,9 +60,7 @@ module Fog @spot_instance_request[name] = value.to_f end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/start_stop_instances.rb b/lib/fog/aws/parsers/compute/start_stop_instances.rb index 1d050c38a..70d1a2d60 100644 --- a/lib/fog/aws/parsers/compute/start_stop_instances.rb +++ b/lib/fog/aws/parsers/compute/start_stop_instances.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class StartStopInstances < Fog::Parsers::Base - def reset @instance = { 'currentState' => {}, 'previousState' => {} } @response = { 'instancesSet' => [] } @@ -32,9 +30,7 @@ module Fog @instance[@state][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/compute/terminate_instances.rb b/lib/fog/aws/parsers/compute/terminate_instances.rb index d8ce22b1a..dfdbb52fa 100644 --- a/lib/fog/aws/parsers/compute/terminate_instances.rb +++ b/lib/fog/aws/parsers/compute/terminate_instances.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module AWS - class TerminateInstances < Fog::Parsers::Base - def reset @instance = { 'previousState' => {}, 'currentState' => {} } @response = { 'instancesSet' => [] } @@ -46,9 +44,7 @@ module Fog @in_current_state = false end end - end - end end end diff --git a/lib/fog/aws/parsers/dns/change_resource_record_sets.rb b/lib/fog/aws/parsers/dns/change_resource_record_sets.rb index c02a862a3..6f863240e 100644 --- a/lib/fog/aws/parsers/dns/change_resource_record_sets.rb +++ b/lib/fog/aws/parsers/dns/change_resource_record_sets.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module AWS - class ChangeResourceRecordSets < Fog::Parsers::Base - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/dns/create_hosted_zone.rb b/lib/fog/aws/parsers/dns/create_hosted_zone.rb index 290b09cec..a835e63f6 100644 --- a/lib/fog/aws/parsers/dns/create_hosted_zone.rb +++ b/lib/fog/aws/parsers/dns/create_hosted_zone.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module AWS - class CreateHostedZone < Fog::Parsers::Base - def reset @hosted_zone = {} @change_info = {} @@ -46,9 +44,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/dns/delete_hosted_zone.rb b/lib/fog/aws/parsers/dns/delete_hosted_zone.rb index 9c65d85b9..0ed53e9fb 100644 --- a/lib/fog/aws/parsers/dns/delete_hosted_zone.rb +++ b/lib/fog/aws/parsers/dns/delete_hosted_zone.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module AWS - class DeleteHostedZone < Fog::Parsers::Base - def reset @response = {} @response['ChangeInfo'] = {} @@ -16,9 +14,7 @@ module Fog @response['ChangeInfo'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/dns/get_change.rb b/lib/fog/aws/parsers/dns/get_change.rb index 7de06f33f..3e46d6a47 100644 --- a/lib/fog/aws/parsers/dns/get_change.rb +++ b/lib/fog/aws/parsers/dns/get_change.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module AWS - class GetChange < Fog::Parsers::Base - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/dns/get_hosted_zone.rb b/lib/fog/aws/parsers/dns/get_hosted_zone.rb index 16516750e..f97f45c10 100644 --- a/lib/fog/aws/parsers/dns/get_hosted_zone.rb +++ b/lib/fog/aws/parsers/dns/get_hosted_zone.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module AWS - class GetHostedZone < Fog::Parsers::Base - def reset @hosted_zone = {} @name_servers = [] @@ -36,9 +34,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/dns/list_hosted_zones.rb b/lib/fog/aws/parsers/dns/list_hosted_zones.rb index 67a5a8b0e..fd709b574 100644 --- a/lib/fog/aws/parsers/dns/list_hosted_zones.rb +++ b/lib/fog/aws/parsers/dns/list_hosted_zones.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module AWS - class ListHostedZones < Fog::Parsers::Base - def reset @hosted_zones = [] @zone = {} @@ -28,9 +26,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/dns/list_resource_record_sets.rb b/lib/fog/aws/parsers/dns/list_resource_record_sets.rb index ac80ba5d6..e41e1d698 100644 --- a/lib/fog/aws/parsers/dns/list_resource_record_sets.rb +++ b/lib/fog/aws/parsers/dns/list_resource_record_sets.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module AWS - class ListResourceRecordSets < Fog::Parsers::Base - def reset @resource_record = [] @resource_record_set = {} @@ -47,9 +45,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/elasticache/authorize_cache_security_group_ingress.rb b/lib/fog/aws/parsers/elasticache/authorize_cache_security_group_ingress.rb index c3aaf99d8..c4f19d297 100644 --- a/lib/fog/aws/parsers/elasticache/authorize_cache_security_group_ingress.rb +++ b/lib/fog/aws/parsers/elasticache/authorize_cache_security_group_ingress.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module Elasticache - require 'fog/aws/parsers/elasticache/security_group_parser' class AuthorizeCacheSecurityGroupIngress < Fog::Parsers::AWS::Elasticache::SecurityGroupParser - def end_element(name) case name when 'CacheSecurityGroup' then @@ -15,11 +13,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/elasticache/base.rb b/lib/fog/aws/parsers/elasticache/base.rb index 9cac1460c..af49f533b 100644 --- a/lib/fog/aws/parsers/elasticache/base.rb +++ b/lib/fog/aws/parsers/elasticache/base.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module Elasticache - # Base parser for ResponseMetadata, RequestId class Base < Fog::Parsers::Base - def reset super @response = { 'ResponseMetadata' => {} } @@ -23,9 +21,7 @@ module Fog super end end - end - end end end diff --git a/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb b/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb index 72d72e9f0..cfc4c6871 100644 --- a/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb +++ b/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/base' class CacheClusterParser < Base - def reset super reset_cache_cluster @@ -26,7 +25,6 @@ module Fog when 'CacheNode'; then @cache_node = {} when 'PendingModifiedValues'; then @pending_values = {} end - end def end_element(name) diff --git a/lib/fog/aws/parsers/elasticache/create_cache_subnet_group.rb b/lib/fog/aws/parsers/elasticache/create_cache_subnet_group.rb index 86887d7c6..658ee8b74 100644 --- a/lib/fog/aws/parsers/elasticache/create_cache_subnet_group.rb +++ b/lib/fog/aws/parsers/elasticache/create_cache_subnet_group.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module Elasticache - require 'fog/aws/parsers/elasticache/subnet_group_parser' class CreateCacheSubnetGroup < Fog::Parsers::AWS::Elasticache::SubnetGroupParser - def reset @response = { 'CreateCacheSubnetGroupResult' => {}, 'ResponseMetadata' => {} } super @@ -26,11 +24,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/elasticache/describe_cache_clusters.rb b/lib/fog/aws/parsers/elasticache/describe_cache_clusters.rb index 56a57bac9..9c4facdcd 100644 --- a/lib/fog/aws/parsers/elasticache/describe_cache_clusters.rb +++ b/lib/fog/aws/parsers/elasticache/describe_cache_clusters.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/cache_cluster_parser' class DescribeCacheClusters < CacheClusterParser - def reset super @response['CacheClusters'] = [] diff --git a/lib/fog/aws/parsers/elasticache/describe_cache_parameters.rb b/lib/fog/aws/parsers/elasticache/describe_cache_parameters.rb index 28131ff7d..f651f0fe3 100644 --- a/lib/fog/aws/parsers/elasticache/describe_cache_parameters.rb +++ b/lib/fog/aws/parsers/elasticache/describe_cache_parameters.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/engine_defaults_parser' class DescribeCacheParameters < EngineDefaultsParser - def end_element(name) case name when 'DescribeCacheParametersResult' diff --git a/lib/fog/aws/parsers/elasticache/describe_cache_subnet_groups.rb b/lib/fog/aws/parsers/elasticache/describe_cache_subnet_groups.rb index ab37333ba..f2368ba0c 100644 --- a/lib/fog/aws/parsers/elasticache/describe_cache_subnet_groups.rb +++ b/lib/fog/aws/parsers/elasticache/describe_cache_subnet_groups.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module Elasticache - require 'fog/aws/parsers/elasticache/subnet_group_parser' class DescribeCacheSubnetGroups < Fog::Parsers::AWS::Elasticache::SubnetGroupParser - def reset @response = { 'DescribeCacheSubnetGroupsResult' => {'CacheSubnetGroups' => []}, 'ResponseMetadata' => {} } super @@ -28,9 +26,7 @@ module Fog else super end - end - end end end diff --git a/lib/fog/aws/parsers/elasticache/describe_engine_default_parameters.rb b/lib/fog/aws/parsers/elasticache/describe_engine_default_parameters.rb index 90393671a..9773140aa 100644 --- a/lib/fog/aws/parsers/elasticache/describe_engine_default_parameters.rb +++ b/lib/fog/aws/parsers/elasticache/describe_engine_default_parameters.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/engine_defaults_parser' class DescribeEngineDefaultParameters < EngineDefaultsParser - def end_element(name) case name when 'EngineDefaults' diff --git a/lib/fog/aws/parsers/elasticache/describe_parameter_groups.rb b/lib/fog/aws/parsers/elasticache/describe_parameter_groups.rb index 81040b746..b4fa476cc 100644 --- a/lib/fog/aws/parsers/elasticache/describe_parameter_groups.rb +++ b/lib/fog/aws/parsers/elasticache/describe_parameter_groups.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/parameter_group_parser' class DescribeParameterGroups < ParameterGroupParser - def reset super @response['CacheParameterGroups'] = [] diff --git a/lib/fog/aws/parsers/elasticache/describe_reserved_cache_nodes.rb b/lib/fog/aws/parsers/elasticache/describe_reserved_cache_nodes.rb index 3de15b7d3..a5b885eca 100644 --- a/lib/fog/aws/parsers/elasticache/describe_reserved_cache_nodes.rb +++ b/lib/fog/aws/parsers/elasticache/describe_reserved_cache_nodes.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module Elasticache - class DescribeReservedCacheNodes < Fog::Parsers::Base - def reset @reserved_node = {} @response = { 'ReservedCacheNodes' => [] } @@ -27,9 +25,7 @@ module Fog @reserved_node[name] = Time.parse(@value) end end - end - end end end diff --git a/lib/fog/aws/parsers/elasticache/describe_security_groups.rb b/lib/fog/aws/parsers/elasticache/describe_security_groups.rb index 70942a4e1..6651eaf7c 100644 --- a/lib/fog/aws/parsers/elasticache/describe_security_groups.rb +++ b/lib/fog/aws/parsers/elasticache/describe_security_groups.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/security_group_parser' class DescribeSecurityGroups < SecurityGroupParser - def reset super @response['CacheSecurityGroups'] = [] diff --git a/lib/fog/aws/parsers/elasticache/engine_defaults_parser.rb b/lib/fog/aws/parsers/elasticache/engine_defaults_parser.rb index 085723e8a..7d742a577 100644 --- a/lib/fog/aws/parsers/elasticache/engine_defaults_parser.rb +++ b/lib/fog/aws/parsers/elasticache/engine_defaults_parser.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/base' class EngineDefaultsParser < Base - def reset super reset_engine_defaults diff --git a/lib/fog/aws/parsers/elasticache/event_list.rb b/lib/fog/aws/parsers/elasticache/event_list.rb index 0ba3bcfbb..1a30c11ae 100644 --- a/lib/fog/aws/parsers/elasticache/event_list.rb +++ b/lib/fog/aws/parsers/elasticache/event_list.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/base' class EventListParser < Base - def reset super @response['Events'] = [] @@ -16,7 +15,6 @@ module Fog case name when 'Event'; then @event = {} end - end def end_element(name) diff --git a/lib/fog/aws/parsers/elasticache/modify_parameter_group.rb b/lib/fog/aws/parsers/elasticache/modify_parameter_group.rb index b15aa0586..4853264d1 100644 --- a/lib/fog/aws/parsers/elasticache/modify_parameter_group.rb +++ b/lib/fog/aws/parsers/elasticache/modify_parameter_group.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/parameter_group_parser' class ModifyParameterGroup < ParameterGroupParser - def reset super @response['ModifyCacheParameterGroupResult'] = [] diff --git a/lib/fog/aws/parsers/elasticache/parameter_group_parser.rb b/lib/fog/aws/parsers/elasticache/parameter_group_parser.rb index d53f5e0f5..0b8e8acc4 100644 --- a/lib/fog/aws/parsers/elasticache/parameter_group_parser.rb +++ b/lib/fog/aws/parsers/elasticache/parameter_group_parser.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/base' class ParameterGroupParser < Base - def reset super reset_parameter_group diff --git a/lib/fog/aws/parsers/elasticache/reset_parameter_group.rb b/lib/fog/aws/parsers/elasticache/reset_parameter_group.rb index 9090e9be2..ff49e00e4 100644 --- a/lib/fog/aws/parsers/elasticache/reset_parameter_group.rb +++ b/lib/fog/aws/parsers/elasticache/reset_parameter_group.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/parameter_group_parser' class ResetParameterGroup < ParameterGroupParser - def reset super @response['ResetCacheParameterGroupResult'] = [] diff --git a/lib/fog/aws/parsers/elasticache/security_group_parser.rb b/lib/fog/aws/parsers/elasticache/security_group_parser.rb index b33ec87e1..b9b9f3e1c 100644 --- a/lib/fog/aws/parsers/elasticache/security_group_parser.rb +++ b/lib/fog/aws/parsers/elasticache/security_group_parser.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/base' class SecurityGroupParser < Fog::Parsers::Base - def reset super reset_security_group @@ -20,7 +19,6 @@ module Fog case name when 'EC2SecurityGroup'; then @ec2_group = {} end - end def end_element(name) diff --git a/lib/fog/aws/parsers/elasticache/single_cache_cluster.rb b/lib/fog/aws/parsers/elasticache/single_cache_cluster.rb index 49673c742..01abd2891 100644 --- a/lib/fog/aws/parsers/elasticache/single_cache_cluster.rb +++ b/lib/fog/aws/parsers/elasticache/single_cache_cluster.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/cache_cluster_parser' class SingleCacheCluster < CacheClusterParser - def end_element(name) case name when 'CacheCluster' diff --git a/lib/fog/aws/parsers/elasticache/single_parameter_group.rb b/lib/fog/aws/parsers/elasticache/single_parameter_group.rb index ad9200208..36b0403da 100644 --- a/lib/fog/aws/parsers/elasticache/single_parameter_group.rb +++ b/lib/fog/aws/parsers/elasticache/single_parameter_group.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/parameter_group_parser' class SingleParameterGroup < ParameterGroupParser - def end_element(name) case name when 'CacheParameterGroup' diff --git a/lib/fog/aws/parsers/elasticache/single_security_group.rb b/lib/fog/aws/parsers/elasticache/single_security_group.rb index 5d80778b0..8c03d3042 100644 --- a/lib/fog/aws/parsers/elasticache/single_security_group.rb +++ b/lib/fog/aws/parsers/elasticache/single_security_group.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/elasticache/security_group_parser' class SingleSecurityGroup < SecurityGroupParser - def reset super @response = { 'ResponseMetadata' => {} } diff --git a/lib/fog/aws/parsers/elasticache/subnet_group_parser.rb b/lib/fog/aws/parsers/elasticache/subnet_group_parser.rb index 304ca8eaa..c2c220c6f 100644 --- a/lib/fog/aws/parsers/elasticache/subnet_group_parser.rb +++ b/lib/fog/aws/parsers/elasticache/subnet_group_parser.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module Elasticache - class SubnetGroupParser < Fog::Parsers::Base - def reset @cache_subnet_group = fresh_subnet_group end @@ -30,7 +28,6 @@ module Fog def fresh_subnet_group {'Subnets' => []} end - end end end diff --git a/lib/fog/aws/parsers/elb/apply_security_groups_to_load_balancer.rb b/lib/fog/aws/parsers/elb/apply_security_groups_to_load_balancer.rb index 79d470eab..4d2124f9a 100644 --- a/lib/fog/aws/parsers/elb/apply_security_groups_to_load_balancer.rb +++ b/lib/fog/aws/parsers/elb/apply_security_groups_to_load_balancer.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class ApplySecurityGroupsToLoadBalancer < Fog::Parsers::Base - def reset @response = { 'ApplySecurityGroupsToLoadBalancerResult' => { 'SecurityGroups' => [] }, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/attach_load_balancer_to_subnets.rb b/lib/fog/aws/parsers/elb/attach_load_balancer_to_subnets.rb index 22245c87a..f2450fffb 100644 --- a/lib/fog/aws/parsers/elb/attach_load_balancer_to_subnets.rb +++ b/lib/fog/aws/parsers/elb/attach_load_balancer_to_subnets.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class AttachLoadBalancerToSubnets < Fog::Parsers::Base - def reset @response = { 'AttachLoadBalancerToSubnetsResult' => { 'Subnets' => [] }, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/configure_health_check.rb b/lib/fog/aws/parsers/elb/configure_health_check.rb index b2934fd70..ef3b0451f 100644 --- a/lib/fog/aws/parsers/elb/configure_health_check.rb +++ b/lib/fog/aws/parsers/elb/configure_health_check.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class ConfigureHealthCheck < Fog::Parsers::Base - def reset @health_check = {} @response = { 'ConfigureHealthCheckResult' => {}, 'ResponseMetadata' => {} } @@ -28,9 +26,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/create_load_balancer.rb b/lib/fog/aws/parsers/elb/create_load_balancer.rb index 27aa2117a..0b38943b7 100644 --- a/lib/fog/aws/parsers/elb/create_load_balancer.rb +++ b/lib/fog/aws/parsers/elb/create_load_balancer.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class CreateLoadBalancer < Fog::Parsers::Base - def reset @response = { 'CreateLoadBalancerResult' => {}, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/delete_load_balancer.rb b/lib/fog/aws/parsers/elb/delete_load_balancer.rb index a7aa65072..ab0fe04cd 100644 --- a/lib/fog/aws/parsers/elb/delete_load_balancer.rb +++ b/lib/fog/aws/parsers/elb/delete_load_balancer.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DeleteLoadBalancer < Fog::Parsers::Base - def reset @response = { 'DeleteLoadBalancerResult' => nil, 'ResponseMetadata' => {} } end @@ -15,9 +13,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb b/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb index 170ca53bb..7ae417121 100644 --- a/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb +++ b/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DeregisterInstancesFromLoadBalancer < Fog::Parsers::Base - def reset @response = { 'DeregisterInstancesFromLoadBalancerResult' => { 'Instances' => [] }, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/describe_instance_health.rb b/lib/fog/aws/parsers/elb/describe_instance_health.rb index 4c01831bb..4e0f9b88a 100644 --- a/lib/fog/aws/parsers/elb/describe_instance_health.rb +++ b/lib/fog/aws/parsers/elb/describe_instance_health.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DescribeInstanceHealth < Fog::Parsers::Base - def reset @response = { 'DescribeInstanceHealthResult' => { 'InstanceStates' => [] }, 'ResponseMetadata' => {} } @instance_state = {} @@ -21,9 +19,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/describe_load_balancer_attributes.rb b/lib/fog/aws/parsers/elb/describe_load_balancer_attributes.rb index fc3d5a509..e3569c380 100644 --- a/lib/fog/aws/parsers/elb/describe_load_balancer_attributes.rb +++ b/lib/fog/aws/parsers/elb/describe_load_balancer_attributes.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DescribeLoadBalancerAttributes < Fog::Parsers::Base - def reset @response = { 'DescribeLoadBalancerAttributesResult' => { 'LoadBalancerAttributes' => {} }, 'ResponseMetadata' => {} } @stack = [] @@ -42,9 +40,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/describe_load_balancer_policies.rb b/lib/fog/aws/parsers/elb/describe_load_balancer_policies.rb index 2317827f6..ecdbd68ff 100644 --- a/lib/fog/aws/parsers/elb/describe_load_balancer_policies.rb +++ b/lib/fog/aws/parsers/elb/describe_load_balancer_policies.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DescribeLoadBalancerPolicies < Fog::Parsers::Base - def reset reset_policy reset_policy_attribute_description @@ -55,9 +53,7 @@ module Fog @response['DescribeLoadBalancerPoliciesResult'] = @results end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/describe_load_balancer_policy_types.rb b/lib/fog/aws/parsers/elb/describe_load_balancer_policy_types.rb index e1184bc4b..11170c525 100644 --- a/lib/fog/aws/parsers/elb/describe_load_balancer_policy_types.rb +++ b/lib/fog/aws/parsers/elb/describe_load_balancer_policy_types.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DescribeLoadBalancerPolicyTypes < Fog::Parsers::Base - def reset reset_policy_type reset_policy_attribute_type_description @@ -61,9 +59,7 @@ module Fog @response['DescribeLoadBalancerPolicyTypesResult'] = @results end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/describe_load_balancers.rb b/lib/fog/aws/parsers/elb/describe_load_balancers.rb index 4144cf528..7e539e51a 100644 --- a/lib/fog/aws/parsers/elb/describe_load_balancers.rb +++ b/lib/fog/aws/parsers/elb/describe_load_balancers.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DescribeLoadBalancers < Fog::Parsers::Base - def reset reset_load_balancer reset_listener_description @@ -162,9 +160,7 @@ module Fog @response['DescribeLoadBalancersResult'] = @results end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/detach_load_balancer_from_subnets.rb b/lib/fog/aws/parsers/elb/detach_load_balancer_from_subnets.rb index fdea5bacd..a687dc176 100644 --- a/lib/fog/aws/parsers/elb/detach_load_balancer_from_subnets.rb +++ b/lib/fog/aws/parsers/elb/detach_load_balancer_from_subnets.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DetachLoadBalancerFromSubnets < Fog::Parsers::Base - def reset @response = { 'DetachLoadBalancerFromSubnetsResult' => { 'Subnets' => [] }, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb b/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb index a50f6975e..223ee399d 100644 --- a/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb +++ b/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class DisableAvailabilityZonesForLoadBalancer < Fog::Parsers::Base - def reset @response = { 'DisableAvailabilityZonesForLoadBalancerResult' => { 'AvailabilityZones' => [] }, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/empty.rb b/lib/fog/aws/parsers/elb/empty.rb index 7f344b2b9..7699b4843 100644 --- a/lib/fog/aws/parsers/elb/empty.rb +++ b/lib/fog/aws/parsers/elb/empty.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class Empty < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -19,9 +17,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb b/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb index 17e2ff998..c2d74a9ae 100644 --- a/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb +++ b/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class EnableAvailabilityZonesForLoadBalancer < Fog::Parsers::Base - def reset @response = { 'EnableAvailabilityZonesForLoadBalancerResult' => { 'AvailabilityZones' => [] }, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb b/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb index 083e539f1..00e3c723d 100644 --- a/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb +++ b/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module ELB - class RegisterInstancesWithLoadBalancer < Fog::Parsers::Base - def reset @response = { 'RegisterInstancesWithLoadBalancerResult' => { 'Instances' => [] }, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/emr/add_instance_groups.rb b/lib/fog/aws/parsers/emr/add_instance_groups.rb index c6437797d..2c8a507c0 100644 --- a/lib/fog/aws/parsers/emr/add_instance_groups.rb +++ b/lib/fog/aws/parsers/emr/add_instance_groups.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module EMR - class AddInstanceGroups < Fog::Parsers::Base - def start_element(name, attrs = []) super case name diff --git a/lib/fog/aws/parsers/emr/add_job_flow_steps.rb b/lib/fog/aws/parsers/emr/add_job_flow_steps.rb index 2a93b70f4..6ca604236 100644 --- a/lib/fog/aws/parsers/emr/add_job_flow_steps.rb +++ b/lib/fog/aws/parsers/emr/add_job_flow_steps.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module EMR - class AddJobFlowSteps < Fog::Parsers::Base def end_element(name) case name diff --git a/lib/fog/aws/parsers/emr/describe_job_flows.rb b/lib/fog/aws/parsers/emr/describe_job_flows.rb index e2df70713..20cf57a8f 100644 --- a/lib/fog/aws/parsers/emr/describe_job_flows.rb +++ b/lib/fog/aws/parsers/emr/describe_job_flows.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module EMR - class DescribeJobFlows < Fog::Parsers::Base - def reset @context = [] @contexts = ['BootstrapActions', 'ExecutionStatusDetail', 'Instances', 'Steps', 'InstanceGroups', 'Args'] @@ -133,7 +131,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/emr/modify_instance_groups.rb b/lib/fog/aws/parsers/emr/modify_instance_groups.rb index f4daf4376..af84e51bd 100644 --- a/lib/fog/aws/parsers/emr/modify_instance_groups.rb +++ b/lib/fog/aws/parsers/emr/modify_instance_groups.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module EMR - class ModifyInstanceGroups < Fog::Parsers::Base def end_element(name) case name diff --git a/lib/fog/aws/parsers/emr/run_job_flow.rb b/lib/fog/aws/parsers/emr/run_job_flow.rb index 4ef3a3790..e088eb63d 100644 --- a/lib/fog/aws/parsers/emr/run_job_flow.rb +++ b/lib/fog/aws/parsers/emr/run_job_flow.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module EMR - class RunJobFlow < Fog::Parsers::Base def end_element(name) case name diff --git a/lib/fog/aws/parsers/emr/set_termination_protection.rb b/lib/fog/aws/parsers/emr/set_termination_protection.rb index fc303bca8..cc4374fb6 100644 --- a/lib/fog/aws/parsers/emr/set_termination_protection.rb +++ b/lib/fog/aws/parsers/emr/set_termination_protection.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module EMR - class SetTerminationProtection < Fog::Parsers::Base def end_element(name) case name diff --git a/lib/fog/aws/parsers/emr/terminate_job_flows.rb b/lib/fog/aws/parsers/emr/terminate_job_flows.rb index e555ff891..20c533e34 100644 --- a/lib/fog/aws/parsers/emr/terminate_job_flows.rb +++ b/lib/fog/aws/parsers/emr/terminate_job_flows.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module EMR - class TerminateJobFlows < Fog::Parsers::Base def end_element(name) case name diff --git a/lib/fog/aws/parsers/iam/base_instance_profile.rb b/lib/fog/aws/parsers/iam/base_instance_profile.rb index 94b981eda..cb79aa2e1 100644 --- a/lib/fog/aws/parsers/iam/base_instance_profile.rb +++ b/lib/fog/aws/parsers/iam/base_instance_profile.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class BaseInstanceProfile < Fog::Parsers::Base - def reset super @stack = [] @@ -70,9 +68,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/basic.rb b/lib/fog/aws/parsers/iam/basic.rb index 28049bd2b..43abee310 100644 --- a/lib/fog/aws/parsers/iam/basic.rb +++ b/lib/fog/aws/parsers/iam/basic.rb @@ -2,16 +2,13 @@ module Fog module Parsers module AWS module IAM - class Basic < Fog::Parsers::Base - def end_element(name) case name when 'RequestId' @response[name] = value end end - end end end diff --git a/lib/fog/aws/parsers/iam/create_access_key.rb b/lib/fog/aws/parsers/iam/create_access_key.rb index d23ac1ecf..d25b1a9e9 100644 --- a/lib/fog/aws/parsers/iam/create_access_key.rb +++ b/lib/fog/aws/parsers/iam/create_access_key.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class CreateAccessKey < Fog::Parsers::Base - def reset @response = { 'AccessKey' => {} } end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/create_group.rb b/lib/fog/aws/parsers/iam/create_group.rb index a75172db3..93c0bc708 100644 --- a/lib/fog/aws/parsers/iam/create_group.rb +++ b/lib/fog/aws/parsers/iam/create_group.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class CreateGroup < Fog::Parsers::Base - def reset @response = { 'Group' => {} } end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/create_user.rb b/lib/fog/aws/parsers/iam/create_user.rb index 8afa02435..8a3200c89 100644 --- a/lib/fog/aws/parsers/iam/create_user.rb +++ b/lib/fog/aws/parsers/iam/create_user.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class CreateUser < Fog::Parsers::Base - def reset @response = { 'User' => {} } end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/get_account_summary.rb b/lib/fog/aws/parsers/iam/get_account_summary.rb index 2d10fd969..dcaf02157 100644 --- a/lib/fog/aws/parsers/iam/get_account_summary.rb +++ b/lib/fog/aws/parsers/iam/get_account_summary.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class GetAccountSummary < Fog::Parsers::Base - def reset super @stack = [] @@ -37,9 +35,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/get_group.rb b/lib/fog/aws/parsers/iam/get_group.rb index d35960267..ad189d315 100644 --- a/lib/fog/aws/parsers/iam/get_group.rb +++ b/lib/fog/aws/parsers/iam/get_group.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module IAM - class GetGroup < Fog::Parsers::Base # http://docs.amazonwebservices.com/IAM/latest/APIReference/index.html?API_GetGroup.html @@ -46,9 +45,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/get_group_policy.rb b/lib/fog/aws/parsers/iam/get_group_policy.rb index 8bb0b14c2..5c8ca9946 100644 --- a/lib/fog/aws/parsers/iam/get_group_policy.rb +++ b/lib/fog/aws/parsers/iam/get_group_policy.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module IAM - class GetGroupPolicy < Fog::Parsers::Base # http://docs.amazonwebservices.com/IAM/latest/APIReference/API_GetGroupPolicy.html @@ -24,9 +23,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/get_role_policy.rb b/lib/fog/aws/parsers/iam/get_role_policy.rb index 5971788e4..124cc467c 100644 --- a/lib/fog/aws/parsers/iam/get_role_policy.rb +++ b/lib/fog/aws/parsers/iam/get_role_policy.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class GetRolePolicy < Fog::Parsers::Base - def reset @response = {'Policy' => {}} end @@ -23,9 +21,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/get_user.rb b/lib/fog/aws/parsers/iam/get_user.rb index 1ab68e3be..ec737d921 100644 --- a/lib/fog/aws/parsers/iam/get_user.rb +++ b/lib/fog/aws/parsers/iam/get_user.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module IAM - class GetUser < Fog::Parsers::Base # http://docs.amazonwebservices.com/IAM/latest/APIReference/API_GetUser.html @@ -20,9 +19,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/get_user_policy.rb b/lib/fog/aws/parsers/iam/get_user_policy.rb index 5610cf16e..af26e7b4a 100644 --- a/lib/fog/aws/parsers/iam/get_user_policy.rb +++ b/lib/fog/aws/parsers/iam/get_user_policy.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module IAM - class GetUserPolicy < Fog::Parsers::Base # http://docs.amazonwebservices.com/IAM/latest/APIReference/API_GetUserPolicy.html @@ -24,9 +23,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/instance_profile.rb b/lib/fog/aws/parsers/iam/instance_profile.rb index 1bbdb94e0..4b9b4a629 100644 --- a/lib/fog/aws/parsers/iam/instance_profile.rb +++ b/lib/fog/aws/parsers/iam/instance_profile.rb @@ -2,32 +2,26 @@ module Fog module Parsers module AWS module IAM - require 'fog/aws/parsers/iam/base_instance_profile' class InstanceProfile < Fog::Parsers::AWS::IAM::BaseInstanceProfile - def reset super @response = {} end - def finished_instance_profile(profile) @response['InstanceProfile'] = profile end def end_element(name) - case name when 'RequestId' @response[name] = value end super end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_access_keys.rb b/lib/fog/aws/parsers/iam/list_access_keys.rb index 2d564492f..fb141b3cf 100644 --- a/lib/fog/aws/parsers/iam/list_access_keys.rb +++ b/lib/fog/aws/parsers/iam/list_access_keys.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListAccessKeys < Fog::Parsers::Base - def reset @access_key = {} @response = { 'AccessKeys' => [] } @@ -23,9 +21,7 @@ module Fog response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_account_aliases.rb b/lib/fog/aws/parsers/iam/list_account_aliases.rb index c17933218..55a805870 100644 --- a/lib/fog/aws/parsers/iam/list_account_aliases.rb +++ b/lib/fog/aws/parsers/iam/list_account_aliases.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListAccountAliases < Fog::Parsers::Base - def reset @response = { 'AccountAliases' => [] } end @@ -19,9 +17,7 @@ module Fog response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_groups.rb b/lib/fog/aws/parsers/iam/list_groups.rb index b98d11bb0..b44bde988 100644 --- a/lib/fog/aws/parsers/iam/list_groups.rb +++ b/lib/fog/aws/parsers/iam/list_groups.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListGroups < Fog::Parsers::Base - def reset @group = {} @response = { 'Groups' => [] } @@ -23,9 +21,7 @@ module Fog response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_groups_for_user.rb b/lib/fog/aws/parsers/iam/list_groups_for_user.rb index 6a0e15b8e..645083aba 100644 --- a/lib/fog/aws/parsers/iam/list_groups_for_user.rb +++ b/lib/fog/aws/parsers/iam/list_groups_for_user.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListGroupsForUser < Fog::Parsers::Base - def reset @group_for_user = {} @response = { 'GroupsForUser' => [] } @@ -23,9 +21,7 @@ module Fog response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_instance_profiles.rb b/lib/fog/aws/parsers/iam/list_instance_profiles.rb index feaeb4897..4d0f24dad 100644 --- a/lib/fog/aws/parsers/iam/list_instance_profiles.rb +++ b/lib/fog/aws/parsers/iam/list_instance_profiles.rb @@ -2,16 +2,13 @@ module Fog module Parsers module AWS module IAM - require 'fog/aws/parsers/iam/base_instance_profile' class ListInstanceProfiles < Fog::Parsers::AWS::IAM::BaseInstanceProfile - def reset super @response = {'InstanceProfiles' => []} end - def finished_instance_profile(profile) @response['InstanceProfiles'] << profile end @@ -25,9 +22,7 @@ module Fog end super end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_mfa_devices.rb b/lib/fog/aws/parsers/iam/list_mfa_devices.rb index 2ae74ddb2..08c3592a0 100644 --- a/lib/fog/aws/parsers/iam/list_mfa_devices.rb +++ b/lib/fog/aws/parsers/iam/list_mfa_devices.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListMFADevices < Fog::Parsers::Base - def reset @mfa_device = {} @response = { 'MFADevices' => [] } @@ -25,9 +23,7 @@ module Fog response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_policies.rb b/lib/fog/aws/parsers/iam/list_policies.rb index b59d6d666..13976a14f 100644 --- a/lib/fog/aws/parsers/iam/list_policies.rb +++ b/lib/fog/aws/parsers/iam/list_policies.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListPolicies < Fog::Parsers::Base - def reset @response = { 'PolicyNames' => [] } end @@ -19,9 +17,7 @@ module Fog response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_roles.rb b/lib/fog/aws/parsers/iam/list_roles.rb index 1093e175f..4a8733a10 100644 --- a/lib/fog/aws/parsers/iam/list_roles.rb +++ b/lib/fog/aws/parsers/iam/list_roles.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module IAM - require 'fog/aws/parsers/iam/role_parser' class ListRoles < Fog::Parsers::AWS::IAM::RoleParser - def reset super @response = { 'Roles' => [] } diff --git a/lib/fog/aws/parsers/iam/list_server_certificates.rb b/lib/fog/aws/parsers/iam/list_server_certificates.rb index a9c899e6c..1810a78c0 100644 --- a/lib/fog/aws/parsers/iam/list_server_certificates.rb +++ b/lib/fog/aws/parsers/iam/list_server_certificates.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListServerCertificates < Fog::Parsers::Base - def reset @response = { 'Certificates' => [] } reset_certificate @@ -29,9 +27,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/list_signing_certificates.rb b/lib/fog/aws/parsers/iam/list_signing_certificates.rb index 3c0d376dc..01f451004 100644 --- a/lib/fog/aws/parsers/iam/list_signing_certificates.rb +++ b/lib/fog/aws/parsers/iam/list_signing_certificates.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListSigningCertificates < Fog::Parsers::Base - def reset @signing_certificate = {} @response = { 'SigningCertificates' => [] } @@ -23,7 +21,6 @@ module Fog response[name] = value end end - end end end diff --git a/lib/fog/aws/parsers/iam/list_users.rb b/lib/fog/aws/parsers/iam/list_users.rb index dc69e60ab..ee51adea9 100644 --- a/lib/fog/aws/parsers/iam/list_users.rb +++ b/lib/fog/aws/parsers/iam/list_users.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class ListUsers < Fog::Parsers::Base - def reset @user = {} @response = { 'Users' => [] } @@ -25,9 +23,7 @@ module Fog response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/login_profile.rb b/lib/fog/aws/parsers/iam/login_profile.rb index dddf89ca4..210bda312 100644 --- a/lib/fog/aws/parsers/iam/login_profile.rb +++ b/lib/fog/aws/parsers/iam/login_profile.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class LoginProfile < Fog::Parsers::Base - def reset @response = { 'LoginProfile' => {} } end @@ -19,7 +17,6 @@ module Fog @response[name] = value end end - end end end diff --git a/lib/fog/aws/parsers/iam/role_parser.rb b/lib/fog/aws/parsers/iam/role_parser.rb index 610030959..3660ec2e9 100644 --- a/lib/fog/aws/parsers/iam/role_parser.rb +++ b/lib/fog/aws/parsers/iam/role_parser.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class RoleParser < Fog::Parsers::Base - def reset @role = {} @stack = [] @@ -44,9 +42,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/single_role.rb b/lib/fog/aws/parsers/iam/single_role.rb index a686f7482..4ea4ca015 100644 --- a/lib/fog/aws/parsers/iam/single_role.rb +++ b/lib/fog/aws/parsers/iam/single_role.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module IAM - require 'fog/aws/parsers/iam/role_parser' class SingleRole < Fog::Parsers::AWS::IAM::RoleParser - def reset super @response = { 'Role' => {} } diff --git a/lib/fog/aws/parsers/iam/update_group.rb b/lib/fog/aws/parsers/iam/update_group.rb index 3232db3ba..fa84f57f0 100644 --- a/lib/fog/aws/parsers/iam/update_group.rb +++ b/lib/fog/aws/parsers/iam/update_group.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module IAM - class UpdateGroup < Fog::Parsers::Base # http://docs.amazonwebservices.com/IAM/latest/APIReference/index.html?API_UpdateGroup.html def reset @@ -17,9 +16,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/update_user.rb b/lib/fog/aws/parsers/iam/update_user.rb index 35a169fad..bbe889cd3 100644 --- a/lib/fog/aws/parsers/iam/update_user.rb +++ b/lib/fog/aws/parsers/iam/update_user.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module IAM - class UpdateUser < Fog::Parsers::Base # http://docs.amazonwebservices.com/IAM/latest/APIReference/index.html?API_UpdateUser.html @@ -18,9 +17,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/upload_server_certificate.rb b/lib/fog/aws/parsers/iam/upload_server_certificate.rb index 80ddc29bc..8c771594e 100644 --- a/lib/fog/aws/parsers/iam/upload_server_certificate.rb +++ b/lib/fog/aws/parsers/iam/upload_server_certificate.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class UploadServerCertificate < Fog::Parsers::Base - def reset @response = { 'Certificate' => {} } end @@ -19,9 +17,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/iam/upload_signing_certificate.rb b/lib/fog/aws/parsers/iam/upload_signing_certificate.rb index 4f473f7f2..2bc568497 100644 --- a/lib/fog/aws/parsers/iam/upload_signing_certificate.rb +++ b/lib/fog/aws/parsers/iam/upload_signing_certificate.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module IAM - class UploadSigningCertificate < Fog::Parsers::Base - def reset @response = { 'Certificate' => {} } end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb b/lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb index 7b2d2ffbb..8839a254a 100644 --- a/lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb +++ b/lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/security_group_parser' class AuthorizeDBSecurityGroupIngress < Fog::Parsers::AWS::RDS::SecurityGroupParser - def reset @response = { 'AuthorizeDBSecurityGroupIngressResult' => {}, 'ResponseMetadata' => {} } super @@ -26,11 +24,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/base.rb b/lib/fog/aws/parsers/rds/base.rb index cc3cad5ca..de9ad6583 100644 --- a/lib/fog/aws/parsers/rds/base.rb +++ b/lib/fog/aws/parsers/rds/base.rb @@ -2,10 +2,8 @@ module Fog module Parsers module AWS module RDS - # Base parser for ResponseMetadata, RequestId class Base < Fog::Parsers::Base - def reset super @response = { 'ResponseMetadata' => {} } @@ -23,9 +21,7 @@ module Fog super end end - end - end end end diff --git a/lib/fog/aws/parsers/rds/create_db_instance.rb b/lib/fog/aws/parsers/rds/create_db_instance.rb index 6a8d0d6ba..7bdfa72ca 100644 --- a/lib/fog/aws/parsers/rds/create_db_instance.rb +++ b/lib/fog/aws/parsers/rds/create_db_instance.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class CreateDBInstance < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'CreateDBInstanceResult' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb b/lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb index a7ee488dc..b19b3a7ec 100644 --- a/lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb +++ b/lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class CreateDBInstanceReadReplica < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'CreateDBInstanceReadReplicaResult' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/create_db_parameter_group.rb b/lib/fog/aws/parsers/rds/create_db_parameter_group.rb index 12cdba5d6..0b057081f 100644 --- a/lib/fog/aws/parsers/rds/create_db_parameter_group.rb +++ b/lib/fog/aws/parsers/rds/create_db_parameter_group.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class CreateDbParameterGroup < Fog::Parsers::Base - def reset @response = { 'CreateDBParameterGroupResult' => {}, 'ResponseMetadata' => {} } @db_parameter_group = {} diff --git a/lib/fog/aws/parsers/rds/create_db_security_group.rb b/lib/fog/aws/parsers/rds/create_db_security_group.rb index 59338968b..c91491ac7 100644 --- a/lib/fog/aws/parsers/rds/create_db_security_group.rb +++ b/lib/fog/aws/parsers/rds/create_db_security_group.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/security_group_parser' class CreateDBSecurityGroup < Fog::Parsers::AWS::RDS::SecurityGroupParser - def reset @response = { 'CreateDBSecurityGroupResult' => {}, 'ResponseMetadata' => {} } super @@ -26,11 +24,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/create_db_snapshot.rb b/lib/fog/aws/parsers/rds/create_db_snapshot.rb index a89b9f05e..d24fc17f9 100644 --- a/lib/fog/aws/parsers/rds/create_db_snapshot.rb +++ b/lib/fog/aws/parsers/rds/create_db_snapshot.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/rds/snapshot_parser' class CreateDBSnapshot < Fog::Parsers::AWS::RDS::SnapshotParser - def reset @response = { 'CreateDBSnapshotResult' => {}, 'ResponseMetadata' => {} } super @@ -26,9 +25,7 @@ module Fog super end end - end - end end end diff --git a/lib/fog/aws/parsers/rds/create_db_subnet_group.rb b/lib/fog/aws/parsers/rds/create_db_subnet_group.rb index 50c0abd84..bf39e28a9 100644 --- a/lib/fog/aws/parsers/rds/create_db_subnet_group.rb +++ b/lib/fog/aws/parsers/rds/create_db_subnet_group.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/subnet_group_parser' class CreateDBSubnetGroup < Fog::Parsers::AWS::RDS::SubnetGroupParser - def reset @response = { 'CreateDBSubnetGroupResult' => {}, 'ResponseMetadata' => {} } super @@ -26,11 +24,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/db_engine_version_parser.rb b/lib/fog/aws/parsers/rds/db_engine_version_parser.rb index f26dc166f..1826b805e 100644 --- a/lib/fog/aws/parsers/rds/db_engine_version_parser.rb +++ b/lib/fog/aws/parsers/rds/db_engine_version_parser.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class DBEngineVersionParser < Fog::Parsers::Base - def reset @db_engine_version = fresh_engine_version end @@ -15,7 +13,6 @@ module Fog def start_element(name, attrs = []) super - end def end_element(name) diff --git a/lib/fog/aws/parsers/rds/db_parser.rb b/lib/fog/aws/parsers/rds/db_parser.rb index 23d91c93b..21e59df83 100644 --- a/lib/fog/aws/parsers/rds/db_parser.rb +++ b/lib/fog/aws/parsers/rds/db_parser.rb @@ -2,12 +2,9 @@ module Fog module Parsers module AWS module RDS - class DbParser < Fog::Parsers::Base - def reset @db_instance = fresh_instance - end def fresh_instance @@ -39,11 +36,9 @@ module Fog @in_vpc_security_groups = true @vpc_security_groups = [] end - end def end_element(name) - case name when 'LatestRestorableTime', 'InstanceCreateTime' diff --git a/lib/fog/aws/parsers/rds/delete_db_instance.rb b/lib/fog/aws/parsers/rds/delete_db_instance.rb index 738d7146f..98b9989e3 100644 --- a/lib/fog/aws/parsers/rds/delete_db_instance.rb +++ b/lib/fog/aws/parsers/rds/delete_db_instance.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class DeleteDBInstance < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'DeleteDBInstanceResult' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/delete_db_parameter_group.rb b/lib/fog/aws/parsers/rds/delete_db_parameter_group.rb index 98cf233bd..8056bbcba 100644 --- a/lib/fog/aws/parsers/rds/delete_db_parameter_group.rb +++ b/lib/fog/aws/parsers/rds/delete_db_parameter_group.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class DeleteDbParameterGroup < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } @db_parameter_group = {} diff --git a/lib/fog/aws/parsers/rds/delete_db_security_group.rb b/lib/fog/aws/parsers/rds/delete_db_security_group.rb index 282c7d6ed..2239aca48 100644 --- a/lib/fog/aws/parsers/rds/delete_db_security_group.rb +++ b/lib/fog/aws/parsers/rds/delete_db_security_group.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/rds/snapshot_parser' class DeleteDBSecurityGroup < Fog::Parsers::AWS::RDS::SnapshotParser - def reset @response = { 'ResponseMetadata' => {} } super @@ -23,9 +22,7 @@ module Fog super end end - end - end end end diff --git a/lib/fog/aws/parsers/rds/delete_db_snapshot.rb b/lib/fog/aws/parsers/rds/delete_db_snapshot.rb index 4d733de7a..6250daab8 100644 --- a/lib/fog/aws/parsers/rds/delete_db_snapshot.rb +++ b/lib/fog/aws/parsers/rds/delete_db_snapshot.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/snapshot_parser' class DeleteDBSnapshot < Fog::Parsers::AWS::RDS::SnapshotParser - def reset @response = { 'DeleteDBSnapshotResult' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/delete_db_subnet_group.rb b/lib/fog/aws/parsers/rds/delete_db_subnet_group.rb index 30525163b..526b13874 100644 --- a/lib/fog/aws/parsers/rds/delete_db_subnet_group.rb +++ b/lib/fog/aws/parsers/rds/delete_db_subnet_group.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/subnet_group_parser' class DeleteDBSubnetGroup < Fog::Parsers::AWS::RDS::SubnetGroupParser - def reset @response = { 'DeleteDBSubnetGroupResponse' => {}, 'ResponseMetadata' => {} } super @@ -23,11 +21,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/describe_db_engine_versions.rb b/lib/fog/aws/parsers/rds/describe_db_engine_versions.rb index a8d88535f..452d1b5aa 100644 --- a/lib/fog/aws/parsers/rds/describe_db_engine_versions.rb +++ b/lib/fog/aws/parsers/rds/describe_db_engine_versions.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_engine_version_parser' class DescribeDBEngineVersions < Fog::Parsers::AWS::RDS::DBEngineVersionParser - def reset @response = { 'DescribeDBEngineVersionsResult' => {'DBEngineVersions' => []}, 'ResponseMetadata' => {} } super @@ -28,11 +26,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/describe_db_instances.rb b/lib/fog/aws/parsers/rds/describe_db_instances.rb index 9bd8d8bd1..d20c08acc 100644 --- a/lib/fog/aws/parsers/rds/describe_db_instances.rb +++ b/lib/fog/aws/parsers/rds/describe_db_instances.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class DescribeDBInstances < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'DescribeDBInstancesResult' => {'DBInstances' => []}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/describe_db_log_files.rb b/lib/fog/aws/parsers/rds/describe_db_log_files.rb index da8998bdd..bdbcadcc1 100644 --- a/lib/fog/aws/parsers/rds/describe_db_log_files.rb +++ b/lib/fog/aws/parsers/rds/describe_db_log_files.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class DescribeDBLogFiles < Fog::Parsers::Base - attr_reader :rds_id def initialize(rds_id) diff --git a/lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb b/lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb index 576fb1313..f724cb740 100644 --- a/lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb +++ b/lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class DescribeDBParameterGroups < Fog::Parsers::Base - def reset @response = { 'DescribeDBParameterGroupsResult' => {'DBParameterGroups' => []}, 'ResponseMetadata' => {} } @db_parameter_group = {} @@ -27,11 +25,8 @@ module Fog when 'RequestId' @response['ResponseMetadata'][name] = value end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/describe_db_parameters.rb b/lib/fog/aws/parsers/rds/describe_db_parameters.rb index 60e32ae10..c74b179cd 100644 --- a/lib/fog/aws/parsers/rds/describe_db_parameters.rb +++ b/lib/fog/aws/parsers/rds/describe_db_parameters.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class DescribeDBParameters < Fog::Parsers::Base - def reset @response = { 'DescribeDBParametersResult' =>{}, 'ResponseMetadata' => {} } @parameter = {} diff --git a/lib/fog/aws/parsers/rds/describe_db_reserved_instances.rb b/lib/fog/aws/parsers/rds/describe_db_reserved_instances.rb index fad7954e9..8f9abd6bb 100644 --- a/lib/fog/aws/parsers/rds/describe_db_reserved_instances.rb +++ b/lib/fog/aws/parsers/rds/describe_db_reserved_instances.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class DescribeDBReservedInstances < Fog::Parsers::Base - def reset @reserved_instance = {} @response = { 'ReservedDBInstances' => [] } @@ -33,9 +31,7 @@ module Fog @reserved_instance[name] = Time.parse(@value) end end - end - end end end diff --git a/lib/fog/aws/parsers/rds/describe_db_security_groups.rb b/lib/fog/aws/parsers/rds/describe_db_security_groups.rb index acb0dd5a8..3e2acba09 100644 --- a/lib/fog/aws/parsers/rds/describe_db_security_groups.rb +++ b/lib/fog/aws/parsers/rds/describe_db_security_groups.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/security_group_parser' class DescribeDBSecurityGroups < Fog::Parsers::AWS::RDS::SecurityGroupParser - def reset @response = { 'DescribeDBSecurityGroupsResult' => {'DBSecurityGroups' => []}, 'ResponseMetadata' => {} } super @@ -28,11 +26,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/describe_db_snapshots.rb b/lib/fog/aws/parsers/rds/describe_db_snapshots.rb index 45f62fa26..fe89f6185 100644 --- a/lib/fog/aws/parsers/rds/describe_db_snapshots.rb +++ b/lib/fog/aws/parsers/rds/describe_db_snapshots.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/snapshot_parser' class DescribeDBSnapshots < Fog::Parsers::AWS::RDS::SnapshotParser - def reset @response = { 'DescribeDBSnapshotsResult' => {'DBSnapshots' => []}, 'ResponseMetadata' => {} } super @@ -28,11 +26,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/describe_db_subnet_groups.rb b/lib/fog/aws/parsers/rds/describe_db_subnet_groups.rb index 959de18af..57c048fdf 100644 --- a/lib/fog/aws/parsers/rds/describe_db_subnet_groups.rb +++ b/lib/fog/aws/parsers/rds/describe_db_subnet_groups.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/subnet_group_parser' class DescribeDBSubnetGroups < Fog::Parsers::AWS::RDS::SubnetGroupParser - def reset @response = { 'DescribeDBSubnetGroupsResult' => {'DBSubnetGroups' => []}, 'ResponseMetadata' => {} } super @@ -28,9 +26,7 @@ module Fog else super end - end - end end end diff --git a/lib/fog/aws/parsers/rds/describe_orderable_db_instance_options.rb b/lib/fog/aws/parsers/rds/describe_orderable_db_instance_options.rb index 8535c9330..cb0f78a56 100644 --- a/lib/fog/aws/parsers/rds/describe_orderable_db_instance_options.rb +++ b/lib/fog/aws/parsers/rds/describe_orderable_db_instance_options.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class DescribeOrderableDBInstanceOptions < Fog::Parsers::Base - def reset @response = { 'DescribeOrderableDBInstanceOptionsResult' => {'OrderableDBInstanceOptions' => []}, 'ResponseMetadata' => {} } @db_instance_option = {} diff --git a/lib/fog/aws/parsers/rds/download_db_logfile_portion.rb b/lib/fog/aws/parsers/rds/download_db_logfile_portion.rb index 7ded7985c..8b1d97ffb 100644 --- a/lib/fog/aws/parsers/rds/download_db_logfile_portion.rb +++ b/lib/fog/aws/parsers/rds/download_db_logfile_portion.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class DownloadDBLogFilePortion < Fog::Parsers::Base - def reset @response = { 'DownloadDBLogFilePortionResult' => {}, 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog key = (name == 'RequestId') ? 'ResponseMetadata' : 'DownloadDBLogFilePortionResult' @response[key][name] = value end - end - end end end diff --git a/lib/fog/aws/parsers/rds/event_list.rb b/lib/fog/aws/parsers/rds/event_list.rb index 77a887455..35753e9e0 100644 --- a/lib/fog/aws/parsers/rds/event_list.rb +++ b/lib/fog/aws/parsers/rds/event_list.rb @@ -5,7 +5,6 @@ module Fog require 'fog/aws/parsers/rds/base' class EventListParser < Base - def reset super @response['Events'] = [] @@ -16,7 +15,6 @@ module Fog case name when 'Event'; then @event = {} end - end def end_element(name) diff --git a/lib/fog/aws/parsers/rds/modify_db_instance.rb b/lib/fog/aws/parsers/rds/modify_db_instance.rb index 6dea9ddbd..e1232cb2e 100644 --- a/lib/fog/aws/parsers/rds/modify_db_instance.rb +++ b/lib/fog/aws/parsers/rds/modify_db_instance.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class ModifyDBInstance < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'ModifyDBInstanceResult' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/modify_db_parameter_group.rb b/lib/fog/aws/parsers/rds/modify_db_parameter_group.rb index fd922cb32..60c63f49f 100644 --- a/lib/fog/aws/parsers/rds/modify_db_parameter_group.rb +++ b/lib/fog/aws/parsers/rds/modify_db_parameter_group.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class ModifyDbParameterGroup < Fog::Parsers::Base - def reset @response = { 'ModifyDBParameterGroupResult' => {}, 'ResponseMetadata' => {} } end diff --git a/lib/fog/aws/parsers/rds/promote_read_replica.rb b/lib/fog/aws/parsers/rds/promote_read_replica.rb index 2be248c27..80fbc0eca 100644 --- a/lib/fog/aws/parsers/rds/promote_read_replica.rb +++ b/lib/fog/aws/parsers/rds/promote_read_replica.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class PromoteReadReplica < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'PromoteReadReplicaResult' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/reboot_db_instance.rb b/lib/fog/aws/parsers/rds/reboot_db_instance.rb index 4cc32fbd9..334d3db04 100644 --- a/lib/fog/aws/parsers/rds/reboot_db_instance.rb +++ b/lib/fog/aws/parsers/rds/reboot_db_instance.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class RebootDBInstance < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'RebootDBInstanceResult' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb b/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb index d022e5d87..db12ec8fe 100644 --- a/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb +++ b/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class RestoreDBInstanceFromDBSnapshot < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'RestoreDBInstanceFromDBSnapshot' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/restore_db_instance_to_point_in_time.rb b/lib/fog/aws/parsers/rds/restore_db_instance_to_point_in_time.rb index b8482f0af..86189c71f 100644 --- a/lib/fog/aws/parsers/rds/restore_db_instance_to_point_in_time.rb +++ b/lib/fog/aws/parsers/rds/restore_db_instance_to_point_in_time.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/db_parser' class RestoreDBInstanceToPointInTime < Fog::Parsers::AWS::RDS::DbParser - def reset @response = { 'RestoreDBInstanceToPointInTime' => {}, 'ResponseMetadata' => {} } super diff --git a/lib/fog/aws/parsers/rds/revoke_db_security_group_ingress.rb b/lib/fog/aws/parsers/rds/revoke_db_security_group_ingress.rb index e846ba38e..88daa2635 100644 --- a/lib/fog/aws/parsers/rds/revoke_db_security_group_ingress.rb +++ b/lib/fog/aws/parsers/rds/revoke_db_security_group_ingress.rb @@ -2,11 +2,9 @@ module Fog module Parsers module AWS module RDS - require 'fog/aws/parsers/rds/security_group_parser' class RevokeDBSecurityGroupIngress < Fog::Parsers::AWS::RDS::SecurityGroupParser - def reset @response = { 'RevokeDBSecurityGroupIngressResult' => {}, 'ResponseMetadata' => {} } super @@ -26,11 +24,8 @@ module Fog else super end - end - end - end end end diff --git a/lib/fog/aws/parsers/rds/security_group_parser.rb b/lib/fog/aws/parsers/rds/security_group_parser.rb index 37317f5eb..e3e8be09d 100644 --- a/lib/fog/aws/parsers/rds/security_group_parser.rb +++ b/lib/fog/aws/parsers/rds/security_group_parser.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class SecurityGroupParser < Fog::Parsers::Base - def reset @security_group = fresh_security_group end @@ -18,7 +16,6 @@ module Fog case name when 'EC2SecurityGroup', 'IPRange'; then @ingress = {} end - end def end_element(name) diff --git a/lib/fog/aws/parsers/rds/snapshot_parser.rb b/lib/fog/aws/parsers/rds/snapshot_parser.rb index 16c2df179..f41534e14 100644 --- a/lib/fog/aws/parsers/rds/snapshot_parser.rb +++ b/lib/fog/aws/parsers/rds/snapshot_parser.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class SnapshotParser < Fog::Parsers::Base - def reset @db_snapshot = fresh_snapshot end @@ -15,7 +13,6 @@ module Fog def start_element(name, attrs = []) super - end def end_element(name) diff --git a/lib/fog/aws/parsers/rds/subnet_group_parser.rb b/lib/fog/aws/parsers/rds/subnet_group_parser.rb index b94e9f55b..03aea7b6a 100644 --- a/lib/fog/aws/parsers/rds/subnet_group_parser.rb +++ b/lib/fog/aws/parsers/rds/subnet_group_parser.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module RDS - class SubnetGroupParser < Fog::Parsers::Base - def reset @db_subnet_group = fresh_subnet_group end @@ -30,7 +28,6 @@ module Fog def fresh_subnet_group {'Subnets' => []} end - end end end diff --git a/lib/fog/aws/parsers/rds/tag_list_parser.rb b/lib/fog/aws/parsers/rds/tag_list_parser.rb index 2441f46fd..a453dadf6 100644 --- a/lib/fog/aws/parsers/rds/tag_list_parser.rb +++ b/lib/fog/aws/parsers/rds/tag_list_parser.rb @@ -4,7 +4,6 @@ module Fog module RDS # parses an XML-formatted list of resource tags from AWS class TagListParser < Fog::Parsers::Base - # each tag is modeled as a String pair (2-element Array) def reset @this_key = nil @@ -27,7 +26,6 @@ module Fog @response['ListTagsForResourceResult']['TagList'] = @tags end end - end end end diff --git a/lib/fog/aws/parsers/redshift/cluster_parser.rb b/lib/fog/aws/parsers/redshift/cluster_parser.rb index 5d5d6b0b9..b0a4bb9c4 100644 --- a/lib/fog/aws/parsers/redshift/cluster_parser.rb +++ b/lib/fog/aws/parsers/redshift/cluster_parser.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class ClusterParser < Fog::Parsers::Base # :cluster_identifier - (String) # :node_type - (String) diff --git a/lib/fog/aws/parsers/redshift/cluster_security_group_parser.rb b/lib/fog/aws/parsers/redshift/cluster_security_group_parser.rb index 7c659ad0a..9c1d639b9 100644 --- a/lib/fog/aws/parsers/redshift/cluster_security_group_parser.rb +++ b/lib/fog/aws/parsers/redshift/cluster_security_group_parser.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class ClusterSecurityGroupParser < Fog::Parsers::Base # :cluster_security_group_name - (String) # :description - (String) diff --git a/lib/fog/aws/parsers/redshift/cluster_snapshot.rb b/lib/fog/aws/parsers/redshift/cluster_snapshot.rb index 6d4dd5a30..c74e514cd 100644 --- a/lib/fog/aws/parsers/redshift/cluster_snapshot.rb +++ b/lib/fog/aws/parsers/redshift/cluster_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - require 'fog/aws/parsers/redshift/cluster_snapshot_parser' class ClusterSnapshot < ClusterSnapshotParser diff --git a/lib/fog/aws/parsers/redshift/cluster_snapshot_parser.rb b/lib/fog/aws/parsers/redshift/cluster_snapshot_parser.rb index 4c7c2d9dc..2aa62c76d 100644 --- a/lib/fog/aws/parsers/redshift/cluster_snapshot_parser.rb +++ b/lib/fog/aws/parsers/redshift/cluster_snapshot_parser.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class ClusterSnapshotParser < Fog::Parsers::Base # :snapshot_identifier - (String) # :cluster_identifier - (String) diff --git a/lib/fog/aws/parsers/redshift/cluster_subnet_group_parser.rb b/lib/fog/aws/parsers/redshift/cluster_subnet_group_parser.rb index cf6678c22..7374013e1 100644 --- a/lib/fog/aws/parsers/redshift/cluster_subnet_group_parser.rb +++ b/lib/fog/aws/parsers/redshift/cluster_subnet_group_parser.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class ClusterSubnetGroupParser < Fog::Parsers::Base # :cluster_subnet_group_name - (String) # :description - (String) diff --git a/lib/fog/aws/parsers/redshift/create_cluster_parameter_group.rb b/lib/fog/aws/parsers/redshift/create_cluster_parameter_group.rb index ad7d70b70..50b85dc49 100644 --- a/lib/fog/aws/parsers/redshift/create_cluster_parameter_group.rb +++ b/lib/fog/aws/parsers/redshift/create_cluster_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class CreateClusterParameterGroup < Fog::Parsers::Base # :parameter_group_name - (String) # :parameter_group_family - (String) diff --git a/lib/fog/aws/parsers/redshift/create_cluster_security_group.rb b/lib/fog/aws/parsers/redshift/create_cluster_security_group.rb index 59a936ec7..2e542ac28 100644 --- a/lib/fog/aws/parsers/redshift/create_cluster_security_group.rb +++ b/lib/fog/aws/parsers/redshift/create_cluster_security_group.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - require 'fog/aws/parsers/redshift/cluster_security_group_parser' class CreateClusterSecurityGroup < ClusterSecurityGroupParser diff --git a/lib/fog/aws/parsers/redshift/describe_cluster_parameter_groups.rb b/lib/fog/aws/parsers/redshift/describe_cluster_parameter_groups.rb index ad6c36690..3b680e125 100644 --- a/lib/fog/aws/parsers/redshift/describe_cluster_parameter_groups.rb +++ b/lib/fog/aws/parsers/redshift/describe_cluster_parameter_groups.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeClusterParameterGroups < Fog::Parsers::Base # :marker - (String) # :parameter_groups - (Array) diff --git a/lib/fog/aws/parsers/redshift/describe_cluster_parameters.rb b/lib/fog/aws/parsers/redshift/describe_cluster_parameters.rb index f9a578086..ef6507d5a 100644 --- a/lib/fog/aws/parsers/redshift/describe_cluster_parameters.rb +++ b/lib/fog/aws/parsers/redshift/describe_cluster_parameters.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeClusterParameters < Fog::Parsers::Base # :marker - (String) # :parameters - (Array) diff --git a/lib/fog/aws/parsers/redshift/describe_cluster_security_groups.rb b/lib/fog/aws/parsers/redshift/describe_cluster_security_groups.rb index f3508a96a..50d492b7d 100644 --- a/lib/fog/aws/parsers/redshift/describe_cluster_security_groups.rb +++ b/lib/fog/aws/parsers/redshift/describe_cluster_security_groups.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - require 'fog/aws/parsers/redshift/cluster_security_group_parser' class DescribeClusterSecurityGroups < ClusterSecurityGroupParser diff --git a/lib/fog/aws/parsers/redshift/describe_cluster_snapshots.rb b/lib/fog/aws/parsers/redshift/describe_cluster_snapshots.rb index 5f4652644..20f22d680 100644 --- a/lib/fog/aws/parsers/redshift/describe_cluster_snapshots.rb +++ b/lib/fog/aws/parsers/redshift/describe_cluster_snapshots.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - require 'fog/aws/parsers/redshift/cluster_snapshot_parser' class DescribeClusterSnapshots < ClusterSnapshotParser diff --git a/lib/fog/aws/parsers/redshift/describe_cluster_subnet_groups.rb b/lib/fog/aws/parsers/redshift/describe_cluster_subnet_groups.rb index 2a5c8f4ed..0370ef1b5 100644 --- a/lib/fog/aws/parsers/redshift/describe_cluster_subnet_groups.rb +++ b/lib/fog/aws/parsers/redshift/describe_cluster_subnet_groups.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeClusterSubnetGroups < Fog::Parsers::Base # :marker - (String) # :cluster_subnet_groups - (Array) diff --git a/lib/fog/aws/parsers/redshift/describe_cluster_versions.rb b/lib/fog/aws/parsers/redshift/describe_cluster_versions.rb index 2feb4b269..33fb94d0d 100644 --- a/lib/fog/aws/parsers/redshift/describe_cluster_versions.rb +++ b/lib/fog/aws/parsers/redshift/describe_cluster_versions.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeClusterVersions < Fog::Parsers::Base # :marker - (String) # :cluster_versions - (Array) diff --git a/lib/fog/aws/parsers/redshift/describe_default_cluster_parameters.rb b/lib/fog/aws/parsers/redshift/describe_default_cluster_parameters.rb index 7f935f311..8a7bca710 100644 --- a/lib/fog/aws/parsers/redshift/describe_default_cluster_parameters.rb +++ b/lib/fog/aws/parsers/redshift/describe_default_cluster_parameters.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeDefaultClusterParameters < Fog::Parsers::Base # :marker - (String) # :parameter_group_family - (String) diff --git a/lib/fog/aws/parsers/redshift/describe_events.rb b/lib/fog/aws/parsers/redshift/describe_events.rb index d0d8cffc5..e224f9a0f 100644 --- a/lib/fog/aws/parsers/redshift/describe_events.rb +++ b/lib/fog/aws/parsers/redshift/describe_events.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeEvents < Fog::Parsers::Base # :marker - (String) # :events - (Array) diff --git a/lib/fog/aws/parsers/redshift/describe_orderable_cluster_options.rb b/lib/fog/aws/parsers/redshift/describe_orderable_cluster_options.rb index 206810a3b..b99a1d7ac 100644 --- a/lib/fog/aws/parsers/redshift/describe_orderable_cluster_options.rb +++ b/lib/fog/aws/parsers/redshift/describe_orderable_cluster_options.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeOrderableClusterOptions < Fog::Parsers::Base # :marker - (String) # :orderable_cluster_options - (Array) diff --git a/lib/fog/aws/parsers/redshift/describe_reserved_node_offerings.rb b/lib/fog/aws/parsers/redshift/describe_reserved_node_offerings.rb index 4fbaede35..b43effed7 100644 --- a/lib/fog/aws/parsers/redshift/describe_reserved_node_offerings.rb +++ b/lib/fog/aws/parsers/redshift/describe_reserved_node_offerings.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeReservedNodeOfferings < Fog::Parsers::Base # :marker - (String) # :reserved_node_offerings - (Array) diff --git a/lib/fog/aws/parsers/redshift/describe_reserved_nodes.rb b/lib/fog/aws/parsers/redshift/describe_reserved_nodes.rb index 2a8694204..23a398950 100644 --- a/lib/fog/aws/parsers/redshift/describe_reserved_nodes.rb +++ b/lib/fog/aws/parsers/redshift/describe_reserved_nodes.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeReservedNodes < Fog::Parsers::Base # :marker - (String) # :reserved_nodes - (Array) diff --git a/lib/fog/aws/parsers/redshift/describe_resize.rb b/lib/fog/aws/parsers/redshift/describe_resize.rb index 8e47fece5..921113972 100644 --- a/lib/fog/aws/parsers/redshift/describe_resize.rb +++ b/lib/fog/aws/parsers/redshift/describe_resize.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class DescribeResize < Fog::Parsers::Base # :target_node_type - (String) # :target_number_of_nodes - (Integer) @@ -15,7 +14,6 @@ module Fog @response = { 'ImportTablesCompleted' => [], 'ImportTablesInProgress' => [], 'ImportTablesNotStarted' => []} end - def start_element(name, attrs = []) super case name diff --git a/lib/fog/aws/parsers/redshift/purchase_reserved_node_offering.rb b/lib/fog/aws/parsers/redshift/purchase_reserved_node_offering.rb index b787436c9..441d44d74 100644 --- a/lib/fog/aws/parsers/redshift/purchase_reserved_node_offering.rb +++ b/lib/fog/aws/parsers/redshift/purchase_reserved_node_offering.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Redshift module AWS - class PurchaseReservedNodeOffering < Fog::Parsers::Base - # :reserved_node_id - (String) # :reserved_node_offering_id - (String) # :node_type - (String) diff --git a/lib/fog/aws/parsers/redshift/revoke_cluster_security_group_ingress.rb b/lib/fog/aws/parsers/redshift/revoke_cluster_security_group_ingress.rb index 129d53660..70f4452a8 100644 --- a/lib/fog/aws/parsers/redshift/revoke_cluster_security_group_ingress.rb +++ b/lib/fog/aws/parsers/redshift/revoke_cluster_security_group_ingress.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - require 'fog/aws/parsers/redshift/cluster_security_group_parser' class RevokeClusterSecurityGroupIngress < ClusterSecurityGroupParser diff --git a/lib/fog/aws/parsers/redshift/update_cluster_parameter_group_parser.rb b/lib/fog/aws/parsers/redshift/update_cluster_parameter_group_parser.rb index d477c40e0..4d0a029d3 100644 --- a/lib/fog/aws/parsers/redshift/update_cluster_parameter_group_parser.rb +++ b/lib/fog/aws/parsers/redshift/update_cluster_parameter_group_parser.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Redshift module AWS - class UpdateClusterParameterGroupParser < Fog::Parsers::Base # :parameter_group_name - (String) # :parameter_group_status - (String) diff --git a/lib/fog/aws/parsers/ses/delete_verified_email_address.rb b/lib/fog/aws/parsers/ses/delete_verified_email_address.rb index 1472b92c2..9d357f064 100644 --- a/lib/fog/aws/parsers/ses/delete_verified_email_address.rb +++ b/lib/fog/aws/parsers/ses/delete_verified_email_address.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SES - class DeleteVerifiedEmailAddress < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -15,9 +13,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/ses/get_send_quota.rb b/lib/fog/aws/parsers/ses/get_send_quota.rb index ffff26744..9430d4bb1 100644 --- a/lib/fog/aws/parsers/ses/get_send_quota.rb +++ b/lib/fog/aws/parsers/ses/get_send_quota.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SES - class GetSendQuota < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/ses/get_send_statistics.rb b/lib/fog/aws/parsers/ses/get_send_statistics.rb index 76821e4ed..263848ea3 100644 --- a/lib/fog/aws/parsers/ses/get_send_statistics.rb +++ b/lib/fog/aws/parsers/ses/get_send_statistics.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SES - class GetSendStatistics < Fog::Parsers::Base - def reset @response = { 'SendDataPoints' => [], 'ResponseMetadata' => {} } @send_data_point = {} @@ -22,7 +20,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb b/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb index 3ce65d915..32fdf7130 100644 --- a/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb +++ b/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SES - class ListVerifiedEmailAddresses < Fog::Parsers::Base - def reset @response = { 'VerifiedEmailAddresses' => [], 'ResponseMetadata' => {} } end @@ -18,7 +16,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/ses/send_email.rb b/lib/fog/aws/parsers/ses/send_email.rb index 5d2ec103a..c98378e2b 100644 --- a/lib/fog/aws/parsers/ses/send_email.rb +++ b/lib/fog/aws/parsers/ses/send_email.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SES - class SendEmail < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/ses/send_raw_email.rb b/lib/fog/aws/parsers/ses/send_raw_email.rb index e48a8754f..1229dbd4f 100644 --- a/lib/fog/aws/parsers/ses/send_raw_email.rb +++ b/lib/fog/aws/parsers/ses/send_raw_email.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SES - class SendRawEmail < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/ses/verify_domain_identity.rb b/lib/fog/aws/parsers/ses/verify_domain_identity.rb index 63ba4e2f0..63a5b99c7 100644 --- a/lib/fog/aws/parsers/ses/verify_domain_identity.rb +++ b/lib/fog/aws/parsers/ses/verify_domain_identity.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SES - class VerifyDomainIdentity < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/ses/verify_email_address.rb b/lib/fog/aws/parsers/ses/verify_email_address.rb index 983a8b4ef..f557f040d 100644 --- a/lib/fog/aws/parsers/ses/verify_email_address.rb +++ b/lib/fog/aws/parsers/ses/verify_email_address.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SES - class VerifyEmailAddress < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -15,9 +13,7 @@ module Fog @response['ResponseMetadata'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/simpledb/basic.rb b/lib/fog/aws/parsers/simpledb/basic.rb index 95601483d..7550ce800 100644 --- a/lib/fog/aws/parsers/simpledb/basic.rb +++ b/lib/fog/aws/parsers/simpledb/basic.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SimpleDB - class Basic < Fog::Parsers::Base - def initialize(nil_string) @nil_string = nil_string reset @@ -22,9 +20,7 @@ module Fog def sdb_decode(value) value.eql?(@nil_string) ? nil : value end - end - end end end diff --git a/lib/fog/aws/parsers/simpledb/domain_metadata.rb b/lib/fog/aws/parsers/simpledb/domain_metadata.rb index aed3ff1ee..df5acc378 100644 --- a/lib/fog/aws/parsers/simpledb/domain_metadata.rb +++ b/lib/fog/aws/parsers/simpledb/domain_metadata.rb @@ -4,9 +4,7 @@ module Fog module Parsers module AWS module SimpleDB - class DomainMetadata < Fog::Parsers::AWS::SimpleDB::Basic - def reset @response = {} end @@ -23,9 +21,7 @@ module Fog response[name] = Time.at(value.to_i) end end - end - end end end diff --git a/lib/fog/aws/parsers/simpledb/get_attributes.rb b/lib/fog/aws/parsers/simpledb/get_attributes.rb index ea00b6f71..7757d1bd1 100644 --- a/lib/fog/aws/parsers/simpledb/get_attributes.rb +++ b/lib/fog/aws/parsers/simpledb/get_attributes.rb @@ -4,9 +4,7 @@ module Fog module Parsers module AWS module SimpleDB - class GetAttributes < Fog::Parsers::AWS::SimpleDB::Basic - def reset @attribute = nil @response = { 'Attributes' => {} } @@ -27,9 +25,7 @@ module Fog response['Attributes'][@attribute] << sdb_decode(value) end end - end - end end end diff --git a/lib/fog/aws/parsers/simpledb/list_domains.rb b/lib/fog/aws/parsers/simpledb/list_domains.rb index 12a70db1f..998f4baf8 100644 --- a/lib/fog/aws/parsers/simpledb/list_domains.rb +++ b/lib/fog/aws/parsers/simpledb/list_domains.rb @@ -4,9 +4,7 @@ module Fog module Parsers module AWS module SimpleDB - class ListDomains < Fog::Parsers::AWS::SimpleDB::Basic - def reset @response = { 'Domains' => [] } end @@ -21,9 +19,7 @@ module Fog response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/simpledb/select.rb b/lib/fog/aws/parsers/simpledb/select.rb index ce39786af..cb616afb6 100644 --- a/lib/fog/aws/parsers/simpledb/select.rb +++ b/lib/fog/aws/parsers/simpledb/select.rb @@ -4,9 +4,7 @@ module Fog module Parsers module AWS module SimpleDB - class Select < Fog::Parsers::AWS::SimpleDB::Basic - def reset @item_name = @attribute_name = nil @response = { 'Items' => {} } @@ -32,9 +30,7 @@ module Fog response['Items'][@item_name][@attribute_name] << sdb_decode(value) end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/add_permission.rb b/lib/fog/aws/parsers/sns/add_permission.rb index 8da72261d..04cdd6e8b 100644 --- a/lib/fog/aws/parsers/sns/add_permission.rb +++ b/lib/fog/aws/parsers/sns/add_permission.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class AddPermission < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/confirm_subscription.rb b/lib/fog/aws/parsers/sns/confirm_subscription.rb index dc9c95bd5..bd6922378 100644 --- a/lib/fog/aws/parsers/sns/confirm_subscription.rb +++ b/lib/fog/aws/parsers/sns/confirm_subscription.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class ConfirmSubscription < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value.strip end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/create_topic.rb b/lib/fog/aws/parsers/sns/create_topic.rb index a037cec44..311d8ae15 100644 --- a/lib/fog/aws/parsers/sns/create_topic.rb +++ b/lib/fog/aws/parsers/sns/create_topic.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class CreateTopic < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value.strip end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/delete_topic.rb b/lib/fog/aws/parsers/sns/delete_topic.rb index 0a0a27ff3..7739a0e33 100644 --- a/lib/fog/aws/parsers/sns/delete_topic.rb +++ b/lib/fog/aws/parsers/sns/delete_topic.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class DeleteTopic < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/get_topic_attributes.rb b/lib/fog/aws/parsers/sns/get_topic_attributes.rb index ea974f5d9..c1e9df35e 100644 --- a/lib/fog/aws/parsers/sns/get_topic_attributes.rb +++ b/lib/fog/aws/parsers/sns/get_topic_attributes.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class GetTopicAttributes < Fog::Parsers::Base - def reset @response = { 'Attributes' => {} } end @@ -25,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/sns/list_subscriptions.rb b/lib/fog/aws/parsers/sns/list_subscriptions.rb index b19c9c925..02533d934 100644 --- a/lib/fog/aws/parsers/sns/list_subscriptions.rb +++ b/lib/fog/aws/parsers/sns/list_subscriptions.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class ListSubscriptions < Fog::Parsers::Base - def reset @response = { 'Subscriptions' => [] } @subscription = {} @@ -22,7 +20,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/parsers/sns/list_topics.rb b/lib/fog/aws/parsers/sns/list_topics.rb index b3df3fb89..40df34d32 100644 --- a/lib/fog/aws/parsers/sns/list_topics.rb +++ b/lib/fog/aws/parsers/sns/list_topics.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class ListTopics < Fog::Parsers::Base - def reset @response = { 'Topics' => [] } end @@ -17,9 +15,7 @@ module Fog response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/publish.rb b/lib/fog/aws/parsers/sns/publish.rb index 91b2a62ee..68f69b338 100644 --- a/lib/fog/aws/parsers/sns/publish.rb +++ b/lib/fog/aws/parsers/sns/publish.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class Publish < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value.rstrip end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/remove_permission.rb b/lib/fog/aws/parsers/sns/remove_permission.rb index e4e43a175..345c1f154 100644 --- a/lib/fog/aws/parsers/sns/remove_permission.rb +++ b/lib/fog/aws/parsers/sns/remove_permission.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class RemovePermission < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/set_topic_attributes.rb b/lib/fog/aws/parsers/sns/set_topic_attributes.rb index 19639b7fe..e652e573a 100644 --- a/lib/fog/aws/parsers/sns/set_topic_attributes.rb +++ b/lib/fog/aws/parsers/sns/set_topic_attributes.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class SetTopicAttributes < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/subscribe.rb b/lib/fog/aws/parsers/sns/subscribe.rb index c0b77a737..9385404e3 100644 --- a/lib/fog/aws/parsers/sns/subscribe.rb +++ b/lib/fog/aws/parsers/sns/subscribe.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class Subscribe < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value.strip end end - end - end end end diff --git a/lib/fog/aws/parsers/sns/unsubscribe.rb b/lib/fog/aws/parsers/sns/unsubscribe.rb index dcab5e46f..5efd437aa 100644 --- a/lib/fog/aws/parsers/sns/unsubscribe.rb +++ b/lib/fog/aws/parsers/sns/unsubscribe.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SNS - class Unsubscribe < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sqs/basic.rb b/lib/fog/aws/parsers/sqs/basic.rb index f99763114..2ea4e2019 100644 --- a/lib/fog/aws/parsers/sqs/basic.rb +++ b/lib/fog/aws/parsers/sqs/basic.rb @@ -3,7 +3,6 @@ module Fog module AWS module SQS class Basic < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -14,9 +13,7 @@ module Fog @response['ResponseMetadata'][name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sqs/create_queue.rb b/lib/fog/aws/parsers/sqs/create_queue.rb index 516feaed5..59614e139 100644 --- a/lib/fog/aws/parsers/sqs/create_queue.rb +++ b/lib/fog/aws/parsers/sqs/create_queue.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SQS - class CreateQueue < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -17,9 +15,7 @@ module Fog @response['QueueUrl'] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sqs/get_queue_attributes.rb b/lib/fog/aws/parsers/sqs/get_queue_attributes.rb index dbbd65511..50f078672 100644 --- a/lib/fog/aws/parsers/sqs/get_queue_attributes.rb +++ b/lib/fog/aws/parsers/sqs/get_queue_attributes.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SQS - class GetQueueAttributes < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {}, 'Attributes' => {}} end @@ -26,9 +24,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/sqs/list_queues.rb b/lib/fog/aws/parsers/sqs/list_queues.rb index 8f3664b94..0e47f37d6 100644 --- a/lib/fog/aws/parsers/sqs/list_queues.rb +++ b/lib/fog/aws/parsers/sqs/list_queues.rb @@ -3,7 +3,6 @@ module Fog module AWS module SQS class ListQueues < Fog::Parsers::Base - def reset @response = { 'QueueUrls' => [], 'ResponseMetadata' => {} } end @@ -16,9 +15,7 @@ module Fog @response['QueueUrls'] << @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sqs/receive_message.rb b/lib/fog/aws/parsers/sqs/receive_message.rb index 75a56ba33..d39b693d1 100644 --- a/lib/fog/aws/parsers/sqs/receive_message.rb +++ b/lib/fog/aws/parsers/sqs/receive_message.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SQS - class ReceiveMessage < Fog::Parsers::Base - def reset @message = { 'Attributes' => {} } @response = { 'ResponseMetadata' => {}, 'Message' => []} @@ -32,9 +30,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/parsers/sqs/send_message.rb b/lib/fog/aws/parsers/sqs/send_message.rb index 00374bf6d..e2ba08554 100644 --- a/lib/fog/aws/parsers/sqs/send_message.rb +++ b/lib/fog/aws/parsers/sqs/send_message.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module SQS - class SendMessage < Fog::Parsers::Base - def reset @response = { 'ResponseMetadata' => {} } end @@ -19,9 +17,7 @@ module Fog @response['MD5OfMessageBody'] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/access_control_list.rb b/lib/fog/aws/parsers/storage/access_control_list.rb index 7f65acfda..53247e1fa 100644 --- a/lib/fog/aws/parsers/storage/access_control_list.rb +++ b/lib/fog/aws/parsers/storage/access_control_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class AccessControlList < Fog::Parsers::Base - def reset @in_access_control_list = false @grant = { 'Grantee' => {} } @@ -37,9 +35,7 @@ module Fog @grant['Grantee'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/complete_multipart_upload.rb b/lib/fog/aws/parsers/storage/complete_multipart_upload.rb index b12cc7218..6c02c7175 100644 --- a/lib/fog/aws/parsers/storage/complete_multipart_upload.rb +++ b/lib/fog/aws/parsers/storage/complete_multipart_upload.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class CompleteMultipartUpload < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/copy_object.rb b/lib/fog/aws/parsers/storage/copy_object.rb index bf7df5f35..7223f4ae7 100644 --- a/lib/fog/aws/parsers/storage/copy_object.rb +++ b/lib/fog/aws/parsers/storage/copy_object.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class CopyObject < Fog::Parsers::Base - def end_element(name) case name when 'ETag' @@ -13,9 +11,7 @@ module Fog @response[name] = Time.parse(value) end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/cors_configuration.rb b/lib/fog/aws/parsers/storage/cors_configuration.rb index 654f34f91..f969feb5c 100644 --- a/lib/fog/aws/parsers/storage/cors_configuration.rb +++ b/lib/fog/aws/parsers/storage/cors_configuration.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Storage module AWS - class CorsConfiguration < Fog::Parsers::Base def reset @in_cors_configuration_list = false @@ -32,9 +31,7 @@ module Fog (@cors_rule[name] ||= []) << value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/delete_multiple_objects.rb b/lib/fog/aws/parsers/storage/delete_multiple_objects.rb index 82679d13b..d2f2c17cb 100644 --- a/lib/fog/aws/parsers/storage/delete_multiple_objects.rb +++ b/lib/fog/aws/parsers/storage/delete_multiple_objects.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class DeleteMultipleObjects < Fog::Parsers::Base - def reset @deleted = { 'Deleted' => {} } @error = { 'Error' => {} } @@ -40,9 +38,7 @@ module Fog @error['Error'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_bucket.rb b/lib/fog/aws/parsers/storage/get_bucket.rb index a2d55f798..0a98d306e 100644 --- a/lib/fog/aws/parsers/storage/get_bucket.rb +++ b/lib/fog/aws/parsers/storage/get_bucket.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class GetBucket < Fog::Parsers::Base - def reset @object = { 'Owner' => {} } @response = { 'Contents' => [], 'CommonPrefixes' => [] } @@ -53,9 +51,7 @@ module Fog @object[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb b/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb index 54f898351..ef9bc795d 100644 --- a/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb +++ b/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class GetBucketLifecycle < Fog::Parsers::Base - def reset @expiration = {} @transition = {} diff --git a/lib/fog/aws/parsers/storage/get_bucket_location.rb b/lib/fog/aws/parsers/storage/get_bucket_location.rb index d1763877a..920f69761 100644 --- a/lib/fog/aws/parsers/storage/get_bucket_location.rb +++ b/lib/fog/aws/parsers/storage/get_bucket_location.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Storage module AWS - class GetBucketLocation < Fog::Parsers::Base - def end_element(name) case name when 'LocationConstraint' @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_bucket_logging.rb b/lib/fog/aws/parsers/storage/get_bucket_logging.rb index 2c1d47077..931aeaadb 100644 --- a/lib/fog/aws/parsers/storage/get_bucket_logging.rb +++ b/lib/fog/aws/parsers/storage/get_bucket_logging.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class GetBucketLogging < Fog::Parsers::Base - def reset @grant = { 'Grantee' => {} } @response = { 'BucketLoggingStatus' => {} } @@ -31,9 +29,7 @@ module Fog @grant['Grantee'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb b/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb index dcd210dfa..dae2f2d47 100644 --- a/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb +++ b/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class GetBucketObjectVersions < Fog::Parsers::Base - def reset @delete_marker = { 'Owner' => {} } @version = { 'Owner' => {} } @@ -79,9 +77,7 @@ module Fog end[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_bucket_tagging.rb b/lib/fog/aws/parsers/storage/get_bucket_tagging.rb index 3f5319c10..3b26b89c7 100644 --- a/lib/fog/aws/parsers/storage/get_bucket_tagging.rb +++ b/lib/fog/aws/parsers/storage/get_bucket_tagging.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class GetBucketTagging < Fog::Parsers::Base - def reset @in_tag = {} @response = {'BucketTagging' => {}} @@ -28,9 +26,7 @@ module Fog @in_tag = {@in_tag.keys.first => value} end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_bucket_versioning.rb b/lib/fog/aws/parsers/storage/get_bucket_versioning.rb index cabb52d16..549c6ebf4 100644 --- a/lib/fog/aws/parsers/storage/get_bucket_versioning.rb +++ b/lib/fog/aws/parsers/storage/get_bucket_versioning.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class GetBucketVersioning < Fog::Parsers::Base - def reset @response = { 'VersioningConfiguration' => {} } end @@ -15,9 +13,7 @@ module Fog @response['VersioningConfiguration'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_bucket_website.rb b/lib/fog/aws/parsers/storage/get_bucket_website.rb index e4f3bdcc0..794489b78 100644 --- a/lib/fog/aws/parsers/storage/get_bucket_website.rb +++ b/lib/fog/aws/parsers/storage/get_bucket_website.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class GetBucketWebsite < Fog::Parsers::Base - def reset @response = { 'ErrorDocument' => {}, 'IndexDocument' => {} } end @@ -17,9 +15,7 @@ module Fog @response['IndexDocument'][name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_request_payment.rb b/lib/fog/aws/parsers/storage/get_request_payment.rb index 1d94e2f73..91edb28ad 100644 --- a/lib/fog/aws/parsers/storage/get_request_payment.rb +++ b/lib/fog/aws/parsers/storage/get_request_payment.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Storage module AWS - class GetRequestPayment < Fog::Parsers::Base - def end_element(name) case name when 'Payer' @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/get_service.rb b/lib/fog/aws/parsers/storage/get_service.rb index 7642818f8..403cb8188 100644 --- a/lib/fog/aws/parsers/storage/get_service.rb +++ b/lib/fog/aws/parsers/storage/get_service.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class GetService < Fog::Parsers::Base - def reset @bucket = {} @response = { 'Owner' => {}, 'Buckets' => [] } @@ -23,9 +21,7 @@ module Fog @bucket[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb b/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb index ec51f869a..df5d66310 100644 --- a/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb +++ b/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class InitiateMultipartUpload < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/list_multipart_uploads.rb b/lib/fog/aws/parsers/storage/list_multipart_uploads.rb index bd53757e0..0692f0074 100644 --- a/lib/fog/aws/parsers/storage/list_multipart_uploads.rb +++ b/lib/fog/aws/parsers/storage/list_multipart_uploads.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class ListMultipartUploads < Fog::Parsers::Base - def reset @upload = { 'Initiator' => {}, 'Owner' => {} } @response = { 'Upload' => [] } @@ -47,9 +45,7 @@ module Fog @upload = { 'Initiator' => {}, 'Owner' => {} } end end - end - end end end diff --git a/lib/fog/aws/parsers/storage/list_parts.rb b/lib/fog/aws/parsers/storage/list_parts.rb index 0a774e43b..4cb6916f6 100644 --- a/lib/fog/aws/parsers/storage/list_parts.rb +++ b/lib/fog/aws/parsers/storage/list_parts.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module AWS - class ListParts < Fog::Parsers::Base - def reset @part = {} @response = { 'Initiator' => {}, 'Part' => [] } @@ -31,9 +29,7 @@ module Fog @part[name] = value.to_i end end - end - end end end diff --git a/lib/fog/aws/parsers/sts/assume_role.rb b/lib/fog/aws/parsers/sts/assume_role.rb index 2c28fce2c..f29a725fd 100644 --- a/lib/fog/aws/parsers/sts/assume_role.rb +++ b/lib/fog/aws/parsers/sts/assume_role.rb @@ -2,9 +2,7 @@ module Fog module Parsers module AWS module STS - class AssumeRole < Fog::Parsers::Base - def reset @response = {} end @@ -21,9 +19,7 @@ module Fog @response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/parsers/sts/get_session_token.rb b/lib/fog/aws/parsers/sts/get_session_token.rb index 9eed371e1..cb57d2007 100644 --- a/lib/fog/aws/parsers/sts/get_session_token.rb +++ b/lib/fog/aws/parsers/sts/get_session_token.rb @@ -2,7 +2,6 @@ module Fog module Parsers module AWS module STS - class GetSessionToken < Fog::Parsers::Base # http://docs.amazonwebservices.com/IAM/latest/UserGuide/index.html?CreatingFedTokens.html @@ -20,9 +19,7 @@ module Fog @response[name] = @value end end - end - end end end diff --git a/lib/fog/aws/rds.rb b/lib/fog/aws/rds.rb index 0708d7cf6..01985ffc4 100644 --- a/lib/fog/aws/rds.rb +++ b/lib/fog/aws/rds.rb @@ -85,7 +85,6 @@ module Fog collection :log_files class Mock - def self.data @data ||= Hash.new do |hash, region| hash[region] = Hash.new do |region_hash, key| @@ -113,14 +112,12 @@ module Fog end def initialize(options={}) - @use_iam_profile = options[:use_iam_profile] @region = options[:region] || 'us-east-1' unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region) raise ArgumentError, "Unknown region: #{@region.inspect}" end - end def data @@ -134,7 +131,6 @@ module Fog def setup_credentials(options) @aws_access_key_id = options[:aws_access_key_id] end - end class Real @@ -244,7 +240,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/redshift.rb b/lib/fog/aws/redshift.rb index 66e0a53ec..0cf9ee46a 100644 --- a/lib/fog/aws/redshift.rb +++ b/lib/fog/aws/redshift.rb @@ -47,11 +47,9 @@ module Fog request :revoke_snapshot_access class Mock - def initialize(options={}) Fog::Mock.not_implemented end - end class Real @@ -75,9 +73,7 @@ module Fog # ==== Returns # * Redshift object with connection to AWS. - def initialize(options={}) - @use_iam_profile = options[:use_iam_profile] @region = options[:region] || 'us-east-1' setup_credentials(options) @@ -93,7 +89,6 @@ module Fog @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) end - private def setup_credentials(options) @aws_access_key_id = options[:aws_access_key_id] diff --git a/lib/fog/aws/region_methods.rb b/lib/fog/aws/region_methods.rb index 80f56d64f..739bb05bf 100644 --- a/lib/fog/aws/region_methods.rb +++ b/lib/fog/aws/region_methods.rb @@ -1,13 +1,11 @@ module Fog module AWS module RegionMethods - def validate_aws_region region unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(region) raise ArgumentError, "Unknown region: #{region.inspect}" end end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb b/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb index 9b986ab67..9c2bf1f5f 100644 --- a/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb +++ b/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Creates a new Auto Scaling group with the specified name. Once the @@ -92,11 +90,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def create_auto_scaling_group(auto_scaling_group_name, availability_zones, launch_configuration_name, max_size, min_size, options = {}) unexpected_options = options.keys - ExpectedOptions[:create_auto_scaling_group] unless unexpected_options.empty? @@ -138,9 +134,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb b/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb index c0ba191da..f287c104b 100644 --- a/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb +++ b/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Creates a new launch configuration. When created, the new launch @@ -73,11 +71,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def create_launch_configuration(image_id, instance_type, launch_configuration_name, options = {}) if self.data[:launch_configurations].has_key?(launch_configuration_name) raise Fog::AWS::AutoScaling::IdentifierTaken.new("Launch Configuration by this name already exists - A launch configuration already exists with the name #{launch_configuration_name}") @@ -106,9 +102,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/create_or_update_tags.rb b/lib/fog/aws/requests/auto_scaling/create_or_update_tags.rb index 7cb2aef04..d102a8bd1 100644 --- a/lib/fog/aws/requests/auto_scaling/create_or_update_tags.rb +++ b/lib/fog/aws/requests/auto_scaling/create_or_update_tags.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Creates new tags or updates existing tags for an Auto Scaling group. @@ -44,20 +42,16 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(params)) end - end class Mock - def create_or_update_tags(tags) if tags.to_a.empty? raise Fog::AWS::AutoScaling::ValidationError.new("1 validation error detected: Value null at 'tags' failed to satisfy constraint: Member must not be null") end raise Fog::Mock::NotImplementedError end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/delete_auto_scaling_group.rb b/lib/fog/aws/requests/auto_scaling/delete_auto_scaling_group.rb index cf149c0d5..d0493a81e 100644 --- a/lib/fog/aws/requests/auto_scaling/delete_auto_scaling_group.rb +++ b/lib/fog/aws/requests/auto_scaling/delete_auto_scaling_group.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Deletes the specified auto scaling group if the group has no @@ -34,11 +32,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def delete_auto_scaling_group(auto_scaling_group_name, options = {}) unless self.data[:auto_scaling_groups].delete(auto_scaling_group_name) raise Fog::AWS::AutoScaling::ValidationError, "The auto scaling group '#{auto_scaling_group_name}' does not exist." @@ -54,7 +50,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/delete_launch_configuration.rb b/lib/fog/aws/requests/auto_scaling/delete_launch_configuration.rb index d4b092d9d..753c537a0 100644 --- a/lib/fog/aws/requests/auto_scaling/delete_launch_configuration.rb +++ b/lib/fog/aws/requests/auto_scaling/delete_launch_configuration.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Deletes the specified launch configuration. @@ -32,11 +30,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }) end - end class Mock - def delete_launch_configuration(launch_configuration_name) unless self.data[:launch_configurations].delete(launch_configuration_name) raise Fog::AWS::AutoScaling::NotFound, "The launch configuration '#{launch_configuration_name}' does not exist." @@ -49,9 +45,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/delete_notification_configuration.rb b/lib/fog/aws/requests/auto_scaling/delete_notification_configuration.rb index 6a1070773..eacf7b0b9 100644 --- a/lib/fog/aws/requests/auto_scaling/delete_notification_configuration.rb +++ b/lib/fog/aws/requests/auto_scaling/delete_notification_configuration.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Deletes notifications created by put_notification_configuration. @@ -31,11 +29,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }) end - end class Mock - def delete_notification_configuration(auto_scaling_group_name, topic_arn) unless self.data[:notification_configurations].has_key?(auto_scaling_group_name) raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - %s' % auto_scaling_group_name) @@ -57,7 +53,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/delete_policy.rb b/lib/fog/aws/requests/auto_scaling/delete_policy.rb index 31e1afad1..307a05cda 100644 --- a/lib/fog/aws/requests/auto_scaling/delete_policy.rb +++ b/lib/fog/aws/requests/auto_scaling/delete_policy.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Deletes a policy created by put_scaling_policy @@ -31,11 +29,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }) end - end class Mock - def delete_policy(auto_scaling_group_name, policy_name) unless self.data[:scaling_policies].delete(policy_name) raise Fog::AWS::AutoScaling::NotFound, "The scaling policy '#{policy_name}' does not exist." @@ -48,9 +44,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/delete_scheduled_action.rb b/lib/fog/aws/requests/auto_scaling/delete_scheduled_action.rb index 8f2332220..5e2b948fa 100644 --- a/lib/fog/aws/requests/auto_scaling/delete_scheduled_action.rb +++ b/lib/fog/aws/requests/auto_scaling/delete_scheduled_action.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Deletes a scheduled action previously created using the @@ -32,17 +30,13 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }) end - end class Mock - def delete_scheduled_action(auto_scaling_group_name, scheduled_action_name) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/delete_tags.rb b/lib/fog/aws/requests/auto_scaling/delete_tags.rb index e447feb36..cfe6dcfcb 100644 --- a/lib/fog/aws/requests/auto_scaling/delete_tags.rb +++ b/lib/fog/aws/requests/auto_scaling/delete_tags.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Removes the specified tags or a set of tags from a set of resources. @@ -44,20 +42,16 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(params)) end - end class Mock - def delete_tags(tags) if tags.to_a.empty? raise Fog::AWS::AutoScaling::ValidationError.new("1 validation error detected: Value null at 'tags' failed to satisfy constraint: Member must not be null") end raise Fog::Mock::NotImplementedError end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_adjustment_types.rb b/lib/fog/aws/requests/auto_scaling/describe_adjustment_types.rb index e26f2ae87..602abad9b 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_adjustment_types.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_adjustment_types.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_adjustment_types' # Returns policy adjustment types for use in the put_scaling_policy @@ -28,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeAdjustmentTypes.new }) end - end class Mock - def describe_adjustment_types() results = { 'AdjustmentTypes' => [] } self.data[:adjustment_types].each do |adjustment_type| @@ -46,7 +42,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb index 5d987af2e..6c27e3eea 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_auto_scaling_groups' # Returns a full description of each Auto Scaling group in the given @@ -104,11 +102,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeAutoScalingGroups.new }.merge!(options)) end - end class Mock - def describe_auto_scaling_groups(options = {}) results = { 'AutoScalingGroups' => [] } asg_set = self.data[:auto_scaling_groups] @@ -132,9 +128,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb index 1de1448ff..18f215eca 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_auto_scaling_instances' # Returns a description of each Auto Scaling instance in the @@ -65,11 +63,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeAutoScalingInstances.new }.merge!(options)) end - end class Mock - def describe_auto_scaling_instances(options = {}) results = { 'AutoScalingInstances' => [] } self.data[:auto_scaling_groups].each do |asg_name, asg_data| @@ -87,9 +83,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_notification_types.rb b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_notification_types.rb index 269ed034a..8764e71dd 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_notification_types.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_notification_types.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_auto_scaling_notification_types' # Returns a list of all notification types that are supported by Auto @@ -28,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeAutoScalingNotificationTypes.new }) end - end class Mock - def describe_auto_scaling_notification_types() results = { 'AutoScalingNotificationTypes' => [], @@ -48,7 +44,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb b/lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb index 33ff84b2f..3e85b0cfa 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_launch_configurations' # Returns a full description of the launch configurations given the @@ -80,11 +78,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeLaunchConfigurations.new }.merge!(options)) end - end class Mock - def describe_launch_configurations(options = {}) launch_configuration_names = options.delete('LaunchConfigurationNames') # even a nil object will turn into an empty array @@ -109,9 +105,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_metric_collection_types.rb b/lib/fog/aws/requests/auto_scaling/describe_metric_collection_types.rb index cd2170515..dd100857d 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_metric_collection_types.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_metric_collection_types.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_metric_collection_types' # Returns a list of metrics and a corresponding list of granularities @@ -30,11 +28,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeMetricCollectionTypes.new }) end - end class Mock - def describe_metric_collection_types() results = { 'Granularities' => [], @@ -54,7 +50,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb b/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb index bc701fbbe..247ae543d 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_notification_configurations' # Returns a list of notification actions associated with Auto Scaling @@ -44,11 +42,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeNotificationConfigurations.new }.merge!(options)) end - end class Mock - def describe_notification_configurations(options = {}) results = { 'NotificationConfigurations' => [] } (options['AutoScalingGroupNames']||self.data[:notification_configurations].keys).each do |asg_name| @@ -71,9 +67,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_policies.rb b/lib/fog/aws/requests/auto_scaling/describe_policies.rb index d88a3facc..c8fa2822c 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_policies.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_policies.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_policies' # Returns descriptions of what each policy does. This action supports @@ -69,11 +67,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribePolicies.new }.merge!(options)) end - end class Mock - def describe_policies(options = {}) results = { 'ScalingPolicies' => [] } policy_set = self.data[:scaling_policies] @@ -103,9 +99,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb b/lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb index de0e9933c..1673dd2c3 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_scaling_activities' # Returns the scaling activities for the specified Auto Scaling group. @@ -72,17 +70,13 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeScalingActivities.new }.merge!(options)) end - end class Mock - def describe_scaling_activities(options = {}) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_scaling_process_types.rb b/lib/fog/aws/requests/auto_scaling/describe_scaling_process_types.rb index b6b8cf7ce..63170a71a 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_scaling_process_types.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_scaling_process_types.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_scaling_process_types' # Returns scaling process types for use in the resume_processes and @@ -29,11 +27,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeScalingProcessTypes.new }) end - end class Mock - def describe_scaling_process_types() results = { 'Processes' => [] } self.data[:process_types].each do |process_type| @@ -47,9 +43,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb b/lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb index ed6d3d488..23b3504a2 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_scheduled_actions' # List all the actions scheduled for your Auto Scaling group that @@ -72,17 +70,13 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeScheduledActions.new }.merge!(options)) end - end class Mock - def describe_scheduled_actions(options = {}) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_tags.rb b/lib/fog/aws/requests/auto_scaling/describe_tags.rb index 847e61233..e20bdc41b 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_tags.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_tags.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_tags' # Lists the Auto Scaling group tags. @@ -58,17 +56,13 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeTags.new }.merge!(options)) end - end class Mock - def describe_tags(options={}) raise Fog::Mock::NotImplementedError end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/describe_termination_policy_types.rb b/lib/fog/aws/requests/auto_scaling/describe_termination_policy_types.rb index 00ba4ba16..96e39c00d 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_termination_policy_types.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_termination_policy_types.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/describe_termination_policy_types' # Returns a list of all termination policies supported by Auto Scaling. @@ -27,11 +25,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::DescribeTerminationPolicyTypes.new }) end - end class Mock - def describe_termination_policy_types() results = { 'TerminationPolicyTypes' => [] } self.data[:termination_policy_types].each do |termination_policy_type| @@ -45,9 +41,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb b/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb index 7b8f7f6ee..78b352fa4 100644 --- a/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb +++ b/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Disables monitoring of group metrics for the Auto Scaling group @@ -36,11 +34,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def disable_metrics_collection(auto_scaling_group_name, options = {}) unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name) Fog::AWS::AutoScaling::ValidationError.new("Group #{auto_scaling_group_name} not found") @@ -48,9 +44,7 @@ module Fog Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb b/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb index 594deccca..84661969e 100644 --- a/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb +++ b/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Enables monitoring of group metrics for the Auto Scaling group @@ -43,11 +41,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def enable_metrics_collection(auto_scaling_group_name, granularity, options = {}) unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name) Fog::AWS::AutoScaling::ValidationError.new("Group #{auto_scaling_group_name} not found") @@ -58,9 +54,7 @@ module Fog Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/execute_policy.rb b/lib/fog/aws/requests/auto_scaling/execute_policy.rb index 30e980f29..e6cd51996 100644 --- a/lib/fog/aws/requests/auto_scaling/execute_policy.rb +++ b/lib/fog/aws/requests/auto_scaling/execute_policy.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Runs the policy you create for your Auto Scaling group in @@ -34,17 +32,13 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def execute_policy(policy_name, options = {}) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb b/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb index fb0e3efa1..2d746e43d 100644 --- a/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb +++ b/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/put_notification_configuration' # Creates a notification configuration for an Auto Scaling group. To @@ -35,11 +33,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::PutNotificationConfiguration.new }.merge!(params)) end - end class Mock - def put_notification_configuration(auto_scaling_group_name, notification_types, topic_arn) unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name) raise Fog::AWS::AutoScaling::ValidationError.new("AutoScalingGroup name not found - #{auto_scaling_group_name}") @@ -62,9 +58,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/put_scaling_policy.rb b/lib/fog/aws/requests/auto_scaling/put_scaling_policy.rb index 51552d85d..dda0a1323 100644 --- a/lib/fog/aws/requests/auto_scaling/put_scaling_policy.rb +++ b/lib/fog/aws/requests/auto_scaling/put_scaling_policy.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/put_scaling_policy' # Creates or updates a policy for an Auto Scaling group. To update an @@ -50,11 +48,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::PutScalingPolicy.new }.merge!(options)) end - end class Mock - def put_scaling_policy(adjustment_type, auto_scaling_group_name, policy_name, scaling_adjustment, options = {}) unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name) raise Fog::AWS::AutoScaling::ValidationError.new('Auto Scaling Group name not found - null') @@ -77,9 +73,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/put_scheduled_update_group_action.rb b/lib/fog/aws/requests/auto_scaling/put_scheduled_update_group_action.rb index bcd993239..b9be811fb 100644 --- a/lib/fog/aws/requests/auto_scaling/put_scheduled_update_group_action.rb +++ b/lib/fog/aws/requests/auto_scaling/put_scheduled_update_group_action.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Creates a scheduled scaling action for a Auto Scaling group. If you @@ -54,17 +52,13 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def put_scheduled_update_group_action(auto_scaling_group_name, scheduled_policy_name, time, options = {}) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/resume_processes.rb b/lib/fog/aws/requests/auto_scaling/resume_processes.rb index bd653fc33..d570b6ed1 100644 --- a/lib/fog/aws/requests/auto_scaling/resume_processes.rb +++ b/lib/fog/aws/requests/auto_scaling/resume_processes.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Resumes Auto Scaling processes for an Auto Scaling group. @@ -34,11 +32,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def resume_processes(auto_scaling_group_name, options = {}) unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name) raise Fog::AWS::AutoScaling::ValidationError.new("AutoScalingGroup name not found - no such group: #{auto_scaling_group_name}") @@ -51,9 +47,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/set_desired_capacity.rb b/lib/fog/aws/requests/auto_scaling/set_desired_capacity.rb index 5b173a63a..6c3ce6b55 100644 --- a/lib/fog/aws/requests/auto_scaling/set_desired_capacity.rb +++ b/lib/fog/aws/requests/auto_scaling/set_desired_capacity.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Adjusts the desired size of the AutoScalingGroup by initiating @@ -61,11 +59,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def set_desired_capacity(auto_scaling_group_name, desired_capacity, options = {}) unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name) Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null') @@ -79,9 +75,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/set_instance_health.rb b/lib/fog/aws/requests/auto_scaling/set_instance_health.rb index 68d07f59c..775806e7b 100644 --- a/lib/fog/aws/requests/auto_scaling/set_instance_health.rb +++ b/lib/fog/aws/requests/auto_scaling/set_instance_health.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Sets the health status of an instance. @@ -35,11 +33,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def set_instance_health(health_status, instance_id, options = {}) unless self.data[:health_states].include?(health_status) raise Fog::AWS::AutoScaling::ValidationError.new('Valid instance health states are: [#{self.data[:health_states].join(", ")}].') @@ -47,9 +43,7 @@ module Fog Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/suspend_processes.rb b/lib/fog/aws/requests/auto_scaling/suspend_processes.rb index 68edf0f7c..eae54ddcc 100644 --- a/lib/fog/aws/requests/auto_scaling/suspend_processes.rb +++ b/lib/fog/aws/requests/auto_scaling/suspend_processes.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/basic' # Suspends Auto Scaling processes for an Auto Scaling group. To suspend @@ -37,11 +35,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def suspend_processes(auto_scaling_group_name, options = {}) unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name) raise Fog::AWS::AutoScaling::ValidationError.new("AutoScalingGroup name not found - no such group: #{auto_scaling_group_name}") @@ -54,9 +50,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/terminate_instance_in_auto_scaling_group.rb b/lib/fog/aws/requests/auto_scaling/terminate_instance_in_auto_scaling_group.rb index 2e4274331..4242543cb 100644 --- a/lib/fog/aws/requests/auto_scaling/terminate_instance_in_auto_scaling_group.rb +++ b/lib/fog/aws/requests/auto_scaling/terminate_instance_in_auto_scaling_group.rb @@ -1,9 +1,7 @@ module Fog module AWS class AutoScaling - class Real - require 'fog/aws/parsers/auto_scaling/terminate_instance_in_auto_scaling_group' # Terminates the specified instance. Optionally, the desired group size @@ -49,17 +47,13 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::TerminateInstanceInAutoScalingGroup.new }) end - end class Mock - def terminate_instance_in_auto_scaling_group(instance_id, should_decrement_desired_capacity) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb b/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb index f65fde0ea..0efcbd220 100644 --- a/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb +++ b/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class AutoScaling class Real - require 'fog/aws/parsers/auto_scaling/basic' # Updates the configuration for the specified AutoScalingGroup. @@ -67,11 +66,9 @@ module Fog :parser => Fog::Parsers::AWS::AutoScaling::Basic.new }.merge!(options)) end - end class Mock - def update_auto_scaling_group(auto_scaling_group_name, options = {}) unexpected_options = options.keys - ExpectedOptions[:update_auto_scaling_group] unless unexpected_options.empty? @@ -90,9 +87,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/beanstalk/check_dns_availability.rb b/lib/fog/aws/requests/beanstalk/check_dns_availability.rb index 8bfbd388e..afebeb5a0 100644 --- a/lib/fog/aws/requests/beanstalk/check_dns_availability.rb +++ b/lib/fog/aws/requests/beanstalk/check_dns_availability.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/check_dns_availability' # Checks if the specified CNAME is available. diff --git a/lib/fog/aws/requests/beanstalk/create_application.rb b/lib/fog/aws/requests/beanstalk/create_application.rb index 3d4fabb41..7e1ee4b6a 100644 --- a/lib/fog/aws/requests/beanstalk/create_application.rb +++ b/lib/fog/aws/requests/beanstalk/create_application.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/create_application' # Creates an application that has one configuration template named default and no application versions. diff --git a/lib/fog/aws/requests/beanstalk/create_application_version.rb b/lib/fog/aws/requests/beanstalk/create_application_version.rb index eb3181058..d4a48a3f7 100644 --- a/lib/fog/aws/requests/beanstalk/create_application_version.rb +++ b/lib/fog/aws/requests/beanstalk/create_application_version.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/create_application_version' # Creates an application version for the specified application. diff --git a/lib/fog/aws/requests/beanstalk/create_configuration_template.rb b/lib/fog/aws/requests/beanstalk/create_configuration_template.rb index 7eb6ba3f0..d4adc4ff6 100644 --- a/lib/fog/aws/requests/beanstalk/create_configuration_template.rb +++ b/lib/fog/aws/requests/beanstalk/create_configuration_template.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/create_configuration_template' # Creates a configuration template. Templates are associated with a specific application and are used to diff --git a/lib/fog/aws/requests/beanstalk/create_environment.rb b/lib/fog/aws/requests/beanstalk/create_environment.rb index f0f718dce..cbf3e9405 100644 --- a/lib/fog/aws/requests/beanstalk/create_environment.rb +++ b/lib/fog/aws/requests/beanstalk/create_environment.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/create_environment' # Launches an environment for the specified application using the specified configuration. diff --git a/lib/fog/aws/requests/beanstalk/create_storage_location.rb b/lib/fog/aws/requests/beanstalk/create_storage_location.rb index 8ae384bf3..6b67e0af5 100644 --- a/lib/fog/aws/requests/beanstalk/create_storage_location.rb +++ b/lib/fog/aws/requests/beanstalk/create_storage_location.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/create_storage_location' # Creates the Amazon S3 storage location for the account. diff --git a/lib/fog/aws/requests/beanstalk/delete_application.rb b/lib/fog/aws/requests/beanstalk/delete_application.rb index cc436a318..b0b451057 100644 --- a/lib/fog/aws/requests/beanstalk/delete_application.rb +++ b/lib/fog/aws/requests/beanstalk/delete_application.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/empty' # Deletes the specified application along with all associated versions and configurations. diff --git a/lib/fog/aws/requests/beanstalk/delete_application_version.rb b/lib/fog/aws/requests/beanstalk/delete_application_version.rb index 9cfa16a41..7e48a6416 100644 --- a/lib/fog/aws/requests/beanstalk/delete_application_version.rb +++ b/lib/fog/aws/requests/beanstalk/delete_application_version.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/empty' # Deletes the specified version from the specified application. diff --git a/lib/fog/aws/requests/beanstalk/delete_configuration_template.rb b/lib/fog/aws/requests/beanstalk/delete_configuration_template.rb index 0d6ba30a5..010215853 100644 --- a/lib/fog/aws/requests/beanstalk/delete_configuration_template.rb +++ b/lib/fog/aws/requests/beanstalk/delete_configuration_template.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/empty' # Deletes the specified configuration template. diff --git a/lib/fog/aws/requests/beanstalk/delete_environment_configuration.rb b/lib/fog/aws/requests/beanstalk/delete_environment_configuration.rb index 0294a459a..bcaee5ee5 100644 --- a/lib/fog/aws/requests/beanstalk/delete_environment_configuration.rb +++ b/lib/fog/aws/requests/beanstalk/delete_environment_configuration.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/empty' # Deletes the draft configuration associated with the running environment. diff --git a/lib/fog/aws/requests/beanstalk/describe_application_versions.rb b/lib/fog/aws/requests/beanstalk/describe_application_versions.rb index 66d7d1822..b23fa74b9 100644 --- a/lib/fog/aws/requests/beanstalk/describe_application_versions.rb +++ b/lib/fog/aws/requests/beanstalk/describe_application_versions.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/describe_application_versions' # Returns descriptions for existing application versions. diff --git a/lib/fog/aws/requests/beanstalk/describe_applications.rb b/lib/fog/aws/requests/beanstalk/describe_applications.rb index c0af5db4f..28f6e8514 100644 --- a/lib/fog/aws/requests/beanstalk/describe_applications.rb +++ b/lib/fog/aws/requests/beanstalk/describe_applications.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/describe_applications' # Returns the descriptions of existing applications. diff --git a/lib/fog/aws/requests/beanstalk/describe_configuration_options.rb b/lib/fog/aws/requests/beanstalk/describe_configuration_options.rb index 60c83baf4..61b942d7d 100644 --- a/lib/fog/aws/requests/beanstalk/describe_configuration_options.rb +++ b/lib/fog/aws/requests/beanstalk/describe_configuration_options.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/describe_configuration_options' # Describes the configuration options that are used in a particular configuration template or environment, diff --git a/lib/fog/aws/requests/beanstalk/describe_configuration_settings.rb b/lib/fog/aws/requests/beanstalk/describe_configuration_settings.rb index 15810fa3d..6c3e2619f 100644 --- a/lib/fog/aws/requests/beanstalk/describe_configuration_settings.rb +++ b/lib/fog/aws/requests/beanstalk/describe_configuration_settings.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/describe_configuration_settings' # Returns a description of the settings for the specified configuration set, that is, either a configuration diff --git a/lib/fog/aws/requests/beanstalk/describe_environment_resources.rb b/lib/fog/aws/requests/beanstalk/describe_environment_resources.rb index 0f1650012..3ee68524f 100644 --- a/lib/fog/aws/requests/beanstalk/describe_environment_resources.rb +++ b/lib/fog/aws/requests/beanstalk/describe_environment_resources.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/describe_environment_resources' # Returns AWS resources for this environment. diff --git a/lib/fog/aws/requests/beanstalk/describe_environments.rb b/lib/fog/aws/requests/beanstalk/describe_environments.rb index 653e45aab..e0c573352 100644 --- a/lib/fog/aws/requests/beanstalk/describe_environments.rb +++ b/lib/fog/aws/requests/beanstalk/describe_environments.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/describe_environments' # Returns descriptions for existing environments. diff --git a/lib/fog/aws/requests/beanstalk/describe_events.rb b/lib/fog/aws/requests/beanstalk/describe_events.rb index cb52728a3..ebbe7723c 100644 --- a/lib/fog/aws/requests/beanstalk/describe_events.rb +++ b/lib/fog/aws/requests/beanstalk/describe_events.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/describe_events' # Returns list of event descriptions matching criteria up to the last 6 weeks. diff --git a/lib/fog/aws/requests/beanstalk/list_available_solution_stacks.rb b/lib/fog/aws/requests/beanstalk/list_available_solution_stacks.rb index f2be2539a..d478af639 100644 --- a/lib/fog/aws/requests/beanstalk/list_available_solution_stacks.rb +++ b/lib/fog/aws/requests/beanstalk/list_available_solution_stacks.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/list_available_solution_stacks' # Checks if the specified CNAME is available. diff --git a/lib/fog/aws/requests/beanstalk/rebuild_environment.rb b/lib/fog/aws/requests/beanstalk/rebuild_environment.rb index 1cbd8a2f7..e72290042 100644 --- a/lib/fog/aws/requests/beanstalk/rebuild_environment.rb +++ b/lib/fog/aws/requests/beanstalk/rebuild_environment.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/empty' # Deletes and recreates all of the AWS resources (for example: the Auto Scaling group, load balancer, etc.) diff --git a/lib/fog/aws/requests/beanstalk/request_environment_info.rb b/lib/fog/aws/requests/beanstalk/request_environment_info.rb index 42f601449..ea48d2ea6 100644 --- a/lib/fog/aws/requests/beanstalk/request_environment_info.rb +++ b/lib/fog/aws/requests/beanstalk/request_environment_info.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/empty' # Returns AWS resources for this environment. diff --git a/lib/fog/aws/requests/beanstalk/restart_app_server.rb b/lib/fog/aws/requests/beanstalk/restart_app_server.rb index f01e6b1cc..e5180a2c3 100644 --- a/lib/fog/aws/requests/beanstalk/restart_app_server.rb +++ b/lib/fog/aws/requests/beanstalk/restart_app_server.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/empty' # Returns AWS resources for this environment. diff --git a/lib/fog/aws/requests/beanstalk/retrieve_environment_info.rb b/lib/fog/aws/requests/beanstalk/retrieve_environment_info.rb index 5507c1f22..f13904281 100644 --- a/lib/fog/aws/requests/beanstalk/retrieve_environment_info.rb +++ b/lib/fog/aws/requests/beanstalk/retrieve_environment_info.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/retrieve_environment_info' # Returns AWS resources for this environment. diff --git a/lib/fog/aws/requests/beanstalk/swap_environment_cnames.rb b/lib/fog/aws/requests/beanstalk/swap_environment_cnames.rb index 88e848e8d..aad9f4224 100644 --- a/lib/fog/aws/requests/beanstalk/swap_environment_cnames.rb +++ b/lib/fog/aws/requests/beanstalk/swap_environment_cnames.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/empty' # Swaps the CNAMEs of two environments. diff --git a/lib/fog/aws/requests/beanstalk/terminate_environment.rb b/lib/fog/aws/requests/beanstalk/terminate_environment.rb index ab8619b0d..ebf250731 100644 --- a/lib/fog/aws/requests/beanstalk/terminate_environment.rb +++ b/lib/fog/aws/requests/beanstalk/terminate_environment.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/terminate_environment' # Terminates the specified environment. diff --git a/lib/fog/aws/requests/beanstalk/update_application.rb b/lib/fog/aws/requests/beanstalk/update_application.rb index f3c194105..c8055c3c7 100644 --- a/lib/fog/aws/requests/beanstalk/update_application.rb +++ b/lib/fog/aws/requests/beanstalk/update_application.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/update_application' # Updates the specified application to have the specified properties. diff --git a/lib/fog/aws/requests/beanstalk/update_application_version.rb b/lib/fog/aws/requests/beanstalk/update_application_version.rb index 02f200b2b..ef1f392f8 100644 --- a/lib/fog/aws/requests/beanstalk/update_application_version.rb +++ b/lib/fog/aws/requests/beanstalk/update_application_version.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/update_application_version' # Updates the specified application version to have the specified properties. diff --git a/lib/fog/aws/requests/beanstalk/update_configuration_template.rb b/lib/fog/aws/requests/beanstalk/update_configuration_template.rb index 485a75fbd..6cca4d10f 100644 --- a/lib/fog/aws/requests/beanstalk/update_configuration_template.rb +++ b/lib/fog/aws/requests/beanstalk/update_configuration_template.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/update_configuration_template' # Updates the specified configuration template to have the specified properties or configuration option values. diff --git a/lib/fog/aws/requests/beanstalk/update_environment.rb b/lib/fog/aws/requests/beanstalk/update_environment.rb index 69c2130f2..f9f80fa27 100644 --- a/lib/fog/aws/requests/beanstalk/update_environment.rb +++ b/lib/fog/aws/requests/beanstalk/update_environment.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/update_environment' # Updates the environment description, deploys a new application version, updates the configuration settings diff --git a/lib/fog/aws/requests/beanstalk/validate_configuration_settings.rb b/lib/fog/aws/requests/beanstalk/validate_configuration_settings.rb index 678347061..466ba0b82 100644 --- a/lib/fog/aws/requests/beanstalk/validate_configuration_settings.rb +++ b/lib/fog/aws/requests/beanstalk/validate_configuration_settings.rb @@ -2,7 +2,6 @@ module Fog module AWS class ElasticBeanstalk class Real - require 'fog/aws/parsers/beanstalk/validate_configuration_settings' # Updates the specified configuration template to have the specified properties or configuration option values. diff --git a/lib/fog/aws/requests/cdn/delete_distribution.rb b/lib/fog/aws/requests/cdn/delete_distribution.rb index 8b9d77971..01b964750 100644 --- a/lib/fog/aws/requests/cdn/delete_distribution.rb +++ b/lib/fog/aws/requests/cdn/delete_distribution.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - # Delete a distribution from CloudFront. # # @param distribution_id [String] Id of distribution to delete. @@ -19,11 +18,9 @@ module Fog :path => "/distribution/#{distribution_id}" }) end - end class Mock - def delete_distribution(distribution_id, etag) distribution = self.data[:distributions][distribution_id] @@ -49,9 +46,7 @@ module Fog Fog::CDN::AWS::Mock.error(:no_such_distribution) end end - end - end end end diff --git a/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb b/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb index 2473dffc6..143705522 100644 --- a/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb +++ b/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - # Delete a streaming distribution from CloudFront. # # @param [String] distribution_id Id of distribution to delete. @@ -19,11 +18,9 @@ module Fog :path => "/streaming-distribution/#{distribution_id}" }) end - end class Mock - def delete_streaming_distribution(distribution_id, etag) distribution = self.data[:streaming_distributions][distribution_id] @@ -48,9 +45,7 @@ module Fog Fog::CDN::AWS::Mock.error(:no_such_streaming_distribution) end end - end - end end end diff --git a/lib/fog/aws/requests/cdn/get_distribution.rb b/lib/fog/aws/requests/cdn/get_distribution.rb index ea01f315e..5061cb7fd 100644 --- a/lib/fog/aws/requests/cdn/get_distribution.rb +++ b/lib/fog/aws/requests/cdn/get_distribution.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/distribution' # Get information about a distribution from CloudFront. @@ -47,11 +46,9 @@ module Fog :path => "/distribution/#{distribution_id}" }) end - end class Mock - def get_distribution(distribution_id) response = Excon::Response.new @@ -76,7 +73,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/cdn/get_distribution_list.rb b/lib/fog/aws/requests/cdn/get_distribution_list.rb index bbd09c638..80e28e0be 100644 --- a/lib/fog/aws/requests/cdn/get_distribution_list.rb +++ b/lib/fog/aws/requests/cdn/get_distribution_list.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/get_distribution_list' # List information about distributions in CloudFront. @@ -48,11 +47,9 @@ module Fog :query => options }) end - end class Mock - def get_distribution_list(options = {}) response = Excon::Response.new response.status = 200 diff --git a/lib/fog/aws/requests/cdn/get_invalidation.rb b/lib/fog/aws/requests/cdn/get_invalidation.rb index 1fc5f1079..f1ec500e2 100644 --- a/lib/fog/aws/requests/cdn/get_invalidation.rb +++ b/lib/fog/aws/requests/cdn/get_invalidation.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/get_invalidation' # Get invalidation. @@ -29,11 +28,9 @@ module Fog :path => "/distribution/#{distribution_id}/invalidation/#{invalidation_id}" }) end - end class Mock - def get_invalidation(distribution_id, invalidation_id) distribution = self.data[:distributions][distribution_id] unless distribution @@ -55,7 +52,6 @@ module Fog response.body = invalidation response end - end end end diff --git a/lib/fog/aws/requests/cdn/get_invalidation_list.rb b/lib/fog/aws/requests/cdn/get_invalidation_list.rb index 6ef2d05d8..f0f4eb255 100644 --- a/lib/fog/aws/requests/cdn/get_invalidation_list.rb +++ b/lib/fog/aws/requests/cdn/get_invalidation_list.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/get_invalidation_list' # Get invalidation list. @@ -33,11 +32,9 @@ module Fog :query => options }) end - end class Mock - def get_invalidation_list(distribution_id, options = {}) distribution = self.data[:distributions][distribution_id] unless distribution @@ -73,9 +70,7 @@ module Fog 'Status' => d['Status'] } end - end - end end end diff --git a/lib/fog/aws/requests/cdn/get_streaming_distribution.rb b/lib/fog/aws/requests/cdn/get_streaming_distribution.rb index dc43cae24..b212af16c 100644 --- a/lib/fog/aws/requests/cdn/get_streaming_distribution.rb +++ b/lib/fog/aws/requests/cdn/get_streaming_distribution.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/streaming_distribution' # Get information about a streaming distribution from CloudFront. @@ -40,11 +39,9 @@ module Fog :path => "/streaming-distribution/#{distribution_id}" }) end - end class Mock - def get_streaming_distribution(distribution_id) response = Excon::Response.new @@ -67,7 +64,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb b/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb index b7be3eba6..806de70ba 100644 --- a/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb +++ b/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/get_streaming_distribution_list' # List information about distributions in CloudFront. @@ -48,11 +47,9 @@ module Fog :query => options }) end - end class Mock - def get_streaming_distribution_list(options = {}) response = Excon::Response.new response.status = 200 @@ -79,7 +76,6 @@ module Fog }.merge(d['StreamingDistributionConfig']) end end - end end end diff --git a/lib/fog/aws/requests/cdn/post_distribution.rb b/lib/fog/aws/requests/cdn/post_distribution.rb index 09a364069..98b8efd5e 100644 --- a/lib/fog/aws/requests/cdn/post_distribution.rb +++ b/lib/fog/aws/requests/cdn/post_distribution.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/distribution' # Create a new distribution in CloudFront. @@ -82,11 +81,9 @@ module Fog :path => "/distribution" }) end - end class Mock - require 'time' def post_distribution(options = {}) diff --git a/lib/fog/aws/requests/cdn/post_invalidation.rb b/lib/fog/aws/requests/cdn/post_invalidation.rb index 892f5f5c7..36bef96f6 100644 --- a/lib/fog/aws/requests/cdn/post_invalidation.rb +++ b/lib/fog/aws/requests/cdn/post_invalidation.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/post_invalidation' # List information about distributions in CloudFront. @@ -40,11 +39,9 @@ module Fog :path => "/distribution/#{distribution_id}/invalidation" }) end - end class Mock - def post_invalidation(distribution_id, paths, caller_reference = Time.now.to_i.to_s) distribution = self.data[:distributions][distribution_id] if distribution @@ -72,9 +69,7 @@ module Fog Fog::CDN::AWS::Mock.error(:no_such_distribution) end end - end - end end end diff --git a/lib/fog/aws/requests/cdn/post_streaming_distribution.rb b/lib/fog/aws/requests/cdn/post_streaming_distribution.rb index 330cd383c..4477a2a89 100644 --- a/lib/fog/aws/requests/cdn/post_streaming_distribution.rb +++ b/lib/fog/aws/requests/cdn/post_streaming_distribution.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/streaming_distribution' # Create a new streaming distribution in CloudFront. @@ -69,12 +68,9 @@ module Fog :path => "/streaming-distribution" }) end - end - class Mock - require 'time' def post_streaming_distribution(options = {}) @@ -114,7 +110,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/cdn/put_distribution_config.rb b/lib/fog/aws/requests/cdn/put_distribution_config.rb index 81d9769e7..71d828631 100644 --- a/lib/fog/aws/requests/cdn/put_distribution_config.rb +++ b/lib/fog/aws/requests/cdn/put_distribution_config.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/distribution' # Update a distribution in CloudFront. @@ -85,11 +84,9 @@ module Fog :path => "/distribution/#{distribution_id}/config" }) end - end class Mock - def put_distribution_config(distribution_id, etag, options = {}) distribution = self.data[:distributions][distribution_id] @@ -114,7 +111,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb b/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb index 32d3ef2b5..bb6d2a597 100644 --- a/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb +++ b/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb @@ -2,7 +2,6 @@ module Fog module CDN class AWS class Real - require 'fog/aws/parsers/cdn/streaming_distribution' # Update a streaming distribution in CloudFront. @@ -74,11 +73,9 @@ module Fog :path => "/streaming-distribution/#{distribution_id}/config" }) end - end class Mock - def put_streaming_distribution_config(distribution_id, etag, options = {}) distribution = self.data[:streaming_distributions][distribution_id] @@ -103,7 +100,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/create_stack.rb b/lib/fog/aws/requests/cloud_formation/create_stack.rb index 39cff787f..fd7dea14f 100644 --- a/lib/fog/aws/requests/cloud_formation/create_stack.rb +++ b/lib/fog/aws/requests/cloud_formation/create_stack.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/create_stack' # Create a stack. @@ -83,7 +82,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::CreateStack.new }.merge!(params)) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/delete_stack.rb b/lib/fog/aws/requests/cloud_formation/delete_stack.rb index cab9e6b75..6fd982457 100644 --- a/lib/fog/aws/requests/cloud_formation/delete_stack.rb +++ b/lib/fog/aws/requests/cloud_formation/delete_stack.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/basic' # Delete a stack. @@ -20,7 +19,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/describe_stack_events.rb b/lib/fog/aws/requests/cloud_formation/describe_stack_events.rb index 167c44475..32ce57c81 100644 --- a/lib/fog/aws/requests/cloud_formation/describe_stack_events.rb +++ b/lib/fog/aws/requests/cloud_formation/describe_stack_events.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/describe_stack_events' # Describe stack events. @@ -34,7 +33,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::DescribeStackEvents.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/describe_stack_resources.rb b/lib/fog/aws/requests/cloud_formation/describe_stack_resources.rb index 72e2ce6a2..73ca74882 100644 --- a/lib/fog/aws/requests/cloud_formation/describe_stack_resources.rb +++ b/lib/fog/aws/requests/cloud_formation/describe_stack_resources.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/describe_stack_resources' # Describe stack resources. @@ -33,7 +32,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::DescribeStackResources.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/describe_stacks.rb b/lib/fog/aws/requests/cloud_formation/describe_stacks.rb index e814cb405..d5d30668f 100644 --- a/lib/fog/aws/requests/cloud_formation/describe_stacks.rb +++ b/lib/fog/aws/requests/cloud_formation/describe_stacks.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/describe_stacks' # Describe stacks. @@ -32,7 +31,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::DescribeStacks.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/get_template.rb b/lib/fog/aws/requests/cloud_formation/get_template.rb index 9ebf1b6f6..918203f05 100644 --- a/lib/fog/aws/requests/cloud_formation/get_template.rb +++ b/lib/fog/aws/requests/cloud_formation/get_template.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/get_template' # Describe stacks. @@ -22,7 +21,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::GetTemplate.new ) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/list_stack_resources.rb b/lib/fog/aws/requests/cloud_formation/list_stack_resources.rb index 4425355ef..ba8d0b14e 100644 --- a/lib/fog/aws/requests/cloud_formation/list_stack_resources.rb +++ b/lib/fog/aws/requests/cloud_formation/list_stack_resources.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/list_stack_resources' # List stack resources. @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::ListStackResources.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/list_stacks.rb b/lib/fog/aws/requests/cloud_formation/list_stacks.rb index 7e7d4b9b1..1587f2a29 100644 --- a/lib/fog/aws/requests/cloud_formation/list_stacks.rb +++ b/lib/fog/aws/requests/cloud_formation/list_stacks.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/list_stacks' # List stacks. @@ -30,7 +29,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::ListStacks.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/update_stack.rb b/lib/fog/aws/requests/cloud_formation/update_stack.rb index 521d457f9..d3722498c 100644 --- a/lib/fog/aws/requests/cloud_formation/update_stack.rb +++ b/lib/fog/aws/requests/cloud_formation/update_stack.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/update_stack' # Update a stack. @@ -51,7 +50,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::UpdateStack.new }.merge!(params)) end - end end end diff --git a/lib/fog/aws/requests/cloud_formation/validate_template.rb b/lib/fog/aws/requests/cloud_formation/validate_template.rb index 2ef5ed579..b16911c92 100644 --- a/lib/fog/aws/requests/cloud_formation/validate_template.rb +++ b/lib/fog/aws/requests/cloud_formation/validate_template.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudFormation class Real - require 'fog/aws/parsers/cloud_formation/validate_template' # Describe stacks. @@ -24,7 +23,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudFormation::ValidateTemplate.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/cloud_watch/delete_alarms.rb b/lib/fog/aws/requests/cloud_watch/delete_alarms.rb index f0eca8331..542450ea8 100644 --- a/lib/fog/aws/requests/cloud_watch/delete_alarms.rb +++ b/lib/fog/aws/requests/cloud_watch/delete_alarms.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/delete_alarms' # Delete a list of alarms diff --git a/lib/fog/aws/requests/cloud_watch/describe_alarm_history.rb b/lib/fog/aws/requests/cloud_watch/describe_alarm_history.rb index ef16b654c..ccb1e7a97 100644 --- a/lib/fog/aws/requests/cloud_watch/describe_alarm_history.rb +++ b/lib/fog/aws/requests/cloud_watch/describe_alarm_history.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/describe_alarm_history' # Retrieves history for the specified alarm diff --git a/lib/fog/aws/requests/cloud_watch/describe_alarms.rb b/lib/fog/aws/requests/cloud_watch/describe_alarms.rb index 7b53097a6..ecd7884c7 100644 --- a/lib/fog/aws/requests/cloud_watch/describe_alarms.rb +++ b/lib/fog/aws/requests/cloud_watch/describe_alarms.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/describe_alarms' # Retrieves alarms with the specified names diff --git a/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb b/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb index eaa1ef42e..4791d99ab 100644 --- a/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb +++ b/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/describe_alarms_for_metric' # Retrieves all alarms for a single metric diff --git a/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb b/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb index b14f91e09..26ea6d074 100644 --- a/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb +++ b/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/disable_alarm_actions' # Disables actions for the specified alarms diff --git a/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb b/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb index 4329610a6..1d229cc6a 100644 --- a/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb +++ b/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/enable_alarm_actions' # Enables actions for the specified alarms diff --git a/lib/fog/aws/requests/cloud_watch/get_metric_statistics.rb b/lib/fog/aws/requests/cloud_watch/get_metric_statistics.rb index a237016bc..4a839fa44 100644 --- a/lib/fog/aws/requests/cloud_watch/get_metric_statistics.rb +++ b/lib/fog/aws/requests/cloud_watch/get_metric_statistics.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/get_metric_statistics' # Fetch datapoints for a metric. At most 1440 datapoints will be returned, the most datapoints that can be queried is 50850 @@ -41,7 +40,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudWatch::GetMetricStatistics.new }.merge(options)) end - end end end diff --git a/lib/fog/aws/requests/cloud_watch/list_metrics.rb b/lib/fog/aws/requests/cloud_watch/list_metrics.rb index cf8456a35..650a9710f 100644 --- a/lib/fog/aws/requests/cloud_watch/list_metrics.rb +++ b/lib/fog/aws/requests/cloud_watch/list_metrics.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/list_metrics' # List availabe metrics @@ -31,7 +30,6 @@ module Fog :parser => Fog::Parsers::AWS::CloudWatch::ListMetrics.new }.merge(options)) end - end class Mock @@ -59,7 +57,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/cloud_watch/put_metric_data.rb b/lib/fog/aws/requests/cloud_watch/put_metric_data.rb index 6a713b74a..c0cf94d02 100644 --- a/lib/fog/aws/requests/cloud_watch/put_metric_data.rb +++ b/lib/fog/aws/requests/cloud_watch/put_metric_data.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/put_metric_data' # Publishes one or more data points to CloudWatch. A new metric is created if necessary diff --git a/lib/fog/aws/requests/cloud_watch/set_alarm_state.rb b/lib/fog/aws/requests/cloud_watch/set_alarm_state.rb index 722af2602..f16d8769b 100644 --- a/lib/fog/aws/requests/cloud_watch/set_alarm_state.rb +++ b/lib/fog/aws/requests/cloud_watch/set_alarm_state.rb @@ -2,7 +2,6 @@ module Fog module AWS class CloudWatch class Real - require 'fog/aws/parsers/cloud_watch/set_alarm_state' # Temporarily sets the state of an alarm diff --git a/lib/fog/aws/requests/compute/allocate_address.rb b/lib/fog/aws/requests/compute/allocate_address.rb index 9efb02fda..e57a9af19 100644 --- a/lib/fog/aws/requests/compute/allocate_address.rb +++ b/lib/fog/aws/requests/compute/allocate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/allocate_address' # Acquire an elastic IP address. @@ -24,11 +23,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::AllocateAddress.new ) end - end class Mock - def allocate_address(domain = 'standard') domain = domain == 'vpc' ? 'vpc' : 'standard' response = Excon::Response.new @@ -52,7 +49,6 @@ module Fog raise(Excon::Errors.status_error({:expects => 200}, response)) end end - end end end diff --git a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb index 048059b9c..a1dde0e13 100644 --- a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb +++ b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/assign_private_ip_addresses' # Assigns one or more secondary private IP addresses to the specified network interface. @@ -20,7 +19,6 @@ module Fog # # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssignPrivateIpAddresses.html] def assign_private_ip_addresses(network_interface_id, options={}) - if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount'] raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.") end @@ -35,11 +33,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::AssignPrivateIpAddresses.new }.merge(options)) end - end class Mock - def assign_private_ip_addresses(network_interface_id, options={}) if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount'] raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.") @@ -53,7 +49,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/associate_address.rb b/lib/fog/aws/requests/compute/associate_address.rb index c316d2059..33e909fa7 100644 --- a/lib/fog/aws/requests/compute/associate_address.rb +++ b/lib/fog/aws/requests/compute/associate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/associate_address' # Associate an elastic IP address with an instance @@ -55,7 +54,6 @@ module Fog end class Mock - def associate_address(*args) if args.first.kind_of? Hash params = args.first @@ -122,7 +120,6 @@ module Fog raise Fog::Compute::AWS::Error.new("You must specify either an InstanceId or a NetworkInterfaceID") end end - end end end diff --git a/lib/fog/aws/requests/compute/associate_dhcp_options.rb b/lib/fog/aws/requests/compute/associate_dhcp_options.rb index 009bee73b..f49bbecbf 100644 --- a/lib/fog/aws/requests/compute/associate_dhcp_options.rb +++ b/lib/fog/aws/requests/compute/associate_dhcp_options.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # # @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def associate_dhcp_options(dhcp_options_id, vpc_id) response = Excon::Response.new if dhcp_options_id && vpc_id @@ -50,7 +47,6 @@ module Fog raise Fog::Compute::AWS::Error.new(message) end end - end end end diff --git a/lib/fog/aws/requests/compute/associate_route_table.rb b/lib/fog/aws/requests/compute/associate_route_table.rb index 39d909eb5..704415db9 100755 --- a/lib/fog/aws/requests/compute/associate_route_table.rb +++ b/lib/fog/aws/requests/compute/associate_route_table.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/associate_route_table' # Associates a subnet with a route table. # @@ -25,11 +24,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::AssociateRouteTable.new ) end - end class Mock - def associate_route_table(routeTableId, subnetId) routetable = self.data[:route_tables].find { |routetable| routetable["routeTableId"].eql? routeTableId } subnet = self.data[:subnets].find { |subnet| subnet["subnetId"].eql? subnetId } @@ -49,7 +46,6 @@ module Fog else raise Fog::Compute::AWS::NotFound.new("The subnet ID '#{subnetId}' does not exist") end - end private @@ -68,7 +64,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/compute/attach_internet_gateway.rb b/lib/fog/aws/requests/compute/attach_internet_gateway.rb index 3a680c807..c2d3f4ccd 100644 --- a/lib/fog/aws/requests/compute/attach_internet_gateway.rb +++ b/lib/fog/aws/requests/compute/attach_internet_gateway.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Attaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC # @@ -26,11 +25,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def attach_internet_gateway(internet_gateway_id, vpc_id) response = Excon::Response.new if internet_gateway_id && vpc_id @@ -49,7 +46,6 @@ module Fog raise Fog::Compute::AWS::Error.new(message) end end - end end end diff --git a/lib/fog/aws/requests/compute/attach_network_interface.rb b/lib/fog/aws/requests/compute/attach_network_interface.rb index 93912ce47..83c4fab5b 100644 --- a/lib/fog/aws/requests/compute/attach_network_interface.rb +++ b/lib/fog/aws/requests/compute/attach_network_interface.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/attach_network_interface' # Attach a network interface @@ -30,9 +29,7 @@ module Fog end end - class Mock - def attach_network_interface(nic_id, instance_id, device_index) response = Excon::Response.new if ! self.data[:instances].find{ |i,i_conf| diff --git a/lib/fog/aws/requests/compute/attach_volume.rb b/lib/fog/aws/requests/compute/attach_volume.rb index 166a434e4..58f2ad974 100644 --- a/lib/fog/aws/requests/compute/attach_volume.rb +++ b/lib/fog/aws/requests/compute/attach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/attach_volume' # Attach an Amazon EBS volume with a running instance, exposing as specified device @@ -33,11 +32,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::AttachVolume.new ) end - end class Mock - def attach_volume(instance_id, volume_id, device) response = Excon::Response.new if instance_id && volume_id && device @@ -80,7 +77,6 @@ module Fog raise Fog::Compute::AWS::Error.new(message) end end - end end end diff --git a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb index 6690cf723..999c13807 100644 --- a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb +++ b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Add permissions to a security group @@ -76,11 +75,9 @@ module Fog end params.reject {|k, v| v.nil? } end - end class Mock - def authorize_security_group_ingress(group_name, options = {}) options = Fog::AWS.parse_security_group_options(group_name, options) if options.key?('GroupName') @@ -222,7 +219,6 @@ module Fog permission['fromPort'] == group_permission['fromPort'] && permission['toPort'] == group_permission['toPort'] } end - end end end diff --git a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb index a8480bfb7..01f1e09d0 100644 --- a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb +++ b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/cancel_spot_instance_requests' # Terminate specified spot instance requests @@ -27,7 +26,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::CancelSpotInstanceRequests.new }.merge!(params)) end - end end end diff --git a/lib/fog/aws/requests/compute/copy_image.rb b/lib/fog/aws/requests/compute/copy_image.rb index b03ee771b..a64e2869b 100644 --- a/lib/fog/aws/requests/compute/copy_image.rb +++ b/lib/fog/aws/requests/compute/copy_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/copy_image' # Copy an image to a different region @@ -32,11 +31,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::CopyImage.new ) end - end class Mock - # # Usage # @@ -56,7 +53,6 @@ module Fog }.merge!(data) response end - end end end diff --git a/lib/fog/aws/requests/compute/copy_snapshot.rb b/lib/fog/aws/requests/compute/copy_snapshot.rb index 229f3a816..c27235a21 100644 --- a/lib/fog/aws/requests/compute/copy_snapshot.rb +++ b/lib/fog/aws/requests/compute/copy_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/copy_snapshot' # Copy a snapshot to a different region @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::CopySnapshot.new ) end - end class Mock - # # Usage # @@ -51,7 +48,6 @@ module Fog }.merge!(data) response end - end end end diff --git a/lib/fog/aws/requests/compute/create_dhcp_options.rb b/lib/fog/aws/requests/compute/create_dhcp_options.rb index fc977c46d..61004f665 100644 --- a/lib/fog/aws/requests/compute/create_dhcp_options.rb +++ b/lib/fog/aws/requests/compute/create_dhcp_options.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_dhcp_options' # Creates a set of DHCP options for your VPC diff --git a/lib/fog/aws/requests/compute/create_image.rb b/lib/fog/aws/requests/compute/create_image.rb index ed64fe0c1..6b1fa53e8 100644 --- a/lib/fog/aws/requests/compute/create_image.rb +++ b/lib/fog/aws/requests/compute/create_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_image' # Create a bootable EBS volume AMI @@ -46,7 +45,6 @@ module Fog end class Mock - # Usage # # AWS[:compute].create_image("i-ac65ee8c", "test", "something") @@ -87,7 +85,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/compute/create_internet_gateway.rb b/lib/fog/aws/requests/compute/create_internet_gateway.rb index c71e84046..ba0aee217 100644 --- a/lib/fog/aws/requests/compute/create_internet_gateway.rb +++ b/lib/fog/aws/requests/compute/create_internet_gateway.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_internet_gateway' # Creates an InternetGateway diff --git a/lib/fog/aws/requests/compute/create_key_pair.rb b/lib/fog/aws/requests/compute/create_key_pair.rb index 221bd5cea..688b1b4ed 100644 --- a/lib/fog/aws/requests/compute/create_key_pair.rb +++ b/lib/fog/aws/requests/compute/create_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_key_pair' # Create a new key pair @@ -26,11 +25,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::CreateKeyPair.new ) end - end class Mock - def create_key_pair(key_name) response = Excon::Response.new unless self.data[:key_pairs][key_name] @@ -49,7 +46,6 @@ module Fog raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.") end end - end end end diff --git a/lib/fog/aws/requests/compute/create_network_interface.rb b/lib/fog/aws/requests/compute/create_network_interface.rb index 525a66d62..3bb6e2c8d 100644 --- a/lib/fog/aws/requests/compute/create_network_interface.rb +++ b/lib/fog/aws/requests/compute/create_network_interface.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_network_interface' # Creates a network interface @@ -57,7 +56,6 @@ module Fog 'SubnetId' => subnetId, :parser => Fog::Parsers::Compute::AWS::CreateNetworkInterface.new }.merge!(options)) - end end diff --git a/lib/fog/aws/requests/compute/create_placement_group.rb b/lib/fog/aws/requests/compute/create_placement_group.rb index 7400b5c65..c16f22e67 100644 --- a/lib/fog/aws/requests/compute/create_placement_group.rb +++ b/lib/fog/aws/requests/compute/create_placement_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Create a new placement group @@ -26,9 +25,7 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end - end end end diff --git a/lib/fog/aws/requests/compute/create_route.rb b/lib/fog/aws/requests/compute/create_route.rb index edff3eab4..ceeda3d2e 100755 --- a/lib/fog/aws/requests/compute/create_route.rb +++ b/lib/fog/aws/requests/compute/create_route.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Creates a route in a route table within a VPC. @@ -40,7 +39,6 @@ module Fog end class Mock - def create_route(route_table_id, destination_cidr_block, internet_gateway_id=nil, instance_id=nil, network_interface_id=nil) instance_owner_id = nil route_table = self.data[:route_tables].find { |routetable| routetable["routeTableId"].eql? route_table_id } diff --git a/lib/fog/aws/requests/compute/create_route_table.rb b/lib/fog/aws/requests/compute/create_route_table.rb index 77ae4304b..e5a1bce8f 100755 --- a/lib/fog/aws/requests/compute/create_route_table.rb +++ b/lib/fog/aws/requests/compute/create_route_table.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_route_table' # Creates a route table for the specified VPC. diff --git a/lib/fog/aws/requests/compute/create_security_group.rb b/lib/fog/aws/requests/compute/create_security_group.rb index 509acdd97..58233f94b 100644 --- a/lib/fog/aws/requests/compute/create_security_group.rb +++ b/lib/fog/aws/requests/compute/create_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_security_group' # Create a new security group @@ -29,11 +28,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::CreateSecurityGroup.new ) end - end class Mock - def create_security_group(name, description, vpc_id=nil) response = Excon::Response.new unless self.data[:security_groups][name] @@ -57,7 +54,6 @@ module Fog raise Fog::Compute::AWS::Error.new("InvalidGroup.Duplicate => The security group '#{name}' already exists") end end - end end end diff --git a/lib/fog/aws/requests/compute/create_snapshot.rb b/lib/fog/aws/requests/compute/create_snapshot.rb index 94e2f4bcb..39747eeb1 100644 --- a/lib/fog/aws/requests/compute/create_snapshot.rb +++ b/lib/fog/aws/requests/compute/create_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_snapshot' # Create a snapshot of an EBS volume and store it in S3 @@ -30,11 +29,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::CreateSnapshot.new ) end - end class Mock - # # Usage # @@ -67,7 +64,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb index 2e90c1e23..7ae94f9bd 100644 --- a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb +++ b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/spot_datafeed_subscription' # Create a spot datafeed subscription @@ -34,7 +33,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::SpotDatafeedSubscription.new ) end - end end end diff --git a/lib/fog/aws/requests/compute/create_subnet.rb b/lib/fog/aws/requests/compute/create_subnet.rb index 208cecec9..10fcdf69a 100644 --- a/lib/fog/aws/requests/compute/create_subnet.rb +++ b/lib/fog/aws/requests/compute/create_subnet.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'ipaddress' require 'fog/aws/parsers/compute/create_subnet' @@ -37,7 +36,6 @@ module Fog 'CidrBlock' => cidrBlock, :parser => Fog::Parsers::Compute::AWS::CreateSubnet.new }.merge!(options)) - end end diff --git a/lib/fog/aws/requests/compute/create_tags.rb b/lib/fog/aws/requests/compute/create_tags.rb index 35c8173d6..a91ea871e 100644 --- a/lib/fog/aws/requests/compute/create_tags.rb +++ b/lib/fog/aws/requests/compute/create_tags.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Adds tags to resources @@ -35,11 +34,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(params)) end - end class Mock - def create_tags(resources, tags) resources = [*resources] @@ -81,9 +78,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/aws/requests/compute/create_volume.rb b/lib/fog/aws/requests/compute/create_volume.rb index ab0de87bf..cda0a7036 100644 --- a/lib/fog/aws/requests/compute/create_volume.rb +++ b/lib/fog/aws/requests/compute/create_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_volume' # Create an EBS volume @@ -43,11 +42,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::CreateVolume.new }.merge(options)) end - end class Mock - def create_volume(availability_zone, size, options = {}) unless options.is_a?(Hash) Fog::Logger.deprecation("create_volume with a bare snapshot_id is deprecated, use create_volume(availability_zone, size, 'SnapshotId' => snapshot_id) instead [light_black](#{caller.first})[/]") @@ -121,7 +118,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/compute/create_vpc.rb b/lib/fog/aws/requests/compute/create_vpc.rb index a572f293c..2eb6c6cab 100644 --- a/lib/fog/aws/requests/compute/create_vpc.rb +++ b/lib/fog/aws/requests/compute/create_vpc.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/create_vpc' # Creates a VPC with the CIDR block you specify. @@ -34,7 +33,6 @@ module Fog 'CidrBlock' => cidrBlock, :parser => Fog::Parsers::Compute::AWS::CreateVpc.new }.merge!(options)) - end end diff --git a/lib/fog/aws/requests/compute/delete_dhcp_options.rb b/lib/fog/aws/requests/compute/delete_dhcp_options.rb index 2ef0611f5..d8f076bc6 100644 --- a/lib/fog/aws/requests/compute/delete_dhcp_options.rb +++ b/lib/fog/aws/requests/compute/delete_dhcp_options.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' #Deletes a set of DHCP options that you specify. Amazon VPC returns an error if the set of options you specify is currently #associated with a VPC. You can disassociate the set of options by associating either a new set of options or the default diff --git a/lib/fog/aws/requests/compute/delete_internet_gateway.rb b/lib/fog/aws/requests/compute/delete_internet_gateway.rb index 68c3431d8..ce725dc88 100644 --- a/lib/fog/aws/requests/compute/delete_internet_gateway.rb +++ b/lib/fog/aws/requests/compute/delete_internet_gateway.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' #Deletes an Internet gateway from your AWS account. The gateway must not be attached to a VPC # diff --git a/lib/fog/aws/requests/compute/delete_key_pair.rb b/lib/fog/aws/requests/compute/delete_key_pair.rb index 39c548648..c39cf3b5c 100644 --- a/lib/fog/aws/requests/compute/delete_key_pair.rb +++ b/lib/fog/aws/requests/compute/delete_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Delete a key pair that you own @@ -25,11 +24,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def delete_key_pair(key_name) response = Excon::Response.new self.data[:key_pairs].delete(key_name) @@ -40,7 +37,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/delete_network_interface.rb b/lib/fog/aws/requests/compute/delete_network_interface.rb index 40ed0287b..f80c37e81 100644 --- a/lib/fog/aws/requests/compute/delete_network_interface.rb +++ b/lib/fog/aws/requests/compute/delete_network_interface.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Deletes a network interface. # diff --git a/lib/fog/aws/requests/compute/delete_placement_group.rb b/lib/fog/aws/requests/compute/delete_placement_group.rb index b82f5d455..adc5e8457 100644 --- a/lib/fog/aws/requests/compute/delete_placement_group.rb +++ b/lib/fog/aws/requests/compute/delete_placement_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Delete a placement group that you own @@ -25,7 +24,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/compute/delete_route.rb b/lib/fog/aws/requests/compute/delete_route.rb index b7ff8d1d3..babe77ab8 100755 --- a/lib/fog/aws/requests/compute/delete_route.rb +++ b/lib/fog/aws/requests/compute/delete_route.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Deletes the specified route from the specified route table. @@ -26,11 +25,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def delete_route(route_table_id, destination_cidr_block) route_table = self.data[:route_tables].find { |routetable| routetable["routeTableId"].eql? route_table_id } unless route_table.nil? diff --git a/lib/fog/aws/requests/compute/delete_route_table.rb b/lib/fog/aws/requests/compute/delete_route_table.rb index 8f189e0c2..5ddb13dc1 100755 --- a/lib/fog/aws/requests/compute/delete_route_table.rb +++ b/lib/fog/aws/requests/compute/delete_route_table.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Deletes the specified route table. @@ -24,7 +23,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock diff --git a/lib/fog/aws/requests/compute/delete_security_group.rb b/lib/fog/aws/requests/compute/delete_security_group.rb index 2315275c6..7117bcf86 100644 --- a/lib/fog/aws/requests/compute/delete_security_group.rb +++ b/lib/fog/aws/requests/compute/delete_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Delete a security group that you own @@ -36,7 +35,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock diff --git a/lib/fog/aws/requests/compute/delete_snapshot.rb b/lib/fog/aws/requests/compute/delete_snapshot.rb index c96521c35..c64bdfc0b 100644 --- a/lib/fog/aws/requests/compute/delete_snapshot.rb +++ b/lib/fog/aws/requests/compute/delete_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Delete a snapshot of an EBS volume that you own @@ -25,11 +24,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def delete_snapshot(snapshot_id) response = Excon::Response.new if snapshot = self.data[:snapshots].delete(snapshot_id) @@ -43,7 +40,6 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' does not exist.") end end - end end end diff --git a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb index ef94a2f3d..0a9e94c23 100644 --- a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb +++ b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Delete a spot datafeed subscription @@ -21,7 +20,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/compute/delete_subnet.rb b/lib/fog/aws/requests/compute/delete_subnet.rb index 01df8a151..34874cd14 100644 --- a/lib/fog/aws/requests/compute/delete_subnet.rb +++ b/lib/fog/aws/requests/compute/delete_subnet.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Deletes a subnet from a VPC. You must terminate all running instances in the subnet before deleting it, otherwise Amazon # VPC returns an error diff --git a/lib/fog/aws/requests/compute/delete_tags.rb b/lib/fog/aws/requests/compute/delete_tags.rb index 83ad0673d..2c97bbc16 100644 --- a/lib/fog/aws/requests/compute/delete_tags.rb +++ b/lib/fog/aws/requests/compute/delete_tags.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Remove tags from resources @@ -37,7 +36,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(params)) end - end class Mock @@ -80,7 +78,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/compute/delete_volume.rb b/lib/fog/aws/requests/compute/delete_volume.rb index cb4436263..e3dd3ebc9 100644 --- a/lib/fog/aws/requests/compute/delete_volume.rb +++ b/lib/fog/aws/requests/compute/delete_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Delete an EBS volume @@ -25,11 +24,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def delete_volume(volume_id) response = Excon::Response.new if volume = self.data[:volumes][volume_id] @@ -49,7 +46,6 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.") end end - end end end diff --git a/lib/fog/aws/requests/compute/delete_vpc.rb b/lib/fog/aws/requests/compute/delete_vpc.rb index c547205f4..a2c99b598 100644 --- a/lib/fog/aws/requests/compute/delete_vpc.rb +++ b/lib/fog/aws/requests/compute/delete_vpc.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Deletes a VPC. You must detach or delete all gateways or other objects diff --git a/lib/fog/aws/requests/compute/deregister_image.rb b/lib/fog/aws/requests/compute/deregister_image.rb index bea353d96..c21b892b4 100644 --- a/lib/fog/aws/requests/compute/deregister_image.rb +++ b/lib/fog/aws/requests/compute/deregister_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/deregister_image' # deregister an image @@ -24,11 +23,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DeregisterImage.new ) end - end class Mock - def deregister_image(image_id) response = Excon::Response.new if image_id @@ -46,7 +43,6 @@ module Fog raise Fog::Compute::AWS::Error.new(message) end end - end end end diff --git a/lib/fog/aws/requests/compute/describe_account_attributes.rb b/lib/fog/aws/requests/compute/describe_account_attributes.rb index bc296bf8a..222509ae7 100644 --- a/lib/fog/aws/requests/compute/describe_account_attributes.rb +++ b/lib/fog/aws/requests/compute/describe_account_attributes.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_account_attributes' # Describe account attributes diff --git a/lib/fog/aws/requests/compute/describe_addresses.rb b/lib/fog/aws/requests/compute/describe_addresses.rb index 6cce4376c..fd5264289 100644 --- a/lib/fog/aws/requests/compute/describe_addresses.rb +++ b/lib/fog/aws/requests/compute/describe_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_addresses' # Describe all or specified IP addresses. @@ -31,11 +30,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeAddresses.new }.merge!(params)) end - end class Mock - def describe_addresses(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]") @@ -59,7 +56,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_availability_zones.rb b/lib/fog/aws/requests/compute/describe_availability_zones.rb index 45981bc09..de27eec81 100644 --- a/lib/fog/aws/requests/compute/describe_availability_zones.rb +++ b/lib/fog/aws/requests/compute/describe_availability_zones.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_availability_zones' # Describe all or specified availability zones @@ -32,11 +31,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeAvailabilityZones.new }.merge!(params)) end - end class Mock - def describe_availability_zones(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]") @@ -91,7 +88,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_dhcp_options.rb b/lib/fog/aws/requests/compute/describe_dhcp_options.rb index 3e1a7448c..9ae9b10ea 100644 --- a/lib/fog/aws/requests/compute/describe_dhcp_options.rb +++ b/lib/fog/aws/requests/compute/describe_dhcp_options.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_dhcp_options' # Describe all or specified dhcp_options diff --git a/lib/fog/aws/requests/compute/describe_images.rb b/lib/fog/aws/requests/compute/describe_images.rb index 587f28300..2f786c660 100644 --- a/lib/fog/aws/requests/compute/describe_images.rb +++ b/lib/fog/aws/requests/compute/describe_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_images' # Describe all or specified images. @@ -53,11 +52,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeImages.new }.merge!(params)) end - end class Mock - def describe_images(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_images with #{filters.class} param is deprecated, use describe_images('image-id' => []) instead [light_black](#{caller.first})[/]") @@ -123,7 +120,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_instance_status.rb b/lib/fog/aws/requests/compute/describe_instance_status.rb index 6ccca84a4..ba07c5688 100644 --- a/lib/fog/aws/requests/compute/describe_instance_status.rb +++ b/lib/fog/aws/requests/compute/describe_instance_status.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_instance_status' # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstanceStatus.html @@ -40,7 +39,6 @@ module Fog } response - end end end diff --git a/lib/fog/aws/requests/compute/describe_instances.rb b/lib/fog/aws/requests/compute/describe_instances.rb index d05c0d63e..0634d769f 100644 --- a/lib/fog/aws/requests/compute/describe_instances.rb +++ b/lib/fog/aws/requests/compute/describe_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_instances' # Describe all or specified instances @@ -75,11 +74,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeInstances.new }.merge!(params)) end - end class Mock - def describe_instances(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]") @@ -249,7 +246,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_internet_gateways.rb b/lib/fog/aws/requests/compute/describe_internet_gateways.rb index f73f20e13..d01fa3e53 100644 --- a/lib/fog/aws/requests/compute/describe_internet_gateways.rb +++ b/lib/fog/aws/requests/compute/describe_internet_gateways.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_internet_gateways' # Describe all or specified internet_gateways diff --git a/lib/fog/aws/requests/compute/describe_key_pairs.rb b/lib/fog/aws/requests/compute/describe_key_pairs.rb index 4744d6449..cd98d2d9a 100644 --- a/lib/fog/aws/requests/compute/describe_key_pairs.rb +++ b/lib/fog/aws/requests/compute/describe_key_pairs.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_key_pairs' # Describe all or specified key pairs @@ -31,11 +30,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeKeyPairs.new }.merge!(params)) end - end class Mock - def describe_key_pairs(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead [light_black](#{caller.first})[/]") @@ -61,7 +58,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_network_acls.rb b/lib/fog/aws/requests/compute/describe_network_acls.rb index 0f887513d..d629cedc3 100644 --- a/lib/fog/aws/requests/compute/describe_network_acls.rb +++ b/lib/fog/aws/requests/compute/describe_network_acls.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_network_acls' # Describe all or specified network ACLs diff --git a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb index 134451257..708b7400c 100644 --- a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb +++ b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_network_interface_attribute' # Describes a network interface attribute value # diff --git a/lib/fog/aws/requests/compute/describe_network_interfaces.rb b/lib/fog/aws/requests/compute/describe_network_interfaces.rb index 193f7e9a5..96a2644fe 100644 --- a/lib/fog/aws/requests/compute/describe_network_interfaces.rb +++ b/lib/fog/aws/requests/compute/describe_network_interfaces.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_network_interfaces' # Describe all or specified network interfaces @@ -63,9 +62,7 @@ module Fog end end - class Mock - def describe_network_interfaces(filters = {}) response = Excon::Response.new @@ -82,7 +79,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_placement_groups.rb b/lib/fog/aws/requests/compute/describe_placement_groups.rb index dce5d28d0..a3f65418b 100644 --- a/lib/fog/aws/requests/compute/describe_placement_groups.rb +++ b/lib/fog/aws/requests/compute/describe_placement_groups.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_placement_groups' # Describe all or specified placement groups @@ -28,7 +27,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribePlacementGroups.new }.merge!(params)) end - end end end diff --git a/lib/fog/aws/requests/compute/describe_regions.rb b/lib/fog/aws/requests/compute/describe_regions.rb index 56289b4e7..c0b34b552 100644 --- a/lib/fog/aws/requests/compute/describe_regions.rb +++ b/lib/fog/aws/requests/compute/describe_regions.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_regions' # Describe all or specified regions @@ -31,11 +30,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeRegions.new }.merge!(params)) end - end class Mock - def describe_regions(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]") @@ -61,7 +58,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances.rb b/lib/fog/aws/requests/compute/describe_reserved_instances.rb index b662029e0..1c31fbd73 100644 --- a/lib/fog/aws/requests/compute/describe_reserved_instances.rb +++ b/lib/fog/aws/requests/compute/describe_reserved_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_reserved_instances' # Describe all or specified reserved instances @@ -40,7 +39,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeReservedInstances.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb index 7a52f6af2..72b0b65fb 100644 --- a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb +++ b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_reserved_instances_offerings' # Describe all or specified reserved instances offerings diff --git a/lib/fog/aws/requests/compute/describe_route_tables.rb b/lib/fog/aws/requests/compute/describe_route_tables.rb index 3db2ca445..19ce54d77 100755 --- a/lib/fog/aws/requests/compute/describe_route_tables.rb +++ b/lib/fog/aws/requests/compute/describe_route_tables.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_route_tables' # Describe one or more of your route tables. diff --git a/lib/fog/aws/requests/compute/describe_security_groups.rb b/lib/fog/aws/requests/compute/describe_security_groups.rb index d13570ac2..45430cffa 100644 --- a/lib/fog/aws/requests/compute/describe_security_groups.rb +++ b/lib/fog/aws/requests/compute/describe_security_groups.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_security_groups' # Describe all or specified security groups @@ -42,11 +41,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeSecurityGroups.new }.merge!(params)) end - end class Mock - def describe_security_groups(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]") @@ -95,7 +92,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_snapshots.rb b/lib/fog/aws/requests/compute/describe_snapshots.rb index 53e93c566..3913b5b2d 100644 --- a/lib/fog/aws/requests/compute/describe_snapshots.rb +++ b/lib/fog/aws/requests/compute/describe_snapshots.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_snapshots' # Describe all or specified snapshots @@ -48,11 +47,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeSnapshots.new }.merge!(params)) end - end class Mock - def describe_snapshots(filters = {}, options = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead [light_black](#{caller.first})[/]") @@ -117,7 +114,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb index 085ab42b1..25e0ca9e1 100644 --- a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb +++ b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/spot_datafeed_subscription' # Describe spot datafeed subscription @@ -28,7 +27,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::SpotDatafeedSubscription.new }) end - end end end diff --git a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb index 38c98670b..a65b5147d 100644 --- a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb +++ b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/spot_instance_requests' # Describe all or specified spot instance requests @@ -41,7 +40,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::SpotInstanceRequests.new }.merge!(params)) end - end end end diff --git a/lib/fog/aws/requests/compute/describe_spot_price_history.rb b/lib/fog/aws/requests/compute/describe_spot_price_history.rb index 8d6e65f7a..ddff34f08 100644 --- a/lib/fog/aws/requests/compute/describe_spot_price_history.rb +++ b/lib/fog/aws/requests/compute/describe_spot_price_history.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_spot_price_history' # Describe all or specified spot price history @@ -30,7 +29,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeSpotPriceHistory.new }.merge!(params)) end - end end end diff --git a/lib/fog/aws/requests/compute/describe_subnets.rb b/lib/fog/aws/requests/compute/describe_subnets.rb index 0af202c3f..f48967f9e 100644 --- a/lib/fog/aws/requests/compute/describe_subnets.rb +++ b/lib/fog/aws/requests/compute/describe_subnets.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_subnets' # Describe all or specified subnets diff --git a/lib/fog/aws/requests/compute/describe_tags.rb b/lib/fog/aws/requests/compute/describe_tags.rb index 1c0a2b63d..db7fb0259 100644 --- a/lib/fog/aws/requests/compute/describe_tags.rb +++ b/lib/fog/aws/requests/compute/describe_tags.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_tags' # Describe all or specified tags @@ -32,7 +31,6 @@ module Fog end class Mock - def describe_tags(filters = {}) response = Excon::Response.new @@ -101,7 +99,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/compute/describe_volume_status.rb b/lib/fog/aws/requests/compute/describe_volume_status.rb index 4fa4fe6d5..7a8d57d20 100644 --- a/lib/fog/aws/requests/compute/describe_volume_status.rb +++ b/lib/fog/aws/requests/compute/describe_volume_status.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_volume_status' # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumeStatus.html @@ -37,7 +36,6 @@ module Fog } response - end end end diff --git a/lib/fog/aws/requests/compute/describe_volumes.rb b/lib/fog/aws/requests/compute/describe_volumes.rb index 3fe6386e5..1f2c62205 100644 --- a/lib/fog/aws/requests/compute/describe_volumes.rb +++ b/lib/fog/aws/requests/compute/describe_volumes.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_volumes' # Describe all or specified volumes. @@ -44,11 +43,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DescribeVolumes.new }.merge!(params)) end - end class Mock - def describe_volumes(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]") @@ -115,7 +112,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb index 5bce79a16..011f2482e 100644 --- a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb +++ b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_vpc_attribute' # Describes a vpc attribute value # diff --git a/lib/fog/aws/requests/compute/describe_vpcs.rb b/lib/fog/aws/requests/compute/describe_vpcs.rb index 9511ad9ef..ccc76054d 100644 --- a/lib/fog/aws/requests/compute/describe_vpcs.rb +++ b/lib/fog/aws/requests/compute/describe_vpcs.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/describe_vpcs' # Describe all or specified vpcs diff --git a/lib/fog/aws/requests/compute/detach_internet_gateway.rb b/lib/fog/aws/requests/compute/detach_internet_gateway.rb index 8b184f2a6..9ad8401b9 100644 --- a/lib/fog/aws/requests/compute/detach_internet_gateway.rb +++ b/lib/fog/aws/requests/compute/detach_internet_gateway.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Detaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC # @@ -26,11 +25,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def detach_internet_gateway(internet_gateway_id, vpc_id) response = Excon::Response.new if internet_gateway_id && vpc_id @@ -49,7 +46,6 @@ module Fog raise Fog::Compute::AWS::Error.new(message) end end - end end end diff --git a/lib/fog/aws/requests/compute/detach_network_interface.rb b/lib/fog/aws/requests/compute/detach_network_interface.rb index c1004fa28..05d8e77fa 100644 --- a/lib/fog/aws/requests/compute/detach_network_interface.rb +++ b/lib/fog/aws/requests/compute/detach_network_interface.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Detaches a network interface. # diff --git a/lib/fog/aws/requests/compute/detach_volume.rb b/lib/fog/aws/requests/compute/detach_volume.rb index d38c6f5f3..6a2617804 100644 --- a/lib/fog/aws/requests/compute/detach_volume.rb +++ b/lib/fog/aws/requests/compute/detach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/detach_volume' # Detach an Amazon EBS volume from a running instance @@ -33,11 +32,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::DetachVolume.new }.merge!(options)) end - end class Mock - def detach_volume(volume_id, options = {}) response = Excon::Response.new response.status = 200 @@ -58,7 +55,6 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.") end end - end end end diff --git a/lib/fog/aws/requests/compute/disassociate_address.rb b/lib/fog/aws/requests/compute/disassociate_address.rb index 45402cd41..efbda12a4 100644 --- a/lib/fog/aws/requests/compute/disassociate_address.rb +++ b/lib/fog/aws/requests/compute/disassociate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Disassociate an elastic IP address from its instance (if any) @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def disassociate_address(public_ip) response = Excon::Response.new response.status = 200 @@ -52,7 +49,6 @@ module Fog raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.") end end - end end end diff --git a/lib/fog/aws/requests/compute/disassociate_route_table.rb b/lib/fog/aws/requests/compute/disassociate_route_table.rb index 67e6cd79b..47f67c468 100755 --- a/lib/fog/aws/requests/compute/disassociate_route_table.rb +++ b/lib/fog/aws/requests/compute/disassociate_route_table.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Disassociates a subnet from a route table. @@ -24,11 +23,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def disassociate_route_table(association_id) assoc_array = nil routetable = self.data[:route_tables].find { |routetable| diff --git a/lib/fog/aws/requests/compute/get_console_output.rb b/lib/fog/aws/requests/compute/get_console_output.rb index fcb216160..0c6396073 100644 --- a/lib/fog/aws/requests/compute/get_console_output.rb +++ b/lib/fog/aws/requests/compute/get_console_output.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/get_console_output' # Retrieve console output for specified instance @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::GetConsoleOutput.new ) end - end class Mock - def get_console_output(instance_id) response = Excon::Response.new if instance = self.data[:instances][instance_id] @@ -47,7 +44,6 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist") end end - end end end diff --git a/lib/fog/aws/requests/compute/get_password_data.rb b/lib/fog/aws/requests/compute/get_password_data.rb index 9aab3024c..8db8a777c 100644 --- a/lib/fog/aws/requests/compute/get_password_data.rb +++ b/lib/fog/aws/requests/compute/get_password_data.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/get_password_data' # Retrieves the encrypted administrator password for an instance running Windows. @@ -29,11 +28,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::GetPasswordData.new ) end - end class Mock - def get_password_data(instance_id) response = Excon::Response.new if instance = self.data[:instances][instance_id] @@ -49,7 +46,6 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist") end end - end end end diff --git a/lib/fog/aws/requests/compute/import_key_pair.rb b/lib/fog/aws/requests/compute/import_key_pair.rb index 89c650e3d..ac8dbe1e5 100644 --- a/lib/fog/aws/requests/compute/import_key_pair.rb +++ b/lib/fog/aws/requests/compute/import_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/import_key_pair' # Import an existing public key to create a new key pair @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::ImportKeyPair.new ) end - end class Mock - def import_key_pair(key_name, public_key_material) response = Excon::Response.new unless self.data[:key_pairs][key_name] @@ -49,7 +46,6 @@ module Fog raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.") end end - end end end diff --git a/lib/fog/aws/requests/compute/modify_image_attribute.rb b/lib/fog/aws/requests/compute/modify_image_attribute.rb index 8d8cf09df..1eca49b55 100644 --- a/lib/fog/aws/requests/compute/modify_image_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_image_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Modify image attributes @@ -35,11 +34,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(params)) end - end class Mock - def modify_image_attribute(image_id, attributes) raise ArgumentError.new("image_id is required") unless image_id @@ -67,7 +64,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/modify_instance_attribute.rb b/lib/fog/aws/requests/compute/modify_instance_attribute.rb index 3972b3ad0..de18e0b94 100644 --- a/lib/fog/aws/requests/compute/modify_instance_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_instance_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Modify instance attributes @@ -37,7 +36,6 @@ module Fog Fog::Logger.deprecation("modify_instance_attributes method is deprecated, use 'modify_instance_attribute' instead") modify_instance_attribute(instance_id, attributes) end - end end end diff --git a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb index 12f6370f5..4850ad715 100644 --- a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Modifies a network interface attribute value diff --git a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb index 698cd9293..da6923c6d 100644 --- a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Modify snapshot attributes @@ -30,7 +29,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(params)) end - end end end diff --git a/lib/fog/aws/requests/compute/modify_volume_attribute.rb b/lib/fog/aws/requests/compute/modify_volume_attribute.rb index afbc7761d..95047c071 100644 --- a/lib/fog/aws/requests/compute/modify_volume_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_volume_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Modifies a volume attribute. @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def modify_volume_attribute(volume_id=nil, auto_enable_io_value=false) response = Excon::Response.new if volume = self.data[:volumes][volume_id] diff --git a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb index e18b5887c..85626210a 100644 --- a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Modifies the specified attribute of the specified VPC. @@ -31,7 +30,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(options)) end - end class Mock diff --git a/lib/fog/aws/requests/compute/monitor_instances.rb b/lib/fog/aws/requests/compute/monitor_instances.rb index 91cbb7872..3c85aae0e 100644 --- a/lib/fog/aws/requests/compute/monitor_instances.rb +++ b/lib/fog/aws/requests/compute/monitor_instances.rb @@ -1,9 +1,7 @@ module Fog module Compute class AWS - class Real - require 'fog/aws/parsers/compute/monitor_unmonitor_instances' # Monitor specified instance @@ -27,11 +25,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::MonitorUnmonitorInstances.new }.merge!(params)) end - end class Mock - def monitor_instances(instance_ids) response = Excon::Response.new response.status = 200 @@ -46,9 +42,7 @@ module Fog response.body = {'requestId' => 'some_request_id', 'instancesSet' => instances_set} response end - end end - end end diff --git a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb index c6e91d192..e5cad5c34 100644 --- a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb +++ b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/purchase_reserved_instances_offering' # Purchases a Reserved Instance for use with your account. @@ -27,7 +26,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::PurchaseReservedInstancesOffering.new }) end - end class Mock diff --git a/lib/fog/aws/requests/compute/reboot_instances.rb b/lib/fog/aws/requests/compute/reboot_instances.rb index 632607fa6..b68b62681 100644 --- a/lib/fog/aws/requests/compute/reboot_instances.rb +++ b/lib/fog/aws/requests/compute/reboot_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Reboot specified instances @@ -25,11 +24,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(params)) end - end class Mock - def reboot_instances(instance_id = []) response = Excon::Response.new instance_id = [*instance_id] @@ -47,7 +44,6 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The instance ID #{instance_id.inspect} does not exist") end end - end end end diff --git a/lib/fog/aws/requests/compute/release_address.rb b/lib/fog/aws/requests/compute/release_address.rb index 41f413170..69456f575 100644 --- a/lib/fog/aws/requests/compute/release_address.rb +++ b/lib/fog/aws/requests/compute/release_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Release an elastic IP address. @@ -30,11 +29,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new ) end - end class Mock - def release_address(public_ip_or_allocation_id) response = Excon::Response.new @@ -56,7 +53,6 @@ module Fog raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip_or_allocation_id}' does not belong to you.") end end - end end end diff --git a/lib/fog/aws/requests/compute/replace_route.rb b/lib/fog/aws/requests/compute/replace_route.rb index c49b1c847..d40144cac 100755 --- a/lib/fog/aws/requests/compute/replace_route.rb +++ b/lib/fog/aws/requests/compute/replace_route.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Replaces a route in a route table within a VPC. @@ -31,12 +30,10 @@ module Fog :idempotent => true, :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(options)) - end end class Mock - def replace_route(route_table_id, destination_cidr_block, options = {}) options['instanceOwnerId'] ||= nil options['DestinationCidrBlock'] ||= destination_cidr_block @@ -77,7 +74,6 @@ module Fog raise Fog::Compute::AWS::InvalidParameterValue.new("Value () for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.") end end - end end end diff --git a/lib/fog/aws/requests/compute/request_spot_instances.rb b/lib/fog/aws/requests/compute/request_spot_instances.rb index 87b9f7da4..4d0d72ac7 100644 --- a/lib/fog/aws/requests/compute/request_spot_instances.rb +++ b/lib/fog/aws/requests/compute/request_spot_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/spot_instance_requests' # Launch specified instances @@ -91,7 +90,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::SpotInstanceRequests.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb index 79539d197..a4790bced 100644 --- a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb +++ b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Resets a network interface attribute value diff --git a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb index 957a2dd77..bed017f32 100644 --- a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb +++ b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/basic' # Remove permissions from a security group @@ -53,11 +52,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(options)) end - end class Mock - def revoke_security_group_ingress(group_name, options = {}) options = Fog::AWS.parse_security_group_options(group_name, options) if options.key?('GroupName') @@ -95,7 +92,6 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist") end end - end end end diff --git a/lib/fog/aws/requests/compute/run_instances.rb b/lib/fog/aws/requests/compute/run_instances.rb index b1eba973d..bc37697b8 100644 --- a/lib/fog/aws/requests/compute/run_instances.rb +++ b/lib/fog/aws/requests/compute/run_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/run_instances' # Launch specified instances @@ -146,11 +145,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::RunInstances.new }.merge!(options)) end - end class Mock - def run_instances(image_id, min_count, max_count, options = {}) response = Excon::Response.new response.status = 200 @@ -270,7 +267,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/compute/start_instances.rb b/lib/fog/aws/requests/compute/start_instances.rb index d7765687c..f78bdedc2 100644 --- a/lib/fog/aws/requests/compute/start_instances.rb +++ b/lib/fog/aws/requests/compute/start_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/start_stop_instances' # Start specified instance @@ -25,7 +24,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::StartStopInstances.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/compute/stop_instances.rb b/lib/fog/aws/requests/compute/stop_instances.rb index 3a54dad07..7ee174cf7 100644 --- a/lib/fog/aws/requests/compute/stop_instances.rb +++ b/lib/fog/aws/requests/compute/stop_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/start_stop_instances' # Stop specified instance @@ -26,7 +25,6 @@ module Fog :parser => Fog::Parsers::Compute::AWS::StartStopInstances.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/compute/terminate_instances.rb b/lib/fog/aws/requests/compute/terminate_instances.rb index 3c37a764b..074d20537 100644 --- a/lib/fog/aws/requests/compute/terminate_instances.rb +++ b/lib/fog/aws/requests/compute/terminate_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class AWS class Real - require 'fog/aws/parsers/compute/terminate_instances' # Terminate specified instances @@ -32,11 +31,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::TerminateInstances.new }.merge!(params)) end - end class Mock - def terminate_instances(instance_id) response = Excon::Response.new instance_id = [*instance_id] @@ -89,7 +86,6 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist") end end - end end end diff --git a/lib/fog/aws/requests/compute/unmonitor_instances.rb b/lib/fog/aws/requests/compute/unmonitor_instances.rb index d8ab41904..3b1937388 100644 --- a/lib/fog/aws/requests/compute/unmonitor_instances.rb +++ b/lib/fog/aws/requests/compute/unmonitor_instances.rb @@ -1,9 +1,7 @@ module Fog module Compute class AWS - class Real - require 'fog/aws/parsers/compute/monitor_unmonitor_instances' # UnMonitor specified instance @@ -27,11 +25,9 @@ module Fog :parser => Fog::Parsers::Compute::AWS::MonitorUnmonitorInstances.new }.merge!(params)) end - end class Mock - def unmonitor_instances(instance_ids) response = Excon::Response.new response.status = 200 @@ -46,10 +42,7 @@ module Fog response.body = {'requestId' => 'some_request_id', 'instancesSet' => instances_set} response end - end - end - end end diff --git a/lib/fog/aws/requests/data_pipeline/activate_pipeline.rb b/lib/fog/aws/requests/data_pipeline/activate_pipeline.rb index 928c69706..c83a1ba2e 100644 --- a/lib/fog/aws/requests/data_pipeline/activate_pipeline.rb +++ b/lib/fog/aws/requests/data_pipeline/activate_pipeline.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # Activate a pipeline # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_ActivatePipeline.html # ==== Parameters @@ -21,7 +19,6 @@ module Fog Fog::JSON.decode(response.body) end - end class Mock @@ -29,7 +26,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/data_pipeline/create_pipeline.rb b/lib/fog/aws/requests/data_pipeline/create_pipeline.rb index 0e636f821..2d6207af6 100644 --- a/lib/fog/aws/requests/data_pipeline/create_pipeline.rb +++ b/lib/fog/aws/requests/data_pipeline/create_pipeline.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # Create a pipeline # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_CreatePipeline.html # ==== Parameters @@ -27,7 +25,6 @@ module Fog Fog::JSON.decode(response.body) end - end class Mock @@ -35,7 +32,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/data_pipeline/delete_pipeline.rb b/lib/fog/aws/requests/data_pipeline/delete_pipeline.rb index ab3f3a2f4..e1bcb1f6f 100644 --- a/lib/fog/aws/requests/data_pipeline/delete_pipeline.rb +++ b/lib/fog/aws/requests/data_pipeline/delete_pipeline.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # Delete a pipeline # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_DeletePipeline.html # ==== Parameters @@ -20,7 +18,6 @@ module Fog 200 == response.status end - end class Mock @@ -28,7 +25,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/data_pipeline/describe_objects.rb b/lib/fog/aws/requests/data_pipeline/describe_objects.rb index 16f1e0037..bac8b78d9 100644 --- a/lib/fog/aws/requests/data_pipeline/describe_objects.rb +++ b/lib/fog/aws/requests/data_pipeline/describe_objects.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # Queries a pipeline for the names of objects that match a specified set of conditions. # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_DescribeObjects.html # ==== Parameters @@ -28,7 +26,6 @@ module Fog Fog::JSON.decode(response.body) end - end class Mock @@ -36,7 +33,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/data_pipeline/describe_pipelines.rb b/lib/fog/aws/requests/data_pipeline/describe_pipelines.rb index 028a59ce5..8316c7522 100644 --- a/lib/fog/aws/requests/data_pipeline/describe_pipelines.rb +++ b/lib/fog/aws/requests/data_pipeline/describe_pipelines.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # Describe pipelines # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_DescribePipelines.html # ==== Parameters @@ -22,7 +20,6 @@ module Fog Fog::JSON.decode(response.body) end - end class Mock @@ -30,7 +27,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/data_pipeline/get_pipeline_definition.rb b/lib/fog/aws/requests/data_pipeline/get_pipeline_definition.rb index c20cca113..21da55b1b 100644 --- a/lib/fog/aws/requests/data_pipeline/get_pipeline_definition.rb +++ b/lib/fog/aws/requests/data_pipeline/get_pipeline_definition.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # Get pipeline definition JSON # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_GetPipelineDefinition.html # ==== Parameters @@ -23,7 +21,6 @@ module Fog Fog::JSON.decode(response.body) end - end class Mock @@ -31,7 +28,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/data_pipeline/list_pipelines.rb b/lib/fog/aws/requests/data_pipeline/list_pipelines.rb index 40e0574a1..30259ad9f 100644 --- a/lib/fog/aws/requests/data_pipeline/list_pipelines.rb +++ b/lib/fog/aws/requests/data_pipeline/list_pipelines.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # List all pipelines # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_ListPipelines.html # ==== Parameters @@ -22,7 +20,6 @@ module Fog Fog::JSON.decode(response.body) end - end class Mock @@ -30,7 +27,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/data_pipeline/put_pipeline_definition.rb b/lib/fog/aws/requests/data_pipeline/put_pipeline_definition.rb index cfa6133c5..485a78ba7 100644 --- a/lib/fog/aws/requests/data_pipeline/put_pipeline_definition.rb +++ b/lib/fog/aws/requests/data_pipeline/put_pipeline_definition.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # Put raw pipeline definition JSON # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_PutPipelineDefinition.html # ==== Parameters @@ -66,7 +64,6 @@ module Fog end end end - end class Mock @@ -74,7 +71,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/data_pipeline/query_objects.rb b/lib/fog/aws/requests/data_pipeline/query_objects.rb index c391e4711..d6ae33f5d 100644 --- a/lib/fog/aws/requests/data_pipeline/query_objects.rb +++ b/lib/fog/aws/requests/data_pipeline/query_objects.rb @@ -1,9 +1,7 @@ module Fog module AWS class DataPipeline - class Real - # Queries a pipeline for the names of objects that match a specified set of conditions. # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_QueryObjects.html # ==== Parameters @@ -28,7 +26,6 @@ module Fog Fog::JSON.decode(response.body) end - end class Mock @@ -36,7 +33,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/aws/requests/dns/change_resource_record_sets.rb b/lib/fog/aws/requests/dns/change_resource_record_sets.rb index 7e7e35e00..d9d05f215 100644 --- a/lib/fog/aws/requests/dns/change_resource_record_sets.rb +++ b/lib/fog/aws/requests/dns/change_resource_record_sets.rb @@ -2,7 +2,6 @@ module Fog module DNS class AWS class Real - require 'fog/aws/parsers/dns/change_resource_record_sets' # Use this action to create or change your authoritative DNS information for a zone @@ -55,7 +54,6 @@ module Fog # change_resource_record_sets("ABCDEFGHIJKLMN", change_batch_options) # def change_resource_record_sets(zone_id, change_batch, options = {}) - # AWS methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use # that form or just the actual id (which is what this request needs) zone_id = zone_id.sub('/hostedzone/', '') @@ -118,7 +116,6 @@ module Fog changes += '' end - body = %Q{#{changes}} request({ :body => body, @@ -127,13 +124,10 @@ module Fog :method => 'POST', :path => "hostedzone/#{zone_id}/rrset" }) - end - end class Mock - def change_resource_record_sets(zone_id, change_batch, options = {}) response = Excon::Response.new errors = [] @@ -200,7 +194,6 @@ module Fog response.body = "NoSuchHostedZoneA hosted zone with the specified hosted zone ID does not exist.#{Fog::AWS::Mock.request_id}" raise(Excon::Errors.status_error({:expects => 200}, response)) end - end end diff --git a/lib/fog/aws/requests/dns/create_hosted_zone.rb b/lib/fog/aws/requests/dns/create_hosted_zone.rb index b8324b1e0..621567441 100644 --- a/lib/fog/aws/requests/dns/create_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/create_hosted_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class AWS class Real - require 'fog/aws/parsers/dns/create_hosted_zone' # Creates a new hosted zone @@ -30,7 +29,6 @@ module Fog # * 'NameServer'<~String> # * status<~Integer> - 201 when successful def create_hosted_zone(name, options = {}) - optional_tags = '' if options[:caller_ref] optional_tags += "#{options[:caller_ref]}" @@ -50,13 +48,10 @@ module Fog :method => 'POST', :path => "hostedzone" }) - end - end class Mock - require 'time' def create_hosted_zone(name, options = {}) diff --git a/lib/fog/aws/requests/dns/delete_hosted_zone.rb b/lib/fog/aws/requests/dns/delete_hosted_zone.rb index d26e2553c..a783b87eb 100644 --- a/lib/fog/aws/requests/dns/delete_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/delete_hosted_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class AWS class Real - require 'fog/aws/parsers/dns/delete_hosted_zone' # Delete a hosted zone @@ -19,7 +18,6 @@ module Fog # * 'SubmittedAt'<~String> The date and time the change was made # * status<~Integer> - 200 when successful def delete_hosted_zone(zone_id) - # AWS methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use # that form or just the actual id (which is what this request needs) zone_id = zone_id.sub('/hostedzone/', '') @@ -30,13 +28,10 @@ module Fog :method => 'DELETE', :path => "hostedzone/#{zone_id}" }) - end - end class Mock - require 'time' def delete_hosted_zone(zone_id) @@ -66,7 +61,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/dns/get_change.rb b/lib/fog/aws/requests/dns/get_change.rb index f70660662..678513924 100644 --- a/lib/fog/aws/requests/dns/get_change.rb +++ b/lib/fog/aws/requests/dns/get_change.rb @@ -2,7 +2,6 @@ module Fog module DNS class AWS class Real - require 'fog/aws/parsers/dns/get_change' # returns the current state of a change request @@ -18,7 +17,6 @@ module Fog # * 'SubmittedAt'<~String> # * status<~Integer> - 200 when successful def get_change(change_id) - # AWS methods return change_ids that looks like '/change/id'. Let the caller either use # that form or just the actual id (which is what this request needs) change_id = change_id.sub('/change/', '') @@ -29,9 +27,7 @@ module Fog :method => 'GET', :path => "change/#{change_id}" }) - end - end class Mock @@ -58,7 +54,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/dns/get_hosted_zone.rb b/lib/fog/aws/requests/dns/get_hosted_zone.rb index 8a5c48080..fbd72bc5e 100644 --- a/lib/fog/aws/requests/dns/get_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/get_hosted_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class AWS class Real - require 'fog/aws/parsers/dns/get_hosted_zone' # retrieve information about a hosted zone @@ -22,7 +21,6 @@ module Fog # * 'NameServer'<~String> # * status<~Integer> - 200 when successful def get_hosted_zone(zone_id) - # AWS methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use # that form or just the actual id (which is what this request needs) zone_id = zone_id.sub('/hostedzone/', '') @@ -33,9 +31,7 @@ module Fog :method => 'GET', :path => "hostedzone/#{zone_id}" }) - end - end class Mock diff --git a/lib/fog/aws/requests/dns/list_hosted_zones.rb b/lib/fog/aws/requests/dns/list_hosted_zones.rb index 82abc6b04..086ca42db 100644 --- a/lib/fog/aws/requests/dns/list_hosted_zones.rb +++ b/lib/fog/aws/requests/dns/list_hosted_zones.rb @@ -2,7 +2,6 @@ module Fog module DNS class AWS class Real - require 'fog/aws/parsers/dns/list_hosted_zones' # Describe all or specified instances @@ -27,7 +26,6 @@ module Fog # * 'NextMarket'<~String> # * status<~Integer> - 200 when successful def list_hosted_zones(options = {}) - parameters = {} options.each do |option, value| case option @@ -45,13 +43,10 @@ module Fog :method => 'GET', :path => "hostedzone" }) - end - end class Mock - def list_hosted_zones(options = {}) maxitems = [options[:max_items]||100,100].min @@ -87,7 +82,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/requests/dns/list_resource_record_sets.rb b/lib/fog/aws/requests/dns/list_resource_record_sets.rb index 68d87d340..8333727d0 100644 --- a/lib/fog/aws/requests/dns/list_resource_record_sets.rb +++ b/lib/fog/aws/requests/dns/list_resource_record_sets.rb @@ -2,7 +2,6 @@ module Fog module DNS class AWS class Real - require 'fog/aws/parsers/dns/list_resource_record_sets' # list your resource record sets @@ -34,7 +33,6 @@ module Fog # * 'NextRecordIdentifier'<~String> # * status<~Integer> - 201 when successful def list_resource_record_sets(zone_id, options = {}) - # AWS methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use # that form or just the actual id (which is what this request needs) zone_id = zone_id.sub('/hostedzone/', '') @@ -56,13 +54,10 @@ module Fog :method => 'GET', :path => "hostedzone/#{zone_id}/rrset" }) - end - end class Mock - def list_resource_record_sets(zone_id, options = {}) maxitems = [options[:max_items]||100,100].min @@ -129,7 +124,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/requests/dynamodb/batch_get_item.rb b/lib/fog/aws/requests/dynamodb/batch_get_item.rb index ebffc35bc..f97899d66 100644 --- a/lib/fog/aws/requests/dynamodb/batch_get_item.rb +++ b/lib/fog/aws/requests/dynamodb/batch_get_item.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Get DynamoDB items # # ==== Parameters @@ -36,7 +35,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/batch_write_item.rb b/lib/fog/aws/requests/dynamodb/batch_write_item.rb index 30e1c63b9..7cdae1470 100644 --- a/lib/fog/aws/requests/dynamodb/batch_write_item.rb +++ b/lib/fog/aws/requests/dynamodb/batch_write_item.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - def batch_put_item(request_items) Fog::Logger.deprecation("batch_put_item is deprecated, use batch_write_item instead") batch_write_item(request_items) @@ -28,7 +27,6 @@ module Fog :headers => {'x-amz-target' => 'DynamoDB_20111205.BatchWriteItem'} ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/create_table.rb b/lib/fog/aws/requests/dynamodb/create_table.rb index 693852e79..3252bf566 100644 --- a/lib/fog/aws/requests/dynamodb/create_table.rb +++ b/lib/fog/aws/requests/dynamodb/create_table.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Create DynamoDB table # # ==== Parameters @@ -48,7 +47,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/delete_item.rb b/lib/fog/aws/requests/dynamodb/delete_item.rb index b78f652bb..50d651721 100644 --- a/lib/fog/aws/requests/dynamodb/delete_item.rb +++ b/lib/fog/aws/requests/dynamodb/delete_item.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Delete DynamoDB item # # ==== Parameters @@ -38,7 +37,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/delete_table.rb b/lib/fog/aws/requests/dynamodb/delete_table.rb index 3a7045278..19945ba8e 100644 --- a/lib/fog/aws/requests/dynamodb/delete_table.rb +++ b/lib/fog/aws/requests/dynamodb/delete_table.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Delete DynamoDB table # # ==== Parameters @@ -35,7 +34,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/describe_table.rb b/lib/fog/aws/requests/dynamodb/describe_table.rb index be8357aad..8d9d794d1 100644 --- a/lib/fog/aws/requests/dynamodb/describe_table.rb +++ b/lib/fog/aws/requests/dynamodb/describe_table.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Describe DynamoDB table # # ==== Parameters @@ -37,7 +36,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/get_item.rb b/lib/fog/aws/requests/dynamodb/get_item.rb index d173d88ec..376cf990a 100644 --- a/lib/fog/aws/requests/dynamodb/get_item.rb +++ b/lib/fog/aws/requests/dynamodb/get_item.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Get DynamoDB item # # ==== Parameters @@ -36,7 +35,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/list_tables.rb b/lib/fog/aws/requests/dynamodb/list_tables.rb index e86740554..c9cf7ae00 100644 --- a/lib/fog/aws/requests/dynamodb/list_tables.rb +++ b/lib/fog/aws/requests/dynamodb/list_tables.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # List DynamoDB tables # # ==== Parameters @@ -22,7 +21,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/put_item.rb b/lib/fog/aws/requests/dynamodb/put_item.rb index 09fff3952..99db4d72b 100644 --- a/lib/fog/aws/requests/dynamodb/put_item.rb +++ b/lib/fog/aws/requests/dynamodb/put_item.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Update DynamoDB item # # ==== Parameters @@ -34,7 +33,6 @@ module Fog :headers => {'x-amz-target' => 'DynamoDB_20111205.PutItem'} ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/query.rb b/lib/fog/aws/requests/dynamodb/query.rb index 54b80ce2d..ace8a528e 100644 --- a/lib/fog/aws/requests/dynamodb/query.rb +++ b/lib/fog/aws/requests/dynamodb/query.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Query DynamoDB items # # ==== Parameters @@ -37,7 +36,6 @@ module Fog :headers => {'x-amz-target' => 'DynamoDB_20111205.Query'} ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/scan.rb b/lib/fog/aws/requests/dynamodb/scan.rb index b5bff681c..cc4b76181 100644 --- a/lib/fog/aws/requests/dynamodb/scan.rb +++ b/lib/fog/aws/requests/dynamodb/scan.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Scan DynamoDB items # # ==== Parameters @@ -38,7 +37,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/update_item.rb b/lib/fog/aws/requests/dynamodb/update_item.rb index 167f06cd2..56140f261 100644 --- a/lib/fog/aws/requests/dynamodb/update_item.rb +++ b/lib/fog/aws/requests/dynamodb/update_item.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Update DynamoDB item # # ==== Parameters @@ -42,7 +41,6 @@ module Fog :headers => {'x-amz-target' => 'DynamoDB_20111205.UpdateItem'} ) end - end end end diff --git a/lib/fog/aws/requests/dynamodb/update_table.rb b/lib/fog/aws/requests/dynamodb/update_table.rb index 926a247be..658c9f90b 100644 --- a/lib/fog/aws/requests/dynamodb/update_table.rb +++ b/lib/fog/aws/requests/dynamodb/update_table.rb @@ -2,7 +2,6 @@ module Fog module AWS class DynamoDB class Real - # Update DynamoDB table throughput # # ==== Parameters @@ -39,7 +38,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/aws/requests/elasticache/authorize_cache_security_group_ingress.rb b/lib/fog/aws/requests/elasticache/authorize_cache_security_group_ingress.rb index 1e46c39e8..2654e3ab3 100644 --- a/lib/fog/aws/requests/elasticache/authorize_cache_security_group_ingress.rb +++ b/lib/fog/aws/requests/elasticache/authorize_cache_security_group_ingress.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/single_security_group' # Authorize ingress to a CacheSecurityGroup using EC2 Security Groups @@ -23,11 +22,9 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::SingleSecurityGroup.new }) end - end class Mock - def authorize_cache_security_group_ingress(name, ec2_name, ec2_owner_id) opts = { 'EC2SecurityGroupName' => ec2_name, @@ -53,7 +50,6 @@ module Fog else raise Fog::AWS::Elasticache::NotFound.new("CacheSecurityGroupNotFound => #{name} not found") end - end end end diff --git a/lib/fog/aws/requests/elasticache/create_cache_cluster.rb b/lib/fog/aws/requests/elasticache/create_cache_cluster.rb index d54e4fc03..7fcf11517 100644 --- a/lib/fog/aws/requests/elasticache/create_cache_cluster.rb +++ b/lib/fog/aws/requests/elasticache/create_cache_cluster.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/single_cache_cluster' # creates a cache cluster # @@ -28,7 +27,6 @@ module Fog # * response <~Excon::Response>: # * body <~Hash> def create_cache_cluster(id, options = {}) - req_options = { 'Action' => 'CreateCacheCluster', 'CacheClusterId' => id.strip, @@ -59,7 +57,6 @@ module Fog end request( req_options ) - end end @@ -92,7 +89,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/elasticache/create_cache_parameter_group.rb b/lib/fog/aws/requests/elasticache/create_cache_parameter_group.rb index ae8ab3499..d6754c0a5 100644 --- a/lib/fog/aws/requests/elasticache/create_cache_parameter_group.rb +++ b/lib/fog/aws/requests/elasticache/create_cache_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/single_parameter_group' # creates a cache parameter group diff --git a/lib/fog/aws/requests/elasticache/create_cache_security_group.rb b/lib/fog/aws/requests/elasticache/create_cache_security_group.rb index 05025ab1e..8f30e1abd 100644 --- a/lib/fog/aws/requests/elasticache/create_cache_security_group.rb +++ b/lib/fog/aws/requests/elasticache/create_cache_security_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/single_security_group' # creates a cache security group @@ -25,7 +24,6 @@ module Fog class Mock def create_cache_security_group(name, description = name) - if self.data[:security_groups][name] raise Fog::AWS::Elasticache::IdentifierTaken.new("CacheClusterAlreadyExists => The security group '#{name}' already exists") end @@ -46,7 +44,6 @@ module Fog } } ) - end end end diff --git a/lib/fog/aws/requests/elasticache/create_cache_subnet_group.rb b/lib/fog/aws/requests/elasticache/create_cache_subnet_group.rb index 45be85e78..3fe86ce14 100644 --- a/lib/fog/aws/requests/elasticache/create_cache_subnet_group.rb +++ b/lib/fog/aws/requests/elasticache/create_cache_subnet_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/create_cache_subnet_group' # Creates a cache subnet group @@ -25,11 +24,9 @@ module Fog params.merge!(Fog::AWS.indexed_param("SubnetIds.member", Array(subnet_ids))) request(params) end - end class Mock - def create_cache_subnet_group(name, subnet_ids, description = name) response = Excon::Response.new if self.data[:subnet_groups] && self.data[:subnet_groups][name] @@ -56,9 +53,7 @@ module Fog 'CreateCacheSubnetGroupResult' => { 'CacheSubnetGroup' => data } } response - end - end end end diff --git a/lib/fog/aws/requests/elasticache/delete_cache_cluster.rb b/lib/fog/aws/requests/elasticache/delete_cache_cluster.rb index 3883429bc..4aab675c3 100644 --- a/lib/fog/aws/requests/elasticache/delete_cache_cluster.rb +++ b/lib/fog/aws/requests/elasticache/delete_cache_cluster.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/describe_cache_clusters' # Deletes a Cache Cluster @@ -19,7 +18,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::DescribeCacheClusters.new ) end - end class Mock @@ -35,7 +33,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/elasticache/delete_cache_parameter_group.rb b/lib/fog/aws/requests/elasticache/delete_cache_parameter_group.rb index a77efd871..314d49279 100644 --- a/lib/fog/aws/requests/elasticache/delete_cache_parameter_group.rb +++ b/lib/fog/aws/requests/elasticache/delete_cache_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/base' # deletes a cache parameter group diff --git a/lib/fog/aws/requests/elasticache/delete_cache_security_group.rb b/lib/fog/aws/requests/elasticache/delete_cache_security_group.rb index 87fcc9841..93cb7b3a2 100644 --- a/lib/fog/aws/requests/elasticache/delete_cache_security_group.rb +++ b/lib/fog/aws/requests/elasticache/delete_cache_security_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/base' # deletes a cache security group diff --git a/lib/fog/aws/requests/elasticache/delete_cache_subnet_group.rb b/lib/fog/aws/requests/elasticache/delete_cache_subnet_group.rb index 7dfbc425f..b81833786 100644 --- a/lib/fog/aws/requests/elasticache/delete_cache_subnet_group.rb +++ b/lib/fog/aws/requests/elasticache/delete_cache_subnet_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/base' # deletes a cache subnet group diff --git a/lib/fog/aws/requests/elasticache/describe_cache_clusters.rb b/lib/fog/aws/requests/elasticache/describe_cache_clusters.rb index c0eef1f82..8832b3d8b 100644 --- a/lib/fog/aws/requests/elasticache/describe_cache_clusters.rb +++ b/lib/fog/aws/requests/elasticache/describe_cache_clusters.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/describe_cache_clusters' # Returns a list of Cache Cluster descriptions @@ -26,7 +25,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::DescribeCacheClusters.new }) end - end class Mock @@ -48,7 +46,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/elasticache/describe_cache_parameter_groups.rb b/lib/fog/aws/requests/elasticache/describe_cache_parameter_groups.rb index d1864f123..fff534899 100644 --- a/lib/fog/aws/requests/elasticache/describe_cache_parameter_groups.rb +++ b/lib/fog/aws/requests/elasticache/describe_cache_parameter_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/describe_parameter_groups' # Returns a list of CacheParameterGroup descriptions @@ -21,7 +20,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::DescribeParameterGroups.new }.merge(options)) end - end class Mock @@ -38,7 +36,6 @@ module Fog parameter_set = self.data[:parameter_groups].values end - response.status = 200 response.body = { "CacheParameterGroups" => parameter_set } diff --git a/lib/fog/aws/requests/elasticache/describe_cache_parameters.rb b/lib/fog/aws/requests/elasticache/describe_cache_parameters.rb index 99ffc7253..a49813df0 100644 --- a/lib/fog/aws/requests/elasticache/describe_cache_parameters.rb +++ b/lib/fog/aws/requests/elasticache/describe_cache_parameters.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/describe_cache_parameters' # Returns a list of CacheParameterGroup descriptions @@ -23,7 +22,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::DescribeCacheParameters.new }) end - end class Mock diff --git a/lib/fog/aws/requests/elasticache/describe_cache_security_groups.rb b/lib/fog/aws/requests/elasticache/describe_cache_security_groups.rb index 4b6b5cc49..a52ae7805 100644 --- a/lib/fog/aws/requests/elasticache/describe_cache_security_groups.rb +++ b/lib/fog/aws/requests/elasticache/describe_cache_security_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/describe_security_groups' # Returns a list of CacheSecurityGroup descriptions @@ -21,12 +20,10 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::DescribeSecurityGroups.new }.merge(options)) end - end class Mock def describe_cache_security_groups(name = nil, opts={}) - if name sec_group_set = [self.data[:security_groups][name]].compact raise Fog::AWS::Elasticache::NotFound.new("Security Group #{name} not found") if sec_group_set.empty? @@ -60,7 +57,6 @@ module Fog } } ) - end end end diff --git a/lib/fog/aws/requests/elasticache/describe_cache_subnet_groups.rb b/lib/fog/aws/requests/elasticache/describe_cache_subnet_groups.rb index 963480241..cf75454db 100644 --- a/lib/fog/aws/requests/elasticache/describe_cache_subnet_groups.rb +++ b/lib/fog/aws/requests/elasticache/describe_cache_subnet_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/describe_cache_subnet_groups' # This API returns a list of CacheSubnetGroup descriptions. If a CacheSubnetGroupName is specified, the list will contain only @@ -30,11 +29,9 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::DescribeCacheSubnetGroups.new }.merge(params)) end - end class Mock - def describe_cache_subnet_groups(name = nil, opts = {}) response = Excon::Response.new @@ -57,7 +54,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/elasticache/describe_engine_default_parameters.rb b/lib/fog/aws/requests/elasticache/describe_engine_default_parameters.rb index 11841505d..bea25614b 100644 --- a/lib/fog/aws/requests/elasticache/describe_engine_default_parameters.rb +++ b/lib/fog/aws/requests/elasticache/describe_engine_default_parameters.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/describe_engine_default_parameters' # Returns the default engine and system parameter information @@ -22,7 +21,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::DescribeEngineDefaultParameters.new }) end - end class Mock diff --git a/lib/fog/aws/requests/elasticache/describe_events.rb b/lib/fog/aws/requests/elasticache/describe_events.rb index a030099fd..28d1f91c5 100644 --- a/lib/fog/aws/requests/elasticache/describe_events.rb +++ b/lib/fog/aws/requests/elasticache/describe_events.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/event_list' # Returns a list of service events @@ -36,7 +35,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::EventListParser.new ) end - end class Mock diff --git a/lib/fog/aws/requests/elasticache/describe_reserved_cache_nodes.rb b/lib/fog/aws/requests/elasticache/describe_reserved_cache_nodes.rb index cd887adfa..ae37ba77f 100644 --- a/lib/fog/aws/requests/elasticache/describe_reserved_cache_nodes.rb +++ b/lib/fog/aws/requests/elasticache/describe_reserved_cache_nodes.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/describe_reserved_cache_nodes' # Describe all or specified reserved Elasticache nodes @@ -27,15 +26,12 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::DescribeReservedCacheNodes.new }.merge(params)) end - end class Mock - def describe_db_reserved_instances(identifier=nil, opts={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/elasticache/modify_cache_cluster.rb b/lib/fog/aws/requests/elasticache/modify_cache_cluster.rb index ec399f7f1..ea4f34363 100644 --- a/lib/fog/aws/requests/elasticache/modify_cache_cluster.rb +++ b/lib/fog/aws/requests/elasticache/modify_cache_cluster.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/single_cache_cluster' # Modifies an existing cache cluster @@ -57,7 +56,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new ))) end - end class Mock @@ -96,7 +94,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/elasticache/modify_cache_parameter_group.rb b/lib/fog/aws/requests/elasticache/modify_cache_parameter_group.rb index 364b2eb9f..9406486df 100644 --- a/lib/fog/aws/requests/elasticache/modify_cache_parameter_group.rb +++ b/lib/fog/aws/requests/elasticache/modify_cache_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/modify_parameter_group' # Modifies an existing cache parameter group @@ -32,7 +31,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::ModifyParameterGroup.new )) end - end class Mock diff --git a/lib/fog/aws/requests/elasticache/reboot_cache_cluster.rb b/lib/fog/aws/requests/elasticache/reboot_cache_cluster.rb index b9fa1ed90..7a5dbbe8d 100644 --- a/lib/fog/aws/requests/elasticache/reboot_cache_cluster.rb +++ b/lib/fog/aws/requests/elasticache/reboot_cache_cluster.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/single_cache_cluster' # Reboots some or all of an existing cache cluster's nodes @@ -31,7 +30,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new )) end - end class Mock @@ -46,7 +44,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/elasticache/reset_cache_parameter_group.rb b/lib/fog/aws/requests/elasticache/reset_cache_parameter_group.rb index 6f834ded4..d57f57c05 100644 --- a/lib/fog/aws/requests/elasticache/reset_cache_parameter_group.rb +++ b/lib/fog/aws/requests/elasticache/reset_cache_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/reset_parameter_group' # Resets an existing cache parameter group @@ -33,7 +32,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::ResetParameterGroup.new )) end - end class Mock diff --git a/lib/fog/aws/requests/elasticache/revoke_cache_security_group_ingress.rb b/lib/fog/aws/requests/elasticache/revoke_cache_security_group_ingress.rb index 7607b588a..31bd39c9a 100644 --- a/lib/fog/aws/requests/elasticache/revoke_cache_security_group_ingress.rb +++ b/lib/fog/aws/requests/elasticache/revoke_cache_security_group_ingress.rb @@ -3,7 +3,6 @@ module Fog module AWS class Elasticache class Real - require 'fog/aws/parsers/elasticache/single_security_group' # Revoke ingress to a CacheSecurityGroup using EC2 Security Groups @@ -24,7 +23,6 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::SingleSecurityGroup.new }) end - end class Mock diff --git a/lib/fog/aws/requests/elb/apply_security_groups_to_load_balancer.rb b/lib/fog/aws/requests/elb/apply_security_groups_to_load_balancer.rb index e1b445971..43ee4e851 100644 --- a/lib/fog/aws/requests/elb/apply_security_groups_to_load_balancer.rb +++ b/lib/fog/aws/requests/elb/apply_security_groups_to_load_balancer.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/apply_security_groups_to_load_balancer' # Sets the security groups for an ELB in VPC @@ -28,11 +27,9 @@ module Fog end alias :apply_security_groups :apply_security_groups_to_load_balancer - end class Mock - def apply_security_groups_to_load_balancer(security_group_ids, lb_name) raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name] diff --git a/lib/fog/aws/requests/elb/attach_load_balancer_to_subnets.rb b/lib/fog/aws/requests/elb/attach_load_balancer_to_subnets.rb index a277c1521..39f36e802 100644 --- a/lib/fog/aws/requests/elb/attach_load_balancer_to_subnets.rb +++ b/lib/fog/aws/requests/elb/attach_load_balancer_to_subnets.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/attach_load_balancer_to_subnets' # Enable a subnet for an existing ELB @@ -28,11 +27,9 @@ module Fog end alias :enable_subnets :attach_load_balancer_to_subnets - end class Mock - def attach_load_balancer_to_subnets(subnet_ids, lb_name) raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name] diff --git a/lib/fog/aws/requests/elb/configure_health_check.rb b/lib/fog/aws/requests/elb/configure_health_check.rb index f5dac0cac..6ad8d33c8 100644 --- a/lib/fog/aws/requests/elb/configure_health_check.rb +++ b/lib/fog/aws/requests/elb/configure_health_check.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/configure_health_check' # Enables the client to define an application healthcheck for the instances. @@ -34,7 +33,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::ConfigureHealthCheck.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/create_app_cookie_stickiness_policy.rb b/lib/fog/aws/requests/elb/create_app_cookie_stickiness_policy.rb index f79e545bb..fe203de4a 100644 --- a/lib/fog/aws/requests/elb/create_app_cookie_stickiness_policy.rb +++ b/lib/fog/aws/requests/elb/create_app_cookie_stickiness_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Create an app cookie stickiness policy @@ -26,7 +25,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/create_lb_cookie_stickiness_policy.rb b/lib/fog/aws/requests/elb/create_lb_cookie_stickiness_policy.rb index 6afb73468..985ef5759 100644 --- a/lib/fog/aws/requests/elb/create_lb_cookie_stickiness_policy.rb +++ b/lib/fog/aws/requests/elb/create_lb_cookie_stickiness_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Create a Load Balancer Cookie Stickiness Policy @@ -28,7 +27,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb index 711ebc9fd..7b3ccb554 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/create_load_balancer' # Create a new Elastic Load Balancer diff --git a/lib/fog/aws/requests/elb/create_load_balancer_listeners.rb b/lib/fog/aws/requests/elb/create_load_balancer_listeners.rb index 27e5a28e1..9e28a7507 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer_listeners.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer_listeners.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Create Elastic Load Balancer Listeners @@ -48,7 +47,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/create_load_balancer_policy.rb b/lib/fog/aws/requests/elb/create_load_balancer_policy.rb index 968bbc3aa..5e4982d37 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer_policy.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Create Elastic Load Balancer Policy @@ -40,7 +39,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/delete_load_balancer.rb b/lib/fog/aws/requests/elb/delete_load_balancer.rb index 802127e90..fec9187be 100644 --- a/lib/fog/aws/requests/elb/delete_load_balancer.rb +++ b/lib/fog/aws/requests/elb/delete_load_balancer.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/delete_load_balancer' # Delete an existing Elastic Load Balancer @@ -26,7 +25,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::DeleteLoadBalancer.new }) end - end class Mock diff --git a/lib/fog/aws/requests/elb/delete_load_balancer_listeners.rb b/lib/fog/aws/requests/elb/delete_load_balancer_listeners.rb index 902862a32..e8bc8f37a 100644 --- a/lib/fog/aws/requests/elb/delete_load_balancer_listeners.rb +++ b/lib/fog/aws/requests/elb/delete_load_balancer_listeners.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Delet Elastic Load Balancer Listeners @@ -24,7 +23,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/delete_load_balancer_policy.rb b/lib/fog/aws/requests/elb/delete_load_balancer_policy.rb index e5d0b40ea..7d5fd13c8 100644 --- a/lib/fog/aws/requests/elb/delete_load_balancer_policy.rb +++ b/lib/fog/aws/requests/elb/delete_load_balancer_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Delete a Load Balancer Stickiness Policy @@ -24,7 +23,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb index cc30020e2..f1a2c5617 100644 --- a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb +++ b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/deregister_instances_from_load_balancer' # Deregister an instance from an existing ELB @@ -29,7 +28,6 @@ module Fog end alias :deregister_instances :deregister_instances_from_load_balancer - end class Mock diff --git a/lib/fog/aws/requests/elb/describe_instance_health.rb b/lib/fog/aws/requests/elb/describe_instance_health.rb index f24bfd6eb..4d8615a70 100644 --- a/lib/fog/aws/requests/elb/describe_instance_health.rb +++ b/lib/fog/aws/requests/elb/describe_instance_health.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/describe_instance_health' # Get health status for one or more instances on an existing ELB @@ -30,7 +29,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::DescribeInstanceHealth.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/describe_load_balancer_attributes.rb b/lib/fog/aws/requests/elb/describe_load_balancer_attributes.rb index 8c3389a8e..8218592f7 100644 --- a/lib/fog/aws/requests/elb/describe_load_balancer_attributes.rb +++ b/lib/fog/aws/requests/elb/describe_load_balancer_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/describe_load_balancer_attributes' # Describe the load balancer attributes @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::DescribeLoadBalancerAttributes.new }) end - end class Mock diff --git a/lib/fog/aws/requests/elb/describe_load_balancer_policies.rb b/lib/fog/aws/requests/elb/describe_load_balancer_policies.rb index 28214ef54..5f324ff94 100644 --- a/lib/fog/aws/requests/elb/describe_load_balancer_policies.rb +++ b/lib/fog/aws/requests/elb/describe_load_balancer_policies.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/describe_load_balancer_policies' # Describe all or specified load balancer policies @@ -31,7 +30,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::DescribeLoadBalancerPolicies.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/describe_load_balancer_policy_types.rb b/lib/fog/aws/requests/elb/describe_load_balancer_policy_types.rb index 1bf9962d8..498b3a850 100644 --- a/lib/fog/aws/requests/elb/describe_load_balancer_policy_types.rb +++ b/lib/fog/aws/requests/elb/describe_load_balancer_policy_types.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/describe_load_balancer_policy_types' # Describe all or specified load balancer policy types @@ -32,7 +31,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::DescribeLoadBalancerPolicyTypes.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/describe_load_balancers.rb b/lib/fog/aws/requests/elb/describe_load_balancers.rb index 9c34fdd44..032f4e4de 100644 --- a/lib/fog/aws/requests/elb/describe_load_balancers.rb +++ b/lib/fog/aws/requests/elb/describe_load_balancers.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/describe_load_balancers' # Describe all or specified load balancers @@ -64,7 +63,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new }.merge!(options)) end - end class Mock diff --git a/lib/fog/aws/requests/elb/detach_load_balancer_from_subnets.rb b/lib/fog/aws/requests/elb/detach_load_balancer_from_subnets.rb index 592bb4482..bd6d1bc7e 100644 --- a/lib/fog/aws/requests/elb/detach_load_balancer_from_subnets.rb +++ b/lib/fog/aws/requests/elb/detach_load_balancer_from_subnets.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/detach_load_balancer_from_subnets' # Disable a subnet for an existing ELB @@ -28,11 +27,9 @@ module Fog end alias :disable_subnets :detach_load_balancer_from_subnets - end class Mock - def detach_load_balancer_from_subnets(subnet_ids, lb_name) raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name] diff --git a/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb b/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb index d3d09376e..0c1589f23 100644 --- a/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb +++ b/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/disable_availability_zones_for_load_balancer' # Disable an availability zone for an existing ELB @@ -28,7 +27,6 @@ module Fog end alias :disable_zones :disable_availability_zones_for_load_balancer - end class Mock diff --git a/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb b/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb index 056f6a07e..05cb42c3d 100644 --- a/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb +++ b/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/enable_availability_zones_for_load_balancer' # Enable an availability zone for an existing ELB @@ -28,11 +27,9 @@ module Fog end alias :enable_zones :enable_availability_zones_for_load_balancer - end class Mock - def enable_availability_zones_for_load_balancer(availability_zones, lb_name) raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name] diff --git a/lib/fog/aws/requests/elb/modify_load_balancer_attributes.rb b/lib/fog/aws/requests/elb/modify_load_balancer_attributes.rb index 244dd8d64..37ac332c0 100644 --- a/lib/fog/aws/requests/elb/modify_load_balancer_attributes.rb +++ b/lib/fog/aws/requests/elb/modify_load_balancer_attributes.rb @@ -2,10 +2,8 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' - # Sets attributes of the load balancer # # Currently the only attributes that can be set are whether CrossZoneLoadBalancing @@ -34,7 +32,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new )) end - end class Mock diff --git a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb index ac0e2e0d8..4674ae11d 100644 --- a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb +++ b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/register_instances_with_load_balancer' # Register an instance with an existing ELB @@ -29,7 +28,6 @@ module Fog end alias :register_instances :register_instances_with_load_balancer - end class Mock diff --git a/lib/fog/aws/requests/elb/set_load_balancer_listener_ssl_certificate.rb b/lib/fog/aws/requests/elb/set_load_balancer_listener_ssl_certificate.rb index bb7289dc1..634ac4484 100644 --- a/lib/fog/aws/requests/elb/set_load_balancer_listener_ssl_certificate.rb +++ b/lib/fog/aws/requests/elb/set_load_balancer_listener_ssl_certificate.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Sets the certificate that terminates the specified listener's SSL @@ -30,7 +29,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new }) end - end class Mock diff --git a/lib/fog/aws/requests/elb/set_load_balancer_policies_for_backend_server.rb b/lib/fog/aws/requests/elb/set_load_balancer_policies_for_backend_server.rb index 9319360f2..43d1859d5 100644 --- a/lib/fog/aws/requests/elb/set_load_balancer_policies_for_backend_server.rb +++ b/lib/fog/aws/requests/elb/set_load_balancer_policies_for_backend_server.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Replaces the current set of policies associated with a port on which the back-end server is listening with a new set of policies. diff --git a/lib/fog/aws/requests/elb/set_load_balancer_policies_of_listener.rb b/lib/fog/aws/requests/elb/set_load_balancer_policies_of_listener.rb index 1fb9a3121..73054aa0d 100644 --- a/lib/fog/aws/requests/elb/set_load_balancer_policies_of_listener.rb +++ b/lib/fog/aws/requests/elb/set_load_balancer_policies_of_listener.rb @@ -2,7 +2,6 @@ module Fog module AWS class ELB class Real - require 'fog/aws/parsers/elb/empty' # Associates, updates, or disables a policy with a listener on the @@ -36,7 +35,6 @@ module Fog :parser => Fog::Parsers::AWS::ELB::Empty.new }.merge!(params)) end - end class Mock diff --git a/lib/fog/aws/requests/emr/add_instance_groups.rb b/lib/fog/aws/requests/emr/add_instance_groups.rb index 01969c4ff..7e26cb10b 100644 --- a/lib/fog/aws/requests/emr/add_instance_groups.rb +++ b/lib/fog/aws/requests/emr/add_instance_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class EMR class Real - require 'fog/aws/parsers/emr/add_instance_groups' # adds an instance group to a running cluster @@ -21,7 +20,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def add_instance_groups(job_flow_id, options={}) - if instance_groups = options.delete('InstanceGroups') options.merge!(Fog::AWS.indexed_param('InstanceGroups.member.%d', [*instance_groups])) end @@ -32,14 +30,12 @@ module Fog :parser => Fog::Parsers::AWS::EMR::AddInstanceGroups.new, }.merge(options)) end - end class Mock def add_instance_groups(job_flow_id, options={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/emr/add_job_flow_steps.rb b/lib/fog/aws/requests/emr/add_job_flow_steps.rb index 8fe6ae290..60319ed01 100644 --- a/lib/fog/aws/requests/emr/add_job_flow_steps.rb +++ b/lib/fog/aws/requests/emr/add_job_flow_steps.rb @@ -2,7 +2,6 @@ module Fog module AWS class EMR class Real - require 'fog/aws/parsers/emr/add_job_flow_steps' # adds new steps to a running job flow. @@ -24,7 +23,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def add_job_flow_steps(job_flow_id, options={}) - if steps = options.delete('Steps') options.merge!(Fog::AWS.serialize_keys('Steps', steps)) end @@ -38,11 +36,9 @@ module Fog end class Mock - def add_job_flow_steps(db_name, options={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/emr/describe_job_flows.rb b/lib/fog/aws/requests/emr/describe_job_flows.rb index de12b21c5..9a41fcacd 100644 --- a/lib/fog/aws/requests/emr/describe_job_flows.rb +++ b/lib/fog/aws/requests/emr/describe_job_flows.rb @@ -2,7 +2,6 @@ module Fog module AWS class EMR class Real - require 'fog/aws/parsers/emr/describe_job_flows' # returns a list of job flows that match all of the supplied parameters. @@ -80,7 +79,6 @@ module Fog # * 'Value'<~String> - The value part of the identified key # * 'Name'<~String> - The name of the job flow step def describe_job_flows(options={}) - if job_ids = options.delete('JobFlowIds') options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids)) end @@ -97,11 +95,9 @@ module Fog end class Mock - def describe_job_flows(db_name, options={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/emr/modify_instance_groups.rb b/lib/fog/aws/requests/emr/modify_instance_groups.rb index cca9dafc0..5adb73f4f 100644 --- a/lib/fog/aws/requests/emr/modify_instance_groups.rb +++ b/lib/fog/aws/requests/emr/modify_instance_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class EMR class Real - require 'fog/aws/parsers/emr/modify_instance_groups' # modifies the number of nodes and configuration settings of an instance group.. @@ -16,7 +15,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash> def modify_instance_groups(options={}) - if job_ids = options.delete('InstanceGroups') options.merge!(Fog::AWS.serialize_keys('InstanceGroups', job_ids)) end @@ -29,11 +27,9 @@ module Fog end class Mock - def modify_instance_groups(options={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/emr/run_job_flow.rb b/lib/fog/aws/requests/emr/run_job_flow.rb index 8c994d17e..21156a6f2 100644 --- a/lib/fog/aws/requests/emr/run_job_flow.rb +++ b/lib/fog/aws/requests/emr/run_job_flow.rb @@ -2,7 +2,6 @@ module Fog module AWS class EMR class Real - require 'fog/aws/parsers/emr/run_job_flow' # creates and starts running a new job flow @@ -48,7 +47,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def run_job_flow(name, options={}) - if bootstrap_actions = options.delete('BootstrapActions') options.merge!(Fog::AWS.serialize_keys('BootstrapActions', bootstrap_actions)) end @@ -97,11 +95,9 @@ module Fog end class Mock - def run_job_flow(db_name, options={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/emr/set_termination_protection.rb b/lib/fog/aws/requests/emr/set_termination_protection.rb index 4f90f7c82..85ddd17d5 100644 --- a/lib/fog/aws/requests/emr/set_termination_protection.rb +++ b/lib/fog/aws/requests/emr/set_termination_protection.rb @@ -2,7 +2,6 @@ module Fog module AWS class EMR class Real - require 'fog/aws/parsers/emr/set_termination_protection' # locks a job flow so the Amazon EC2 instances in the cluster cannot be terminated by user intervention. @@ -15,7 +14,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash> def set_termination_protection(is_protected, options={}) - if job_ids = options.delete('JobFlowIds') options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids)) end @@ -28,11 +26,9 @@ module Fog end class Mock - def set_termination_protection(db_name, options={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/emr/terminate_job_flows.rb b/lib/fog/aws/requests/emr/terminate_job_flows.rb index 5616c904a..4a67cbf9b 100644 --- a/lib/fog/aws/requests/emr/terminate_job_flows.rb +++ b/lib/fog/aws/requests/emr/terminate_job_flows.rb @@ -2,7 +2,6 @@ module Fog module AWS class EMR class Real - require 'fog/aws/parsers/emr/terminate_job_flows' # shuts a list of job flows down. @@ -14,7 +13,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash> def terminate_job_flows(options={}) - if job_ids = options.delete('JobFlowIds') options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids)) end @@ -26,11 +24,9 @@ module Fog end class Mock - def terminate_job_flows(db_name, options={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/glacier/abort_multipart_upload.rb b/lib/fog/aws/requests/glacier/abort_multipart_upload.rb index a9903afc3..97c8ec06d 100644 --- a/lib/fog/aws/requests/glacier/abort_multipart_upload.rb +++ b/lib/fog/aws/requests/glacier/abort_multipart_upload.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Abort an upload # # ==== Parameters @@ -29,7 +28,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/complete_multipart_upload.rb b/lib/fog/aws/requests/glacier/complete_multipart_upload.rb index 56f27b6b7..293d146e1 100644 --- a/lib/fog/aws/requests/glacier/complete_multipart_upload.rb +++ b/lib/fog/aws/requests/glacier/complete_multipart_upload.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Complete an upload # # ==== Parameters @@ -36,7 +35,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/create_archive.rb b/lib/fog/aws/requests/glacier/create_archive.rb index 92bd62760..f1cabbb4c 100644 --- a/lib/fog/aws/requests/glacier/create_archive.rb +++ b/lib/fog/aws/requests/glacier/create_archive.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Upload an archive # # ==== Parameters @@ -37,7 +36,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/create_vault.rb b/lib/fog/aws/requests/glacier/create_vault.rb index d0994b9d0..fa1481a08 100644 --- a/lib/fog/aws/requests/glacier/create_vault.rb +++ b/lib/fog/aws/requests/glacier/create_vault.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # This operation creates a new vault with the specified name. . # # ==== Parameters @@ -28,7 +27,6 @@ module Fog })) end end - end end end diff --git a/lib/fog/aws/requests/glacier/delete_archive.rb b/lib/fog/aws/requests/glacier/delete_archive.rb index c6cb2caf5..a873b13ee 100644 --- a/lib/fog/aws/requests/glacier/delete_archive.rb +++ b/lib/fog/aws/requests/glacier/delete_archive.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Delete an archive # # ==== Parameters @@ -29,7 +28,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/delete_vault.rb b/lib/fog/aws/requests/glacier/delete_vault.rb index 6e0a96491..5a15a7b19 100644 --- a/lib/fog/aws/requests/glacier/delete_vault.rb +++ b/lib/fog/aws/requests/glacier/delete_vault.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Delete a vault. Amazon Glacier will delete a vault only if there are no archives in the vault as per the last inventory # and there have been no writes to the vault since the last inventory # @@ -28,7 +27,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/delete_vault_notification_configuration.rb b/lib/fog/aws/requests/glacier/delete_vault_notification_configuration.rb index f230e21e3..740f0fdd6 100644 --- a/lib/fog/aws/requests/glacier/delete_vault_notification_configuration.rb +++ b/lib/fog/aws/requests/glacier/delete_vault_notification_configuration.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Delete vault's notification configuration # # ==== Parameters @@ -27,7 +26,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/describe_job.rb b/lib/fog/aws/requests/glacier/describe_job.rb index caa74bd4f..c924c1610 100644 --- a/lib/fog/aws/requests/glacier/describe_job.rb +++ b/lib/fog/aws/requests/glacier/describe_job.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Complete an upload # # ==== Parameters @@ -29,7 +28,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/describe_vault.rb b/lib/fog/aws/requests/glacier/describe_vault.rb index c3a26c57a..edb5eedec 100644 --- a/lib/fog/aws/requests/glacier/describe_vault.rb +++ b/lib/fog/aws/requests/glacier/describe_vault.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # This operation returns information about a vault # # ==== Parameters @@ -28,7 +27,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/get_job_output.rb b/lib/fog/aws/requests/glacier/get_job_output.rb index 7f353599e..c89f987c4 100644 --- a/lib/fog/aws/requests/glacier/get_job_output.rb +++ b/lib/fog/aws/requests/glacier/get_job_output.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Get the output from a job # # ==== Parameters @@ -35,7 +34,6 @@ module Fog )) end end - end end end diff --git a/lib/fog/aws/requests/glacier/get_vault_notification_configuration.rb b/lib/fog/aws/requests/glacier/get_vault_notification_configuration.rb index c88631fb9..03585fd59 100644 --- a/lib/fog/aws/requests/glacier/get_vault_notification_configuration.rb +++ b/lib/fog/aws/requests/glacier/get_vault_notification_configuration.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Get a vault's notification configuration # # ==== Parameters @@ -28,7 +27,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/initiate_job.rb b/lib/fog/aws/requests/glacier/initiate_job.rb index 7048a6db4..3f4edc5c5 100644 --- a/lib/fog/aws/requests/glacier/initiate_job.rb +++ b/lib/fog/aws/requests/glacier/initiate_job.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # This operation initates a multipart upload of an archive to a vault # # ==== Parameters @@ -35,7 +34,6 @@ module Fog }) end end - end end end diff --git a/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb b/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb index e6cd207e6..cf545d466 100644 --- a/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb +++ b/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # This operation initates a multipart upload of an archive to a vault # # ==== Parameters @@ -32,7 +31,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/list_jobs.rb b/lib/fog/aws/requests/glacier/list_jobs.rb index 9702224a5..76461e451 100644 --- a/lib/fog/aws/requests/glacier/list_jobs.rb +++ b/lib/fog/aws/requests/glacier/list_jobs.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # lists in-progress and recently jobs for the specified vault # # ==== Parameters @@ -22,7 +21,6 @@ module Fog account_id = options.delete('account_id') || '-' path = "/#{account_id}/vaults/#{Fog::AWS.escape(vault_name)}/jobs" - request( :expects => 200, :idempotent => true, @@ -33,7 +31,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/list_multipart_uploads.rb b/lib/fog/aws/requests/glacier/list_multipart_uploads.rb index 07512a427..751aea628 100644 --- a/lib/fog/aws/requests/glacier/list_multipart_uploads.rb +++ b/lib/fog/aws/requests/glacier/list_multipart_uploads.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # lists in-progress multipart uploads for the specified vault # # ==== Parameters @@ -20,7 +19,6 @@ module Fog account_id = options.delete('account_id') || '-' path = "/#{account_id}/vaults/#{Fog::AWS.escape(vault_name)}/multipart-uploads" - request( :expects => 200, :idempotent => true, @@ -31,7 +29,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/list_parts.rb b/lib/fog/aws/requests/glacier/list_parts.rb index ae92c536c..0c1b8d5d1 100644 --- a/lib/fog/aws/requests/glacier/list_parts.rb +++ b/lib/fog/aws/requests/glacier/list_parts.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # lists the parts of an archive that have been uploaded in a specific multipart upload # # ==== Parameters @@ -31,7 +30,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/list_vaults.rb b/lib/fog/aws/requests/glacier/list_vaults.rb index 225e85c8e..fc6d61100 100644 --- a/lib/fog/aws/requests/glacier/list_vaults.rb +++ b/lib/fog/aws/requests/glacier/list_vaults.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # This operation lists all vaults owned by the calling user’s account. # # ==== Parameters @@ -30,7 +29,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/set_vault_notification_configuration.rb b/lib/fog/aws/requests/glacier/set_vault_notification_configuration.rb index c7647b4f7..dd9498dba 100644 --- a/lib/fog/aws/requests/glacier/set_vault_notification_configuration.rb +++ b/lib/fog/aws/requests/glacier/set_vault_notification_configuration.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Set a vault's notification configuration # # ==== Parameters @@ -31,7 +30,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/glacier/upload_part.rb b/lib/fog/aws/requests/glacier/upload_part.rb index eb6f835df..cba1ff1e2 100644 --- a/lib/fog/aws/requests/glacier/upload_part.rb +++ b/lib/fog/aws/requests/glacier/upload_part.rb @@ -2,7 +2,6 @@ module Fog module AWS class Glacier class Real - # Upload an archive # # ==== Parameters @@ -40,7 +39,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/aws/requests/iam/add_role_to_instance_profile.rb b/lib/fog/aws/requests/iam/add_role_to_instance_profile.rb index bb89f898c..7c3afd817 100644 --- a/lib/fog/aws/requests/iam/add_role_to_instance_profile.rb +++ b/lib/fog/aws/requests/iam/add_role_to_instance_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Add a role to an instance profile @@ -27,9 +26,7 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end - end end end diff --git a/lib/fog/aws/requests/iam/add_user_to_group.rb b/lib/fog/aws/requests/iam/add_user_to_group.rb index 6ea8175d7..400efefc3 100644 --- a/lib/fog/aws/requests/iam/add_user_to_group.rb +++ b/lib/fog/aws/requests/iam/add_user_to_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Add a user to a group @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end class Mock - def add_user_to_group(group_name, user_name) if data[:groups].has_key? group_name if data[:users].has_key? user_name @@ -51,7 +48,6 @@ module Fog raise Fog::AWS::IAM::NotFound.new("The group with name #{group_name} cannot be found.") end end - end end end diff --git a/lib/fog/aws/requests/iam/create_access_key.rb b/lib/fog/aws/requests/iam/create_access_key.rb index f0113bbd0..2ebaa96b2 100644 --- a/lib/fog/aws/requests/iam/create_access_key.rb +++ b/lib/fog/aws/requests/iam/create_access_key.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/create_access_key' # Create a access keys for user (by default detects user from access credentials) @@ -30,7 +29,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::CreateAccessKey.new }.merge!(options)) end - end class Mock def create_access_key(options) diff --git a/lib/fog/aws/requests/iam/create_account_alias.rb b/lib/fog/aws/requests/iam/create_account_alias.rb index 1347e4cd4..7cd02e60c 100644 --- a/lib/fog/aws/requests/iam/create_account_alias.rb +++ b/lib/fog/aws/requests/iam/create_account_alias.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' def create_account_alias(account_alias) @@ -12,7 +11,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/iam/create_group.rb b/lib/fog/aws/requests/iam/create_group.rb index 9c9177405..47bf6743e 100644 --- a/lib/fog/aws/requests/iam/create_group.rb +++ b/lib/fog/aws/requests/iam/create_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/create_group' # Create a new group @@ -32,11 +31,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::CreateGroup.new ) end - end class Mock - def create_group(group_name, path = '/') if data[:groups].has_key? group_name raise Fog::AWS::IAM::EntityAlreadyExists.new("Group with name #{group_name} already exists.") @@ -52,7 +49,6 @@ module Fog response.status = 200 end end - end end end diff --git a/lib/fog/aws/requests/iam/create_instance_profile.rb b/lib/fog/aws/requests/iam/create_instance_profile.rb index 34f23f067..7c5b32341 100644 --- a/lib/fog/aws/requests/iam/create_instance_profile.rb +++ b/lib/fog/aws/requests/iam/create_instance_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/instance_profile' # Create a new instance_profile diff --git a/lib/fog/aws/requests/iam/create_login_profile.rb b/lib/fog/aws/requests/iam/create_login_profile.rb index de16c7ee8..cca2cfc20 100644 --- a/lib/fog/aws/requests/iam/create_login_profile.rb +++ b/lib/fog/aws/requests/iam/create_login_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/login_profile' # Creates a login profile for a user @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::LoginProfile.new }) end - end end end diff --git a/lib/fog/aws/requests/iam/create_role.rb b/lib/fog/aws/requests/iam/create_role.rb index 6bb86c2e1..d37f7df47 100644 --- a/lib/fog/aws/requests/iam/create_role.rb +++ b/lib/fog/aws/requests/iam/create_role.rb @@ -49,7 +49,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::SingleRole.new ) end - end end end diff --git a/lib/fog/aws/requests/iam/create_user.rb b/lib/fog/aws/requests/iam/create_user.rb index 0a354ca32..48c87a1b6 100644 --- a/lib/fog/aws/requests/iam/create_user.rb +++ b/lib/fog/aws/requests/iam/create_user.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/create_user' # Create a new user @@ -32,7 +31,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::CreateUser.new ) end - end class Mock diff --git a/lib/fog/aws/requests/iam/delete_access_key.rb b/lib/fog/aws/requests/iam/delete_access_key.rb index 74b657d50..458b5fb75 100644 --- a/lib/fog/aws/requests/iam/delete_access_key.rb +++ b/lib/fog/aws/requests/iam/delete_access_key.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Delete an access key @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new }.merge!(options)) end - end class Mock - def delete_access_key(access_key_id, options = {}) user_name = options['UserName'] if user_name && data[:users].has_key?(user_name) && data[:users][user_name][:access_keys].any? { |akey| akey['AccessKeyId'] == access_key_id } @@ -44,7 +41,6 @@ module Fog raise Fog::AWS::IAM::NotFound.new("The Access Key with id #{access_key_id} cannot be found.") end end - end end end diff --git a/lib/fog/aws/requests/iam/delete_account_alias.rb b/lib/fog/aws/requests/iam/delete_account_alias.rb index ba49c8378..a20c236ca 100644 --- a/lib/fog/aws/requests/iam/delete_account_alias.rb +++ b/lib/fog/aws/requests/iam/delete_account_alias.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' def delete_account_alias(account_alias) @@ -12,7 +11,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/iam/delete_group.rb b/lib/fog/aws/requests/iam/delete_group.rb index fe5138496..cbac34b79 100644 --- a/lib/fog/aws/requests/iam/delete_group.rb +++ b/lib/fog/aws/requests/iam/delete_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Delete a group @@ -25,11 +24,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end class Mock - def delete_group(group_name) if data[:groups].has_key? group_name if data[:groups][group_name][:members].empty? diff --git a/lib/fog/aws/requests/iam/delete_group_policy.rb b/lib/fog/aws/requests/iam/delete_group_policy.rb index 3952ef27a..e57170f80 100644 --- a/lib/fog/aws/requests/iam/delete_group_policy.rb +++ b/lib/fog/aws/requests/iam/delete_group_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Remove a policy from a group @@ -27,7 +26,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/iam/delete_instance_profile.rb b/lib/fog/aws/requests/iam/delete_instance_profile.rb index ee81826b2..4ccfc4f27 100644 --- a/lib/fog/aws/requests/iam/delete_instance_profile.rb +++ b/lib/fog/aws/requests/iam/delete_instance_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Delete a instance_profile @@ -25,7 +24,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/iam/delete_login_profile.rb b/lib/fog/aws/requests/iam/delete_login_profile.rb index 304978b52..163f36ae4 100644 --- a/lib/fog/aws/requests/iam/delete_login_profile.rb +++ b/lib/fog/aws/requests/iam/delete_login_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Deletes a user's login profile @@ -24,7 +23,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new }) end - end end end diff --git a/lib/fog/aws/requests/iam/delete_role.rb b/lib/fog/aws/requests/iam/delete_role.rb index bc490ca61..02c2c548b 100644 --- a/lib/fog/aws/requests/iam/delete_role.rb +++ b/lib/fog/aws/requests/iam/delete_role.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Delete a role @@ -25,7 +24,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/iam/delete_role_policy.rb b/lib/fog/aws/requests/iam/delete_role_policy.rb index bcf12915d..7293f1efb 100644 --- a/lib/fog/aws/requests/iam/delete_role_policy.rb +++ b/lib/fog/aws/requests/iam/delete_role_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Remove a policy from a role @@ -27,9 +26,7 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end - end end end diff --git a/lib/fog/aws/requests/iam/delete_server_certificate.rb b/lib/fog/aws/requests/iam/delete_server_certificate.rb index a49d38053..d9a5d0253 100644 --- a/lib/fog/aws/requests/iam/delete_server_certificate.rb +++ b/lib/fog/aws/requests/iam/delete_server_certificate.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Deletes the specified server certificate. @@ -25,7 +24,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new }) end - end class Mock diff --git a/lib/fog/aws/requests/iam/delete_signing_certificate.rb b/lib/fog/aws/requests/iam/delete_signing_certificate.rb index 12d397095..b13726f19 100644 --- a/lib/fog/aws/requests/iam/delete_signing_certificate.rb +++ b/lib/fog/aws/requests/iam/delete_signing_certificate.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Upload signing certificate for user (by default detects user from access credentials) @@ -26,7 +25,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/delete_user.rb b/lib/fog/aws/requests/iam/delete_user.rb index 7f832bdbc..7f3621ab8 100644 --- a/lib/fog/aws/requests/iam/delete_user.rb +++ b/lib/fog/aws/requests/iam/delete_user.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Delete a user @@ -25,11 +24,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end class Mock - def delete_user(user_name) if data[:users].has_key? user_name data[:users].delete user_name @@ -40,9 +37,7 @@ module Fog else raise Fog::AWS::IAM::NotFound.new("The user with name #{user_name} cannot be found.") end - end - end end end diff --git a/lib/fog/aws/requests/iam/delete_user_policy.rb b/lib/fog/aws/requests/iam/delete_user_policy.rb index c72f79bd6..3acb5c4e4 100644 --- a/lib/fog/aws/requests/iam/delete_user_policy.rb +++ b/lib/fog/aws/requests/iam/delete_user_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Remove a policy from a user @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end class Mock - def delete_user_policy(user_name, policy_name) if data[:users].has_key?(user_name) && data[:users][user_name][:policies].has_key?(policy_name) data[:users][user_name][:policies].delete policy_name @@ -43,7 +40,6 @@ module Fog raise Fog::AWS::IAM::NotFound.new("The user policy with name #{policy_name} cannot be found.") end end - end end end diff --git a/lib/fog/aws/requests/iam/get_account_summary.rb b/lib/fog/aws/requests/iam/get_account_summary.rb index 6a650162c..8a56a0da3 100644 --- a/lib/fog/aws/requests/iam/get_account_summary.rb +++ b/lib/fog/aws/requests/iam/get_account_summary.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/get_account_summary' # Retrieve account level information about account entity usage and IAM quotas @@ -43,11 +42,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::GetAccountSummary.new ) end - end class Mock - def get_account_summary Excon::Response.new.tap do |response| response.status = 200 @@ -72,9 +69,7 @@ module Fog } end end - end - end end end diff --git a/lib/fog/aws/requests/iam/get_group.rb b/lib/fog/aws/requests/iam/get_group.rb index 47c3e250f..c62a8c79a 100644 --- a/lib/fog/aws/requests/iam/get_group.rb +++ b/lib/fog/aws/requests/iam/get_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/get_group' # Get Group @@ -37,7 +36,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::GetGroup.new }.merge!(options)) end - end class Mock def get_group(group_name, options = {}) diff --git a/lib/fog/aws/requests/iam/get_group_policy.rb b/lib/fog/aws/requests/iam/get_group_policy.rb index 11fc26bdf..4dec0a150 100644 --- a/lib/fog/aws/requests/iam/get_group_policy.rb +++ b/lib/fog/aws/requests/iam/get_group_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/get_group_policy' # Get Group Policy @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::GetGroupPolicy.new }) end - end class Mock def get_group_policy(policy_name, group_name) diff --git a/lib/fog/aws/requests/iam/get_instance_profile.rb b/lib/fog/aws/requests/iam/get_instance_profile.rb index 069951d81..ba33a0bb9 100644 --- a/lib/fog/aws/requests/iam/get_instance_profile.rb +++ b/lib/fog/aws/requests/iam/get_instance_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/instance_profile' # Retrieves information about an instance profile @@ -35,7 +34,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::InstanceProfile.new }) end - end end end diff --git a/lib/fog/aws/requests/iam/get_login_profile.rb b/lib/fog/aws/requests/iam/get_login_profile.rb index 1c3d5cd10..6f9470925 100644 --- a/lib/fog/aws/requests/iam/get_login_profile.rb +++ b/lib/fog/aws/requests/iam/get_login_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/login_profile' # Retrieves the login profile for a user @@ -28,7 +27,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::LoginProfile.new }) end - end end end diff --git a/lib/fog/aws/requests/iam/get_role.rb b/lib/fog/aws/requests/iam/get_role.rb index 34534e178..c60f8999d 100644 --- a/lib/fog/aws/requests/iam/get_role.rb +++ b/lib/fog/aws/requests/iam/get_role.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/single_role' # Get the specified role @@ -31,7 +30,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::SingleRole.new ) end - end end end diff --git a/lib/fog/aws/requests/iam/get_role_policy.rb b/lib/fog/aws/requests/iam/get_role_policy.rb index 9dade3876..cab6e83b7 100644 --- a/lib/fog/aws/requests/iam/get_role_policy.rb +++ b/lib/fog/aws/requests/iam/get_role_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/get_role_policy' # Get Role Policy @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::GetRolePolicy.new }) end - end end end diff --git a/lib/fog/aws/requests/iam/get_server_certificate.rb b/lib/fog/aws/requests/iam/get_server_certificate.rb index 8a0766a83..aa0fb8934 100644 --- a/lib/fog/aws/requests/iam/get_server_certificate.rb +++ b/lib/fog/aws/requests/iam/get_server_certificate.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/upload_server_certificate' # Gets the specified server certificate. @@ -25,7 +24,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::UploadServerCertificate.new }) end - end class Mock diff --git a/lib/fog/aws/requests/iam/get_user.rb b/lib/fog/aws/requests/iam/get_user.rb index a620213a0..4fe7d6a9c 100644 --- a/lib/fog/aws/requests/iam/get_user.rb +++ b/lib/fog/aws/requests/iam/get_user.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/get_user' # Get User @@ -31,7 +30,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::GetUser.new }.merge!(options)) end - end class Mock diff --git a/lib/fog/aws/requests/iam/get_user_policy.rb b/lib/fog/aws/requests/iam/get_user_policy.rb index 7b7e3693d..d5a953be3 100644 --- a/lib/fog/aws/requests/iam/get_user_policy.rb +++ b/lib/fog/aws/requests/iam/get_user_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/get_user_policy' # Get User Policy @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::GetUserPolicy.new }) end - end class Mock def get_user_policy(policy_name, user_name) diff --git a/lib/fog/aws/requests/iam/list_access_keys.rb b/lib/fog/aws/requests/iam/list_access_keys.rb index 5691b3fb1..5dec3fa5b 100644 --- a/lib/fog/aws/requests/iam/list_access_keys.rb +++ b/lib/fog/aws/requests/iam/list_access_keys.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_access_keys' # List access_keys @@ -33,11 +32,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListAccessKeys.new }.merge!(options)) end - end class Mock - def list_access_keys(options = {}) #FIXME: Doesn't do anything with options, aside from UserName if user = options['UserName'] diff --git a/lib/fog/aws/requests/iam/list_account_aliases.rb b/lib/fog/aws/requests/iam/list_account_aliases.rb index ce5d7ae8f..9197896c6 100644 --- a/lib/fog/aws/requests/iam/list_account_aliases.rb +++ b/lib/fog/aws/requests/iam/list_account_aliases.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_account_aliases' def list_account_aliases(options = {}) @@ -11,7 +10,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListAccountAliases.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/list_group_policies.rb b/lib/fog/aws/requests/iam/list_group_policies.rb index 0866424ba..f83adc924 100644 --- a/lib/fog/aws/requests/iam/list_group_policies.rb +++ b/lib/fog/aws/requests/iam/list_group_policies.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_policies' # List policies for a group @@ -32,7 +31,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListPolicies.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/list_groups.rb b/lib/fog/aws/requests/iam/list_groups.rb index e2ffc5738..8084c3862 100644 --- a/lib/fog/aws/requests/iam/list_groups.rb +++ b/lib/fog/aws/requests/iam/list_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_groups' # List groups @@ -35,11 +34,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListGroups.new }.merge!(options)) end - end class Mock - def list_groups(options = {} ) #FIXME: Doesn't observe options Excon::Response.new.tap do |response| diff --git a/lib/fog/aws/requests/iam/list_groups_for_user.rb b/lib/fog/aws/requests/iam/list_groups_for_user.rb index 1c6446a69..7bd5bd0c7 100644 --- a/lib/fog/aws/requests/iam/list_groups_for_user.rb +++ b/lib/fog/aws/requests/iam/list_groups_for_user.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_groups_for_user' # List groups_for_user @@ -36,7 +35,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListGroupsForUser.new }.merge!(options)) end - end class Mock diff --git a/lib/fog/aws/requests/iam/list_instance_profiles.rb b/lib/fog/aws/requests/iam/list_instance_profiles.rb index 45d950a30..95d876cfc 100644 --- a/lib/fog/aws/requests/iam/list_instance_profiles.rb +++ b/lib/fog/aws/requests/iam/list_instance_profiles.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_instance_profiles' # Lists instance profiles @@ -43,7 +42,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListInstanceProfiles.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/list_instance_profiles_for_role.rb b/lib/fog/aws/requests/iam/list_instance_profiles_for_role.rb index b8f5e89d2..45a8af69b 100644 --- a/lib/fog/aws/requests/iam/list_instance_profiles_for_role.rb +++ b/lib/fog/aws/requests/iam/list_instance_profiles_for_role.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_instance_profiles' # Lists the instance profiles that have the specified associated role @@ -44,7 +43,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListInstanceProfiles.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/list_role_policies.rb b/lib/fog/aws/requests/iam/list_role_policies.rb index 60e76de85..26962dc23 100644 --- a/lib/fog/aws/requests/iam/list_role_policies.rb +++ b/lib/fog/aws/requests/iam/list_role_policies.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_policies' # Lists the names of policies associated with a role @@ -32,7 +31,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListPolicies.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/list_roles.rb b/lib/fog/aws/requests/iam/list_roles.rb index 3cc5998a8..18267c1be 100644 --- a/lib/fog/aws/requests/iam/list_roles.rb +++ b/lib/fog/aws/requests/iam/list_roles.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_roles' # Lists roles @@ -36,7 +35,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListRoles.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/list_server_certificates.rb b/lib/fog/aws/requests/iam/list_server_certificates.rb index 267161d96..11a0eab83 100644 --- a/lib/fog/aws/requests/iam/list_server_certificates.rb +++ b/lib/fog/aws/requests/iam/list_server_certificates.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_server_certificates' # List server certificates @@ -35,7 +34,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListServerCertificates.new }.merge!(options)) end - end class Mock diff --git a/lib/fog/aws/requests/iam/list_signing_certificates.rb b/lib/fog/aws/requests/iam/list_signing_certificates.rb index f28f4a4b9..cb519713d 100644 --- a/lib/fog/aws/requests/iam/list_signing_certificates.rb +++ b/lib/fog/aws/requests/iam/list_signing_certificates.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_signing_certificates' # List signing certificates for user (by default detects user from access credentials) @@ -31,7 +30,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListSigningCertificates.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/list_user_policies.rb b/lib/fog/aws/requests/iam/list_user_policies.rb index 32d138819..1962a71ac 100644 --- a/lib/fog/aws/requests/iam/list_user_policies.rb +++ b/lib/fog/aws/requests/iam/list_user_policies.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_policies' # List policies for a user @@ -32,11 +31,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListPolicies.new }.merge!(options)) end - end class Mock - def list_user_policies(user_name, options = {}) #FIXME: doesn't use options atm if data[:users].has_key? user_name @@ -50,7 +47,6 @@ module Fog raise Fog::AWS::IAM::NotFound.new("The user with name #{user_name} cannot be found.") end end - end end end diff --git a/lib/fog/aws/requests/iam/list_users.rb b/lib/fog/aws/requests/iam/list_users.rb index 698c99df6..ae3cb7f4f 100644 --- a/lib/fog/aws/requests/iam/list_users.rb +++ b/lib/fog/aws/requests/iam/list_users.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/list_users' # List users @@ -35,7 +34,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::ListUsers.new }.merge!(options)) end - end class Mock diff --git a/lib/fog/aws/requests/iam/put_group_policy.rb b/lib/fog/aws/requests/iam/put_group_policy.rb index dc943b75d..4d6462555 100644 --- a/lib/fog/aws/requests/iam/put_group_policy.rb +++ b/lib/fog/aws/requests/iam/put_group_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Add or update a policy for a group @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end class Mock #FIXME: You can't actually use the credentials for anything elsewhere in Fog diff --git a/lib/fog/aws/requests/iam/put_role_policy.rb b/lib/fog/aws/requests/iam/put_role_policy.rb index 257b42d5d..f6924ef34 100644 --- a/lib/fog/aws/requests/iam/put_role_policy.rb +++ b/lib/fog/aws/requests/iam/put_role_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Add or update a policy for a role @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end end end diff --git a/lib/fog/aws/requests/iam/put_user_policy.rb b/lib/fog/aws/requests/iam/put_user_policy.rb index 0ee036bfe..a9c03693a 100644 --- a/lib/fog/aws/requests/iam/put_user_policy.rb +++ b/lib/fog/aws/requests/iam/put_user_policy.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Add or update a policy for a user @@ -29,11 +28,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end class Mock - #FIXME: You can't actually use the credentials for anything elsewhere in Fog #FIXME: Doesn't do any validation on the policy def put_user_policy(user_name, policy_name, policy_document) diff --git a/lib/fog/aws/requests/iam/remove_role_from_instance_profile.rb b/lib/fog/aws/requests/iam/remove_role_from_instance_profile.rb index c6c1cfdf8..e2380203e 100644 --- a/lib/fog/aws/requests/iam/remove_role_from_instance_profile.rb +++ b/lib/fog/aws/requests/iam/remove_role_from_instance_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # removes a role from an instance profile @@ -28,9 +27,7 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end - end end end diff --git a/lib/fog/aws/requests/iam/remove_user_from_group.rb b/lib/fog/aws/requests/iam/remove_user_from_group.rb index 24b19d4c8..aa512c0b6 100644 --- a/lib/fog/aws/requests/iam/remove_user_from_group.rb +++ b/lib/fog/aws/requests/iam/remove_user_from_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Remove a user from a group @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new ) end - end class Mock - def remove_user_from_group(group_name, user_name) if data[:groups].has_key? group_name if data[:users].has_key? user_name diff --git a/lib/fog/aws/requests/iam/update_access_key.rb b/lib/fog/aws/requests/iam/update_access_key.rb index cc9c1413c..615df7b0f 100644 --- a/lib/fog/aws/requests/iam/update_access_key.rb +++ b/lib/fog/aws/requests/iam/update_access_key.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Update an access key for a user @@ -29,7 +28,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new }.merge!(options)) end - end class Mock @@ -52,7 +50,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/iam/update_group.rb b/lib/fog/aws/requests/iam/update_group.rb index 6504ed0a2..79dd6b8c8 100644 --- a/lib/fog/aws/requests/iam/update_group.rb +++ b/lib/fog/aws/requests/iam/update_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/update_group' # Update a Group @@ -32,7 +31,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::UpdateGroup.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/update_login_profile.rb b/lib/fog/aws/requests/iam/update_login_profile.rb index e54357efd..40a3ab436 100644 --- a/lib/fog/aws/requests/iam/update_login_profile.rb +++ b/lib/fog/aws/requests/iam/update_login_profile.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/basic' # Updates a login profile for a user @@ -26,7 +25,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new }) end - end end end diff --git a/lib/fog/aws/requests/iam/update_server_certificate.rb b/lib/fog/aws/requests/iam/update_server_certificate.rb index 0b6a9ec2f..762199eef 100644 --- a/lib/fog/aws/requests/iam/update_server_certificate.rb +++ b/lib/fog/aws/requests/iam/update_server_certificate.rb @@ -30,7 +30,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new }.merge!(options)) end - end class Mock diff --git a/lib/fog/aws/requests/iam/update_signing_certificate.rb b/lib/fog/aws/requests/iam/update_signing_certificate.rb index da18730d0..fe011ce87 100644 --- a/lib/fog/aws/requests/iam/update_signing_certificate.rb +++ b/lib/fog/aws/requests/iam/update_signing_certificate.rb @@ -25,7 +25,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::Basic.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/update_user.rb b/lib/fog/aws/requests/iam/update_user.rb index 291dfc5b4..b73d1912f 100644 --- a/lib/fog/aws/requests/iam/update_user.rb +++ b/lib/fog/aws/requests/iam/update_user.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/update_user' # Update a user @@ -32,7 +31,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::UpdateUser.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/iam/upload_server_certificate.rb b/lib/fog/aws/requests/iam/upload_server_certificate.rb index eccb884b9..d3e505dbf 100644 --- a/lib/fog/aws/requests/iam/upload_server_certificate.rb +++ b/lib/fog/aws/requests/iam/upload_server_certificate.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/upload_server_certificate' # Uploads a server certificate entity for the AWS Account. @@ -39,7 +38,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::UploadServerCertificate.new }.merge!(options)) end - end class Mock diff --git a/lib/fog/aws/requests/iam/upload_signing_certificate.rb b/lib/fog/aws/requests/iam/upload_signing_certificate.rb index c45b14b35..c77c875f4 100644 --- a/lib/fog/aws/requests/iam/upload_signing_certificate.rb +++ b/lib/fog/aws/requests/iam/upload_signing_certificate.rb @@ -2,7 +2,6 @@ module Fog module AWS class IAM class Real - require 'fog/aws/parsers/iam/upload_signing_certificate' # Upload signing certificate for user (by default detects user from access credentials) @@ -31,7 +30,6 @@ module Fog :parser => Fog::Parsers::AWS::IAM::UploadSigningCertificate.new }.merge!(options)) end - end end end diff --git a/lib/fog/aws/requests/rds/add_tags_to_resource.rb b/lib/fog/aws/requests/rds/add_tags_to_resource.rb index 07bba85b9..4ee57ddc9 100644 --- a/lib/fog/aws/requests/rds/add_tags_to_resource.rb +++ b/lib/fog/aws/requests/rds/add_tags_to_resource.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - # adds tags to a database instance # http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_AddTagsToResource.html # ==== Parameters @@ -21,11 +20,9 @@ module Fog }.merge(Fog::AWS.indexed_param('Tags.member.%d.Key', keys)). merge(Fog::AWS.indexed_param('Tags.member.%d.Value', values))) end - end class Mock - def add_tags_to_resource(rds_id, tags) response = Excon::Response.new if server = self.data[:servers][rds_id] @@ -39,7 +36,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found") end end - end end end diff --git a/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb b/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb index 4760bcc71..a936e0d4d 100644 --- a/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb +++ b/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/authorize_db_security_group_ingress' # authorizes a db security group ingress @@ -25,13 +24,10 @@ module Fog :parser => Fog::Parsers::AWS::RDS::AuthorizeDBSecurityGroupIngress.new, 'DBSecurityGroupName' => name }.merge(opts)) - end - end class Mock - def authorize_db_security_group_ingress(name, opts = {}) unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId')) raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId' @@ -62,9 +58,7 @@ module Fog else raise Fog::AWS::RDS::NotFound.new("DBSecurityGroupNotFound => #{name} not found") end - end - end end end diff --git a/lib/fog/aws/requests/rds/create_db_instance.rb b/lib/fog/aws/requests/rds/create_db_instance.rb index 0b8f02215..ae5a63fff 100644 --- a/lib/fog/aws/requests/rds/create_db_instance.rb +++ b/lib/fog/aws/requests/rds/create_db_instance.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/create_db_instance' # Create a db instance @@ -34,7 +33,6 @@ module Fog # # @see http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html def create_db_instance(db_name, options={}) - if security_groups = options.delete('DBSecurityGroups') options.merge!(Fog::AWS.indexed_param('DBSecurityGroups.member.%d', [*security_groups])) end @@ -49,11 +47,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::CreateDBInstance.new, }.merge(options)) end - end class Mock - def create_db_instance(db_name, options={}) response = Excon::Response.new if self.data[:servers] and self.data[:servers][db_name] @@ -116,7 +112,6 @@ module Fog "VpcSecurityGroups" => options["VpcSecurityGroups"], } - self.data[:servers][db_name] = data response.body = { "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }, @@ -129,7 +124,6 @@ module Fog self.data[:tags][db_name] = {} response end - end end end diff --git a/lib/fog/aws/requests/rds/create_db_instance_read_replica.rb b/lib/fog/aws/requests/rds/create_db_instance_read_replica.rb index 52af499e7..098fe8ff8 100644 --- a/lib/fog/aws/requests/rds/create_db_instance_read_replica.rb +++ b/lib/fog/aws/requests/rds/create_db_instance_read_replica.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/create_db_instance_read_replica' # create a read replica db instance @@ -18,8 +17,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def create_db_instance_read_replica(instance_identifier, source_identifier, options={}) - - request({ 'Action' => 'CreateDBInstanceReadReplica', 'DBInstanceIdentifier' => instance_identifier, @@ -27,11 +24,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::CreateDBInstanceReadReplica.new, }.merge(options)) end - end class Mock - def create_db_instance_read_replica(instance_identifier, source_identifier, options={}) # TODO: throw error when instance_identifier already exists, # or source_identifier doesn't exist @@ -76,7 +71,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/requests/rds/create_db_parameter_group.rb b/lib/fog/aws/requests/rds/create_db_parameter_group.rb index 149785ccd..6b1aa47ac 100644 --- a/lib/fog/aws/requests/rds/create_db_parameter_group.rb +++ b/lib/fog/aws/requests/rds/create_db_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/create_db_parameter_group' # create a database parameter group @@ -16,7 +15,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def create_db_parameter_group(group_name, group_family, description) - request({ 'Action' => 'CreateDBParameterGroup', 'DBParameterGroupName' => group_name, @@ -26,11 +24,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::CreateDbParameterGroup.new }) end - end class Mock - def create_db_parameter_group(group_name, group_family, description) response = Excon::Response.new if self.data[:parameter_groups] and self.data[:parameter_groups][group_name] @@ -50,9 +46,7 @@ module Fog } response.status = 200 response - end - end end end diff --git a/lib/fog/aws/requests/rds/create_db_security_group.rb b/lib/fog/aws/requests/rds/create_db_security_group.rb index c259cd271..e24b6744b 100644 --- a/lib/fog/aws/requests/rds/create_db_security_group.rb +++ b/lib/fog/aws/requests/rds/create_db_security_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/create_db_security_group' # creates a db security group @@ -21,11 +20,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::CreateDBSecurityGroup.new }) end - end class Mock - def create_db_security_group(name, description = name) response = Excon::Response.new if self.data[:security_groups] and self.data[:security_groups][name] @@ -45,9 +42,7 @@ module Fog 'CreateDBSecurityGroupResult' => { 'DBSecurityGroup' => data } } response - end - end end end diff --git a/lib/fog/aws/requests/rds/create_db_snapshot.rb b/lib/fog/aws/requests/rds/create_db_snapshot.rb index 6edfd69b4..41316bd05 100644 --- a/lib/fog/aws/requests/rds/create_db_snapshot.rb +++ b/lib/fog/aws/requests/rds/create_db_snapshot.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/create_db_snapshot' # creates a db snapshot @@ -21,11 +20,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::CreateDBSnapshot.new }) end - end class Mock - def create_db_snapshot(identifier, name) response = Excon::Response.new if data[:snapshots][name] @@ -64,7 +61,6 @@ module Fog # SnapshotCreateTime is not part of the response. self.data[:snapshots][name]['SnapshotCreateTime'] = Time.now response - end end end diff --git a/lib/fog/aws/requests/rds/create_db_subnet_group.rb b/lib/fog/aws/requests/rds/create_db_subnet_group.rb index 9b28c8261..0c4d37c1f 100644 --- a/lib/fog/aws/requests/rds/create_db_subnet_group.rb +++ b/lib/fog/aws/requests/rds/create_db_subnet_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/create_db_subnet_group' # Creates a db subnet group @@ -22,11 +21,9 @@ module Fog params.merge!(Fog::AWS.indexed_param("SubnetIds.member", Array(subnet_ids))) request(params) end - end class Mock - def create_db_subnet_group(name, subnet_ids, description = name) response = Excon::Response.new if self.data[:subnet_groups] && self.data[:subnet_groups][name] @@ -57,9 +54,7 @@ module Fog 'CreateDBSubnetGroupResult' => { 'DBSubnetGroup' => data } } response - end - end end end diff --git a/lib/fog/aws/requests/rds/delete_db_instance.rb b/lib/fog/aws/requests/rds/delete_db_instance.rb index baa333f5c..85ed2e64c 100644 --- a/lib/fog/aws/requests/rds/delete_db_instance.rb +++ b/lib/fog/aws/requests/rds/delete_db_instance.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/delete_db_instance' # delete a database instance @@ -25,11 +24,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DeleteDBInstance.new }.merge(params)) end - end class Mock - def delete_db_instance(identifier, snapshot_identifier, skip_snapshot = false) response = Excon::Response.new @@ -48,7 +45,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found") end end - end end end diff --git a/lib/fog/aws/requests/rds/delete_db_parameter_group.rb b/lib/fog/aws/requests/rds/delete_db_parameter_group.rb index b4e807db3..864de0ccd 100644 --- a/lib/fog/aws/requests/rds/delete_db_parameter_group.rb +++ b/lib/fog/aws/requests/rds/delete_db_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/delete_db_parameter_group' # delete a database parameter group @@ -13,7 +12,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def delete_db_parameter_group(group_name) - request({ 'Action' => 'DeleteDBParameterGroup', 'DBParameterGroupName' => group_name, @@ -21,11 +19,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DeleteDbParameterGroup.new }) end - end class Mock - def delete_db_parameter_group(group_name) response = Excon::Response.new @@ -39,7 +35,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBParameterGroup not found: #{group_name}") end end - end end end diff --git a/lib/fog/aws/requests/rds/delete_db_security_group.rb b/lib/fog/aws/requests/rds/delete_db_security_group.rb index c1506faa7..b1fa40afc 100644 --- a/lib/fog/aws/requests/rds/delete_db_security_group.rb +++ b/lib/fog/aws/requests/rds/delete_db_security_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/delete_db_security_group' # deletes a db security group @@ -19,11 +18,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DeleteDBSecurityGroup.new }) end - end class Mock - def delete_db_security_group(name, description = name) response = Excon::Response.new @@ -37,7 +34,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBSecurityGroupNotFound => #{name} not found") end end - end end end diff --git a/lib/fog/aws/requests/rds/delete_db_snapshot.rb b/lib/fog/aws/requests/rds/delete_db_snapshot.rb index 036b54f0f..352ed5c3d 100644 --- a/lib/fog/aws/requests/rds/delete_db_snapshot.rb +++ b/lib/fog/aws/requests/rds/delete_db_snapshot.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/delete_db_snapshot' # delete a database snapshot @@ -13,7 +12,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def delete_db_snapshot(name) - request({ 'Action' => 'DeleteDBSnapshot', 'DBSnapshotIdentifier' => name, @@ -21,11 +19,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DeleteDBSnapshot.new }) end - end class Mock - def delete_db_snapshot(name) # TODO: raise error if snapshot isn't 'available' response = Excon::Response.new @@ -40,7 +36,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/rds/delete_db_subnet_group.rb b/lib/fog/aws/requests/rds/delete_db_subnet_group.rb index 26849b448..1b1fbf597 100644 --- a/lib/fog/aws/requests/rds/delete_db_subnet_group.rb +++ b/lib/fog/aws/requests/rds/delete_db_subnet_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/delete_db_subnet_group' # Deletes a db subnet group @@ -18,11 +17,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DeleteDBSubnetGroup.new } request(params) end - end class Mock - def delete_db_subnet_group(name) response = Excon::Response.new unless self.data[:subnet_groups] && self.data[:subnet_groups][name] @@ -35,7 +32,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/rds/describe_db_engine_versions.rb b/lib/fog/aws/requests/rds/describe_db_engine_versions.rb index 459b4b35d..491c0e07f 100644 --- a/lib/fog/aws/requests/rds/describe_db_engine_versions.rb +++ b/lib/fog/aws/requests/rds/describe_db_engine_versions.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_engine_versions' def describe_db_engine_versions(opts={}) @@ -19,15 +18,12 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeDBEngineVersions.new }.merge(params)) end - end class Mock - def describe_db_engine_versions(opts={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/rds/describe_db_instances.rb b/lib/fog/aws/requests/rds/describe_db_instances.rb index 4e7336c88..25a162f9b 100644 --- a/lib/fog/aws/requests/rds/describe_db_instances.rb +++ b/lib/fog/aws/requests/rds/describe_db_instances.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_instances' # Describe all or specified load db instances @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeDBInstances.new }.merge(params)) end - end class Mock - def describe_db_instances(identifier=nil, opts={}) response = Excon::Response.new server_set = [] @@ -86,8 +83,6 @@ module Fog } response end - - end end end diff --git a/lib/fog/aws/requests/rds/describe_db_log_files.rb b/lib/fog/aws/requests/rds/describe_db_log_files.rb index 0921403e5..ba456fc46 100644 --- a/lib/fog/aws/requests/rds/describe_db_log_files.rb +++ b/lib/fog/aws/requests/rds/describe_db_log_files.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_log_files' # Describe log files for a DB instance @@ -35,7 +34,6 @@ module Fog end class Mock - def describe_db_log_files(rds_id=nil, opts={}) response = Excon::Response.new log_file_set = [] @@ -60,7 +58,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/rds/describe_db_parameter_groups.rb b/lib/fog/aws/requests/rds/describe_db_parameter_groups.rb index 992bba45f..dfa78b166 100644 --- a/lib/fog/aws/requests/rds/describe_db_parameter_groups.rb +++ b/lib/fog/aws/requests/rds/describe_db_parameter_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_parameter_groups' # This API returns a list of DBParameterGroup descriptions. If a DBParameterGroupName is specified, the list will contain only the descriptions of the specified DBParameterGroup @@ -30,11 +29,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeDBParameterGroups.new }.merge(params)) end - end class Mock - def describe_db_parameter_groups(name=nil, opts={}) response = Excon::Response.new parameter_set = [] @@ -48,7 +45,6 @@ module Fog parameter_set = self.data[:parameter_groups].values end - response.status = 200 response.body = { "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }, @@ -56,7 +52,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/rds/describe_db_parameters.rb b/lib/fog/aws/requests/rds/describe_db_parameters.rb index cab0967cf..5b51da422 100644 --- a/lib/fog/aws/requests/rds/describe_db_parameters.rb +++ b/lib/fog/aws/requests/rds/describe_db_parameters.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_parameters' # Describe parameters from a parameter group @@ -31,11 +30,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeDBParameters.new }.merge(params)) end - end class Mock - def describe_db_parameters(name, opts={}) Fog::Mock.not_implemented end diff --git a/lib/fog/aws/requests/rds/describe_db_reserved_instances.rb b/lib/fog/aws/requests/rds/describe_db_reserved_instances.rb index e0033a409..6d07d35cf 100644 --- a/lib/fog/aws/requests/rds/describe_db_reserved_instances.rb +++ b/lib/fog/aws/requests/rds/describe_db_reserved_instances.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_reserved_instances' # Describe all or specified load db instances @@ -27,15 +26,12 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeDBReservedInstances.new }.merge(params)) end - end class Mock - def describe_db_reserved_instances(identifier=nil, opts={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/rds/describe_db_security_groups.rb b/lib/fog/aws/requests/rds/describe_db_security_groups.rb index 334d1604d..675ea132d 100644 --- a/lib/fog/aws/requests/rds/describe_db_security_groups.rb +++ b/lib/fog/aws/requests/rds/describe_db_security_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_security_groups' # Describe all or specified db security groups @@ -23,11 +22,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeDBSecurityGroups.new }.merge(opts)) end - end class Mock - def describe_db_security_groups(opts={}) response = Excon::Response.new sec_group_set = [] @@ -77,7 +74,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/rds/describe_db_snapshots.rb b/lib/fog/aws/requests/rds/describe_db_snapshots.rb index 85a80fcb0..1ab314d9e 100644 --- a/lib/fog/aws/requests/rds/describe_db_snapshots.rb +++ b/lib/fog/aws/requests/rds/describe_db_snapshots.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_snapshots' # Describe all or specified db snapshots @@ -29,11 +28,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeDBSnapshots.new }.merge(params)) end - end class Mock - def describe_db_snapshots(opts={}) response = Excon::Response.new snapshots = self.data[:snapshots].values @@ -62,9 +59,7 @@ module Fog "DescribeDBSnapshotsResult" => { "DBSnapshots" => snapshots } } response - end - end end end diff --git a/lib/fog/aws/requests/rds/describe_db_subnet_groups.rb b/lib/fog/aws/requests/rds/describe_db_subnet_groups.rb index e6af85e95..36fd7008e 100644 --- a/lib/fog/aws/requests/rds/describe_db_subnet_groups.rb +++ b/lib/fog/aws/requests/rds/describe_db_subnet_groups.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_db_subnet_groups' # This API returns a list of DBSubnetGroup descriptions. If a DBSubnetGroupName is specified, the list will contain only @@ -30,11 +29,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeDBSubnetGroups.new }.merge(params)) end - end class Mock - def describe_db_subnet_groups(name = nil, opts = {}) response = Excon::Response.new @@ -57,7 +54,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/rds/describe_events.rb b/lib/fog/aws/requests/rds/describe_events.rb index c312ada93..488b07a5e 100644 --- a/lib/fog/aws/requests/rds/describe_events.rb +++ b/lib/fog/aws/requests/rds/describe_events.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/event_list' # Returns a list of service events @@ -39,7 +38,6 @@ module Fog :parser => Fog::Parsers::AWS::RDS::EventListParser.new ) end - end class Mock diff --git a/lib/fog/aws/requests/rds/describe_orderable_db_instance_options.rb b/lib/fog/aws/requests/rds/describe_orderable_db_instance_options.rb index 3b0163fb1..95d147ff2 100644 --- a/lib/fog/aws/requests/rds/describe_orderable_db_instance_options.rb +++ b/lib/fog/aws/requests/rds/describe_orderable_db_instance_options.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/describe_orderable_db_instance_options' # Describe all or specified load db instances @@ -34,11 +33,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DescribeOrderableDBInstanceOptions.new }.merge(params)) end - end class Mock - def describe_orderable_db_instance_options(engine=nil, opts={}) instance_options = [] response = Excon::Response.new @@ -69,7 +66,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/rds/download_db_logfile_portion.rb b/lib/fog/aws/requests/rds/download_db_logfile_portion.rb index 4b2fae683..e8361b34d 100644 --- a/lib/fog/aws/requests/rds/download_db_logfile_portion.rb +++ b/lib/fog/aws/requests/rds/download_db_logfile_portion.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/download_db_logfile_portion' # Retrieve a portion of a log file of a db instance @@ -30,11 +29,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::DownloadDBLogFilePortion.new }.merge(params)) end - end class Mock - def download_db_logfile_portion(identifier=nil, filename=nil, opts={}) response = Excon::Response.new server_set = [] @@ -55,8 +52,6 @@ module Fog } response end - - end end end diff --git a/lib/fog/aws/requests/rds/list_tags_for_resource.rb b/lib/fog/aws/requests/rds/list_tags_for_resource.rb index 6c37a5ce3..c02d1e29c 100644 --- a/lib/fog/aws/requests/rds/list_tags_for_resource.rb +++ b/lib/fog/aws/requests/rds/list_tags_for_resource.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/tag_list_parser' # returns a Hash of tags for a database instance @@ -19,11 +18,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::TagListParser.new ) end - end class Mock - def list_tags_for_resource(rds_id) response = Excon::Response.new if server = self.data[:servers][rds_id] @@ -37,7 +34,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found") end end - end end end diff --git a/lib/fog/aws/requests/rds/modify_db_instance.rb b/lib/fog/aws/requests/rds/modify_db_instance.rb index 22059854f..997a32f9b 100644 --- a/lib/fog/aws/requests/rds/modify_db_instance.rb +++ b/lib/fog/aws/requests/rds/modify_db_instance.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/modify_db_instance' # modifies a database instance @@ -29,7 +28,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def modify_db_instance(db_name, apply_immediately, options={}) - if security_groups = options.delete('DBSecurityGroups') options.merge!(Fog::AWS.indexed_param('DBSecurityGroups.member.%d', [*security_groups])) end @@ -45,11 +43,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::ModifyDBInstance.new, }.merge(options)) end - end class Mock - def modify_db_instance(db_name, apply_immediately, options={}) response = Excon::Response.new if self.data[:servers][db_name] @@ -79,7 +75,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBInstance #{db_name} not found") end end - end end end diff --git a/lib/fog/aws/requests/rds/modify_db_parameter_group.rb b/lib/fog/aws/requests/rds/modify_db_parameter_group.rb index 0d29f0d38..9a03bac27 100644 --- a/lib/fog/aws/requests/rds/modify_db_parameter_group.rb +++ b/lib/fog/aws/requests/rds/modify_db_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/modify_db_parameter_group' # modifies a database parameter group @@ -18,7 +17,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def modify_db_parameter_group(group_name, parameters) - parameter_names = [] parameter_values = [] parameter_apply_methods = [] @@ -40,15 +38,12 @@ module Fog :parser => Fog::Parsers::AWS::RDS::ModifyDbParameterGroup.new }.merge(params)) end - end class Mock - def modify_db_parameter_group(group_name, parameters) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/rds/promote_read_replica.rb b/lib/fog/aws/requests/rds/promote_read_replica.rb index f6702785b..68388bbb3 100644 --- a/lib/fog/aws/requests/rds/promote_read_replica.rb +++ b/lib/fog/aws/requests/rds/promote_read_replica.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/promote_read_replica' # promote a read replica to a writable RDS instance @@ -31,13 +30,10 @@ module Fog :parser => Fog::Parsers::AWS::RDS::PromoteReadReplica.new }.merge(params)) end - end class Mock - def promote_read_replica(identifier, backup_retention_period = nil, preferred_backup_window = nil) - if self.data[:servers][identifier] data = { 'BackupRetentionPeriod' => backup_retention_period || 1, @@ -57,7 +53,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found") end end - end end end diff --git a/lib/fog/aws/requests/rds/reboot_db_instance.rb b/lib/fog/aws/requests/rds/reboot_db_instance.rb index 458bf418c..c7f942191 100644 --- a/lib/fog/aws/requests/rds/reboot_db_instance.rb +++ b/lib/fog/aws/requests/rds/reboot_db_instance.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/reboot_db_instance' # reboots a database instance @@ -19,11 +18,9 @@ module Fog :parser => Fog::Parsers::AWS::RDS::RebootDBInstance.new, }) end - end class Mock - def reboot_db_instance(instance_identifier) response = Excon::Response.new if server = self.data[:servers][instance_identifier] @@ -44,7 +41,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBInstance #{instance_identifier} not found") end end - end end end diff --git a/lib/fog/aws/requests/rds/remove_tags_from_resource.rb b/lib/fog/aws/requests/rds/remove_tags_from_resource.rb index 5eef00273..be84c17d9 100644 --- a/lib/fog/aws/requests/rds/remove_tags_from_resource.rb +++ b/lib/fog/aws/requests/rds/remove_tags_from_resource.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - # removes tags from a database instance # http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_RemoveTagsFromResource.html # ==== Parameters @@ -19,11 +18,9 @@ module Fog }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys)) ) end - end class Mock - def remove_tags_from_resource(rds_id, keys) response = Excon::Response.new if server = self.data[:servers][rds_id] @@ -37,7 +34,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found") end end - end end end diff --git a/lib/fog/aws/requests/rds/restore_db_instance_from_db_snapshot.rb b/lib/fog/aws/requests/rds/restore_db_instance_from_db_snapshot.rb index 87e0fceec..9c6191df1 100644 --- a/lib/fog/aws/requests/rds/restore_db_instance_from_db_snapshot.rb +++ b/lib/fog/aws/requests/rds/restore_db_instance_from_db_snapshot.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/restore_db_instance_from_db_snapshot' # Restores a DB Instance from a DB Snapshot @@ -18,15 +17,12 @@ module Fog :parser => Fog::Parsers::AWS::RDS::RestoreDBInstanceFromDBSnapshot.new, }.merge(opts)) end - end class Mock - def restore_db_instance_from_db_snapshot(snapshot_id, db_id, options={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/rds/restore_db_instance_to_point_in_time.rb b/lib/fog/aws/requests/rds/restore_db_instance_to_point_in_time.rb index a1a598f4e..4073bfa54 100644 --- a/lib/fog/aws/requests/rds/restore_db_instance_to_point_in_time.rb +++ b/lib/fog/aws/requests/rds/restore_db_instance_to_point_in_time.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/restore_db_instance_to_point_in_time' # Restores a DB Instance to a point in time @@ -18,15 +17,12 @@ module Fog :parser => Fog::Parsers::AWS::RDS::RestoreDBInstanceToPointInTime.new, }.merge(opts)) end - end class Mock - def restore_db_instance_to_point_in_time(source_db_name, target_db_name, opts={}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb b/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb index b630fb636..6435b7ec5 100644 --- a/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb +++ b/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb @@ -2,7 +2,6 @@ module Fog module AWS class RDS class Real - require 'fog/aws/parsers/rds/revoke_db_security_group_ingress' # revokes a db security group ingress @@ -25,13 +24,10 @@ module Fog :parser => Fog::Parsers::AWS::RDS::RevokeDBSecurityGroupIngress.new, 'DBSecurityGroupName' => name }.merge(opts)) - end - end class Mock - def revoke_db_security_group_ingress(name, opts = {}) unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId')) raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId' @@ -61,7 +57,6 @@ module Fog raise Fog::AWS::RDS::NotFound.new("DBSecurityGroupNotFound => #{name} not found") end end - end end end diff --git a/lib/fog/aws/requests/redshift/authorize_snapshot_access.rb b/lib/fog/aws/requests/redshift/authorize_snapshot_access.rb index 3c00944a2..384891081 100644 --- a/lib/fog/aws/requests/redshift/authorize_snapshot_access.rb +++ b/lib/fog/aws/requests/redshift/authorize_snapshot_access.rb @@ -37,7 +37,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/copy_cluster_snapshot.rb b/lib/fog/aws/requests/redshift/copy_cluster_snapshot.rb index f9ac15ee7..dbd480a8d 100644 --- a/lib/fog/aws/requests/redshift/copy_cluster_snapshot.rb +++ b/lib/fog/aws/requests/redshift/copy_cluster_snapshot.rb @@ -41,7 +41,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/create_cluster.rb b/lib/fog/aws/requests/redshift/create_cluster.rb index c86fbdbe4..5d6b24c52 100644 --- a/lib/fog/aws/requests/redshift/create_cluster.rb +++ b/lib/fog/aws/requests/redshift/create_cluster.rb @@ -119,7 +119,6 @@ module Fog params[:query].merge!(Fog::AWS.indexed_param('VpcSecurityGroupIds.member.%d', [*vpc_security_group_ids])) end - params[:query]['Action'] = 'CreateCluster' params[:query]['DBName'] = db_name if db_name params[:query]['ClusterIdentifier'] = cluster_identifier if cluster_identifier @@ -141,11 +140,9 @@ module Fog params[:query]['PubliclyAccessible'] = publicly_accessible if publicly_accessible params[:query]['Encrypted'] = encrypted if encrypted - request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/create_cluster_parameter_group.rb b/lib/fog/aws/requests/redshift/create_cluster_parameter_group.rb index 546abeeba..fce5225ac 100644 --- a/lib/fog/aws/requests/redshift/create_cluster_parameter_group.rb +++ b/lib/fog/aws/requests/redshift/create_cluster_parameter_group.rb @@ -48,7 +48,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/create_cluster_security_group.rb b/lib/fog/aws/requests/redshift/create_cluster_security_group.rb index 2f2495703..c0d6c665f 100644 --- a/lib/fog/aws/requests/redshift/create_cluster_security_group.rb +++ b/lib/fog/aws/requests/redshift/create_cluster_security_group.rb @@ -36,7 +36,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/create_cluster_snapshot.rb b/lib/fog/aws/requests/redshift/create_cluster_snapshot.rb index 30ca4d807..2d050435e 100644 --- a/lib/fog/aws/requests/redshift/create_cluster_snapshot.rb +++ b/lib/fog/aws/requests/redshift/create_cluster_snapshot.rb @@ -38,7 +38,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/create_cluster_subnet_group.rb b/lib/fog/aws/requests/redshift/create_cluster_subnet_group.rb index d524118b6..fdeb13050 100644 --- a/lib/fog/aws/requests/redshift/create_cluster_subnet_group.rb +++ b/lib/fog/aws/requests/redshift/create_cluster_subnet_group.rb @@ -44,7 +44,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/delete_cluster.rb b/lib/fog/aws/requests/redshift/delete_cluster.rb index 7335334bf..79eac199b 100644 --- a/lib/fog/aws/requests/redshift/delete_cluster.rb +++ b/lib/fog/aws/requests/redshift/delete_cluster.rb @@ -45,7 +45,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/delete_cluster_parameter_group.rb b/lib/fog/aws/requests/redshift/delete_cluster_parameter_group.rb index c244058a7..15b5f42e7 100644 --- a/lib/fog/aws/requests/redshift/delete_cluster_parameter_group.rb +++ b/lib/fog/aws/requests/redshift/delete_cluster_parameter_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Redshift class Real - # ==== Parameters # # @param [Hash] options diff --git a/lib/fog/aws/requests/redshift/delete_cluster_security_group.rb b/lib/fog/aws/requests/redshift/delete_cluster_security_group.rb index 3e47b1fcd..b7f0059d9 100644 --- a/lib/fog/aws/requests/redshift/delete_cluster_security_group.rb +++ b/lib/fog/aws/requests/redshift/delete_cluster_security_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Redshift class Real - # ==== Parameters # # @param [Hash] options diff --git a/lib/fog/aws/requests/redshift/delete_cluster_snapshot.rb b/lib/fog/aws/requests/redshift/delete_cluster_snapshot.rb index 1f11ecfd4..659c6f086 100644 --- a/lib/fog/aws/requests/redshift/delete_cluster_snapshot.rb +++ b/lib/fog/aws/requests/redshift/delete_cluster_snapshot.rb @@ -38,7 +38,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/delete_cluster_subnet_group.rb b/lib/fog/aws/requests/redshift/delete_cluster_subnet_group.rb index e92980d95..2e1c17bb6 100644 --- a/lib/fog/aws/requests/redshift/delete_cluster_subnet_group.rb +++ b/lib/fog/aws/requests/redshift/delete_cluster_subnet_group.rb @@ -2,7 +2,6 @@ module Fog module AWS class Redshift class Real - # ==== Parameters # # @param [Hash] options @@ -32,7 +31,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_cluster_parameter_groups.rb b/lib/fog/aws/requests/redshift/describe_cluster_parameter_groups.rb index 8a669a226..41ee1fe26 100644 --- a/lib/fog/aws/requests/redshift/describe_cluster_parameter_groups.rb +++ b/lib/fog/aws/requests/redshift/describe_cluster_parameter_groups.rb @@ -42,7 +42,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_cluster_parameters.rb b/lib/fog/aws/requests/redshift/describe_cluster_parameters.rb index df0ec23eb..b727a3a96 100644 --- a/lib/fog/aws/requests/redshift/describe_cluster_parameters.rb +++ b/lib/fog/aws/requests/redshift/describe_cluster_parameters.rb @@ -49,7 +49,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_cluster_security_groups.rb b/lib/fog/aws/requests/redshift/describe_cluster_security_groups.rb index abd8b39da..f90236394 100644 --- a/lib/fog/aws/requests/redshift/describe_cluster_security_groups.rb +++ b/lib/fog/aws/requests/redshift/describe_cluster_security_groups.rb @@ -44,7 +44,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_cluster_snapshots.rb b/lib/fog/aws/requests/redshift/describe_cluster_snapshots.rb index 8e36c3c5e..16be7a52d 100644 --- a/lib/fog/aws/requests/redshift/describe_cluster_snapshots.rb +++ b/lib/fog/aws/requests/redshift/describe_cluster_snapshots.rb @@ -67,7 +67,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_cluster_subnet_groups.rb b/lib/fog/aws/requests/redshift/describe_cluster_subnet_groups.rb index c05e877c3..dd3f64cf4 100644 --- a/lib/fog/aws/requests/redshift/describe_cluster_subnet_groups.rb +++ b/lib/fog/aws/requests/redshift/describe_cluster_subnet_groups.rb @@ -41,7 +41,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_cluster_versions.rb b/lib/fog/aws/requests/redshift/describe_cluster_versions.rb index 87f157889..1a83c355c 100644 --- a/lib/fog/aws/requests/redshift/describe_cluster_versions.rb +++ b/lib/fog/aws/requests/redshift/describe_cluster_versions.rb @@ -48,7 +48,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_default_cluster_parameters.rb b/lib/fog/aws/requests/redshift/describe_default_cluster_parameters.rb index 2b679b282..9749e7996 100644 --- a/lib/fog/aws/requests/redshift/describe_default_cluster_parameters.rb +++ b/lib/fog/aws/requests/redshift/describe_default_cluster_parameters.rb @@ -43,7 +43,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_events.rb b/lib/fog/aws/requests/redshift/describe_events.rb index 16e88c847..16a157635 100644 --- a/lib/fog/aws/requests/redshift/describe_events.rb +++ b/lib/fog/aws/requests/redshift/describe_events.rb @@ -74,7 +74,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_orderable_cluster_options.rb b/lib/fog/aws/requests/redshift/describe_orderable_cluster_options.rb index 757f0779c..a5c591bb5 100644 --- a/lib/fog/aws/requests/redshift/describe_orderable_cluster_options.rb +++ b/lib/fog/aws/requests/redshift/describe_orderable_cluster_options.rb @@ -49,7 +49,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_reserved_node_offerings.rb b/lib/fog/aws/requests/redshift/describe_reserved_node_offerings.rb index acc1d58e6..9b8726f07 100644 --- a/lib/fog/aws/requests/redshift/describe_reserved_node_offerings.rb +++ b/lib/fog/aws/requests/redshift/describe_reserved_node_offerings.rb @@ -42,7 +42,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_reserved_nodes.rb b/lib/fog/aws/requests/redshift/describe_reserved_nodes.rb index 3a4981d3c..41382608a 100644 --- a/lib/fog/aws/requests/redshift/describe_reserved_nodes.rb +++ b/lib/fog/aws/requests/redshift/describe_reserved_nodes.rb @@ -42,7 +42,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/describe_resize.rb b/lib/fog/aws/requests/redshift/describe_resize.rb index a71de1584..a2abf8d34 100644 --- a/lib/fog/aws/requests/redshift/describe_resize.rb +++ b/lib/fog/aws/requests/redshift/describe_resize.rb @@ -33,7 +33,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/modify_cluster.rb b/lib/fog/aws/requests/redshift/modify_cluster.rb index 7cedb34c3..d3687146d 100644 --- a/lib/fog/aws/requests/redshift/modify_cluster.rb +++ b/lib/fog/aws/requests/redshift/modify_cluster.rb @@ -87,7 +87,6 @@ module Fog params[:query].merge!(Fog::AWS.indexed_param('VpcSecurityGroupIds.member.%d', [*vpc_security_group_ids])) end - params[:query]['Action'] = 'ModifyCluster' params[:query]['ClusterIdentifier'] = cluster_identifier if cluster_identifier params[:query]['ClusterParameterGroupName'] = cluster_parameter_group_name if cluster_parameter_group_name @@ -105,7 +104,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/modify_cluster_subnet_group.rb b/lib/fog/aws/requests/redshift/modify_cluster_subnet_group.rb index 13e4cbae6..2ef3dccf6 100644 --- a/lib/fog/aws/requests/redshift/modify_cluster_subnet_group.rb +++ b/lib/fog/aws/requests/redshift/modify_cluster_subnet_group.rb @@ -44,7 +44,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/purchase_reserved_node_offering.rb b/lib/fog/aws/requests/redshift/purchase_reserved_node_offering.rb index 35d6abdd4..14445c723 100644 --- a/lib/fog/aws/requests/redshift/purchase_reserved_node_offering.rb +++ b/lib/fog/aws/requests/redshift/purchase_reserved_node_offering.rb @@ -34,7 +34,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/reboot_cluster.rb b/lib/fog/aws/requests/redshift/reboot_cluster.rb index b43246cfd..3ac34906e 100644 --- a/lib/fog/aws/requests/redshift/reboot_cluster.rb +++ b/lib/fog/aws/requests/redshift/reboot_cluster.rb @@ -29,7 +29,6 @@ module Fog params[:query]['Action'] = 'RebootCluster' params[:query]['ClusterIdentifier'] = cluster_identifier if cluster_identifier request(params) - end end end diff --git a/lib/fog/aws/requests/redshift/reset_cluster_parameter_group.rb b/lib/fog/aws/requests/redshift/reset_cluster_parameter_group.rb index bff7f8705..56dce36bb 100644 --- a/lib/fog/aws/requests/redshift/reset_cluster_parameter_group.rb +++ b/lib/fog/aws/requests/redshift/reset_cluster_parameter_group.rb @@ -50,7 +50,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/redshift/restore_from_cluster_snapshot.rb b/lib/fog/aws/requests/redshift/restore_from_cluster_snapshot.rb index 36d7606ab..ff30d1496 100644 --- a/lib/fog/aws/requests/redshift/restore_from_cluster_snapshot.rb +++ b/lib/fog/aws/requests/redshift/restore_from_cluster_snapshot.rb @@ -49,7 +49,6 @@ module Fog publicly_accessible = options[:publicly_accessible] owner_account = options[:owner_account] - path = "/" params = { :headers => {}, diff --git a/lib/fog/aws/requests/redshift/revoke_snapshot_access.rb b/lib/fog/aws/requests/redshift/revoke_snapshot_access.rb index 0b6f37e8b..9e7f1e6e0 100644 --- a/lib/fog/aws/requests/redshift/revoke_snapshot_access.rb +++ b/lib/fog/aws/requests/redshift/revoke_snapshot_access.rb @@ -38,7 +38,6 @@ module Fog request(params) end end - end end end diff --git a/lib/fog/aws/requests/ses/delete_verified_email_address.rb b/lib/fog/aws/requests/ses/delete_verified_email_address.rb index 7017e3eb2..270b5057a 100644 --- a/lib/fog/aws/requests/ses/delete_verified_email_address.rb +++ b/lib/fog/aws/requests/ses/delete_verified_email_address.rb @@ -2,7 +2,6 @@ module Fog module AWS class SES class Real - require 'fog/aws/parsers/ses/delete_verified_email_address' # Delete an existing verified email address @@ -21,7 +20,6 @@ module Fog :parser => Fog::Parsers::AWS::SES::DeleteVerifiedEmailAddress.new }) end - end end end diff --git a/lib/fog/aws/requests/ses/get_send_quota.rb b/lib/fog/aws/requests/ses/get_send_quota.rb index fc9a0a8e1..b113c2f3c 100644 --- a/lib/fog/aws/requests/ses/get_send_quota.rb +++ b/lib/fog/aws/requests/ses/get_send_quota.rb @@ -2,7 +2,6 @@ module Fog module AWS class SES class Real - require 'fog/aws/parsers/ses/get_send_quota' # Returns the user's current activity limits. @@ -24,7 +23,6 @@ module Fog :parser => Fog::Parsers::AWS::SES::GetSendQuota.new }) end - end end end diff --git a/lib/fog/aws/requests/ses/get_send_statistics.rb b/lib/fog/aws/requests/ses/get_send_statistics.rb index a197ff36c..fd11e121c 100644 --- a/lib/fog/aws/requests/ses/get_send_statistics.rb +++ b/lib/fog/aws/requests/ses/get_send_statistics.rb @@ -2,7 +2,6 @@ module Fog module AWS class SES class Real - require 'fog/aws/parsers/ses/get_send_statistics' # Returns the user's current activity limits. @@ -27,7 +26,6 @@ module Fog :parser => Fog::Parsers::AWS::SES::GetSendStatistics.new }) end - end end end diff --git a/lib/fog/aws/requests/ses/list_verified_email_addresses.rb b/lib/fog/aws/requests/ses/list_verified_email_addresses.rb index ff908144d..7d5d6bf2d 100644 --- a/lib/fog/aws/requests/ses/list_verified_email_addresses.rb +++ b/lib/fog/aws/requests/ses/list_verified_email_addresses.rb @@ -2,7 +2,6 @@ module Fog module AWS class SES class Real - require 'fog/aws/parsers/ses/list_verified_email_addresses' # Returns a list containing all of the email addresses that have been verified @@ -21,7 +20,6 @@ module Fog :parser => Fog::Parsers::AWS::SES::ListVerifiedEmailAddresses.new }) end - end end end diff --git a/lib/fog/aws/requests/ses/send_email.rb b/lib/fog/aws/requests/ses/send_email.rb index 6db1d7b3a..a08e16fed 100644 --- a/lib/fog/aws/requests/ses/send_email.rb +++ b/lib/fog/aws/requests/ses/send_email.rb @@ -2,7 +2,6 @@ module Fog module AWS class SES class Real - require 'fog/aws/parsers/ses/send_email' # Send an email @@ -66,7 +65,6 @@ module Fog :parser => Fog::Parsers::AWS::SES::SendEmail.new }.merge(params)) end - end end end diff --git a/lib/fog/aws/requests/ses/send_raw_email.rb b/lib/fog/aws/requests/ses/send_raw_email.rb index 3f7bfa867..e998dd7fa 100644 --- a/lib/fog/aws/requests/ses/send_raw_email.rb +++ b/lib/fog/aws/requests/ses/send_raw_email.rb @@ -2,7 +2,6 @@ module Fog module AWS class SES class Real - require 'fog/aws/parsers/ses/send_raw_email' # Send a raw email @@ -34,7 +33,6 @@ module Fog :parser => Fog::Parsers::AWS::SES::SendRawEmail.new }.merge(params)) end - end end end diff --git a/lib/fog/aws/requests/ses/verify_domain_identity.rb b/lib/fog/aws/requests/ses/verify_domain_identity.rb index 54229d8b2..3296528cb 100644 --- a/lib/fog/aws/requests/ses/verify_domain_identity.rb +++ b/lib/fog/aws/requests/ses/verify_domain_identity.rb @@ -2,7 +2,6 @@ module Fog module AWS class SES class Real - require 'fog/aws/parsers/ses/verify_domain_identity' # Verifies a domain. This action returns a verification authorization @@ -23,7 +22,6 @@ module Fog :parser => Fog::Parsers::AWS::SES::VerifyDomainIdentity.new }) end - end end end diff --git a/lib/fog/aws/requests/ses/verify_email_address.rb b/lib/fog/aws/requests/ses/verify_email_address.rb index 8f37f7684..0098a6fa2 100644 --- a/lib/fog/aws/requests/ses/verify_email_address.rb +++ b/lib/fog/aws/requests/ses/verify_email_address.rb @@ -2,7 +2,6 @@ module Fog module AWS class SES class Real - require 'fog/aws/parsers/ses/verify_email_address' # Verifies an email address. This action causes a confirmation email message to be sent to the specified address. @@ -21,7 +20,6 @@ module Fog :parser => Fog::Parsers::AWS::SES::VerifyEmailAddress.new }) end - end end end diff --git a/lib/fog/aws/requests/simpledb/batch_put_attributes.rb b/lib/fog/aws/requests/simpledb/batch_put_attributes.rb index 6af08287a..cb99282cf 100644 --- a/lib/fog/aws/requests/simpledb/batch_put_attributes.rb +++ b/lib/fog/aws/requests/simpledb/batch_put_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - # Put items attributes into a SimpleDB domain # # ==== Parameters @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string) }.merge!(encode_batch_attributes(items, replace_attributes))) end - end class Mock - def batch_put_attributes(domain_name, items, replace_attributes = Hash.new([])) response = Excon::Response.new if self.data[:domains][domain_name] @@ -57,7 +54,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/simpledb/create_domain.rb b/lib/fog/aws/requests/simpledb/create_domain.rb index 9512f0e9d..e192db131 100644 --- a/lib/fog/aws/requests/simpledb/create_domain.rb +++ b/lib/fog/aws/requests/simpledb/create_domain.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - # Create a SimpleDB domain # # ==== Parameters @@ -22,11 +21,9 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string) ) end - end class Mock - def create_domain(domain_name) response = Excon::Response.new self.data[:domains][domain_name] = {} @@ -37,7 +34,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/simpledb/delete_attributes.rb b/lib/fog/aws/requests/simpledb/delete_attributes.rb index b51011a96..e1ccce9d5 100644 --- a/lib/fog/aws/requests/simpledb/delete_attributes.rb +++ b/lib/fog/aws/requests/simpledb/delete_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - # List metadata for SimpleDB domain # # ==== Parameters @@ -30,11 +29,9 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string) }.merge!(encode_attributes(attributes))) end - end class Mock - def delete_attributes(domain_name, item_name, attributes = nil) response = Excon::Response.new if self.data[:domains][domain_name] @@ -66,7 +63,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/simpledb/delete_domain.rb b/lib/fog/aws/requests/simpledb/delete_domain.rb index e780ccccd..217e3b9ca 100644 --- a/lib/fog/aws/requests/simpledb/delete_domain.rb +++ b/lib/fog/aws/requests/simpledb/delete_domain.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - # Delete a SimpleDB domain # # ==== Parameters @@ -22,11 +21,9 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string) ) end - end class Mock - def delete_domain(domain_name) response = Excon::Response.new if self.data[:domains].delete(domain_name) @@ -38,7 +35,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/simpledb/domain_metadata.rb b/lib/fog/aws/requests/simpledb/domain_metadata.rb index 486ef1507..2e04a7805 100644 --- a/lib/fog/aws/requests/simpledb/domain_metadata.rb +++ b/lib/fog/aws/requests/simpledb/domain_metadata.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - require 'fog/aws/parsers/simpledb/domain_metadata' # List metadata for SimpleDB domain @@ -31,11 +30,9 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::DomainMetadata.new(@nil_string) ) end - end class Mock - def domain_metadata(domain_name) response = Excon::Response.new if domain = self.data[:domains][domain_name] @@ -69,7 +66,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/simpledb/get_attributes.rb b/lib/fog/aws/requests/simpledb/get_attributes.rb index 079cd8888..da66f6ae1 100644 --- a/lib/fog/aws/requests/simpledb/get_attributes.rb +++ b/lib/fog/aws/requests/simpledb/get_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - require 'fog/aws/parsers/simpledb/get_attributes' # List metadata for SimpleDB domain @@ -42,11 +41,9 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::GetAttributes.new(@nil_string) }.merge!(encode_attribute_names(options['AttributeName']))) end - end class Mock - def get_attributes(domain_name, item_name, options = {}) if options.is_a?(Array) Fog::Logger.deprecation("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]") @@ -77,7 +74,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/simpledb/list_domains.rb b/lib/fog/aws/requests/simpledb/list_domains.rb index c76829e44..ef62b8ab9 100644 --- a/lib/fog/aws/requests/simpledb/list_domains.rb +++ b/lib/fog/aws/requests/simpledb/list_domains.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - require 'fog/aws/parsers/simpledb/list_domains' # List SimpleDB domains @@ -27,11 +26,9 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::ListDomains.new(@nil_string) }.merge!(options)) end - end class Mock - def list_domains(options = {}) response = Excon::Response.new keys = self.data[:domains].keys @@ -52,7 +49,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/simpledb/put_attributes.rb b/lib/fog/aws/requests/simpledb/put_attributes.rb index c891100bd..bb40f7479 100644 --- a/lib/fog/aws/requests/simpledb/put_attributes.rb +++ b/lib/fog/aws/requests/simpledb/put_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - # Put item attributes into a SimpleDB domain # # ==== Parameters @@ -34,11 +33,9 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string) }.merge!(encode_attributes(attributes, options[:replace], options[:expect]))) end - end class Mock - def put_attributes(domain_name, item_name, attributes, options = {}) options[:expect] = {} unless options[:expect] options[:replace] = [] unless options[:replace] @@ -71,7 +68,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/simpledb/select.rb b/lib/fog/aws/requests/simpledb/select.rb index 331053d0d..56d05c5ff 100644 --- a/lib/fog/aws/requests/simpledb/select.rb +++ b/lib/fog/aws/requests/simpledb/select.rb @@ -2,7 +2,6 @@ module Fog module AWS class SimpleDB class Real - require 'fog/aws/parsers/simpledb/select' # Select item data from SimpleDB @@ -36,7 +35,6 @@ module Fog :parser => Fog::Parsers::AWS::SimpleDB::Select.new(@nil_string) ) end - end end end diff --git a/lib/fog/aws/requests/sns/add_permission.rb b/lib/fog/aws/requests/sns/add_permission.rb index b6ec32b2c..6b6898697 100644 --- a/lib/fog/aws/requests/sns/add_permission.rb +++ b/lib/fog/aws/requests/sns/add_permission.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/add_permission' def add_permission(options = {}) @@ -11,15 +10,12 @@ module Fog :parser => Fog::Parsers::AWS::SNS::AddPermission.new }.merge!(options)) end - end class Mock - def add_permission(options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/sns/confirm_subscription.rb b/lib/fog/aws/requests/sns/confirm_subscription.rb index a0c3e5e48..75ecefb33 100644 --- a/lib/fog/aws/requests/sns/confirm_subscription.rb +++ b/lib/fog/aws/requests/sns/confirm_subscription.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/confirm_subscription' # Confirm a subscription @@ -25,9 +24,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::ConfirmSubscription.new }.merge!(options)) end - end - end end end diff --git a/lib/fog/aws/requests/sns/create_topic.rb b/lib/fog/aws/requests/sns/create_topic.rb index b44b6fa78..8273ab564 100644 --- a/lib/fog/aws/requests/sns/create_topic.rb +++ b/lib/fog/aws/requests/sns/create_topic.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/create_topic' # Create a topic @@ -21,9 +20,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::CreateTopic.new }) end - end - end end end diff --git a/lib/fog/aws/requests/sns/delete_topic.rb b/lib/fog/aws/requests/sns/delete_topic.rb index 52a06fabd..e5d10e9d4 100644 --- a/lib/fog/aws/requests/sns/delete_topic.rb +++ b/lib/fog/aws/requests/sns/delete_topic.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/delete_topic' # Delete a topic @@ -21,9 +20,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::DeleteTopic.new }) end - end - end end end diff --git a/lib/fog/aws/requests/sns/get_topic_attributes.rb b/lib/fog/aws/requests/sns/get_topic_attributes.rb index e9cd881d5..dab7531a2 100644 --- a/lib/fog/aws/requests/sns/get_topic_attributes.rb +++ b/lib/fog/aws/requests/sns/get_topic_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/get_topic_attributes' # Get attributes of a topic @@ -21,9 +20,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::GetTopicAttributes.new }) end - end - end end end diff --git a/lib/fog/aws/requests/sns/list_subscriptions.rb b/lib/fog/aws/requests/sns/list_subscriptions.rb index 223d7311e..377d230f0 100644 --- a/lib/fog/aws/requests/sns/list_subscriptions.rb +++ b/lib/fog/aws/requests/sns/list_subscriptions.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/list_subscriptions' # List subscriptions @@ -21,9 +20,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::ListSubscriptions.new }.merge!(options)) end - end - end end end diff --git a/lib/fog/aws/requests/sns/list_subscriptions_by_topic.rb b/lib/fog/aws/requests/sns/list_subscriptions_by_topic.rb index cc078d8a6..c6ff0a06f 100644 --- a/lib/fog/aws/requests/sns/list_subscriptions_by_topic.rb +++ b/lib/fog/aws/requests/sns/list_subscriptions_by_topic.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/list_subscriptions' # List subscriptions for a topic @@ -23,9 +22,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::ListSubscriptions.new }.merge!(options)) end - end - end end end diff --git a/lib/fog/aws/requests/sns/list_topics.rb b/lib/fog/aws/requests/sns/list_topics.rb index fdd9fd07e..8dc63d117 100644 --- a/lib/fog/aws/requests/sns/list_topics.rb +++ b/lib/fog/aws/requests/sns/list_topics.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/list_topics' # List topics @@ -21,9 +20,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::ListTopics.new }.merge!(options)) end - end - end end end diff --git a/lib/fog/aws/requests/sns/publish.rb b/lib/fog/aws/requests/sns/publish.rb index f87176659..d161fedba 100644 --- a/lib/fog/aws/requests/sns/publish.rb +++ b/lib/fog/aws/requests/sns/publish.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/publish' # Send a message to a topic @@ -26,9 +25,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::Publish.new }.merge!(options)) end - end - end end end diff --git a/lib/fog/aws/requests/sns/remove_permission.rb b/lib/fog/aws/requests/sns/remove_permission.rb index b920314b0..743b00beb 100644 --- a/lib/fog/aws/requests/sns/remove_permission.rb +++ b/lib/fog/aws/requests/sns/remove_permission.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/remove_permission' def remove_permission(options = {}) @@ -11,15 +10,12 @@ module Fog :parser => Fog::Parsers::AWS::SNS::RemovePermission.new }.merge!(options)) end - end class Mock - def remove_permission(options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/aws/requests/sns/set_topic_attributes.rb b/lib/fog/aws/requests/sns/set_topic_attributes.rb index 8e30a8994..e57904787 100644 --- a/lib/fog/aws/requests/sns/set_topic_attributes.rb +++ b/lib/fog/aws/requests/sns/set_topic_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/set_topic_attributes' # Set attributes of a topic @@ -25,9 +24,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::SetTopicAttributes.new }) end - end - end end end diff --git a/lib/fog/aws/requests/sns/subscribe.rb b/lib/fog/aws/requests/sns/subscribe.rb index ede9de2d5..0c1a56c04 100644 --- a/lib/fog/aws/requests/sns/subscribe.rb +++ b/lib/fog/aws/requests/sns/subscribe.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/subscribe' # Create a subscription @@ -25,9 +24,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::Subscribe.new }) end - end - end end end diff --git a/lib/fog/aws/requests/sns/unsubscribe.rb b/lib/fog/aws/requests/sns/unsubscribe.rb index 0a990db3a..dbeb4f8a0 100644 --- a/lib/fog/aws/requests/sns/unsubscribe.rb +++ b/lib/fog/aws/requests/sns/unsubscribe.rb @@ -2,7 +2,6 @@ module Fog module AWS class SNS class Real - require 'fog/aws/parsers/sns/unsubscribe' # Delete a subscription @@ -21,9 +20,7 @@ module Fog :parser => Fog::Parsers::AWS::SNS::Unsubscribe.new }) end - end - end end end diff --git a/lib/fog/aws/requests/sqs/change_message_visibility.rb b/lib/fog/aws/requests/sqs/change_message_visibility.rb index b330d826c..475a180a2 100644 --- a/lib/fog/aws/requests/sqs/change_message_visibility.rb +++ b/lib/fog/aws/requests/sqs/change_message_visibility.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/basic' # Change visibility timeout for a message @@ -25,11 +24,9 @@ module Fog :path => path_from_queue_url(queue_url) }) end - end class Mock - def change_message_visibility(queue_url, receipt_handle, visibility_timeout) Excon::Response.new.tap do |response| if (queue = data[:queues][queue_url]) @@ -55,9 +52,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/requests/sqs/create_queue.rb b/lib/fog/aws/requests/sqs/create_queue.rb index cbac2b8bc..76f34a9fd 100644 --- a/lib/fog/aws/requests/sqs/create_queue.rb +++ b/lib/fog/aws/requests/sqs/create_queue.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/create_queue' # Create a queue @@ -23,7 +22,6 @@ module Fog :parser => Fog::Parsers::AWS::SQS::CreateQueue.new }.merge!(options)) end - end class Mock @@ -57,7 +55,6 @@ module Fog 'QueueUrl' => queue_url } end - end end end diff --git a/lib/fog/aws/requests/sqs/delete_message.rb b/lib/fog/aws/requests/sqs/delete_message.rb index da5a4d97b..34d4e7716 100644 --- a/lib/fog/aws/requests/sqs/delete_message.rb +++ b/lib/fog/aws/requests/sqs/delete_message.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/basic' # Delete a message from a queue @@ -23,11 +22,9 @@ module Fog :path => path_from_queue_url(queue_url), }) end - end class Mock - def delete_message(queue_url, receipt_handle) Excon::Response.new.tap do |response| if (queue = data[:queues][queue_url]) @@ -53,7 +50,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/sqs/delete_queue.rb b/lib/fog/aws/requests/sqs/delete_queue.rb index 6d8c3d577..0640ad369 100644 --- a/lib/fog/aws/requests/sqs/delete_queue.rb +++ b/lib/fog/aws/requests/sqs/delete_queue.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/basic' # Delete a queue @@ -21,11 +20,9 @@ module Fog :path => path_from_queue_url(queue_url), }) end - end class Mock - def delete_queue(queue_url) Excon::Response.new.tap do |response| if (queue = data[:queues][queue_url]) @@ -44,9 +41,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/aws/requests/sqs/get_queue_attributes.rb b/lib/fog/aws/requests/sqs/get_queue_attributes.rb index 23a92b432..7e5379994 100644 --- a/lib/fog/aws/requests/sqs/get_queue_attributes.rb +++ b/lib/fog/aws/requests/sqs/get_queue_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/get_queue_attributes' # Get attributes of a queue @@ -23,11 +22,9 @@ module Fog :parser => Fog::Parsers::AWS::SQS::GetQueueAttributes.new }) end - end class Mock - def get_queue_attributes(queue_url, attribute_name) Excon::Response.new.tap do |response| if (queue = data[:queues][queue_url]) @@ -45,7 +42,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/sqs/list_queues.rb b/lib/fog/aws/requests/sqs/list_queues.rb index 9a9919550..416a57469 100644 --- a/lib/fog/aws/requests/sqs/list_queues.rb +++ b/lib/fog/aws/requests/sqs/list_queues.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/list_queues' # List queues diff --git a/lib/fog/aws/requests/sqs/receive_message.rb b/lib/fog/aws/requests/sqs/receive_message.rb index d829a67b0..ba1096467 100644 --- a/lib/fog/aws/requests/sqs/receive_message.rb +++ b/lib/fog/aws/requests/sqs/receive_message.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/receive_message' # Get a message from a queue (marks it as unavailable temporarily, but does not remove from queue, see delete_message) @@ -26,11 +25,9 @@ module Fog :parser => Fog::Parsers::AWS::SQS::ReceiveMessage.new }.merge!(options)) end - end class Mock - def receive_message(queue_url, options = {}) Excon::Response.new.tap do |response| if (queue = data[:queues][queue_url]) @@ -80,7 +77,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/sqs/send_message.rb b/lib/fog/aws/requests/sqs/send_message.rb index 335238bcd..728bdd695 100644 --- a/lib/fog/aws/requests/sqs/send_message.rb +++ b/lib/fog/aws/requests/sqs/send_message.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/send_message' # Add a message to a queue @@ -23,11 +22,9 @@ module Fog :parser => Fog::Parsers::AWS::SQS::SendMessage.new }) end - end class Mock - def send_message(queue_url, message) Excon::Response.new.tap do |response| if (queue = data[:queues][queue_url]) @@ -62,7 +59,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/sqs/set_queue_attributes.rb b/lib/fog/aws/requests/sqs/set_queue_attributes.rb index 20ef22710..41e34dd37 100644 --- a/lib/fog/aws/requests/sqs/set_queue_attributes.rb +++ b/lib/fog/aws/requests/sqs/set_queue_attributes.rb @@ -2,7 +2,6 @@ module Fog module AWS class SQS class Real - require 'fog/aws/parsers/sqs/basic' # Get attributes of a queue @@ -25,7 +24,6 @@ module Fog :parser => Fog::Parsers::AWS::SQS::Basic.new }) end - end class Mock diff --git a/lib/fog/aws/requests/storage/abort_multipart_upload.rb b/lib/fog/aws/requests/storage/abort_multipart_upload.rb index 0b2d15e71..4191e3fdc 100644 --- a/lib/fog/aws/requests/storage/abort_multipart_upload.rb +++ b/lib/fog/aws/requests/storage/abort_multipart_upload.rb @@ -21,7 +21,6 @@ module Fog :query => {'uploadId' => upload_id} }) end - end # Real class Mock # :nodoc:all diff --git a/lib/fog/aws/requests/storage/acl_utils.rb b/lib/fog/aws/requests/storage/acl_utils.rb index b11689bd2..7585bd4fe 100644 --- a/lib/fog/aws/requests/storage/acl_utils.rb +++ b/lib/fog/aws/requests/storage/acl_utils.rb @@ -1,7 +1,6 @@ module Fog module Storage class AWS - require 'fog/aws/parsers/storage/access_control_list' private @@ -56,7 +55,6 @@ module Fog Nokogiri::XML::SAX::Parser.new(parser).parse(acl_xml) parser.response end - end end end diff --git a/lib/fog/aws/requests/storage/complete_multipart_upload.rb b/lib/fog/aws/requests/storage/complete_multipart_upload.rb index 1713a7487..c5580cc8e 100644 --- a/lib/fog/aws/requests/storage/complete_multipart_upload.rb +++ b/lib/fog/aws/requests/storage/complete_multipart_upload.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/complete_multipart_upload' # Complete a multipart upload @@ -45,7 +44,6 @@ module Fog :query => {'uploadId' => upload_id} }) end - end # Real class Mock # :nodoc:all diff --git a/lib/fog/aws/requests/storage/copy_object.rb b/lib/fog/aws/requests/storage/copy_object.rb index c6faa9347..a4310f14f 100644 --- a/lib/fog/aws/requests/storage/copy_object.rb +++ b/lib/fog/aws/requests/storage/copy_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/copy_object' # Copy an object from one S3 bucket to another @@ -39,11 +38,9 @@ module Fog :parser => Fog::Parsers::Storage::AWS::CopyObject.new, }) end - end class Mock # :nodoc:all - def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {}) response = Excon::Response.new source_bucket = self.data[:buckets][source_bucket_name] @@ -74,7 +71,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/requests/storage/cors_utils.rb b/lib/fog/aws/requests/storage/cors_utils.rb index 44ecc243a..0e4b3e59b 100644 --- a/lib/fog/aws/requests/storage/cors_utils.rb +++ b/lib/fog/aws/requests/storage/cors_utils.rb @@ -1,7 +1,6 @@ module Fog module Storage class AWS - require 'fog/aws/parsers/storage/cors_configuration' private @@ -35,7 +34,6 @@ module Fog Nokogiri::XML::SAX::Parser.new(parser).parse(cors_xml) parser.response end - end end end diff --git a/lib/fog/aws/requests/storage/delete_bucket.rb b/lib/fog/aws/requests/storage/delete_bucket.rb index f4ebf14a4..2d5331038 100644 --- a/lib/fog/aws/requests/storage/delete_bucket.rb +++ b/lib/fog/aws/requests/storage/delete_bucket.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Delete an S3 bucket # # @param bucket_name [String] name of bucket to delete @@ -20,11 +19,9 @@ module Fog :method => 'DELETE' }) end - end class Mock # :nodoc:all - def delete_bucket(bucket_name) response = Excon::Response.new if self.data[:buckets][bucket_name].nil? @@ -39,9 +36,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/aws/requests/storage/delete_bucket_cors.rb b/lib/fog/aws/requests/storage/delete_bucket_cors.rb index 6c775f20d..27900a6ac 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_cors.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_cors.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Deletes the cors configuration information set for the bucket. # # @param bucket_name [String] name of bucket to delete cors rules from @@ -21,9 +20,7 @@ module Fog :query => {'cors' => nil} }) end - end - end end end diff --git a/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb index 411ceabbc..3574fbbdd 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Delete lifecycle configuration for a bucket # # @param bucket_name [String] name of bucket to delete lifecycle configuration from diff --git a/lib/fog/aws/requests/storage/delete_bucket_policy.rb b/lib/fog/aws/requests/storage/delete_bucket_policy.rb index f9bfca95c..22cba099f 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_policy.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_policy.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Delete policy for a bucket # # @param bucket_name [String] name of bucket to delete policy from @@ -21,9 +20,7 @@ module Fog :query => {'policy' => nil} }) end - end - end end end diff --git a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb index b99227d1b..8c3af34ec 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Delete tagging for a bucket # # @param bucket_name [String] name of bucket to delete tagging from @@ -21,11 +20,9 @@ module Fog :query => {'tagging' => nil} }) end - end class Mock # :nodoc:all - def delete_bucket_tagging(bucket_name) response = Excon::Response.new if self.data[:buckets][bucket_name] @@ -38,9 +35,7 @@ module Fog response end - end - end end end diff --git a/lib/fog/aws/requests/storage/delete_bucket_website.rb b/lib/fog/aws/requests/storage/delete_bucket_website.rb index 8dcdb447e..d6e80d802 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_website.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_website.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Delete website configuration for a bucket # # @param bucket_name [String] name of bucket to delete website configuration from @@ -21,9 +20,7 @@ module Fog :query => {'website' => nil} }) end - end - end end end diff --git a/lib/fog/aws/requests/storage/delete_multiple_objects.rb b/lib/fog/aws/requests/storage/delete_multiple_objects.rb index 40da111e9..b42df4923 100644 --- a/lib/fog/aws/requests/storage/delete_multiple_objects.rb +++ b/lib/fog/aws/requests/storage/delete_multiple_objects.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/delete_multiple_objects' # Delete multiple objects from S3 @@ -61,11 +60,9 @@ module Fog :query => {'delete' => nil} }) end - end class Mock # :nodoc:all - def delete_multiple_objects(bucket_name, object_names, options = {}) headers = options.dup headers.delete(:quiet) @@ -161,7 +158,6 @@ module Fog } } end - end end end diff --git a/lib/fog/aws/requests/storage/delete_object.rb b/lib/fog/aws/requests/storage/delete_object.rb index 4eed5d953..2f0dd3125 100644 --- a/lib/fog/aws/requests/storage/delete_object.rb +++ b/lib/fog/aws/requests/storage/delete_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Delete an object from S3 # # @param bucket_name [String] Name of bucket containing object to delete @@ -30,11 +29,9 @@ module Fog :path => path }) end - end class Mock # :nodoc:all - def delete_object(bucket_name, object_name, options = {}) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -111,7 +108,6 @@ module Fog } } end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket.rb b/lib/fog/aws/requests/storage/get_bucket.rb index 4e24157d1..2b63bd4f4 100644 --- a/lib/fog/aws/requests/storage/get_bucket.rb +++ b/lib/fog/aws/requests/storage/get_bucket.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_bucket' # List information about objects in an S3 bucket @@ -51,11 +50,9 @@ module Fog :query => options }) end - end class Mock # :nodoc:all - def get_bucket(bucket_name, options = {}) prefix, marker, delimiter, max_keys = \ options['prefix'], options['marker'], options['delimiter'], options['max-keys'] @@ -105,7 +102,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket_acl.rb b/lib/fog/aws/requests/storage/get_bucket_acl.rb index af506e29b..5b5560d5d 100644 --- a/lib/fog/aws/requests/storage/get_bucket_acl.rb +++ b/lib/fog/aws/requests/storage/get_bucket_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/access_control_list' # Get access control list for an S3 bucket @@ -40,11 +39,9 @@ module Fog :query => {'acl' => nil} }) end - end class Mock # :nodoc:all - require 'fog/aws/requests/storage/acl_utils' def get_bucket_acl(bucket_name) @@ -62,7 +59,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket_cors.rb b/lib/fog/aws/requests/storage/get_bucket_cors.rb index b9c1aa413..21e42f1ae 100644 --- a/lib/fog/aws/requests/storage/get_bucket_cors.rb +++ b/lib/fog/aws/requests/storage/get_bucket_cors.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/cors_configuration' # Gets the CORS configuration for an S3 bucket @@ -36,11 +35,9 @@ module Fog :query => {'cors' => nil} }) end - end class Mock # :nodoc:all - require 'fog/aws/requests/storage/cors_utils' def get_bucket_cors(bucket_name) @@ -58,7 +55,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb index 4fb957be1..0f0e4ebf3 100644 --- a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb +++ b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_bucket_lifecycle' # Get bucket lifecycle configuration @@ -30,7 +29,6 @@ module Fog :query => {'lifecycle' => nil} }) end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket_location.rb b/lib/fog/aws/requests/storage/get_bucket_location.rb index 7dc38249c..2c8378aae 100644 --- a/lib/fog/aws/requests/storage/get_bucket_location.rb +++ b/lib/fog/aws/requests/storage/get_bucket_location.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_bucket_location' # Get location constraint for an S3 bucket @@ -26,11 +25,9 @@ module Fog :query => {'location' => nil} }) end - end class Mock # :nodoc:all - def get_bucket_location(bucket_name) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -51,7 +48,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket_logging.rb b/lib/fog/aws/requests/storage/get_bucket_logging.rb index e62e83f23..87c8d5ec2 100644 --- a/lib/fog/aws/requests/storage/get_bucket_logging.rb +++ b/lib/fog/aws/requests/storage/get_bucket_logging.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_bucket_logging' # Get logging status for an S3 bucket @@ -40,7 +39,6 @@ module Fog :query => {'logging' => nil} }) end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb index 424ebdb69..41b75f5aa 100644 --- a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb +++ b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_bucket_object_versions' # List information about object versions in an S3 bucket @@ -61,7 +60,6 @@ module Fog :parser => Fog::Parsers::Storage::AWS::GetBucketObjectVersions.new, :query => {'versions' => nil}.merge!(options) }) end - end class Mock diff --git a/lib/fog/aws/requests/storage/get_bucket_policy.rb b/lib/fog/aws/requests/storage/get_bucket_policy.rb index fcda482f9..8a1c793c6 100644 --- a/lib/fog/aws/requests/storage/get_bucket_policy.rb +++ b/lib/fog/aws/requests/storage/get_bucket_policy.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Get bucket policy for an S3 bucket # # @param bucket_name [String] name of bucket to get policy for @@ -26,9 +25,7 @@ module Fog }) response.body = Fog::JSON.decode(response.body) unless response.body.nil? end - end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket_tagging.rb b/lib/fog/aws/requests/storage/get_bucket_tagging.rb index f840785f3..a5f979418 100644 --- a/lib/fog/aws/requests/storage/get_bucket_tagging.rb +++ b/lib/fog/aws/requests/storage/get_bucket_tagging.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_bucket_tagging' # Get tags for an S3 bucket @@ -30,11 +29,9 @@ module Fog :query => {'tagging' => nil} }) end - end class Mock # :nodoc:all - def get_bucket_tagging(bucket_name) response = Excon::Response.new if self.data[:buckets][bucket_name] && self.data[:bucket_tagging][bucket_name] @@ -47,7 +44,6 @@ module Fog response end end - end end end diff --git a/lib/fog/aws/requests/storage/get_bucket_versioning.rb b/lib/fog/aws/requests/storage/get_bucket_versioning.rb index db295ddf7..b3e91dc14 100644 --- a/lib/fog/aws/requests/storage/get_bucket_versioning.rb +++ b/lib/fog/aws/requests/storage/get_bucket_versioning.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_bucket_versioning' # Get versioning status for an S3 bucket diff --git a/lib/fog/aws/requests/storage/get_bucket_website.rb b/lib/fog/aws/requests/storage/get_bucket_website.rb index cda7d9031..a64ff658f 100644 --- a/lib/fog/aws/requests/storage/get_bucket_website.rb +++ b/lib/fog/aws/requests/storage/get_bucket_website.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_bucket_website' # Get website configuration for an S3 bucket @@ -33,7 +32,6 @@ module Fog :query => {'website' => nil} }) end - end end end diff --git a/lib/fog/aws/requests/storage/get_object.rb b/lib/fog/aws/requests/storage/get_object.rb index 66026ce7c..f1f461898 100644 --- a/lib/fog/aws/requests/storage/get_object.rb +++ b/lib/fog/aws/requests/storage/get_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Get an object from S3 # # @param bucket_name [String] Name of bucket to read from @@ -61,11 +60,9 @@ module Fog :method => 'GET', })) end - end class Mock # :nodoc:all - def get_object(bucket_name, object_name, options = {}, &block) version_id = options.delete('versionId') diff --git a/lib/fog/aws/requests/storage/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb index e2dfe143c..f074e6c19 100644 --- a/lib/fog/aws/requests/storage/get_object_acl.rb +++ b/lib/fog/aws/requests/storage/get_object_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/access_control_list' # Get access control list for an S3 object @@ -51,11 +50,9 @@ module Fog :query => query }) end - end class Mock # :nodoc:all - require 'fog/aws/requests/storage/acl_utils' def get_object_acl(bucket_name, object_name, options = {}) @@ -73,7 +70,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/storage/get_object_http_url.rb b/lib/fog/aws/requests/storage/get_object_http_url.rb index b8448358a..1b5480a03 100644 --- a/lib/fog/aws/requests/storage/get_object_http_url.rb +++ b/lib/fog/aws/requests/storage/get_object_http_url.rb @@ -1,17 +1,13 @@ module Fog module Storage class AWS - module GetObjectHttpUrl - def get_object_http_url(bucket_name, object_name, expires, options = {}) get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'http')) end - end class Real - # Get an expiring object http url from S3 # # @param bucket_name [String] Name of bucket containing object @@ -24,13 +20,10 @@ module Fog # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include GetObjectHttpUrl - end class Mock # :nodoc:all - include GetObjectHttpUrl - end end end diff --git a/lib/fog/aws/requests/storage/get_object_https_url.rb b/lib/fog/aws/requests/storage/get_object_https_url.rb index f8588cd52..5b8411ed6 100644 --- a/lib/fog/aws/requests/storage/get_object_https_url.rb +++ b/lib/fog/aws/requests/storage/get_object_https_url.rb @@ -1,17 +1,13 @@ module Fog module Storage class AWS - module GetObjectHttpsUrl - def get_object_https_url(bucket_name, object_name, expires, options = {}) get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'https')) end - end class Real - # Get an expiring object https url from S3 # # @param bucket_name [String] Name of bucket containing object @@ -24,13 +20,10 @@ module Fog # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include GetObjectHttpsUrl - end class Mock # :nodoc:all - include GetObjectHttpsUrl - end end end diff --git a/lib/fog/aws/requests/storage/get_object_torrent.rb b/lib/fog/aws/requests/storage/get_object_torrent.rb index 1036cee77..2ebab2d4a 100644 --- a/lib/fog/aws/requests/storage/get_object_torrent.rb +++ b/lib/fog/aws/requests/storage/get_object_torrent.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Get torrent for an S3 object # # @param bucket_name [String] name of bucket containing object @@ -40,7 +39,6 @@ module Fog :query => {'torrent' => nil} }) end - end end end diff --git a/lib/fog/aws/requests/storage/get_object_url.rb b/lib/fog/aws/requests/storage/get_object_url.rb index 591a2be62..fc304e103 100644 --- a/lib/fog/aws/requests/storage/get_object_url.rb +++ b/lib/fog/aws/requests/storage/get_object_url.rb @@ -1,9 +1,7 @@ module Fog module Storage class AWS - module GetObjectUrl - def get_object_url(bucket_name, object_name, expires, options = {}) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -20,7 +18,6 @@ module Fog end class Real - # Get an expiring object url from S3 # # @param bucket_name [String] Name of bucket containing object @@ -33,13 +30,10 @@ module Fog # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include GetObjectUrl - end class Mock # :nodoc:all - include GetObjectUrl - end end end diff --git a/lib/fog/aws/requests/storage/get_request_payment.rb b/lib/fog/aws/requests/storage/get_request_payment.rb index 55bdb7cad..c12baef62 100644 --- a/lib/fog/aws/requests/storage/get_request_payment.rb +++ b/lib/fog/aws/requests/storage/get_request_payment.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_request_payment' # Get configured payer for an S3 bucket @@ -26,11 +25,9 @@ module Fog :query => {'requestPayment' => nil} }) end - end class Mock # :nodoc:all - def get_request_payment(bucket_name) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -42,7 +39,6 @@ module Fog end response end - end end end diff --git a/lib/fog/aws/requests/storage/get_service.rb b/lib/fog/aws/requests/storage/get_service.rb index a13b3dfd1..497f54d1b 100644 --- a/lib/fog/aws/requests/storage/get_service.rb +++ b/lib/fog/aws/requests/storage/get_service.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/get_service' # List information about S3 buckets for authorized user @@ -28,11 +27,9 @@ module Fog :parser => Fog::Parsers::Storage::AWS::GetService.new }) end - end class Mock # :nodoc:all - def get_service response = Excon::Response.new response.headers['Status'] = 200 @@ -47,7 +44,6 @@ module Fog } response end - end end end diff --git a/lib/fog/aws/requests/storage/head_object.rb b/lib/fog/aws/requests/storage/head_object.rb index 6d99ff9cf..9d2d1e33b 100644 --- a/lib/fog/aws/requests/storage/head_object.rb +++ b/lib/fog/aws/requests/storage/head_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Get headers for an object from S3 # # @param bucket_name [String] Name of bucket to read from @@ -49,17 +48,14 @@ module Fog :query => query }) end - end class Mock # :nodoc:all - def head_object(bucket_name, object_name, options = {}) response = get_object(bucket_name, object_name, options) response.body = nil response end - end end end diff --git a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb index da0b969fe..95e89125c 100644 --- a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb +++ b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/initiate_multipart_upload' # Initiate a multipart upload to an S3 bucket @@ -37,7 +36,6 @@ module Fog :query => {'uploads' => nil} }) end - end # Real class Mock # :nodoc:all diff --git a/lib/fog/aws/requests/storage/list_multipart_uploads.rb b/lib/fog/aws/requests/storage/list_multipart_uploads.rb index bd078dcdc..eb45c0e01 100644 --- a/lib/fog/aws/requests/storage/list_multipart_uploads.rb +++ b/lib/fog/aws/requests/storage/list_multipart_uploads.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/list_multipart_uploads' # List multipart uploads for a bucket @@ -47,7 +46,6 @@ module Fog :query => options.merge!({'uploads' => nil}) }) end - end end end diff --git a/lib/fog/aws/requests/storage/list_parts.rb b/lib/fog/aws/requests/storage/list_parts.rb index 4a388d36c..4344870da 100644 --- a/lib/fog/aws/requests/storage/list_parts.rb +++ b/lib/fog/aws/requests/storage/list_parts.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/parsers/storage/list_parts' # List parts for a multipart upload @@ -48,7 +47,6 @@ module Fog :query => options.merge!({'uploadId' => upload_id}) }) end - end end end diff --git a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb index 0f6ae8176..f5771c933 100644 --- a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb +++ b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value} # Form should look like:
# These hidden fields should then appear, followed by a field named 'file' which is either a textarea or file input. @@ -31,7 +30,6 @@ module Fog end options end - end end end diff --git a/lib/fog/aws/requests/storage/post_object_restore.rb b/lib/fog/aws/requests/storage/post_object_restore.rb index 468c3f28c..6e738c8c5 100644 --- a/lib/fog/aws/requests/storage/post_object_restore.rb +++ b/lib/fog/aws/requests/storage/post_object_restore.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Restore an object from Glacier to its original S3 path # # @param bucket_name [String] Name of bucket containing object @@ -37,17 +36,14 @@ module Fog :path => CGI.escape(object_name) }) end - end class Mock # :nodoc:all - def post_object_restore(bucket_name, object_name, days = 100000) response = get_object(bucket_name, object_name) response.body = nil response end - end end end diff --git a/lib/fog/aws/requests/storage/put_bucket.rb b/lib/fog/aws/requests/storage/put_bucket.rb index 25fcd2986..c07a4bba3 100644 --- a/lib/fog/aws/requests/storage/put_bucket.rb +++ b/lib/fog/aws/requests/storage/put_bucket.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Create an S3 bucket # # @param bucket_name [String] name of bucket to create @@ -35,11 +34,9 @@ DATA :method => 'PUT' }) end - end class Mock # :nodoc:all - def put_bucket(bucket_name, options = {}) acl = options['x-amz-acl'] || 'private' if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) @@ -70,7 +67,6 @@ DATA end response end - end end end diff --git a/lib/fog/aws/requests/storage/put_bucket_acl.rb b/lib/fog/aws/requests/storage/put_bucket_acl.rb index 69caa5d51..d8abcbf23 100644 --- a/lib/fog/aws/requests/storage/put_bucket_acl.rb +++ b/lib/fog/aws/requests/storage/put_bucket_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/requests/storage/acl_utils' # Change access control list for an S3 bucket @@ -65,7 +64,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/storage/put_bucket_cors.rb b/lib/fog/aws/requests/storage/put_bucket_cors.rb index 707f4bdc7..0b645fc30 100644 --- a/lib/fog/aws/requests/storage/put_bucket_cors.rb +++ b/lib/fog/aws/requests/storage/put_bucket_cors.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/requests/storage/cors_utils' # Sets the cors configuration for your bucket. If the configuration exists, Amazon S3 replaces it. @@ -43,7 +42,6 @@ module Fog self.data[:cors][:bucket][bucket_name] = Fog::Storage::AWS.hash_to_cors(cors) end end - end end end diff --git a/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb index 769c0578c..fbc1184d1 100644 --- a/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb +++ b/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Change lifecycle configuration for an S3 bucket # # @param bucket_name [String] name of bucket to set lifecycle configuration for diff --git a/lib/fog/aws/requests/storage/put_bucket_logging.rb b/lib/fog/aws/requests/storage/put_bucket_logging.rb index 8fa9b5bd7..74a365073 100644 --- a/lib/fog/aws/requests/storage/put_bucket_logging.rb +++ b/lib/fog/aws/requests/storage/put_bucket_logging.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Change logging status for an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -74,7 +73,6 @@ DATA :query => {'logging' => nil} }) end - end end end diff --git a/lib/fog/aws/requests/storage/put_bucket_policy.rb b/lib/fog/aws/requests/storage/put_bucket_policy.rb index 4ab327284..76eb4566c 100644 --- a/lib/fog/aws/requests/storage/put_bucket_policy.rb +++ b/lib/fog/aws/requests/storage/put_bucket_policy.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Change bucket policy for an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -20,7 +19,6 @@ module Fog :query => {'policy' => nil} }) end - end end end diff --git a/lib/fog/aws/requests/storage/put_bucket_tagging.rb b/lib/fog/aws/requests/storage/put_bucket_tagging.rb index 1e63c32d2..cce053c04 100644 --- a/lib/fog/aws/requests/storage/put_bucket_tagging.rb +++ b/lib/fog/aws/requests/storage/put_bucket_tagging.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Change tag set for an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -34,11 +33,9 @@ DATA :query => {'tagging' => nil} }) end - end class Mock # :nodoc:all - def put_bucket_tagging(bucket_name, tags) response = Excon::Response.new @@ -52,9 +49,7 @@ DATA response end - end - end end end diff --git a/lib/fog/aws/requests/storage/put_bucket_versioning.rb b/lib/fog/aws/requests/storage/put_bucket_versioning.rb index 9a8c72c3e..deb1f1188 100644 --- a/lib/fog/aws/requests/storage/put_bucket_versioning.rb +++ b/lib/fog/aws/requests/storage/put_bucket_versioning.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Change versioning status for an S3 bucket # # @param bucket_name [String] name of bucket to modify diff --git a/lib/fog/aws/requests/storage/put_bucket_website.rb b/lib/fog/aws/requests/storage/put_bucket_website.rb index 1c79bf8e2..da15e02a6 100644 --- a/lib/fog/aws/requests/storage/put_bucket_website.rb +++ b/lib/fog/aws/requests/storage/put_bucket_website.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Change website configuration for an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -40,11 +39,9 @@ DATA :query => {'website' => nil} }) end - end class Mock # :nodoc:all - def put_bucket_website(bucket_name, suffix, options = {}) response = Excon::Response.new if self.data[:buckets][bucket_name] @@ -56,9 +53,7 @@ DATA response end - end - end end end diff --git a/lib/fog/aws/requests/storage/put_object.rb b/lib/fog/aws/requests/storage/put_object.rb index bfc5ebd15..c60f2c421 100644 --- a/lib/fog/aws/requests/storage/put_object.rb +++ b/lib/fog/aws/requests/storage/put_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Create an object in an S3 bucket # # @param bucket_name [String] Name of bucket to create object in @@ -39,11 +38,9 @@ module Fog :method => 'PUT', }) end - end class Mock # :nodoc:all - require 'fog/aws/requests/storage/shared_mock_methods' include Fog::Storage::AWS::SharedMockMethods @@ -70,7 +67,6 @@ module Fog response.headers['x-amz-version-id'] = object['VersionId'] if object['VersionId'] != 'null' response end - end end end diff --git a/lib/fog/aws/requests/storage/put_object_acl.rb b/lib/fog/aws/requests/storage/put_object_acl.rb index 9ddbcb386..e2b666351 100644 --- a/lib/fog/aws/requests/storage/put_object_acl.rb +++ b/lib/fog/aws/requests/storage/put_object_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - require 'fog/aws/requests/storage/acl_utils' # Change access control list for an S3 object @@ -74,7 +73,6 @@ module Fog end end end - end end end diff --git a/lib/fog/aws/requests/storage/put_object_url.rb b/lib/fog/aws/requests/storage/put_object_url.rb index 70cd1daf8..b0ea262c2 100644 --- a/lib/fog/aws/requests/storage/put_object_url.rb +++ b/lib/fog/aws/requests/storage/put_object_url.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS module PutObjectUrl - def put_object_url(bucket_name, object_name, expires, headers = {}, options = {}) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -20,7 +19,6 @@ module Fog end class Real - # Get an expiring object url from S3 for putting an object # # @param bucket_name [String] Name of bucket containing object @@ -33,13 +31,10 @@ module Fog # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include PutObjectUrl - end class Mock # :nodoc:all - include PutObjectUrl - end end end diff --git a/lib/fog/aws/requests/storage/put_request_payment.rb b/lib/fog/aws/requests/storage/put_request_payment.rb index 21e253413..5126808e2 100644 --- a/lib/fog/aws/requests/storage/put_request_payment.rb +++ b/lib/fog/aws/requests/storage/put_request_payment.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Change who pays for requests to an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -26,11 +25,9 @@ DATA :query => {'requestPayment' => nil} }) end - end class Mock # :nodoc:all - def put_request_payment(bucket_name, payer) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -42,7 +39,6 @@ DATA end response end - end end end diff --git a/lib/fog/aws/requests/storage/sync_clock.rb b/lib/fog/aws/requests/storage/sync_clock.rb index 7dbc576f7..669041288 100644 --- a/lib/fog/aws/requests/storage/sync_clock.rb +++ b/lib/fog/aws/requests/storage/sync_clock.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Sync clock against S3 to avoid skew errors # def sync_clock @@ -13,15 +12,12 @@ module Fog end Fog::Time.now = Time.parse(response.headers['Date']) end - end # Real class Mock # :nodoc:all - def sync_clock true end - end # Mock end # Storage end # AWS diff --git a/lib/fog/aws/requests/storage/upload_part.rb b/lib/fog/aws/requests/storage/upload_part.rb index d74b3b9f6..ed9f33074 100644 --- a/lib/fog/aws/requests/storage/upload_part.rb +++ b/lib/fog/aws/requests/storage/upload_part.rb @@ -2,7 +2,6 @@ module Fog module Storage class AWS class Real - # Upload a part for a multipart upload # # @param bucket_name [String] Name of bucket to add part to @@ -34,7 +33,6 @@ module Fog :query => {'uploadId' => upload_id, 'partNumber' => part_number} }) end - end # Real class Mock # :nodoc:all diff --git a/lib/fog/aws/requests/sts/assume_role.rb b/lib/fog/aws/requests/sts/assume_role.rb index ff9f59161..8735751ff 100644 --- a/lib/fog/aws/requests/sts/assume_role.rb +++ b/lib/fog/aws/requests/sts/assume_role.rb @@ -2,7 +2,6 @@ module Fog module AWS class STS class Real - require 'fog/aws/parsers/sts/assume_role' # Assume Role @@ -39,7 +38,6 @@ module Fog :parser => Fog::Parsers::AWS::STS::AssumeRole.new }) end - end end end diff --git a/lib/fog/aws/requests/sts/get_federation_token.rb b/lib/fog/aws/requests/sts/get_federation_token.rb index 2a8ce0e3f..192e7ceb5 100644 --- a/lib/fog/aws/requests/sts/get_federation_token.rb +++ b/lib/fog/aws/requests/sts/get_federation_token.rb @@ -2,7 +2,6 @@ module Fog module AWS class STS class Real - require 'fog/aws/parsers/sts/get_session_token' # Get federation token diff --git a/lib/fog/aws/requests/sts/get_session_token.rb b/lib/fog/aws/requests/sts/get_session_token.rb index f76531ba4..18d02f45f 100644 --- a/lib/fog/aws/requests/sts/get_session_token.rb +++ b/lib/fog/aws/requests/sts/get_session_token.rb @@ -2,7 +2,6 @@ module Fog module AWS class STS class Real - require 'fog/aws/parsers/sts/get_session_token' def get_session_token(duration=43200) diff --git a/lib/fog/aws/ses.rb b/lib/fog/aws/ses.rb index 265377584..44d995b6c 100644 --- a/lib/fog/aws/ses.rb +++ b/lib/fog/aws/ses.rb @@ -22,11 +22,9 @@ module Fog request :send_raw_email class Mock - def initialize(options={}) Fog::Mock.not_implemented end - end class Real @@ -86,7 +84,6 @@ module Fog idempotent = params.delete(:idempotent) parser = params.delete(:parser) - headers = { 'Content-Type' => 'application/x-www-form-urlencoded', 'Date' => Fog::Time.now.to_date_header, @@ -131,7 +128,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/signaturev4.rb b/lib/fog/aws/signaturev4.rb index 0dfdea44e..35939886e 100644 --- a/lib/fog/aws/signaturev4.rb +++ b/lib/fog/aws/signaturev4.rb @@ -67,8 +67,6 @@ DATA kSigning = Fog::HMAC.new('sha256', kService).sign('aws4_request') Fog::HMAC.new('sha256', kSigning) end - - end end end diff --git a/lib/fog/aws/simpledb.rb b/lib/fog/aws/simpledb.rb index 12d0755b8..9f03a61c0 100644 --- a/lib/fog/aws/simpledb.rb +++ b/lib/fog/aws/simpledb.rb @@ -20,7 +20,6 @@ module Fog request :select class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -197,7 +196,6 @@ module Fog value.to_s end end - end end end diff --git a/lib/fog/aws/sns.rb b/lib/fog/aws/sns.rb index 1a1a69d6d..0090b78ee 100644 --- a/lib/fog/aws/sns.rb +++ b/lib/fog/aws/sns.rb @@ -24,10 +24,8 @@ module Fog request :unsubscribe class Mock - def initialize(options={}) end - end class Real @@ -108,7 +106,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/sqs.rb b/lib/fog/aws/sqs.rb index be74ef0a1..8fe00eb43 100644 --- a/lib/fog/aws/sqs.rb +++ b/lib/fog/aws/sqs.rb @@ -144,7 +144,6 @@ module Fog response end - end end end diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb index 5f2b22a50..b0201f95c 100644 --- a/lib/fog/aws/storage.rb +++ b/lib/fog/aws/storage.rb @@ -108,7 +108,6 @@ module Fog request :upload_part module Utils - attr_accessor :region def cdn @@ -260,7 +259,6 @@ module Fog :query => query, }).to_s end - end class Mock @@ -385,7 +383,6 @@ module Fog @aws_session_token = options[:aws_session_token] @aws_credentials_expire_at = options[:aws_credentials_expire_at] end - end class Real @@ -459,7 +456,6 @@ DATA end string_to_sign << canonical_amz_headers - query_string = '' if params[:query] query_args = [] diff --git a/lib/fog/aws/sts.rb b/lib/fog/aws/sts.rb index 4a899333e..6d246cd40 100644 --- a/lib/fog/aws/sts.rb +++ b/lib/fog/aws/sts.rb @@ -136,9 +136,7 @@ module Fog Fog::AWS::STS::Error.slurp(error, "#{match[:code]} => #{match[:message]}") end end - end - end end end diff --git a/lib/fog/bare_metal_cloud/compute.rb b/lib/fog/bare_metal_cloud/compute.rb index 8f12437b9..d504196c6 100644 --- a/lib/fog/bare_metal_cloud/compute.rb +++ b/lib/fog/bare_metal_cloud/compute.rb @@ -3,7 +3,6 @@ require 'fog/bare_metal_cloud/core' module Fog module Compute class BareMetalCloud < Fog::Service - requires :bare_metal_cloud_password, :bare_metal_cloud_username recognizes :host, :port, :scheme, :persistent @@ -21,7 +20,6 @@ module Fog request :reboot_server class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = {} @@ -43,11 +41,9 @@ module Fog def reset_data self.class.data.delete(@bare_metal_cloud_username) end - end class Real - def initialize(options={}) require 'fog/core/parser' @@ -92,7 +88,6 @@ module Fog response end - end end end diff --git a/lib/fog/bare_metal_cloud/core.rb b/lib/fog/bare_metal_cloud/core.rb index 8c6532f68..081ea210d 100644 --- a/lib/fog/bare_metal_cloud/core.rb +++ b/lib/fog/bare_metal_cloud/core.rb @@ -3,10 +3,8 @@ require 'fog/xml' module Fog module BareMetalCloud - extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/add_server.rb b/lib/fog/bare_metal_cloud/requests/compute/add_server.rb index 361559b2f..c17e6fead 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/add_server.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/add_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # Boot a new server # # ==== Parameters @@ -26,7 +25,6 @@ module Fog :query => {'planId' => plan_id}.merge!(options) ) end - end end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/add_server_by_configuration.rb b/lib/fog/bare_metal_cloud/requests/compute/add_server_by_configuration.rb index 7722b35d1..824fdf0b1 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/add_server_by_configuration.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/add_server_by_configuration.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # Boot a new server by configuration # # ==== Parameters @@ -26,7 +25,6 @@ module Fog :query => {'configuration' => config}.merge!(options) ) end - end end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/cancel_server.rb b/lib/fog/bare_metal_cloud/requests/compute/cancel_server.rb index cb4bece3f..1008a5442 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/cancel_server.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/cancel_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # Shutdown a running server # # ==== Parameters @@ -23,7 +22,6 @@ module Fog :query => {'serverId' => server_id} ) end - end end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/get_server.rb b/lib/fog/bare_metal_cloud/requests/compute/get_server.rb index 73f898091..e30c65d65 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/get_server.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/get_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # List servers # # ==== Parameters @@ -34,7 +33,6 @@ module Fog :query => {'serverId' => server_id} ) end - end end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/list_configurations.rb b/lib/fog/bare_metal_cloud/requests/compute/list_configurations.rb index 62bb5f843..0b5594232 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/list_configurations.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/list_configurations.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # List Configurations # # ==== Returns @@ -20,7 +19,6 @@ module Fog :path => 'api/listConfigurations' ) end - end end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/list_images.rb b/lib/fog/bare_metal_cloud/requests/compute/list_images.rb index b96ba0270..199152af6 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/list_images.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # List images # # ==== Returns @@ -20,7 +19,6 @@ module Fog :path => 'api/listImages' ) end - end end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/list_plans.rb b/lib/fog/bare_metal_cloud/requests/compute/list_plans.rb index a4aca8802..84ebd5c4c 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/list_plans.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/list_plans.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # List available plans # # ==== Returns @@ -23,7 +22,6 @@ module Fog :path => 'api/listPlans' ) end - end end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/list_servers.rb b/lib/fog/bare_metal_cloud/requests/compute/list_servers.rb index 5a0195016..507e42b81 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/list_servers.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/list_servers.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # List servers # # ==== Returns @@ -29,7 +28,6 @@ module Fog :path => 'api/listServers' ) end - end end end diff --git a/lib/fog/bare_metal_cloud/requests/compute/reboot_server.rb b/lib/fog/bare_metal_cloud/requests/compute/reboot_server.rb index a695ee4ff..438adb511 100644 --- a/lib/fog/bare_metal_cloud/requests/compute/reboot_server.rb +++ b/lib/fog/bare_metal_cloud/requests/compute/reboot_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class BareMetalCloud class Real - # Reboot a running server # # ==== Parameters @@ -17,7 +16,6 @@ module Fog :query => {'serverId' => server_id} ) end - end end end diff --git a/lib/fog/bin.rb b/lib/fog/bin.rb index 12dcf19d0..e2f210eeb 100644 --- a/lib/fog/bin.rb +++ b/lib/fog/bin.rb @@ -2,7 +2,6 @@ require 'fog/core/credentials' module Fog class << self - def available_providers @available_providers ||= Fog.providers.values.select {|provider| Kernel.const_get(provider).available?}.sort end @@ -10,12 +9,10 @@ module Fog def registered_providers @registered_providers ||= Fog.providers.values.sort end - end class Bin class << self - def available? availability = true for service in services @@ -50,10 +47,8 @@ module Fog def collections services.map {|service| self[service].collections}.flatten.sort_by {|service| service.to_s} end - end end - end require 'fog/bin/atmos' diff --git a/lib/fog/bin/atmos.rb b/lib/fog/bin/atmos.rb index 59da2f226..af456f7a5 100644 --- a/lib/fog/bin/atmos.rb +++ b/lib/fog/bin/atmos.rb @@ -1,6 +1,5 @@ class Atmos < Fog::Bin class << self - def class_for(key) case key when :storage @@ -26,6 +25,5 @@ class Atmos < Fog::Bin def services Fog::Atmos.services end - end end diff --git a/lib/fog/bin/aws.rb b/lib/fog/bin/aws.rb index e15784ae5..2e4c82399 100644 --- a/lib/fog/bin/aws.rb +++ b/lib/fog/bin/aws.rb @@ -1,6 +1,5 @@ class AWS < Fog::Bin class << self - def class_for(key) case key when :auto_scaling @@ -118,6 +117,5 @@ class AWS < Fog::Bin def services Fog::AWS.services end - end end diff --git a/lib/fog/bin/bare_metal_cloud.rb b/lib/fog/bin/bare_metal_cloud.rb index 34fc21a6d..00293fb63 100644 --- a/lib/fog/bin/bare_metal_cloud.rb +++ b/lib/fog/bin/bare_metal_cloud.rb @@ -1,6 +1,5 @@ class BareMetalCloud < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class BareMetalCloud < Fog::Bin def services Fog::BareMetalCloud.services end - end end diff --git a/lib/fog/bin/bluebox.rb b/lib/fog/bin/bluebox.rb index 0207e4581..ad31eb7a4 100644 --- a/lib/fog/bin/bluebox.rb +++ b/lib/fog/bin/bluebox.rb @@ -1,6 +1,5 @@ class Bluebox < Fog::Bin class << self - def class_for(key) case key when :compute @@ -33,6 +32,5 @@ class Bluebox < Fog::Bin def services Fog::Bluebox.services end - end end diff --git a/lib/fog/bin/brightbox.rb b/lib/fog/bin/brightbox.rb index 638080fb0..c3c087e1e 100644 --- a/lib/fog/bin/brightbox.rb +++ b/lib/fog/bin/brightbox.rb @@ -1,6 +1,5 @@ class Brightbox < Fog::Bin class << self - def class_for(key) case key when :compute @@ -30,6 +29,5 @@ class Brightbox < Fog::Bin def services Fog::Brightbox.services end - end end diff --git a/lib/fog/bin/clodo.rb b/lib/fog/bin/clodo.rb index f36e46e85..e40794e08 100644 --- a/lib/fog/bin/clodo.rb +++ b/lib/fog/bin/clodo.rb @@ -1,6 +1,5 @@ class Clodo < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class Clodo < Fog::Bin def services Fog::Clodo.services end - end end diff --git a/lib/fog/bin/cloudsigma.rb b/lib/fog/bin/cloudsigma.rb index 08047923d..72a7e15be 100644 --- a/lib/fog/bin/cloudsigma.rb +++ b/lib/fog/bin/cloudsigma.rb @@ -1,6 +1,5 @@ class CloudSigma < Fog::Bin class << self - def class_for(key) case key when :compute diff --git a/lib/fog/bin/cloudstack.rb b/lib/fog/bin/cloudstack.rb index 162307a0a..0dc3ee481 100644 --- a/lib/fog/bin/cloudstack.rb +++ b/lib/fog/bin/cloudstack.rb @@ -1,6 +1,5 @@ class Cloudstack < Fog::Bin class << self - def class_for(key) case key when :compute @@ -25,6 +24,5 @@ class Cloudstack < Fog::Bin def services Fog::Cloudstack.services end - end end diff --git a/lib/fog/bin/digitalocean.rb b/lib/fog/bin/digitalocean.rb index 309ebe1ad..9cdad9960 100644 --- a/lib/fog/bin/digitalocean.rb +++ b/lib/fog/bin/digitalocean.rb @@ -1,6 +1,5 @@ class DigitalOcean < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class DigitalOcean < Fog::Bin def services Fog::DigitalOcean.services end - end end diff --git a/lib/fog/bin/dnsimple.rb b/lib/fog/bin/dnsimple.rb index 4de858510..cd6af599b 100644 --- a/lib/fog/bin/dnsimple.rb +++ b/lib/fog/bin/dnsimple.rb @@ -1,6 +1,5 @@ class DNSimple < Fog::Bin class << self - def class_for(key) case key when :dns @@ -26,6 +25,5 @@ class DNSimple < Fog::Bin def services Fog::DNSimple.services end - end end diff --git a/lib/fog/bin/dnsmadeeasy.rb b/lib/fog/bin/dnsmadeeasy.rb index a5bba033c..d5ffa2109 100644 --- a/lib/fog/bin/dnsmadeeasy.rb +++ b/lib/fog/bin/dnsmadeeasy.rb @@ -1,6 +1,5 @@ class DNSMadeEasy < Fog::Bin class << self - def class_for(key) case key when :dns @@ -26,6 +25,5 @@ class DNSMadeEasy < Fog::Bin def services Fog::DNSMadeEasy.services end - end end diff --git a/lib/fog/bin/dreamhost.rb b/lib/fog/bin/dreamhost.rb index 158b8ed11..61c0244c6 100644 --- a/lib/fog/bin/dreamhost.rb +++ b/lib/fog/bin/dreamhost.rb @@ -1,6 +1,5 @@ class Dreamhost < Fog::Bin class << self - def class_for(key) case key when :dns @@ -26,6 +25,5 @@ class Dreamhost < Fog::Bin def services Fog::Dreamhost.services end - end end diff --git a/lib/fog/bin/dynect.rb b/lib/fog/bin/dynect.rb index 110b52444..3ec4d68b9 100644 --- a/lib/fog/bin/dynect.rb +++ b/lib/fog/bin/dynect.rb @@ -1,6 +1,5 @@ class Dynect < Fog::Bin class << self - def class_for(key) case key when :dns @@ -25,6 +24,5 @@ class Dynect < Fog::Bin def services [:dns] end - end end diff --git a/lib/fog/bin/ecloud.rb b/lib/fog/bin/ecloud.rb index 6562400ca..38bebec7f 100644 --- a/lib/fog/bin/ecloud.rb +++ b/lib/fog/bin/ecloud.rb @@ -1,6 +1,5 @@ class Ecloud < Fog::Bin class << self - def available? Fog::Ecloud::ECLOUD_OPTIONS.all? {|requirement| Fog.credentials.include?(requirement)} end @@ -30,6 +29,5 @@ class Ecloud < Fog::Bin def services Fog::Ecloud.services end - end end diff --git a/lib/fog/bin/fogdocker.rb b/lib/fog/bin/fogdocker.rb index 9219a75ea..111db6276 100644 --- a/lib/fog/bin/fogdocker.rb +++ b/lib/fog/bin/fogdocker.rb @@ -1,6 +1,5 @@ class Fogdocker < Fog::Bin class << self - def class_for(key) case key when :compute @@ -25,6 +24,5 @@ class Fogdocker < Fog::Bin def services Fog::Fogdocker.services end - end end diff --git a/lib/fog/bin/glesys.rb b/lib/fog/bin/glesys.rb index 83e364dac..26568270b 100644 --- a/lib/fog/bin/glesys.rb +++ b/lib/fog/bin/glesys.rb @@ -1,6 +1,5 @@ class Glesys < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class Glesys < Fog::Bin def services Fog::Glesys.services end - end end diff --git a/lib/fog/bin/go_grid.rb b/lib/fog/bin/go_grid.rb index 4acc091fd..fc2ffe282 100644 --- a/lib/fog/bin/go_grid.rb +++ b/lib/fog/bin/go_grid.rb @@ -1,6 +1,5 @@ class GoGrid < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class GoGrid < Fog::Bin def services Fog::GoGrid.services end - end end diff --git a/lib/fog/bin/google.rb b/lib/fog/bin/google.rb index b7389f22a..61eb50d28 100644 --- a/lib/fog/bin/google.rb +++ b/lib/fog/bin/google.rb @@ -1,6 +1,5 @@ module Google # deviates from other bin stuff to accomodate gem class << self - def class_for(key) case key when :compute diff --git a/lib/fog/bin/hp.rb b/lib/fog/bin/hp.rb index 0250fe5b6..d7137e73c 100644 --- a/lib/fog/bin/hp.rb +++ b/lib/fog/bin/hp.rb @@ -1,6 +1,5 @@ class HP < Fog::Bin class << self - def class_for(key) case key when :block_storage @@ -57,6 +56,5 @@ class HP < Fog::Bin def services Fog::HP.services end - end end diff --git a/lib/fog/bin/ibm.rb b/lib/fog/bin/ibm.rb index 06a2a45c4..4c48a4e36 100644 --- a/lib/fog/bin/ibm.rb +++ b/lib/fog/bin/ibm.rb @@ -1,6 +1,5 @@ class IBM < Fog::Bin class << self - def class_for(key) case key when :compute @@ -29,6 +28,5 @@ class IBM < Fog::Bin def services Fog::IBM.services end - end end diff --git a/lib/fog/bin/internet_archive.rb b/lib/fog/bin/internet_archive.rb index c5af5a1ff..1671fa373 100644 --- a/lib/fog/bin/internet_archive.rb +++ b/lib/fog/bin/internet_archive.rb @@ -1,6 +1,5 @@ class InternetArchive < Fog::Bin class << self - def class_for(key) case key when :storage @@ -29,6 +28,5 @@ class InternetArchive < Fog::Bin def services Fog::InternetArchive.services end - end end diff --git a/lib/fog/bin/joyent.rb b/lib/fog/bin/joyent.rb index 654269cb6..eaa08dd9f 100644 --- a/lib/fog/bin/joyent.rb +++ b/lib/fog/bin/joyent.rb @@ -1,6 +1,5 @@ class Joyent < Fog::Bin class << self - def class_for(key) case key when :compute @@ -30,6 +29,5 @@ class Joyent < Fog::Bin def services Fog::Joyent.services end - end end diff --git a/lib/fog/bin/libvirt.rb b/lib/fog/bin/libvirt.rb index 6e003285a..8cff49d5b 100644 --- a/lib/fog/bin/libvirt.rb +++ b/lib/fog/bin/libvirt.rb @@ -1,6 +1,5 @@ module Libvirt # deviates from other bin stuff to accomodate gem class << self - def class_for(key) case key when :compute @@ -55,6 +54,5 @@ module Libvirt # deviates from other bin stuff to accomodate gem def services Fog::Libvirt.services end - end end diff --git a/lib/fog/bin/linode.rb b/lib/fog/bin/linode.rb index a94349d08..8426273c3 100644 --- a/lib/fog/bin/linode.rb +++ b/lib/fog/bin/linode.rb @@ -1,6 +1,5 @@ class Linode < Fog::Bin class << self - def class_for(key) case key when :compute @@ -31,6 +30,5 @@ class Linode < Fog::Bin def services Fog::Linode.services end - end end diff --git a/lib/fog/bin/local.rb b/lib/fog/bin/local.rb index bd22f67a1..dafd23075 100644 --- a/lib/fog/bin/local.rb +++ b/lib/fog/bin/local.rb @@ -1,6 +1,5 @@ class Local < Fog::Bin class << self - def class_for(key) case key when :storage @@ -26,6 +25,5 @@ class Local < Fog::Bin def services Fog::Local.services end - end end diff --git a/lib/fog/bin/ninefold.rb b/lib/fog/bin/ninefold.rb index 3a3911295..9d546f296 100644 --- a/lib/fog/bin/ninefold.rb +++ b/lib/fog/bin/ninefold.rb @@ -1,6 +1,5 @@ class Ninefold < Fog::Bin class << self - def class_for(key) case key when :compute @@ -31,6 +30,5 @@ class Ninefold < Fog::Bin def services Fog::Ninefold.services end - end end diff --git a/lib/fog/bin/openstack.rb b/lib/fog/bin/openstack.rb index 18bb1e9bf..4c933afd3 100644 --- a/lib/fog/bin/openstack.rb +++ b/lib/fog/bin/openstack.rb @@ -1,6 +1,5 @@ class OpenStack < Fog::Bin class << self - def class_for(key) case key when :compute @@ -61,6 +60,5 @@ class OpenStack < Fog::Bin def services Fog::OpenStack.services end - end end diff --git a/lib/fog/bin/openvz.rb b/lib/fog/bin/openvz.rb index 6adcb438f..42af38cc2 100644 --- a/lib/fog/bin/openvz.rb +++ b/lib/fog/bin/openvz.rb @@ -1,6 +1,5 @@ class Openvz < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class Openvz < Fog::Bin def services Fog::Openvz.services end - end end diff --git a/lib/fog/bin/ovirt.rb b/lib/fog/bin/ovirt.rb index 62df5d764..14eca5e2c 100644 --- a/lib/fog/bin/ovirt.rb +++ b/lib/fog/bin/ovirt.rb @@ -1,6 +1,5 @@ class Ovirt < Fog::Bin class << self - def class_for(key) case key when :compute @@ -25,6 +24,5 @@ class Ovirt < Fog::Bin def services Fog::Ovirt.services end - end end diff --git a/lib/fog/bin/rackspace.rb b/lib/fog/bin/rackspace.rb index 7e9952b9b..51c894152 100644 --- a/lib/fog/bin/rackspace.rb +++ b/lib/fog/bin/rackspace.rb @@ -1,6 +1,5 @@ class Rackspace < Fog::Bin class << self - def class_for(key) case key when :auto_scale @@ -74,6 +73,5 @@ class Rackspace < Fog::Bin def services Fog::Rackspace.services end - end end diff --git a/lib/fog/bin/rage4.rb b/lib/fog/bin/rage4.rb index 0d78c9f5c..0511b9075 100644 --- a/lib/fog/bin/rage4.rb +++ b/lib/fog/bin/rage4.rb @@ -1,6 +1,5 @@ class Rage4 < Fog::Bin class << self - def class_for(key) case key when :dns @@ -26,6 +25,5 @@ class Rage4 < Fog::Bin def services Fog::Rage4.services end - end end diff --git a/lib/fog/bin/riakcs.rb b/lib/fog/bin/riakcs.rb index ee64bea43..a7abade7f 100644 --- a/lib/fog/bin/riakcs.rb +++ b/lib/fog/bin/riakcs.rb @@ -1,6 +1,5 @@ class RiakCS < Fog::Bin class << self - def class_for(key) case key when :provisioning @@ -22,6 +21,5 @@ class RiakCS < Fog::Bin def services Fog::RiakCS.services end - end end diff --git a/lib/fog/bin/sakuracloud.rb b/lib/fog/bin/sakuracloud.rb index 935b9e86c..91dc2d44f 100644 --- a/lib/fog/bin/sakuracloud.rb +++ b/lib/fog/bin/sakuracloud.rb @@ -1,6 +1,5 @@ class SakuraCloud < Fog::Bin class << self - def class_for(key) case key when :compute @@ -31,6 +30,5 @@ class SakuraCloud < Fog::Bin def services Fog::SakuraCloud.services end - end end diff --git a/lib/fog/bin/serverlove.rb b/lib/fog/bin/serverlove.rb index 62b722d3c..d6dab118d 100644 --- a/lib/fog/bin/serverlove.rb +++ b/lib/fog/bin/serverlove.rb @@ -1,6 +1,5 @@ class Serverlove < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class Serverlove < Fog::Bin def services Fog::Serverlove.services end - end end diff --git a/lib/fog/bin/stormondemand.rb b/lib/fog/bin/stormondemand.rb index 2b889e3b6..da824c9f0 100644 --- a/lib/fog/bin/stormondemand.rb +++ b/lib/fog/bin/stormondemand.rb @@ -1,6 +1,5 @@ class StormOnDemand < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class StormOnDemand < Fog::Bin def services Fog::StormOnDemand.services end - end end diff --git a/lib/fog/bin/terremark.rb b/lib/fog/bin/terremark.rb index 76258c71a..c3e192aff 100644 --- a/lib/fog/bin/terremark.rb +++ b/lib/fog/bin/terremark.rb @@ -1,6 +1,5 @@ class Terremark < Fog::Bin class << self - def available? Fog::Terremark::VCLOUD_OPTIONS.all? {|requirement| Fog.credentials.include?(requirement)} end @@ -26,6 +25,5 @@ class Terremark < Fog::Bin end @@connections[service] end - end end diff --git a/lib/fog/bin/vcloud.rb b/lib/fog/bin/vcloud.rb index 56442c564..3825e3e2d 100644 --- a/lib/fog/bin/vcloud.rb +++ b/lib/fog/bin/vcloud.rb @@ -1,6 +1,5 @@ class Vcloud < Fog::Bin class << self - def class_for(key) case key when :compute @@ -25,6 +24,5 @@ class Vcloud < Fog::Bin def services Fog::Vcloud.services end - end end diff --git a/lib/fog/bin/vcloud_director.rb b/lib/fog/bin/vcloud_director.rb index 50b2f7e71..f5ad0e8be 100644 --- a/lib/fog/bin/vcloud_director.rb +++ b/lib/fog/bin/vcloud_director.rb @@ -1,6 +1,5 @@ class VcloudDirector < Fog::Bin class << self - def class_for(key) case key when :compute @@ -25,6 +24,5 @@ class VcloudDirector < Fog::Bin def services Fog::VcloudDirector.services end - end end diff --git a/lib/fog/bin/vmfusion.rb b/lib/fog/bin/vmfusion.rb index 7ac8161b7..7a5190051 100644 --- a/lib/fog/bin/vmfusion.rb +++ b/lib/fog/bin/vmfusion.rb @@ -1,6 +1,5 @@ module Vmfusion # deviates from other bin stuff to accomodate gem class << self - def class_for(key) case key when :compute @@ -55,6 +54,5 @@ module Vmfusion # deviates from other bin stuff to accomodate gem def services Fog::Vmfusion.services end - end end diff --git a/lib/fog/bin/voxel.rb b/lib/fog/bin/voxel.rb index 7d384734d..028851bbf 100644 --- a/lib/fog/bin/voxel.rb +++ b/lib/fog/bin/voxel.rb @@ -1,6 +1,5 @@ class Voxel < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class Voxel < Fog::Bin def services Fog::Voxel.services end - end end diff --git a/lib/fog/bin/vsphere.rb b/lib/fog/bin/vsphere.rb index 9d06b916d..020d11351 100644 --- a/lib/fog/bin/vsphere.rb +++ b/lib/fog/bin/vsphere.rb @@ -1,6 +1,5 @@ class Vsphere < Fog::Bin class << self - def class_for(key) case key when :compute @@ -25,6 +24,5 @@ class Vsphere < Fog::Bin def services Fog::Vsphere.services end - end end diff --git a/lib/fog/bin/xenserver.rb b/lib/fog/bin/xenserver.rb index 1b560962a..ae94ec03e 100644 --- a/lib/fog/bin/xenserver.rb +++ b/lib/fog/bin/xenserver.rb @@ -1,6 +1,5 @@ class XenServer < Fog::Bin class << self - def class_for(key) case key when :compute @@ -26,6 +25,5 @@ class XenServer < Fog::Bin def services Fog::XenServer.services end - end end diff --git a/lib/fog/bin/zerigo.rb b/lib/fog/bin/zerigo.rb index 38b69fc1a..6ec8a47a5 100644 --- a/lib/fog/bin/zerigo.rb +++ b/lib/fog/bin/zerigo.rb @@ -1,6 +1,5 @@ class Zerigo < Fog::Bin class << self - def class_for(key) case key when :dns @@ -26,6 +25,5 @@ class Zerigo < Fog::Bin def services Fog::Zerigo.services end - end end diff --git a/lib/fog/bluebox/blb.rb b/lib/fog/bluebox/blb.rb index 250f63cec..33f832fa9 100644 --- a/lib/fog/bluebox/blb.rb +++ b/lib/fog/bluebox/blb.rb @@ -3,7 +3,6 @@ require 'fog/bluebox/core' module Fog module Bluebox class BLB < Fog::Service - requires :bluebox_api_key, :bluebox_customer_id recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent @@ -18,7 +17,6 @@ module Fog model :lb_backend collection :lb_backends - request_path 'fog/bluebox/requests/blb' request :get_lb_application @@ -78,7 +76,6 @@ module Fog end response end - end end end diff --git a/lib/fog/bluebox/compute.rb b/lib/fog/bluebox/compute.rb index 335484727..d582f9330 100644 --- a/lib/fog/bluebox/compute.rb +++ b/lib/fog/bluebox/compute.rb @@ -3,7 +3,6 @@ require 'fog/bluebox/core' module Fog module Compute class Bluebox < Fog::Service - requires :bluebox_api_key, :bluebox_customer_id recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent @@ -33,7 +32,6 @@ module Fog request :reboot_block class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = {} @@ -55,11 +53,9 @@ module Fog def reset_data self.class.data.delete(@bluebox_api_key) end - end class Real - def initialize(options={}) @bluebox_api_key = options[:bluebox_api_key] @bluebox_customer_id = options[:bluebox_customer_id] @@ -96,7 +92,6 @@ module Fog end response end - end end end diff --git a/lib/fog/bluebox/core.rb b/lib/fog/bluebox/core.rb index 9834a88cd..b82d6bc65 100644 --- a/lib/fog/bluebox/core.rb +++ b/lib/fog/bluebox/core.rb @@ -3,12 +3,10 @@ require 'fog/json' module Fog module Bluebox - extend Fog::Provider service(:blb, 'BLB') service(:compute, 'Compute') service(:dns, 'DNS') - end end diff --git a/lib/fog/bluebox/dns.rb b/lib/fog/bluebox/dns.rb index 118a83f67..1c7f75410 100644 --- a/lib/fog/bluebox/dns.rb +++ b/lib/fog/bluebox/dns.rb @@ -3,7 +3,6 @@ require 'fog/bluebox/core' module Fog module DNS class Bluebox < Fog::Service - requires :bluebox_api_key, :bluebox_customer_id recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent @@ -96,7 +95,6 @@ module Fog def auth_header @auth_header ||= Base64.encode64("#{@bluebox_customer_id}:#{@bluebox_api_key}").gsub("\n",'') end - end end end diff --git a/lib/fog/bluebox/models/blb/lb_application.rb b/lib/fog/bluebox/models/blb/lb_application.rb index c4923e253..9936f05e4 100644 --- a/lib/fog/bluebox/models/blb/lb_application.rb +++ b/lib/fog/bluebox/models/blb/lb_application.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Bluebox class BLB - class LbApplication < Fog::Model identity :id @@ -24,9 +23,7 @@ module Fog :lb_application => self }) end - end - end end end diff --git a/lib/fog/bluebox/models/blb/lb_applications.rb b/lib/fog/bluebox/models/blb/lb_applications.rb index 7599ad2c8..26e086dbd 100644 --- a/lib/fog/bluebox/models/blb/lb_applications.rb +++ b/lib/fog/bluebox/models/blb/lb_applications.rb @@ -18,9 +18,7 @@ module Fog rescue Fog::Bluebox::BLB::NotFound nil end - end - end end end diff --git a/lib/fog/bluebox/models/blb/lb_backend.rb b/lib/fog/bluebox/models/blb/lb_backend.rb index 86b657fbb..64f787e8c 100644 --- a/lib/fog/bluebox/models/blb/lb_backend.rb +++ b/lib/fog/bluebox/models/blb/lb_backend.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Bluebox class BLB - class LbBackend < Fog::Model identity :id @@ -14,9 +13,7 @@ module Fog attribute :acl_name attribute :acl_rule attribute :check_interval - end - end end end diff --git a/lib/fog/bluebox/models/blb/lb_backends.rb b/lib/fog/bluebox/models/blb/lb_backends.rb index d111c83d6..626d340f6 100644 --- a/lib/fog/bluebox/models/blb/lb_backends.rb +++ b/lib/fog/bluebox/models/blb/lb_backends.rb @@ -5,7 +5,6 @@ module Fog module Bluebox class BLB class LbBackends < Fog::Collection - model Fog::Bluebox::BLB::LbBackend attr_accessor :lb_service @@ -22,9 +21,7 @@ module Fog rescue Fog::Compute::Bluebox::NotFound nil end - end - end end end diff --git a/lib/fog/bluebox/models/blb/lb_service.rb b/lib/fog/bluebox/models/blb/lb_service.rb index 22ffbf8b8..72a7b6999 100644 --- a/lib/fog/bluebox/models/blb/lb_service.rb +++ b/lib/fog/bluebox/models/blb/lb_service.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Bluebox class BLB - class LbService < Fog::Model identity :id @@ -17,7 +16,6 @@ module Fog attribute :status_password attribute :created, :aliases => 'created_at' - def lb_application collection.lb_application end @@ -28,7 +26,6 @@ module Fog :lb_service => self }) end - end end end diff --git a/lib/fog/bluebox/models/blb/lb_services.rb b/lib/fog/bluebox/models/blb/lb_services.rb index 71ef06c42..7cd4cde78 100644 --- a/lib/fog/bluebox/models/blb/lb_services.rb +++ b/lib/fog/bluebox/models/blb/lb_services.rb @@ -21,9 +21,7 @@ module Fog rescue Fog::Bluebox::BLB::NotFound nil end - end - end end end diff --git a/lib/fog/bluebox/models/compute/flavor.rb b/lib/fog/bluebox/models/compute/flavor.rb index a3cd82e73..d02da4093 100644 --- a/lib/fog/bluebox/models/compute/flavor.rb +++ b/lib/fog/bluebox/models/compute/flavor.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Bluebox - class Flavor < Fog::Model - identity :id attribute :name @@ -37,9 +35,7 @@ module Fog # end raise StandardError.new("Figure me out!?!") end - end - end end end diff --git a/lib/fog/bluebox/models/compute/flavors.rb b/lib/fog/bluebox/models/compute/flavors.rb index 7ce0df18f..97b456907 100644 --- a/lib/fog/bluebox/models/compute/flavors.rb +++ b/lib/fog/bluebox/models/compute/flavors.rb @@ -4,9 +4,7 @@ require 'fog/bluebox/models/compute/flavor' module Fog module Compute class Bluebox - class Flavors < Fog::Collection - model Fog::Compute::Bluebox::Flavor def all @@ -20,9 +18,7 @@ module Fog rescue Fog::Compute::Bluebox::NotFound nil end - end - end end end diff --git a/lib/fog/bluebox/models/compute/image.rb b/lib/fog/bluebox/models/compute/image.rb index 660867958..d029921ad 100644 --- a/lib/fog/bluebox/models/compute/image.rb +++ b/lib/fog/bluebox/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Bluebox - class Image < Fog::Model - identity :id attribute :block_id @@ -26,9 +24,7 @@ module Fog data = service.destroy_template(id) true end - end - end end end diff --git a/lib/fog/bluebox/models/compute/images.rb b/lib/fog/bluebox/models/compute/images.rb index 0f563dbf5..747641e9b 100644 --- a/lib/fog/bluebox/models/compute/images.rb +++ b/lib/fog/bluebox/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/bluebox/models/compute/image' module Fog module Compute class Bluebox - class Images < Fog::Collection - model Fog::Compute::Bluebox::Image def all @@ -20,9 +18,7 @@ module Fog rescue Fog::Compute::Bluebox::NotFound nil end - end - end end end diff --git a/lib/fog/bluebox/models/compute/location.rb b/lib/fog/bluebox/models/compute/location.rb index 9c2fc43b9..6d8cd959f 100644 --- a/lib/fog/bluebox/models/compute/location.rb +++ b/lib/fog/bluebox/models/compute/location.rb @@ -3,15 +3,11 @@ require 'fog/core/model' module Fog module Compute class Bluebox - class Location < Fog::Model - identity :id attribute :description - end - end end end diff --git a/lib/fog/bluebox/models/compute/locations.rb b/lib/fog/bluebox/models/compute/locations.rb index ecbb56f1d..b798e611b 100644 --- a/lib/fog/bluebox/models/compute/locations.rb +++ b/lib/fog/bluebox/models/compute/locations.rb @@ -4,9 +4,7 @@ require 'fog/bluebox/models/compute/location' module Fog module Compute class Bluebox - class Locations < Fog::Collection - model Fog::Compute::Bluebox::Location def all @@ -20,9 +18,7 @@ module Fog rescue Fog::Compute::Bluebox::NotFound nil end - end - end end end diff --git a/lib/fog/bluebox/models/compute/server.rb b/lib/fog/bluebox/models/compute/server.rb index 72b1dab0f..cb904f268 100644 --- a/lib/fog/bluebox/models/compute/server.rb +++ b/lib/fog/bluebox/models/compute/server.rb @@ -3,11 +3,9 @@ require 'fog/compute/models/server' module Fog module Compute class Bluebox - class BlockInstantiationError < StandardError; end class Server < Fog::Compute::Server - identity :id attribute :cpu @@ -116,9 +114,7 @@ module Fog def username @username ||= 'deploy' end - end - end end end diff --git a/lib/fog/bluebox/models/compute/servers.rb b/lib/fog/bluebox/models/compute/servers.rb index 360d8a779..1f89be381 100644 --- a/lib/fog/bluebox/models/compute/servers.rb +++ b/lib/fog/bluebox/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/bluebox/models/compute/server' module Fog module Compute class Bluebox - class Servers < Fog::Collection - model Fog::Compute::Bluebox::Server def all @@ -28,9 +26,7 @@ module Fog rescue Fog::Compute::Bluebox::NotFound nil end - end - end end end diff --git a/lib/fog/bluebox/models/dns/record.rb b/lib/fog/bluebox/models/dns/record.rb index 09fb66416..1c923d8a9 100644 --- a/lib/fog/bluebox/models/dns/record.rb +++ b/lib/fog/bluebox/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class Bluebox - class Record < Fog::Model extend Fog::Deprecation deprecate :ip, :value @@ -47,9 +46,7 @@ module Fog def zone=(new_zone) @zone = new_zone end - end - end end end diff --git a/lib/fog/bluebox/models/dns/records.rb b/lib/fog/bluebox/models/dns/records.rb index bf8f1a2e6..5ccdcd03f 100644 --- a/lib/fog/bluebox/models/dns/records.rb +++ b/lib/fog/bluebox/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/bluebox/models/dns/record' module Fog module DNS class Bluebox - class Records < Fog::Collection - attribute :zone model Fog::DNS::Bluebox::Record @@ -28,9 +26,7 @@ module Fog requires :zone super({ :zone => zone }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/bluebox/models/dns/zone.rb b/lib/fog/bluebox/models/dns/zone.rb index cbbc60c90..cc7425202 100644 --- a/lib/fog/bluebox/models/dns/zone.rb +++ b/lib/fog/bluebox/models/dns/zone.rb @@ -4,9 +4,7 @@ require 'fog/bluebox/models/dns/records' module Fog module DNS class Bluebox - class Zone < Fog::Model - identity :id attribute :domain, :aliases => 'name' diff --git a/lib/fog/bluebox/models/dns/zones.rb b/lib/fog/bluebox/models/dns/zones.rb index b82535500..43f5e983c 100644 --- a/lib/fog/bluebox/models/dns/zones.rb +++ b/lib/fog/bluebox/models/dns/zones.rb @@ -4,9 +4,7 @@ require 'fog/bluebox/models/dns/zone' module Fog module DNS class Bluebox - class Zones < Fog::Collection - model Fog::DNS::Bluebox::Zone def all @@ -20,9 +18,7 @@ module Fog rescue Fog::Service::NotFound nil end - end - end end end diff --git a/lib/fog/bluebox/parsers/dns/create_record.rb b/lib/fog/bluebox/parsers/dns/create_record.rb index acc77130f..373891cf8 100644 --- a/lib/fog/bluebox/parsers/dns/create_record.rb +++ b/lib/fog/bluebox/parsers/dns/create_record.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Bluebox - class CreateRecord < Fog::Parsers::Base - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/bluebox/parsers/dns/create_zone.rb b/lib/fog/bluebox/parsers/dns/create_zone.rb index dd222d363..23f7407e4 100644 --- a/lib/fog/bluebox/parsers/dns/create_zone.rb +++ b/lib/fog/bluebox/parsers/dns/create_zone.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Bluebox - class CreateZone < Fog::Parsers::Base - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/bluebox/parsers/dns/get_record.rb b/lib/fog/bluebox/parsers/dns/get_record.rb index b6979ac8d..90742c67a 100644 --- a/lib/fog/bluebox/parsers/dns/get_record.rb +++ b/lib/fog/bluebox/parsers/dns/get_record.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Bluebox - class GetRecord < Fog::Parsers::Base - def reset @response = { } end @@ -12,9 +10,7 @@ module Fog def end_element(name) @response[name] = value end - end - end end end diff --git a/lib/fog/bluebox/parsers/dns/get_records.rb b/lib/fog/bluebox/parsers/dns/get_records.rb index faf3785f2..9b9d09478 100644 --- a/lib/fog/bluebox/parsers/dns/get_records.rb +++ b/lib/fog/bluebox/parsers/dns/get_records.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Bluebox - class GetRecords < Fog::Parsers::Base - def reset @record = {} @response = { 'records' => [] } @@ -19,9 +17,7 @@ module Fog @record[name] = value end end - end - end end end diff --git a/lib/fog/bluebox/parsers/dns/get_zone.rb b/lib/fog/bluebox/parsers/dns/get_zone.rb index 44ffb8046..806402f08 100644 --- a/lib/fog/bluebox/parsers/dns/get_zone.rb +++ b/lib/fog/bluebox/parsers/dns/get_zone.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Bluebox - class GetZone < Fog::Parsers::Base - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/bluebox/parsers/dns/get_zones.rb b/lib/fog/bluebox/parsers/dns/get_zones.rb index 117e55bdf..95fd66917 100644 --- a/lib/fog/bluebox/parsers/dns/get_zones.rb +++ b/lib/fog/bluebox/parsers/dns/get_zones.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Bluebox - class GetZones < Fog::Parsers::Base - def reset @zone = {} @response = { 'zones' => [] } @@ -21,9 +19,7 @@ module Fog @zone = {} end end - end - end end end diff --git a/lib/fog/bluebox/requests/blb/get_lb_application.rb b/lib/fog/bluebox/requests/blb/get_lb_application.rb index f37ff1916..8bf125841 100644 --- a/lib/fog/bluebox/requests/blb/get_lb_application.rb +++ b/lib/fog/bluebox/requests/blb/get_lb_application.rb @@ -27,7 +27,6 @@ module Fog class Mock end - end end end diff --git a/lib/fog/bluebox/requests/blb/get_lb_applications.rb b/lib/fog/bluebox/requests/blb/get_lb_applications.rb index 5da65eef5..86f740c72 100644 --- a/lib/fog/bluebox/requests/blb/get_lb_applications.rb +++ b/lib/fog/bluebox/requests/blb/get_lb_applications.rb @@ -25,7 +25,6 @@ module Fog class Mock end - end end end diff --git a/lib/fog/bluebox/requests/blb/get_lb_backend.rb b/lib/fog/bluebox/requests/blb/get_lb_backend.rb index 7f2020446..c24dc2321 100644 --- a/lib/fog/bluebox/requests/blb/get_lb_backend.rb +++ b/lib/fog/bluebox/requests/blb/get_lb_backend.rb @@ -30,7 +30,6 @@ module Fog class Mock end - end end end diff --git a/lib/fog/bluebox/requests/blb/get_lb_backends.rb b/lib/fog/bluebox/requests/blb/get_lb_backends.rb index 12a8ab812..9eabd6864 100644 --- a/lib/fog/bluebox/requests/blb/get_lb_backends.rb +++ b/lib/fog/bluebox/requests/blb/get_lb_backends.rb @@ -30,7 +30,6 @@ module Fog class Mock end - end end end diff --git a/lib/fog/bluebox/requests/blb/get_lb_machine.rb b/lib/fog/bluebox/requests/blb/get_lb_machine.rb index c04316d50..2fc7b9692 100644 --- a/lib/fog/bluebox/requests/blb/get_lb_machine.rb +++ b/lib/fog/bluebox/requests/blb/get_lb_machine.rb @@ -29,7 +29,6 @@ module Fog class Mock end - end end end diff --git a/lib/fog/bluebox/requests/blb/get_lb_machines.rb b/lib/fog/bluebox/requests/blb/get_lb_machines.rb index e0bb698f6..e9bb99db2 100644 --- a/lib/fog/bluebox/requests/blb/get_lb_machines.rb +++ b/lib/fog/bluebox/requests/blb/get_lb_machines.rb @@ -29,7 +29,6 @@ module Fog class Mock end - end end end diff --git a/lib/fog/bluebox/requests/blb/get_lb_service.rb b/lib/fog/bluebox/requests/blb/get_lb_service.rb index 082d2f466..1b90c5989 100644 --- a/lib/fog/bluebox/requests/blb/get_lb_service.rb +++ b/lib/fog/bluebox/requests/blb/get_lb_service.rb @@ -30,7 +30,6 @@ module Fog class Mock end - end end end diff --git a/lib/fog/bluebox/requests/blb/get_lb_services.rb b/lib/fog/bluebox/requests/blb/get_lb_services.rb index d5d36fdf4..141e00a7f 100644 --- a/lib/fog/bluebox/requests/blb/get_lb_services.rb +++ b/lib/fog/bluebox/requests/blb/get_lb_services.rb @@ -30,7 +30,6 @@ module Fog class Mock end - end end end diff --git a/lib/fog/bluebox/requests/compute/create_block.rb b/lib/fog/bluebox/requests/compute/create_block.rb index 5ea7942a1..494ad5800 100644 --- a/lib/fog/bluebox/requests/compute/create_block.rb +++ b/lib/fog/bluebox/requests/compute/create_block.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Create a new block # # ==== Parameters @@ -19,7 +18,6 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: def create_block(product_id, template_id, location_id, options = {}) - unless options.has_key?('password') || options.has_key?('ssh_public_key') raise ArgumentError, 'Either password or public_key must be supplied' end @@ -40,7 +38,6 @@ module Fog :body => options.map {|k,v| "#{CGI.escape(k)}=#{CGI.escape(v)}"}.join('&') ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/create_template.rb b/lib/fog/bluebox/requests/compute/create_template.rb index 9cbc7a49a..9a3d12fa9 100644 --- a/lib/fog/bluebox/requests/compute/create_template.rb +++ b/lib/fog/bluebox/requests/compute/create_template.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Create a template from block # # ==== Parameters @@ -20,7 +19,6 @@ module Fog :query => {'id' => block_id}.merge!(options) ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/destroy_block.rb b/lib/fog/bluebox/requests/compute/destroy_block.rb index 71b8efb9b..74b61e846 100644 --- a/lib/fog/bluebox/requests/compute/destroy_block.rb +++ b/lib/fog/bluebox/requests/compute/destroy_block.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Destroy a block # # ==== Parameters @@ -19,7 +18,6 @@ module Fog :path => "api/blocks/#{block_id}.json" ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/destroy_template.rb b/lib/fog/bluebox/requests/compute/destroy_template.rb index b788e3bd6..8db150270 100644 --- a/lib/fog/bluebox/requests/compute/destroy_template.rb +++ b/lib/fog/bluebox/requests/compute/destroy_template.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Create a template from block # # ==== Parameters @@ -19,7 +18,6 @@ module Fog :path => "api/block_templates/#{id}.json" ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/get_block.rb b/lib/fog/bluebox/requests/compute/get_block.rb index 9f718d36c..65a36dbd5 100644 --- a/lib/fog/bluebox/requests/compute/get_block.rb +++ b/lib/fog/bluebox/requests/compute/get_block.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Get details of a block. # # ==== Parameters @@ -19,7 +18,6 @@ module Fog :path => "api/blocks/#{block_id}.json" ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/get_blocks.rb b/lib/fog/bluebox/requests/compute/get_blocks.rb index 2b56b65d2..0b03c75a2 100644 --- a/lib/fog/bluebox/requests/compute/get_blocks.rb +++ b/lib/fog/bluebox/requests/compute/get_blocks.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Get list of blocks # # ==== Returns @@ -21,7 +20,6 @@ module Fog :path => 'api/blocks.json' ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/get_location.rb b/lib/fog/bluebox/requests/compute/get_location.rb index f08c40a75..38af734e0 100644 --- a/lib/fog/bluebox/requests/compute/get_location.rb +++ b/lib/fog/bluebox/requests/compute/get_location.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Get details of a location # # ==== Parameters @@ -19,7 +18,6 @@ module Fog :path => "api/locations/#{location_id}.json" ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/get_locations.rb b/lib/fog/bluebox/requests/compute/get_locations.rb index e49cac4cb..d0cf3a259 100644 --- a/lib/fog/bluebox/requests/compute/get_locations.rb +++ b/lib/fog/bluebox/requests/compute/get_locations.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Get list of locations # # ==== Returns @@ -17,7 +16,6 @@ module Fog :path => 'api/locations.json' ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/get_product.rb b/lib/fog/bluebox/requests/compute/get_product.rb index ea47e8b91..e47613c80 100644 --- a/lib/fog/bluebox/requests/compute/get_product.rb +++ b/lib/fog/bluebox/requests/compute/get_product.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Get details of a product # # ==== Parameters @@ -19,7 +18,6 @@ module Fog :path => "api/block_products/#{product_id}.json" ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/get_products.rb b/lib/fog/bluebox/requests/compute/get_products.rb index 0eeac5fc6..bef1c0ff8 100644 --- a/lib/fog/bluebox/requests/compute/get_products.rb +++ b/lib/fog/bluebox/requests/compute/get_products.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Get list of products # # ==== Returns @@ -18,7 +17,6 @@ module Fog :path => 'api/block_products.json' ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/get_template.rb b/lib/fog/bluebox/requests/compute/get_template.rb index 10526be84..44e47ccae 100644 --- a/lib/fog/bluebox/requests/compute/get_template.rb +++ b/lib/fog/bluebox/requests/compute/get_template.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Get details of a template # # ==== Parameters @@ -19,7 +18,6 @@ module Fog :path => "api/block_templates/#{template_id}.json" ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/get_templates.rb b/lib/fog/bluebox/requests/compute/get_templates.rb index d5ad8d416..db1954580 100644 --- a/lib/fog/bluebox/requests/compute/get_templates.rb +++ b/lib/fog/bluebox/requests/compute/get_templates.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Get list of OS templates # # ==== Returns @@ -19,7 +18,6 @@ module Fog :path => 'api/block_templates.json' ) end - end end end diff --git a/lib/fog/bluebox/requests/compute/reboot_block.rb b/lib/fog/bluebox/requests/compute/reboot_block.rb index a3669a1bd..8cd74d24a 100644 --- a/lib/fog/bluebox/requests/compute/reboot_block.rb +++ b/lib/fog/bluebox/requests/compute/reboot_block.rb @@ -2,7 +2,6 @@ module Fog module Compute class Bluebox class Real - # Reboot block # # ==== Parameters @@ -20,7 +19,6 @@ module Fog :path => "api/blocks/#{block_id}/#{'soft_' if type == 'SOFT'}reboot.json" ) end - end end end diff --git a/lib/fog/bluebox/requests/dns/create_record.rb b/lib/fog/bluebox/requests/dns/create_record.rb index 05dc16c42..cf171226e 100644 --- a/lib/fog/bluebox/requests/dns/create_record.rb +++ b/lib/fog/bluebox/requests/dns/create_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - require 'fog/bluebox/parsers/dns/create_record' # Create a new record in a DNS zone @@ -33,15 +32,12 @@ module Fog :path => "/api/domains/#{zone_id}/records.xml" ) end - end class Mock - def create_record(zone_id, type, name, content) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/create_zone.rb b/lib/fog/bluebox/requests/dns/create_zone.rb index 8f5a6feef..ec6eff942 100644 --- a/lib/fog/bluebox/requests/dns/create_zone.rb +++ b/lib/fog/bluebox/requests/dns/create_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - require 'fog/bluebox/parsers/dns/create_zone' # Create a new DNS zone @@ -37,15 +36,12 @@ module Fog :path => "/api/domains.xml" ) end - end class Mock - def create_zone(options) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/delete_record.rb b/lib/fog/bluebox/requests/dns/delete_record.rb index f604447da..411ae004a 100644 --- a/lib/fog/bluebox/requests/dns/delete_record.rb +++ b/lib/fog/bluebox/requests/dns/delete_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - # Delete a record from the specified DNS zone # ==== Parameters # * record_id<~Integer> - Id of DNS record to delete @@ -16,15 +15,12 @@ module Fog :path => "/api/domains/#{zone_id}/records/#{record_id}.xml" ) end - end class Mock - def delete_record(zone_id, record_id) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/delete_zone.rb b/lib/fog/bluebox/requests/dns/delete_zone.rb index b0882ebb2..18d88c772 100644 --- a/lib/fog/bluebox/requests/dns/delete_zone.rb +++ b/lib/fog/bluebox/requests/dns/delete_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - # Delete a zone from DNS # ==== Parameters # * zone_id<~Integer> - Id of zone to delete @@ -16,15 +15,12 @@ module Fog :path => "/api/domains/#{zone_id}.xml" ) end - end class Mock - def delete_zone(zone_id) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/get_record.rb b/lib/fog/bluebox/requests/dns/get_record.rb index 82609b057..33840f48c 100644 --- a/lib/fog/bluebox/requests/dns/get_record.rb +++ b/lib/fog/bluebox/requests/dns/get_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - require 'fog/bluebox/parsers/dns/get_record' # Get an individual DNS record from the specified zone @@ -25,15 +24,12 @@ module Fog :path => "/api/domains/#{zone_id}/records/#{record_id}.xml" ) end - end class Mock - def get_record(record_id) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/get_records.rb b/lib/fog/bluebox/requests/dns/get_records.rb index 82d29effd..f2c11ab74 100644 --- a/lib/fog/bluebox/requests/dns/get_records.rb +++ b/lib/fog/bluebox/requests/dns/get_records.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - require 'fog/bluebox/parsers/dns/get_records' # Get all the DNS records across all the DNS zones for this account @@ -26,15 +25,12 @@ module Fog :path => "/api/domains/#{zone_id}/records.xml" ) end - end class Mock - def get_records Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/get_zone.rb b/lib/fog/bluebox/requests/dns/get_zone.rb index 815319a61..9be1a342f 100644 --- a/lib/fog/bluebox/requests/dns/get_zone.rb +++ b/lib/fog/bluebox/requests/dns/get_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - require 'fog/bluebox/parsers/dns/get_zone' # Get details of a DNS zone @@ -29,15 +28,12 @@ module Fog :path => "/api/domains/#{zone_id}.xml" ) end - end class Mock - def get_zone(zone_id) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/get_zones.rb b/lib/fog/bluebox/requests/dns/get_zones.rb index 0035ee23e..e43bc365b 100644 --- a/lib/fog/bluebox/requests/dns/get_zones.rb +++ b/lib/fog/bluebox/requests/dns/get_zones.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - require 'fog/bluebox/parsers/dns/get_zones' # Get list of all DNS zones hosted on Bluebox (for this account) @@ -28,15 +27,12 @@ module Fog :path => '/api/domains.xml' ) end - end class Mock - def get_zones Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/update_record.rb b/lib/fog/bluebox/requests/dns/update_record.rb index b69c8d6ca..77043512a 100644 --- a/lib/fog/bluebox/requests/dns/update_record.rb +++ b/lib/fog/bluebox/requests/dns/update_record.rb @@ -2,7 +2,6 @@ module Fog module Bluebox class DNS class Real - # Updates an existing record in a DNS zone # ==== Parameters # * type<~String> - type of DNS record (A, CNAME, etc) @@ -19,15 +18,12 @@ module Fog :path => "/api/domains/#{zone_id}/records/#{record_id}.xml" ) end - end class Mock - def create_record(zone_id, type, domain, content) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/bluebox/requests/dns/update_zone.rb b/lib/fog/bluebox/requests/dns/update_zone.rb index aaab9075d..4d3e4b470 100644 --- a/lib/fog/bluebox/requests/dns/update_zone.rb +++ b/lib/fog/bluebox/requests/dns/update_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Bluebox class Real - # Updates an existing DNS zone def update_zone(zone_id, options) body = %Q{} @@ -15,15 +14,12 @@ module Fog :path => "/api/domains/#{zone_id}.xml" ) end - end class Mock - def create_record(zone_id, type, domain, content) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/clodo/compute.rb b/lib/fog/clodo/compute.rb index e415502b0..4be4d21a8 100644 --- a/lib/fog/clodo/compute.rb +++ b/lib/fog/clodo/compute.rb @@ -3,7 +3,6 @@ require 'fog/clodo/core' module Fog module Compute class Clodo < Fog::Service - requires :clodo_api_key, :clodo_username recognizes :clodo_auth_url, :persistent recognizes :clodo_auth_token, :clodo_management_url @@ -40,7 +39,6 @@ module Fog # request :update_server class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -69,11 +67,9 @@ module Fog def reset_data self.class.data.delete(@clodo_username) end - end class Real - def initialize(options={}) @clodo_api_key = options[:clodo_api_key] @clodo_username = options[:clodo_username] @@ -145,7 +141,6 @@ module Fog @port = uri.port @scheme = uri.scheme end - end end end diff --git a/lib/fog/clodo/core.rb b/lib/fog/clodo/core.rb index 099ded5b6..1e57607b8 100644 --- a/lib/fog/clodo/core.rb +++ b/lib/fog/clodo/core.rb @@ -3,7 +3,6 @@ require 'fog/json' module Fog module Clodo - extend Fog::Provider service(:compute, 'Compute') @@ -29,7 +28,6 @@ module Fog response.headers.reject do |key, value| !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key) end - end # authenticate end # module Clodo end # module Fog diff --git a/lib/fog/clodo/models/compute/image.rb b/lib/fog/clodo/models/compute/image.rb index c0ac0dbe3..c6f55bd7d 100644 --- a/lib/fog/clodo/models/compute/image.rb +++ b/lib/fog/clodo/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Clodo - class Image < Fog::Model - identity :id attribute :name @@ -23,9 +21,7 @@ module Fog def ready? status == 'ACTIVE' end - end - end end end diff --git a/lib/fog/clodo/models/compute/images.rb b/lib/fog/clodo/models/compute/images.rb index 0479f8336..d4914854e 100644 --- a/lib/fog/clodo/models/compute/images.rb +++ b/lib/fog/clodo/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/clodo/models/compute/image' module Fog module Compute class Clodo - class Images < Fog::Collection - model Fog::Compute::Clodo::Image def all @@ -20,9 +18,7 @@ module Fog rescue Fog::Compute::Clodo::NotFound nil end - end - end end end diff --git a/lib/fog/clodo/models/compute/server.rb b/lib/fog/clodo/models/compute/server.rb index b6d834526..78342acb0 100644 --- a/lib/fog/clodo/models/compute/server.rb +++ b/lib/fog/clodo/models/compute/server.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class Clodo - class Server < Fog::Compute::Server - identity :id attribute :addresses @@ -117,10 +115,7 @@ module Fog end private - end - end end - end diff --git a/lib/fog/clodo/models/compute/servers.rb b/lib/fog/clodo/models/compute/servers.rb index 14da86a09..988c6d8b9 100644 --- a/lib/fog/clodo/models/compute/servers.rb +++ b/lib/fog/clodo/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/clodo/models/compute/server' module Fog module Compute class Clodo - class Servers < Fog::Collection - model Fog::Compute::Clodo::Server def all @@ -28,9 +26,7 @@ module Fog rescue Fog::Compute::Clodo::NotFound nil end - end - end end end diff --git a/lib/fog/clodo/requests/compute/add_ip_address.rb b/lib/fog/clodo/requests/compute/add_ip_address.rb index e2bb4966a..76725ff3e 100644 --- a/lib/fog/clodo/requests/compute/add_ip_address.rb +++ b/lib/fog/clodo/requests/compute/add_ip_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # Bye new IP-address for specified server # ==== Paramaters # * server_id<~Integer> - Id of server to bye IP for @@ -22,7 +21,6 @@ module Fog class Mock def add_ip_address(server_id) - raise Excon::Errors::BadRequest.new( "Invalid image ID" ) unless server_id > 0 diff --git a/lib/fog/clodo/requests/compute/create_server.rb b/lib/fog/clodo/requests/compute/create_server.rb index cedfd5f22..bd6acdb33 100644 --- a/lib/fog/clodo/requests/compute/create_server.rb +++ b/lib/fog/clodo/requests/compute/create_server.rb @@ -35,13 +35,11 @@ module Fog :method => 'POST', :path => 'servers' ) - end end class Mock def create_server(image_id, options = {}) - raise Excon::Errors::BadRequest.new("Invalid image ID") unless image_id > 0 response = Excon::Response.new diff --git a/lib/fog/clodo/requests/compute/delete_ip_address.rb b/lib/fog/clodo/requests/compute/delete_ip_address.rb index b2fc4d1f1..4d5a3d19f 100644 --- a/lib/fog/clodo/requests/compute/delete_ip_address.rb +++ b/lib/fog/clodo/requests/compute/delete_ip_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # Delete IP-address from specified server # ==== Paramaters # * server_id<~Integer> - Id of server to delete IP from @@ -26,7 +25,6 @@ module Fog class Mock def delete_ip_address(server_id, ip) - server = self.data[:servers][server_id] raise Excon::Errors::BadRequest.new "Server not found" unless server diff --git a/lib/fog/clodo/requests/compute/delete_server.rb b/lib/fog/clodo/requests/compute/delete_server.rb index 0101ea6d6..d9ff7c480 100644 --- a/lib/fog/clodo/requests/compute/delete_server.rb +++ b/lib/fog/clodo/requests/compute/delete_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # Delete an existing server # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "servers/#{server_id}" ) end - end class Mock - def delete_server(server_id) response = Excon::Response.new @@ -37,7 +34,6 @@ module Fog raise Fog::Compute::Clodo::NotFound end end - end end end diff --git a/lib/fog/clodo/requests/compute/get_server_details.rb b/lib/fog/clodo/requests/compute/get_server_details.rb index 83a33eeac..7a1c4f518 100644 --- a/lib/fog/clodo/requests/compute/get_server_details.rb +++ b/lib/fog/clodo/requests/compute/get_server_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # Get details about a server # # ==== Parameters @@ -26,11 +25,9 @@ module Fog :path => "servers/#{server_id}" ) end - end class Mock - def get_server_details(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == "#{server_id}"} @@ -42,7 +39,6 @@ module Fog raise Fog::Compute::Clodo::NotFound end end - end end end diff --git a/lib/fog/clodo/requests/compute/list_images.rb b/lib/fog/clodo/requests/compute/list_images.rb index c03e032ff..1015e3433 100644 --- a/lib/fog/clodo/requests/compute/list_images.rb +++ b/lib/fog/clodo/requests/compute/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # List all images (IDs and names only) # # ==== Returns @@ -19,11 +18,9 @@ module Fog :path => 'images' ) end - end class Mock - def list_images response = Excon::Response.new response.status = 200 @@ -41,7 +38,6 @@ module Fog } response end - end end end diff --git a/lib/fog/clodo/requests/compute/list_images_detail.rb b/lib/fog/clodo/requests/compute/list_images_detail.rb index 5c04ee4f9..a434dacb9 100644 --- a/lib/fog/clodo/requests/compute/list_images_detail.rb +++ b/lib/fog/clodo/requests/compute/list_images_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # List all images # # ==== Returns @@ -24,11 +23,9 @@ module Fog :path => 'images/detail' ) end - end class Mock - def list_images_detail response = Excon::Response.new response.status = 200 @@ -54,7 +51,6 @@ module Fog } response end - end end end diff --git a/lib/fog/clodo/requests/compute/list_servers.rb b/lib/fog/clodo/requests/compute/list_servers.rb index 7342f7621..c4f61787d 100644 --- a/lib/fog/clodo/requests/compute/list_servers.rb +++ b/lib/fog/clodo/requests/compute/list_servers.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # List all servers (IDs and names only) # # ==== Returns @@ -27,11 +26,9 @@ module Fog :path => 'servers' ) end - end class Mock - def list_servers response = Excon::Response.new data = list_servers_detail.body['servers'] @@ -43,7 +40,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/clodo/requests/compute/list_servers_detail.rb b/lib/fog/clodo/requests/compute/list_servers_detail.rb index e64bda0d9..3222bf06a 100644 --- a/lib/fog/clodo/requests/compute/list_servers_detail.rb +++ b/lib/fog/clodo/requests/compute/list_servers_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # List all servers details # # ==== Returns @@ -22,11 +21,9 @@ module Fog :path => 'servers/detail' ) end - end class Mock - def list_servers_detail response = Excon::Response.new @@ -44,7 +41,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/clodo/requests/compute/move_ip_address.rb b/lib/fog/clodo/requests/compute/move_ip_address.rb index c35f9e4ad..937d415a1 100644 --- a/lib/fog/clodo/requests/compute/move_ip_address.rb +++ b/lib/fog/clodo/requests/compute/move_ip_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class Clodo class Real - # Move IP-address to specified server. # ==== Paramaters # * server_id<~Integer> - Id of server to move IP to diff --git a/lib/fog/clodo/requests/compute/server_action.rb b/lib/fog/clodo/requests/compute/server_action.rb index f9227c4d8..a5f2b4732 100644 --- a/lib/fog/clodo/requests/compute/server_action.rb +++ b/lib/fog/clodo/requests/compute/server_action.rb @@ -12,7 +12,6 @@ module Fog end class Mock def server_action(id, action) - raise Excon::Errors::BadRequest.new("Invalid server id #{id}.") unless id > 0 response = Excon::Response.new diff --git a/lib/fog/cloudsigma/compute.rb b/lib/fog/cloudsigma/compute.rb index d231b52aa..c070ec849 100644 --- a/lib/fog/cloudsigma/compute.rb +++ b/lib/fog/cloudsigma/compute.rb @@ -79,7 +79,6 @@ module Fog model :pricing request :get_pricing - module CommonMockAndReal def initialize(options={}) @init_options = options @@ -107,7 +106,6 @@ module Fog def currency # Cache since currency does not change @currency ||= profile.currency - end def pricing @@ -181,7 +179,6 @@ module Fog Pricing.new(Hash[current_pricing_pairs]) end - end class Mock @@ -216,10 +213,7 @@ module Fog include Collections include CommonMockAndReal include Fog::CloudSigma::CloudSigmaConnection::Real - end - end end - end diff --git a/lib/fog/cloudsigma/connection.rb b/lib/fog/cloudsigma/connection.rb index c9211d49a..ec36a2f2b 100644 --- a/lib/fog/cloudsigma/connection.rb +++ b/lib/fog/cloudsigma/connection.rb @@ -3,7 +3,6 @@ require 'fog/cloudsigma/error' module Fog module CloudSigma module CloudSigmaConnection - module Real def auth_header(type = :basic) case type @@ -47,7 +46,6 @@ module Fog req_path = params[:path] params[:path] = "#{@path_prefix}#{req_path}" - params[:body] = Fog::JSON.encode(params[:body]) if params[:body] begin @@ -113,7 +111,6 @@ module Fog def setup_connection(options) @username = options[:cloudsigma_username] @password = options[:cloudsigma_password] - end def mock_get(obj_or_collection, status, key=nil) @@ -189,9 +186,7 @@ module Fog response end - end - end end end diff --git a/lib/fog/cloudsigma/error.rb b/lib/fog/cloudsigma/error.rb index 8ed7b73de..c12a37959 100644 --- a/lib/fog/cloudsigma/error.rb +++ b/lib/fog/cloudsigma/error.rb @@ -9,7 +9,6 @@ module Fog @error_point = error_point super(message) end - end class NotFound < Error; end @@ -35,11 +34,6 @@ module Fog new_error.verbose = error.message new_error end - - - end - - end end diff --git a/lib/fog/cloudsigma/mock_data.rb b/lib/fog/cloudsigma/mock_data.rb index ca1a97975..e51f1ee22 100644 --- a/lib/fog/cloudsigma/mock_data.rb +++ b/lib/fog/cloudsigma/mock_data.rb @@ -37,7 +37,6 @@ module Fog :current_usage => {}, :balance => {:balance => 100, :currency => 'CHF'}, - } end end diff --git a/lib/fog/cloudsigma/models/fwpolicies.rb b/lib/fog/cloudsigma/models/fwpolicies.rb index 0ee5d89ab..7d3c9e296 100644 --- a/lib/fog/cloudsigma/models/fwpolicies.rb +++ b/lib/fog/cloudsigma/models/fwpolicies.rb @@ -12,10 +12,7 @@ module Fog data = resp.body['objects'] load(data) end - end - - end end end diff --git a/lib/fog/cloudsigma/models/fwpolicy.rb b/lib/fog/cloudsigma/models/fwpolicy.rb index 9d50c1f94..240a94e00 100644 --- a/lib/fog/cloudsigma/models/fwpolicy.rb +++ b/lib/fog/cloudsigma/models/fwpolicy.rb @@ -14,8 +14,6 @@ module Fog attribute :servers, :type => :array model_attribute_array :rules, Rule end - - end end end diff --git a/lib/fog/cloudsigma/models/ip.rb b/lib/fog/cloudsigma/models/ip.rb index a50053dea..4874e73aa 100644 --- a/lib/fog/cloudsigma/models/ip.rb +++ b/lib/fog/cloudsigma/models/ip.rb @@ -14,8 +14,6 @@ module Fog attribute :subscription attribute :gateway, :type => :string attribute :resource_uri, :type => :string - - end end end diff --git a/lib/fog/cloudsigma/models/ips.rb b/lib/fog/cloudsigma/models/ips.rb index cfb7906d1..d8b6f75bb 100644 --- a/lib/fog/cloudsigma/models/ips.rb +++ b/lib/fog/cloudsigma/models/ips.rb @@ -20,7 +20,6 @@ module Fog rescue Fog::CloudSigma::Errors::NotFound return nil end - end end end diff --git a/lib/fog/cloudsigma/models/lib_volume.rb b/lib/fog/cloudsigma/models/lib_volume.rb index 93ad12e47..470c80591 100644 --- a/lib/fog/cloudsigma/models/lib_volume.rb +++ b/lib/fog/cloudsigma/models/lib_volume.rb @@ -31,8 +31,6 @@ module Fog attribute :os, :type => :string attribute :resource_uri, :type => :string - - def reload requires :identity collection.get(identity) diff --git a/lib/fog/cloudsigma/models/lib_volumes.rb b/lib/fog/cloudsigma/models/lib_volumes.rb index 7578ab9f8..64dfcab98 100644 --- a/lib/fog/cloudsigma/models/lib_volumes.rb +++ b/lib/fog/cloudsigma/models/lib_volumes.rb @@ -20,7 +20,6 @@ module Fog rescue Fog::CloudSigma::Errors::NotFound return nil end - end end end diff --git a/lib/fog/cloudsigma/models/nic.rb b/lib/fog/cloudsigma/models/nic.rb index bb06e3025..6fbd88989 100644 --- a/lib/fog/cloudsigma/models/nic.rb +++ b/lib/fog/cloudsigma/models/nic.rb @@ -2,13 +2,10 @@ require 'fog/core/model' require 'fog/cloudsigma/nested_model' require 'fog/cloudsigma/models/ipconf' - module Fog module Compute class CloudSigma class Nic < Fog::CloudSigma::CloudsigmaModel - - attribute :boot_order attribute :mac, :type => :string attribute :model, :type => :string @@ -16,7 +13,6 @@ module Fog attribute :firewall_policy model_attribute :ip_v4_conf, IPConf model_attribute :ip_v6_conf, IPConf - end end end diff --git a/lib/fog/cloudsigma/models/price_record.rb b/lib/fog/cloudsigma/models/price_record.rb index 0e4e1c6d8..71d957f99 100644 --- a/lib/fog/cloudsigma/models/price_record.rb +++ b/lib/fog/cloudsigma/models/price_record.rb @@ -31,7 +31,6 @@ module Fog def base_price price / multiplier end - end end end diff --git a/lib/fog/cloudsigma/models/pricing.rb b/lib/fog/cloudsigma/models/pricing.rb index 4185fe1e0..06a119ffd 100644 --- a/lib/fog/cloudsigma/models/pricing.rb +++ b/lib/fog/cloudsigma/models/pricing.rb @@ -13,7 +13,6 @@ module Fog model_attribute :ssd, PriceRecord model_attribute :tx, PriceRecord model_attribute :vlan, PriceRecord - end end end diff --git a/lib/fog/cloudsigma/models/profile.rb b/lib/fog/cloudsigma/models/profile.rb index 9e75de812..270d98e85 100644 --- a/lib/fog/cloudsigma/models/profile.rb +++ b/lib/fog/cloudsigma/models/profile.rb @@ -32,7 +32,6 @@ module Fog attribute :country, :type => :string attribute :postcode, :type => :string - def save update end @@ -43,7 +42,6 @@ module Fog self end - end end end diff --git a/lib/fog/cloudsigma/models/rule.rb b/lib/fog/cloudsigma/models/rule.rb index da910861e..a8999a46f 100644 --- a/lib/fog/cloudsigma/models/rule.rb +++ b/lib/fog/cloudsigma/models/rule.rb @@ -12,8 +12,6 @@ module Fog attribute :ip_proto, :type => :string attribute :src_ip, :type => :string attribute :src_port, :type => :string - - end end end diff --git a/lib/fog/cloudsigma/models/server.rb b/lib/fog/cloudsigma/models/server.rb index c29c39f39..2e0d0f29b 100644 --- a/lib/fog/cloudsigma/models/server.rb +++ b/lib/fog/cloudsigma/models/server.rb @@ -6,8 +6,6 @@ module Fog module Compute class CloudSigma class Server < Fog::CloudSigma::CloudsigmaModel - - identity :uuid attribute :status, :type => :string @@ -28,7 +26,6 @@ module Fog model_attribute_array :volumes, MountPoint, :aliases => 'drives' model_attribute_array :nics, Nic - def save if persisted? update @@ -54,7 +51,6 @@ module Fog response = service.update_server(identity, data) new_attributes = response.body merge_attributes(new_attributes) - end def destroy @@ -126,7 +122,6 @@ module Fog end end - vol_id = volume.kind_of?(String) ? volume : volume.identity mountpoint_data = { 'drive' => vol_id, diff --git a/lib/fog/cloudsigma/models/servers.rb b/lib/fog/cloudsigma/models/servers.rb index eb68fac6f..5c8a3e169 100644 --- a/lib/fog/cloudsigma/models/servers.rb +++ b/lib/fog/cloudsigma/models/servers.rb @@ -20,7 +20,6 @@ module Fog rescue Fog::CloudSigma::Errors::NotFound return nil end - end end end diff --git a/lib/fog/cloudsigma/models/subscription.rb b/lib/fog/cloudsigma/models/subscription.rb index 60865270a..4025c2237 100644 --- a/lib/fog/cloudsigma/models/subscription.rb +++ b/lib/fog/cloudsigma/models/subscription.rb @@ -46,7 +46,6 @@ module Fog self.class.new(response.body) end - end end end diff --git a/lib/fog/cloudsigma/models/vlans.rb b/lib/fog/cloudsigma/models/vlans.rb index b5f67aa03..ff500cdce 100644 --- a/lib/fog/cloudsigma/models/vlans.rb +++ b/lib/fog/cloudsigma/models/vlans.rb @@ -20,7 +20,6 @@ module Fog rescue Fog::CloudSigma::Errors::NotFound return nil end - end end end diff --git a/lib/fog/cloudsigma/models/volume.rb b/lib/fog/cloudsigma/models/volume.rb index 8072cea21..ce106ef28 100644 --- a/lib/fog/cloudsigma/models/volume.rb +++ b/lib/fog/cloudsigma/models/volume.rb @@ -20,7 +20,6 @@ module Fog attribute :size, :type => :integer attribute :resource_uri, :type => :string - def save if persisted? update @@ -46,7 +45,6 @@ module Fog response = service.update_volume(identity, data) new_attributes = response.body merge_attributes(new_attributes) - end def destroy diff --git a/lib/fog/cloudsigma/models/volumes.rb b/lib/fog/cloudsigma/models/volumes.rb index 40881e41e..2aae678f1 100644 --- a/lib/fog/cloudsigma/models/volumes.rb +++ b/lib/fog/cloudsigma/models/volumes.rb @@ -20,7 +20,6 @@ module Fog rescue Fog::CloudSigma::Errors::NotFound return nil end - end end end diff --git a/lib/fog/cloudsigma/requests/calculate_subscription_price.rb b/lib/fog/cloudsigma/requests/calculate_subscription_price.rb index bd2cfccfa..d7acbfc38 100644 --- a/lib/fog/cloudsigma/requests/calculate_subscription_price.rb +++ b/lib/fog/cloudsigma/requests/calculate_subscription_price.rb @@ -9,10 +9,8 @@ module Fog class Mock def calculate_subscription_price(data) - end end - end end end diff --git a/lib/fog/cloudsigma/requests/clone_libvolume.rb b/lib/fog/cloudsigma/requests/clone_libvolume.rb index 40d66227d..d4049f70b 100644 --- a/lib/fog/cloudsigma/requests/clone_libvolume.rb +++ b/lib/fog/cloudsigma/requests/clone_libvolume.rb @@ -26,7 +26,6 @@ module Fog response end end - end end end diff --git a/lib/fog/cloudsigma/requests/clone_server.rb b/lib/fog/cloudsigma/requests/clone_server.rb index da985f764..cb0f72263 100644 --- a/lib/fog/cloudsigma/requests/clone_server.rb +++ b/lib/fog/cloudsigma/requests/clone_server.rb @@ -26,7 +26,6 @@ module Fog response end end - end end end diff --git a/lib/fog/cloudsigma/requests/clone_volume.rb b/lib/fog/cloudsigma/requests/clone_volume.rb index 3a647b914..69c717eab 100644 --- a/lib/fog/cloudsigma/requests/clone_volume.rb +++ b/lib/fog/cloudsigma/requests/clone_volume.rb @@ -26,7 +26,6 @@ module Fog response end end - end end end diff --git a/lib/fog/cloudsigma/requests/close_vnc.rb b/lib/fog/cloudsigma/requests/close_vnc.rb index e98e58a65..a9e4711d3 100644 --- a/lib/fog/cloudsigma/requests/close_vnc.rb +++ b/lib/fog/cloudsigma/requests/close_vnc.rb @@ -24,7 +24,6 @@ module Fog response end end - end end end diff --git a/lib/fog/cloudsigma/requests/create_server.rb b/lib/fog/cloudsigma/requests/create_server.rb index 2e8ac5a72..555815000 100644 --- a/lib/fog/cloudsigma/requests/create_server.rb +++ b/lib/fog/cloudsigma/requests/create_server.rb @@ -23,11 +23,9 @@ module Fog 'tags' => [] } - mock_create(:servers, 202, data, uuid, defaults) end end - end end end diff --git a/lib/fog/cloudsigma/requests/create_subscription.rb b/lib/fog/cloudsigma/requests/create_subscription.rb index 80223506a..405a8d826 100644 --- a/lib/fog/cloudsigma/requests/create_subscription.rb +++ b/lib/fog/cloudsigma/requests/create_subscription.rb @@ -9,7 +9,6 @@ module Fog class Mock def create_subscription(data) - if data[:period] != '1 month' || data[:start_time] || data[:end_time] raise Fog::Errors::MockNotImplemented.new('Currently only mocks for subscriptions with period 1 month from now are implemented as mock') end @@ -34,7 +33,6 @@ module Fog mock_create(:subscriptions, 200, data, id, defaults) end end - end end end diff --git a/lib/fog/cloudsigma/requests/create_volume.rb b/lib/fog/cloudsigma/requests/create_volume.rb index 185d5b719..56072ef2b 100644 --- a/lib/fog/cloudsigma/requests/create_volume.rb +++ b/lib/fog/cloudsigma/requests/create_volume.rb @@ -24,7 +24,6 @@ module Fog mock_create(:volumes, 202, data, uuid, defaults) end end - end end end diff --git a/lib/fog/cloudsigma/requests/delete_server.rb b/lib/fog/cloudsigma/requests/delete_server.rb index c6e3a39b5..d3c6d5de3 100644 --- a/lib/fog/cloudsigma/requests/delete_server.rb +++ b/lib/fog/cloudsigma/requests/delete_server.rb @@ -12,7 +12,6 @@ module Fog mock_delete(:servers, 204, server_id) end end - end end end diff --git a/lib/fog/cloudsigma/requests/delete_volume.rb b/lib/fog/cloudsigma/requests/delete_volume.rb index f54f8f092..04c7b2328 100644 --- a/lib/fog/cloudsigma/requests/delete_volume.rb +++ b/lib/fog/cloudsigma/requests/delete_volume.rb @@ -12,7 +12,6 @@ module Fog mock_delete(:volumes, 204, vol_id) end end - end end end diff --git a/lib/fog/cloudsigma/requests/extend_subscription.rb b/lib/fog/cloudsigma/requests/extend_subscription.rb index 87c7d4376..380931690 100644 --- a/lib/fog/cloudsigma/requests/extend_subscription.rb +++ b/lib/fog/cloudsigma/requests/extend_subscription.rb @@ -13,10 +13,8 @@ module Fog class Mock def extend_subscription(sub_id, data) - end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_balance.rb b/lib/fog/cloudsigma/requests/get_balance.rb index 0ffa2afc8..60d364bef 100644 --- a/lib/fog/cloudsigma/requests/get_balance.rb +++ b/lib/fog/cloudsigma/requests/get_balance.rb @@ -12,7 +12,6 @@ module Fog mock_get(:balance, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_current_usage.rb b/lib/fog/cloudsigma/requests/get_current_usage.rb index 31c78e78f..4f5f49aef 100644 --- a/lib/fog/cloudsigma/requests/get_current_usage.rb +++ b/lib/fog/cloudsigma/requests/get_current_usage.rb @@ -9,10 +9,8 @@ module Fog class Mock def get_current_usage - end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_ip.rb b/lib/fog/cloudsigma/requests/get_ip.rb index 58d065baa..5e681a3d5 100644 --- a/lib/fog/cloudsigma/requests/get_ip.rb +++ b/lib/fog/cloudsigma/requests/get_ip.rb @@ -12,7 +12,6 @@ module Fog mock_get(:ips, 200, ip) end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_lib_volume.rb b/lib/fog/cloudsigma/requests/get_lib_volume.rb index 6d0878729..d6dcb5dec 100644 --- a/lib/fog/cloudsigma/requests/get_lib_volume.rb +++ b/lib/fog/cloudsigma/requests/get_lib_volume.rb @@ -12,7 +12,6 @@ module Fog mock_get(:libvolumes, 200, vol_id) end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_pricing.rb b/lib/fog/cloudsigma/requests/get_pricing.rb index 20e1e9b83..fab574259 100644 --- a/lib/fog/cloudsigma/requests/get_pricing.rb +++ b/lib/fog/cloudsigma/requests/get_pricing.rb @@ -22,7 +22,6 @@ module Fog mock_get(:pricing, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_profile.rb b/lib/fog/cloudsigma/requests/get_profile.rb index 5b6bf67d4..504f9b1a6 100644 --- a/lib/fog/cloudsigma/requests/get_profile.rb +++ b/lib/fog/cloudsigma/requests/get_profile.rb @@ -12,7 +12,6 @@ module Fog mock_get(:profile, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_server.rb b/lib/fog/cloudsigma/requests/get_server.rb index 39b502674..8219cad8d 100644 --- a/lib/fog/cloudsigma/requests/get_server.rb +++ b/lib/fog/cloudsigma/requests/get_server.rb @@ -12,7 +12,6 @@ module Fog mock_get(:servers, 200, server_id) end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_subscription.rb b/lib/fog/cloudsigma/requests/get_subscription.rb index bd4ff454e..c8db78afe 100644 --- a/lib/fog/cloudsigma/requests/get_subscription.rb +++ b/lib/fog/cloudsigma/requests/get_subscription.rb @@ -12,7 +12,6 @@ module Fog mock_get(:subscriptions, 200, sub_id) end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_vlan.rb b/lib/fog/cloudsigma/requests/get_vlan.rb index 93d7e2439..70dfdeaba 100644 --- a/lib/fog/cloudsigma/requests/get_vlan.rb +++ b/lib/fog/cloudsigma/requests/get_vlan.rb @@ -12,7 +12,6 @@ module Fog mock_get(:vlans, 200, vlan) end end - end end end diff --git a/lib/fog/cloudsigma/requests/get_volume.rb b/lib/fog/cloudsigma/requests/get_volume.rb index deeefeb4d..cf24cb2a7 100644 --- a/lib/fog/cloudsigma/requests/get_volume.rb +++ b/lib/fog/cloudsigma/requests/get_volume.rb @@ -12,7 +12,6 @@ module Fog mock_get(:volumes, 200, vol_id) end end - end end end diff --git a/lib/fog/cloudsigma/requests/list_fwpolicies.rb b/lib/fog/cloudsigma/requests/list_fwpolicies.rb index ee13ad4e5..4199a71e1 100644 --- a/lib/fog/cloudsigma/requests/list_fwpolicies.rb +++ b/lib/fog/cloudsigma/requests/list_fwpolicies.rb @@ -12,7 +12,6 @@ module Fog Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/cloudsigma/requests/list_ips.rb b/lib/fog/cloudsigma/requests/list_ips.rb index a03f119ca..2a25ff6df 100644 --- a/lib/fog/cloudsigma/requests/list_ips.rb +++ b/lib/fog/cloudsigma/requests/list_ips.rb @@ -12,7 +12,6 @@ module Fog mock_list(:ips, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/list_lib_volumes.rb b/lib/fog/cloudsigma/requests/list_lib_volumes.rb index d782ace47..74beb36fc 100644 --- a/lib/fog/cloudsigma/requests/list_lib_volumes.rb +++ b/lib/fog/cloudsigma/requests/list_lib_volumes.rb @@ -12,7 +12,6 @@ module Fog mock_list(:libvolumes, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/list_servers.rb b/lib/fog/cloudsigma/requests/list_servers.rb index 942ec7d0c..b7f995686 100644 --- a/lib/fog/cloudsigma/requests/list_servers.rb +++ b/lib/fog/cloudsigma/requests/list_servers.rb @@ -12,7 +12,6 @@ module Fog mock_list(:servers, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/list_subscriptions.rb b/lib/fog/cloudsigma/requests/list_subscriptions.rb index ccb5355ae..3deadce47 100644 --- a/lib/fog/cloudsigma/requests/list_subscriptions.rb +++ b/lib/fog/cloudsigma/requests/list_subscriptions.rb @@ -12,7 +12,6 @@ module Fog mock_list(:subscriptions, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/list_vlans.rb b/lib/fog/cloudsigma/requests/list_vlans.rb index f49b7884d..2a5b93d2a 100644 --- a/lib/fog/cloudsigma/requests/list_vlans.rb +++ b/lib/fog/cloudsigma/requests/list_vlans.rb @@ -12,7 +12,6 @@ module Fog mock_list(:vlans, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/list_volumes.rb b/lib/fog/cloudsigma/requests/list_volumes.rb index b26998b2b..8ac6e8b7e 100644 --- a/lib/fog/cloudsigma/requests/list_volumes.rb +++ b/lib/fog/cloudsigma/requests/list_volumes.rb @@ -12,7 +12,6 @@ module Fog mock_list(:volumes, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/open_vnc.rb b/lib/fog/cloudsigma/requests/open_vnc.rb index 831d9b4ae..a64a8cdd8 100644 --- a/lib/fog/cloudsigma/requests/open_vnc.rb +++ b/lib/fog/cloudsigma/requests/open_vnc.rb @@ -28,7 +28,6 @@ module Fog response end end - end end end diff --git a/lib/fog/cloudsigma/requests/start_server.rb b/lib/fog/cloudsigma/requests/start_server.rb index 740502d76..a8f62c793 100644 --- a/lib/fog/cloudsigma/requests/start_server.rb +++ b/lib/fog/cloudsigma/requests/start_server.rb @@ -26,7 +26,6 @@ module Fog response end end - end end end diff --git a/lib/fog/cloudsigma/requests/stop_server.rb b/lib/fog/cloudsigma/requests/stop_server.rb index e13f4c58b..5356764a9 100644 --- a/lib/fog/cloudsigma/requests/stop_server.rb +++ b/lib/fog/cloudsigma/requests/stop_server.rb @@ -23,11 +23,9 @@ module Fog 'uuid' => server_id } - response end end - end end end diff --git a/lib/fog/cloudsigma/requests/update_profile.rb b/lib/fog/cloudsigma/requests/update_profile.rb index dc4fd2745..d62a63b3f 100644 --- a/lib/fog/cloudsigma/requests/update_profile.rb +++ b/lib/fog/cloudsigma/requests/update_profile.rb @@ -12,7 +12,6 @@ module Fog mock_update(data, :profile, 200) end end - end end end diff --git a/lib/fog/cloudsigma/requests/update_server.rb b/lib/fog/cloudsigma/requests/update_server.rb index d485f4337..28f3efaf7 100644 --- a/lib/fog/cloudsigma/requests/update_server.rb +++ b/lib/fog/cloudsigma/requests/update_server.rb @@ -34,7 +34,6 @@ module Fog end end end - end end end diff --git a/lib/fog/cloudsigma/requests/update_vlan.rb b/lib/fog/cloudsigma/requests/update_vlan.rb index 223832fba..32044528d 100644 --- a/lib/fog/cloudsigma/requests/update_vlan.rb +++ b/lib/fog/cloudsigma/requests/update_vlan.rb @@ -14,7 +14,6 @@ module Fog mock_update(data, :vlans, 200, vlan_id) end end - end end end diff --git a/lib/fog/cloudsigma/requests/update_volume.rb b/lib/fog/cloudsigma/requests/update_volume.rb index a1bf30c0c..ac00aac23 100644 --- a/lib/fog/cloudsigma/requests/update_volume.rb +++ b/lib/fog/cloudsigma/requests/update_volume.rb @@ -12,7 +12,6 @@ module Fog mock_update(data, :volumes, 200, vol_id) end end - end end end diff --git a/lib/fog/cloudstack/compute.rb b/lib/fog/cloudstack/compute.rb index 23054a8da..a90358c0c 100644 --- a/lib/fog/cloudstack/compute.rb +++ b/lib/fog/cloudstack/compute.rb @@ -4,7 +4,6 @@ require 'digest/md5' module Fog module Compute class Cloudstack < Fog::Service - class BadRequest < Fog::Compute::Cloudstack::Error; end class Unauthorized < Fog::Compute::Cloudstack::Error; end @@ -15,7 +14,6 @@ module Fog request_path 'fog/cloudstack/requests/compute' - model_path 'fog/cloudstack/models/compute' model :address model :disk_offering @@ -139,7 +137,6 @@ module Fog request :update_virtual_machine class Real - def initialize(options={}) @cloudstack_api_key = options[:cloudstack_api_key] @cloudstack_secret_access_key = options[:cloudstack_secret_access_key] @@ -251,7 +248,6 @@ module Fog raise Fog::Compute::Cloudstack::Error, error_text end end - end end # Real diff --git a/lib/fog/cloudstack/core.rb b/lib/fog/cloudstack/core.rb index c916dc0c3..83ff29cc6 100644 --- a/lib/fog/cloudstack/core.rb +++ b/lib/fog/cloudstack/core.rb @@ -4,7 +4,6 @@ require 'uri' module Fog module Cloudstack - extend Fog::Provider service(:compute, 'Compute') diff --git a/lib/fog/cloudstack/models/compute/disk_offering.rb b/lib/fog/cloudstack/models/compute/disk_offering.rb index 4364ab3fa..0a91c9a41 100644 --- a/lib/fog/cloudstack/models/compute/disk_offering.rb +++ b/lib/fog/cloudstack/models/compute/disk_offering.rb @@ -13,7 +13,6 @@ module Fog attribute :storage_type, :aliases => 'storagetype' attribute :tags - def save requires :display_text, :name @@ -39,7 +38,6 @@ module Fog success_status == 'true' end - end # DiskOffering end # Cloudstack end # Compute diff --git a/lib/fog/cloudstack/models/compute/disk_offerings.rb b/lib/fog/cloudstack/models/compute/disk_offerings.rb index 85f8fb7eb..29932ec89 100644 --- a/lib/fog/cloudstack/models/compute/disk_offerings.rb +++ b/lib/fog/cloudstack/models/compute/disk_offerings.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/disk_offering' module Fog module Compute class Cloudstack - class DiskOfferings < Fog::Collection - model Fog::Compute::Cloudstack::DiskOffering def all(options = {}) @@ -21,7 +19,6 @@ module Fog new(disk_offering_data) end end - end end end diff --git a/lib/fog/cloudstack/models/compute/flavors.rb b/lib/fog/cloudstack/models/compute/flavors.rb index 001c587c3..5ccabc13c 100644 --- a/lib/fog/cloudstack/models/compute/flavors.rb +++ b/lib/fog/cloudstack/models/compute/flavors.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/flavor' module Fog module Compute class Cloudstack - class Flavors < Fog::Collection - model Fog::Compute::Cloudstack::Flavor def all @@ -22,7 +20,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/cloudstack/models/compute/images.rb b/lib/fog/cloudstack/models/compute/images.rb index bc13f8682..ee5c1c329 100644 --- a/lib/fog/cloudstack/models/compute/images.rb +++ b/lib/fog/cloudstack/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/image' module Fog module Compute class Cloudstack - class Images < Fog::Collection - model Fog::Compute::Cloudstack::Image def all(filters={}) diff --git a/lib/fog/cloudstack/models/compute/job.rb b/lib/fog/cloudstack/models/compute/job.rb index 55ea8d9e9..4467a3b92 100644 --- a/lib/fog/cloudstack/models/compute/job.rb +++ b/lib/fog/cloudstack/models/compute/job.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Job < Fog::Model - identity :id, :aliases => 'jobid' attribute :user_id, :aliases => 'userid' attribute :account_id, :aliases => 'accountid' diff --git a/lib/fog/cloudstack/models/compute/jobs.rb b/lib/fog/cloudstack/models/compute/jobs.rb index 1fac02fbf..a82844b6d 100644 --- a/lib/fog/cloudstack/models/compute/jobs.rb +++ b/lib/fog/cloudstack/models/compute/jobs.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/job' module Fog module Compute class Cloudstack - class Jobs < Fog::Collection - model Fog::Compute::Cloudstack::Job def all @@ -22,7 +20,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/cloudstack/models/compute/security_group_rule.rb b/lib/fog/cloudstack/models/compute/security_group_rule.rb index b9d498911..37ae8f731 100644 --- a/lib/fog/cloudstack/models/compute/security_group_rule.rb +++ b/lib/fog/cloudstack/models/compute/security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class SecurityGroupRule < Fog::Model - identity :id, :aliases => 'ruleid' attribute :security_group_id, :type => :string @@ -55,7 +54,6 @@ module Fog options.merge!("startport" => self.start_port) unless self.start_port.nil? options.merge("endport" => self.end_port) unless self.end_port.nil? end - end # SecurityGroupRule end # Cloudstack end # Compute diff --git a/lib/fog/cloudstack/models/compute/security_group_rules.rb b/lib/fog/cloudstack/models/compute/security_group_rules.rb index 2271c935f..e8b23799a 100644 --- a/lib/fog/cloudstack/models/compute/security_group_rules.rb +++ b/lib/fog/cloudstack/models/compute/security_group_rules.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/security_group_rule' module Fog module Compute class Cloudstack - class SecurityGroupRules < Fog::Collection - model Fog::Compute::Cloudstack::SecurityGroupRule attribute :security_group_id, :type => :string diff --git a/lib/fog/cloudstack/models/compute/security_groups.rb b/lib/fog/cloudstack/models/compute/security_groups.rb index 8a22b7cef..43ad1eca1 100644 --- a/lib/fog/cloudstack/models/compute/security_groups.rb +++ b/lib/fog/cloudstack/models/compute/security_groups.rb @@ -5,7 +5,6 @@ module Fog module Compute class Cloudstack class SecurityGroups < Fog::Collection - model Fog::Compute::Cloudstack::SecurityGroup def all(options={}) @@ -21,7 +20,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/cloudstack/models/compute/servers.rb b/lib/fog/cloudstack/models/compute/servers.rb index 8d49d1fd1..26e0d39d5 100644 --- a/lib/fog/cloudstack/models/compute/servers.rb +++ b/lib/fog/cloudstack/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/server' module Fog module Compute class Cloudstack - class Servers < Fog::Collection - model Fog::Compute::Cloudstack::Server def all(attributes={}) @@ -33,7 +31,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/cloudstack/models/compute/snapshots.rb b/lib/fog/cloudstack/models/compute/snapshots.rb index 7ad0b2888..44c29d602 100644 --- a/lib/fog/cloudstack/models/compute/snapshots.rb +++ b/lib/fog/cloudstack/models/compute/snapshots.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/snapshot' module Fog module Compute class Cloudstack - class Snapshots < Fog::Collection - model Fog::Compute::Cloudstack::Snapshot def all @@ -19,7 +17,6 @@ module Fog new(snapshot) if snapshot end end - end end end diff --git a/lib/fog/cloudstack/models/compute/volume.rb b/lib/fog/cloudstack/models/compute/volume.rb index a20c9e344..2fa2b5ae1 100644 --- a/lib/fog/cloudstack/models/compute/volume.rb +++ b/lib/fog/cloudstack/models/compute/volume.rb @@ -77,7 +77,6 @@ module Fog self end - def attach(instance_or_id, mountpoint=nil) requires :id instance_id = instance_or_id.is_a?(Server) ? instance_or_id.id : instance_or_id diff --git a/lib/fog/cloudstack/models/compute/volumes.rb b/lib/fog/cloudstack/models/compute/volumes.rb index f4dd65d09..5dcfa1882 100644 --- a/lib/fog/cloudstack/models/compute/volumes.rb +++ b/lib/fog/cloudstack/models/compute/volumes.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/volume' module Fog module Compute class Cloudstack - class Volumes < Fog::Collection - model Fog::Compute::Cloudstack::Volume def all @@ -22,7 +20,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/cloudstack/models/compute/zones.rb b/lib/fog/cloudstack/models/compute/zones.rb index 108aafe33..923c7e2dc 100644 --- a/lib/fog/cloudstack/models/compute/zones.rb +++ b/lib/fog/cloudstack/models/compute/zones.rb @@ -4,9 +4,7 @@ require 'fog/cloudstack/models/compute/zone' module Fog module Compute class Cloudstack - class Zones < Fog::Collection - model Fog::Compute::Cloudstack::Zone def all(filters={}) @@ -26,7 +24,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/cloudstack/requests/compute/acquire_ip_address.rb b/lib/fog/cloudstack/requests/compute/acquire_ip_address.rb index 88a05a317..b98fa8629 100644 --- a/lib/fog/cloudstack/requests/compute/acquire_ip_address.rb +++ b/lib/fog/cloudstack/requests/compute/acquire_ip_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates an account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/associateIpAddress.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/assign_to_load_balancer_rule.rb b/lib/fog/cloudstack/requests/compute/assign_to_load_balancer_rule.rb index 335981a22..2c0bf653e 100644 --- a/lib/fog/cloudstack/requests/compute/assign_to_load_balancer_rule.rb +++ b/lib/fog/cloudstack/requests/compute/assign_to_load_balancer_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Assigns virtual machine or a list of virtual machines to a load balancer rule. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/assignToLoadBalancerRule.html] @@ -17,7 +16,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/attach_volume.rb b/lib/fog/cloudstack/requests/compute/attach_volume.rb index 9c12ea746..401fda95e 100644 --- a/lib/fog/cloudstack/requests/compute/attach_volume.rb +++ b/lib/fog/cloudstack/requests/compute/attach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Attaches a disk volume to a virtual machine. # # {CloudStack API Reference}[http://http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/attachVolume.html] @@ -13,11 +12,9 @@ module Fog request(options) end - end # Real class Mock - def attach_volume(options={}) volume_id = options['id'] server_id = options['virtualmachineid'] diff --git a/lib/fog/cloudstack/requests/compute/authorize_security_group_ingress.rb b/lib/fog/cloudstack/requests/compute/authorize_security_group_ingress.rb index 3b86c114c..89febbd8b 100644 --- a/lib/fog/cloudstack/requests/compute/authorize_security_group_ingress.rb +++ b/lib/fog/cloudstack/requests/compute/authorize_security_group_ingress.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - def authorize_security_group_ingress(options={}) options.merge!( 'command' => 'authorizeSecurityGroupIngress' @@ -10,7 +9,6 @@ module Fog request(options) end - end # Real class Mock diff --git a/lib/fog/cloudstack/requests/compute/change_service_for_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/change_service_for_virtual_machine.rb index 787c0d5aa..cd8cb60dd 100644 --- a/lib/fog/cloudstack/requests/compute/change_service_for_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/change_service_for_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Changes the service offering for a virtual machine. The virtual machine must be in a "Stopped" state for this command to take effect. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/changeServiceForVirtualMachine.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_account.rb b/lib/fog/cloudstack/requests/compute/create_account.rb index 602340831..9b1f7f276 100644 --- a/lib/fog/cloudstack/requests/compute/create_account.rb +++ b/lib/fog/cloudstack/requests/compute/create_account.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates an account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createAccount.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_disk_offering.rb b/lib/fog/cloudstack/requests/compute/create_disk_offering.rb index 6996249b0..29ee28ea9 100644 --- a/lib/fog/cloudstack/requests/compute/create_disk_offering.rb +++ b/lib/fog/cloudstack/requests/compute/create_disk_offering.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a disk offering. # # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.0.0/root_admin/createDiskOffering.html] @@ -12,11 +11,9 @@ module Fog ) request(options) end - end # Real class Mock - def create_disk_offering(options={}) disk_offering_id = Fog::Cloudstack.uuid @@ -45,7 +42,6 @@ module Fog {'creatediskofferingresponse' => disk_offering} end end - end # Cloudstack end # Compute end # Fog diff --git a/lib/fog/cloudstack/requests/compute/create_domain.rb b/lib/fog/cloudstack/requests/compute/create_domain.rb index 858e44547..f9471ba74 100644 --- a/lib/fog/cloudstack/requests/compute/create_domain.rb +++ b/lib/fog/cloudstack/requests/compute/create_domain.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a domain. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createDomain.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_load_balancer_rule.rb b/lib/fog/cloudstack/requests/compute/create_load_balancer_rule.rb index 958153cfc..15a693b91 100644 --- a/lib/fog/cloudstack/requests/compute/create_load_balancer_rule.rb +++ b/lib/fog/cloudstack/requests/compute/create_load_balancer_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a load balancer rule # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.11/global_admin/createLoadBalancerRule.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_network.rb b/lib/fog/cloudstack/requests/compute/create_network.rb index 49748630c..533199f48 100644 --- a/lib/fog/cloudstack/requests/compute/create_network.rb +++ b/lib/fog/cloudstack/requests/compute/create_network.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates an network. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createNetwork.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_port_forwarding_rule.rb b/lib/fog/cloudstack/requests/compute/create_port_forwarding_rule.rb index fa595c911..b49db7d2c 100644 --- a/lib/fog/cloudstack/requests/compute/create_port_forwarding_rule.rb +++ b/lib/fog/cloudstack/requests/compute/create_port_forwarding_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a domain. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createPortForwardingRule.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_snapshot.rb b/lib/fog/cloudstack/requests/compute/create_snapshot.rb index feed4f79d..30d035267 100644 --- a/lib/fog/cloudstack/requests/compute/create_snapshot.rb +++ b/lib/fog/cloudstack/requests/compute/create_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a snapshot for an account that already exists. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createSnapshot.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end class Mock diff --git a/lib/fog/cloudstack/requests/compute/create_snapshot_policy.rb b/lib/fog/cloudstack/requests/compute/create_snapshot_policy.rb index 904e0dbf1..0fd7d91a6 100644 --- a/lib/fog/cloudstack/requests/compute/create_snapshot_policy.rb +++ b/lib/fog/cloudstack/requests/compute/create_snapshot_policy.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates an account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createSnapshotPolicy.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_ssh_key_pair.rb b/lib/fog/cloudstack/requests/compute/create_ssh_key_pair.rb index a4e746ad5..d357e1629 100644 --- a/lib/fog/cloudstack/requests/compute/create_ssh_key_pair.rb +++ b/lib/fog/cloudstack/requests/compute/create_ssh_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a new SSH key pair.. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createSSHKeyPair.html] @@ -14,7 +13,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_user.rb b/lib/fog/cloudstack/requests/compute/create_user.rb index 3949bc319..aa2d2fc7d 100644 --- a/lib/fog/cloudstack/requests/compute/create_user.rb +++ b/lib/fog/cloudstack/requests/compute/create_user.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a user for an account that already exists. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createUser.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/create_volume.rb b/lib/fog/cloudstack/requests/compute/create_volume.rb index 7e57dd0c3..917a530a0 100644 --- a/lib/fog/cloudstack/requests/compute/create_volume.rb +++ b/lib/fog/cloudstack/requests/compute/create_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a volume for an account that already exists. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createVolume.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end # Real class Mock diff --git a/lib/fog/cloudstack/requests/compute/create_zone.rb b/lib/fog/cloudstack/requests/compute/create_zone.rb index 7a3f4a646..bc76d19fe 100644 --- a/lib/fog/cloudstack/requests/compute/create_zone.rb +++ b/lib/fog/cloudstack/requests/compute/create_zone.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists zones. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listZones.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end # Real end # Cloudstack end # Compute diff --git a/lib/fog/cloudstack/requests/compute/delete_account.rb b/lib/fog/cloudstack/requests/compute/delete_account.rb index 8311895d5..2ee7aecf6 100644 --- a/lib/fog/cloudstack/requests/compute/delete_account.rb +++ b/lib/fog/cloudstack/requests/compute/delete_account.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a account, and all users associated with this account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deleteAccount.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_disk_offering.rb b/lib/fog/cloudstack/requests/compute/delete_disk_offering.rb index 192182542..482d63e2b 100644 --- a/lib/fog/cloudstack/requests/compute/delete_disk_offering.rb +++ b/lib/fog/cloudstack/requests/compute/delete_disk_offering.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates a disk offering. # # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.0.0/root_admin/deleteDiskOffering.html] @@ -12,20 +11,16 @@ module Fog ) request(options) end - end # Real class Mock - def delete_disk_offering(options={}) disk_offering_id = options['id'] data[:disk_offerings].delete(disk_offering_id) if data[:disk_offerings][disk_offering_id] { 'deletediskofferingresponse' => { 'success' => 'true' } } end - end - end # Cloudstack end # Compute end # Fog diff --git a/lib/fog/cloudstack/requests/compute/delete_domain.rb b/lib/fog/cloudstack/requests/compute/delete_domain.rb index 5a5a834d7..10ebd7cb7 100644 --- a/lib/fog/cloudstack/requests/compute/delete_domain.rb +++ b/lib/fog/cloudstack/requests/compute/delete_domain.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a specified domain. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deleteDomain.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_load_balancer_rule.rb b/lib/fog/cloudstack/requests/compute/delete_load_balancer_rule.rb index 425a902ea..3905bedeb 100644 --- a/lib/fog/cloudstack/requests/compute/delete_load_balancer_rule.rb +++ b/lib/fog/cloudstack/requests/compute/delete_load_balancer_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a domain. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deleteLoadBalancerRule.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_port_forwarding_rule.rb b/lib/fog/cloudstack/requests/compute/delete_port_forwarding_rule.rb index aa14a53da..1ef830478 100644 --- a/lib/fog/cloudstack/requests/compute/delete_port_forwarding_rule.rb +++ b/lib/fog/cloudstack/requests/compute/delete_port_forwarding_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates a domain. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deletePortForwardingRule.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_security_group.rb b/lib/fog/cloudstack/requests/compute/delete_security_group.rb index 6022682fe..cf4377ccc 100644 --- a/lib/fog/cloudstack/requests/compute/delete_security_group.rb +++ b/lib/fog/cloudstack/requests/compute/delete_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates an account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deleteSecurityGroup.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end # Real class Mock @@ -31,7 +29,6 @@ module Fog end end end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_snapshot.rb b/lib/fog/cloudstack/requests/compute/delete_snapshot.rb index 7a6742bb5..3356cb429 100644 --- a/lib/fog/cloudstack/requests/compute/delete_snapshot.rb +++ b/lib/fog/cloudstack/requests/compute/delete_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a specified snapshot. # # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.0.0/user/deleteSnapshot.html] @@ -13,11 +12,9 @@ module Fog request(options) end - end class Mock - # Deletes a specified snapashot. # # {CloudStack API Reference}[http://cloudstack.apache.org/docs/api/apidocs-4.0.0/user/deleteSnapshot.html] @@ -54,9 +51,7 @@ module Fog self.data[:jobs][job_id] = job job_id end - end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_snapshot_policies.rb b/lib/fog/cloudstack/requests/compute/delete_snapshot_policies.rb index a2b97657b..6ab7b72f2 100644 --- a/lib/fog/cloudstack/requests/compute/delete_snapshot_policies.rb +++ b/lib/fog/cloudstack/requests/compute/delete_snapshot_policies.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a specified user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deleteSnapshotPolicies.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_ssh_key_pair.rb b/lib/fog/cloudstack/requests/compute/delete_ssh_key_pair.rb index 032a9383b..b4aff8948 100644 --- a/lib/fog/cloudstack/requests/compute/delete_ssh_key_pair.rb +++ b/lib/fog/cloudstack/requests/compute/delete_ssh_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a keypair by name # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/deleteSSHKeyPair.html] @@ -14,7 +13,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_template.rb b/lib/fog/cloudstack/requests/compute/delete_template.rb index 6e6c1125a..1f062a408 100644 --- a/lib/fog/cloudstack/requests/compute/delete_template.rb +++ b/lib/fog/cloudstack/requests/compute/delete_template.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a specified template. # # {CloudStack API Reference}[http://http://download.cloud.com/releases/3.0.0/api_3.0.0/user/deleteTemplate.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_user.rb b/lib/fog/cloudstack/requests/compute/delete_user.rb index 9ab375586..6378b6289 100644 --- a/lib/fog/cloudstack/requests/compute/delete_user.rb +++ b/lib/fog/cloudstack/requests/compute/delete_user.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a specified user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deleteUser.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/delete_volume.rb b/lib/fog/cloudstack/requests/compute/delete_volume.rb index 9598a029a..8f08298cd 100644 --- a/lib/fog/cloudstack/requests/compute/delete_volume.rb +++ b/lib/fog/cloudstack/requests/compute/delete_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a specified user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deleteVolume.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end # Real class Mock def delete_volume(options={}) diff --git a/lib/fog/cloudstack/requests/compute/deploy_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/deploy_virtual_machine.rb index 52aeb8574..e523185b2 100644 --- a/lib/fog/cloudstack/requests/compute/deploy_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/deploy_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Creates and automatically starts a virtual machine based on a service offering, disk offering, and template. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/deployVirtualMachine.html] @@ -28,7 +27,6 @@ module Fog end # Real class Mock - def deploy_virtual_machine(options={}) zone_id = options['zoneid'] unless zone_id diff --git a/lib/fog/cloudstack/requests/compute/destroy_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/destroy_virtual_machine.rb index 3f8c20456..c8cf94b73 100644 --- a/lib/fog/cloudstack/requests/compute/destroy_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/destroy_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates account information for the authenticated user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/destroyVirtualMachine.html] @@ -13,11 +12,9 @@ module Fog request(options) end - end # Real class Mock - def destroy_virtual_machine(options={}) identity = options["id"] diff --git a/lib/fog/cloudstack/requests/compute/detach_volume.rb b/lib/fog/cloudstack/requests/compute/detach_volume.rb index e639b9cbf..3ba95d882 100644 --- a/lib/fog/cloudstack/requests/compute/detach_volume.rb +++ b/lib/fog/cloudstack/requests/compute/detach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Deletes a specified domain. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/detachVolume.html] @@ -13,11 +12,9 @@ module Fog request(options) end - end # Real class Mock - def detach_volume(options={}) volume_id = options['id'] diff --git a/lib/fog/cloudstack/requests/compute/disable_account.rb b/lib/fog/cloudstack/requests/compute/disable_account.rb index ec87a7ba9..e4178c16c 100644 --- a/lib/fog/cloudstack/requests/compute/disable_account.rb +++ b/lib/fog/cloudstack/requests/compute/disable_account.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Disables an account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/disableAccount.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/disable_user.rb b/lib/fog/cloudstack/requests/compute/disable_user.rb index 4f2728a27..b74b302b7 100644 --- a/lib/fog/cloudstack/requests/compute/disable_user.rb +++ b/lib/fog/cloudstack/requests/compute/disable_user.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Disables a user account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/disableUser.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/enable_account.rb b/lib/fog/cloudstack/requests/compute/enable_account.rb index ad83d1b8b..4891bec9a 100644 --- a/lib/fog/cloudstack/requests/compute/enable_account.rb +++ b/lib/fog/cloudstack/requests/compute/enable_account.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Enables an account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/enableAccount.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/enable_user.rb b/lib/fog/cloudstack/requests/compute/enable_user.rb index 1e3c03873..eb3640b56 100644 --- a/lib/fog/cloudstack/requests/compute/enable_user.rb +++ b/lib/fog/cloudstack/requests/compute/enable_user.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Enables a user account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/enableUser.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/generate_usage_records.rb b/lib/fog/cloudstack/requests/compute/generate_usage_records.rb index 907c29ea5..be34c9952 100644 --- a/lib/fog/cloudstack/requests/compute/generate_usage_records.rb +++ b/lib/fog/cloudstack/requests/compute/generate_usage_records.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all available networks. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/generateUsageRecords.html] @@ -21,7 +20,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/get_vm_password.rb b/lib/fog/cloudstack/requests/compute/get_vm_password.rb index 1704da271..4992ee427 100644 --- a/lib/fog/cloudstack/requests/compute/get_vm_password.rb +++ b/lib/fog/cloudstack/requests/compute/get_vm_password.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Returns an encrypted password for the VM # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/getVMPassword.html] @@ -14,7 +13,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_accounts.rb b/lib/fog/cloudstack/requests/compute/list_accounts.rb index ffdeab8e0..76206f9e0 100644 --- a/lib/fog/cloudstack/requests/compute/list_accounts.rb +++ b/lib/fog/cloudstack/requests/compute/list_accounts.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists accounts and provides detailed account information for listed accounts. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listAccounts.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_alerts.rb b/lib/fog/cloudstack/requests/compute/list_alerts.rb index 69f8cf7b8..52d7f023b 100644 --- a/lib/fog/cloudstack/requests/compute/list_alerts.rb +++ b/lib/fog/cloudstack/requests/compute/list_alerts.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all alerts. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listAlerts.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_async_jobs.rb b/lib/fog/cloudstack/requests/compute/list_async_jobs.rb index c22b0dfbf..8322160a0 100644 --- a/lib/fog/cloudstack/requests/compute/list_async_jobs.rb +++ b/lib/fog/cloudstack/requests/compute/list_async_jobs.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all pending asynchronous jobs for the account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listAsyncJobs.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end # Real class Mock def list_async_jobs(options={}) diff --git a/lib/fog/cloudstack/requests/compute/list_capabilities.rb b/lib/fog/cloudstack/requests/compute/list_capabilities.rb index 047fd776a..73ee6c356 100644 --- a/lib/fog/cloudstack/requests/compute/list_capabilities.rb +++ b/lib/fog/cloudstack/requests/compute/list_capabilities.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists configurations and provides detailed account information for listed configurations. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listAccounts.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_capacity.rb b/lib/fog/cloudstack/requests/compute/list_capacity.rb index f2347c265..25d71618d 100644 --- a/lib/fog/cloudstack/requests/compute/list_capacity.rb +++ b/lib/fog/cloudstack/requests/compute/list_capacity.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists domains and provides detailed information for listed domains. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listDomains.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_clusters.rb b/lib/fog/cloudstack/requests/compute/list_clusters.rb index cac96d450..ee2258fba 100644 --- a/lib/fog/cloudstack/requests/compute/list_clusters.rb +++ b/lib/fog/cloudstack/requests/compute/list_clusters.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists configurations and provides detailed account information for listed configurations. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listAccounts.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_configurations.rb b/lib/fog/cloudstack/requests/compute/list_configurations.rb index 204d0bef0..acd937e26 100644 --- a/lib/fog/cloudstack/requests/compute/list_configurations.rb +++ b/lib/fog/cloudstack/requests/compute/list_configurations.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists configurations and provides detailed account information for listed configurations. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listAccounts.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_disk_offerings.rb b/lib/fog/cloudstack/requests/compute/list_disk_offerings.rb index c003079d9..f21edc6be 100644 --- a/lib/fog/cloudstack/requests/compute/list_disk_offerings.rb +++ b/lib/fog/cloudstack/requests/compute/list_disk_offerings.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all available disk offerings. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listDiskOfferings.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end class Mock @@ -22,7 +20,6 @@ module Fog disk_offerings = self.data[:disk_offerings] { "listdiskofferingsresponse" => { "count"=> disk_offerings.count, "diskoffering"=> disk_offerings.values } } end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_domain_children.rb b/lib/fog/cloudstack/requests/compute/list_domain_children.rb index 2cbe24648..71d51fe2d 100644 --- a/lib/fog/cloudstack/requests/compute/list_domain_children.rb +++ b/lib/fog/cloudstack/requests/compute/list_domain_children.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all children domains belonging to a specified domain. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listDomainChildren.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_domains.rb b/lib/fog/cloudstack/requests/compute/list_domains.rb index 683b1eead..b21bc414e 100644 --- a/lib/fog/cloudstack/requests/compute/list_domains.rb +++ b/lib/fog/cloudstack/requests/compute/list_domains.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists domains and provides detailed information for listed domains. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listDomains.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_events.rb b/lib/fog/cloudstack/requests/compute/list_events.rb index 7843880af..c82733586 100644 --- a/lib/fog/cloudstack/requests/compute/list_events.rb +++ b/lib/fog/cloudstack/requests/compute/list_events.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # A command to list events. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listEvents.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_external_firewalls.rb b/lib/fog/cloudstack/requests/compute/list_external_firewalls.rb index b188287e9..22507f7fe 100644 --- a/lib/fog/cloudstack/requests/compute/list_external_firewalls.rb +++ b/lib/fog/cloudstack/requests/compute/list_external_firewalls.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # List external firewall appliances. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listExternalFirewalls.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_external_load_balancers.rb b/lib/fog/cloudstack/requests/compute/list_external_load_balancers.rb index 1e2cc1227..3dbac62b2 100644 --- a/lib/fog/cloudstack/requests/compute/list_external_load_balancers.rb +++ b/lib/fog/cloudstack/requests/compute/list_external_load_balancers.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # List external load balancer appliances. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listExternalLoadBalancers.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_firewall_rules.rb b/lib/fog/cloudstack/requests/compute/list_firewall_rules.rb index c1459b120..a6b6da2c6 100644 --- a/lib/fog/cloudstack/requests/compute/list_firewall_rules.rb +++ b/lib/fog/cloudstack/requests/compute/list_firewall_rules.rb @@ -8,7 +8,6 @@ module Fog ) request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_hosts.rb b/lib/fog/cloudstack/requests/compute/list_hosts.rb index 594889329..aec29b408 100644 --- a/lib/fog/cloudstack/requests/compute/list_hosts.rb +++ b/lib/fog/cloudstack/requests/compute/list_hosts.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists hosts. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listHosts.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_hypervisors.rb b/lib/fog/cloudstack/requests/compute/list_hypervisors.rb index 8244d4db4..5cee1779e 100644 --- a/lib/fog/cloudstack/requests/compute/list_hypervisors.rb +++ b/lib/fog/cloudstack/requests/compute/list_hypervisors.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists hypervisors. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listHypervisors.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_instance_groups.rb b/lib/fog/cloudstack/requests/compute/list_instance_groups.rb index 1cc417c8e..b1b73023a 100644 --- a/lib/fog/cloudstack/requests/compute/list_instance_groups.rb +++ b/lib/fog/cloudstack/requests/compute/list_instance_groups.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists VM groups. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listInstanceGroups.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_isos.rb b/lib/fog/cloudstack/requests/compute/list_isos.rb index 839f71cb5..b3e0c039c 100644 --- a/lib/fog/cloudstack/requests/compute/list_isos.rb +++ b/lib/fog/cloudstack/requests/compute/list_isos.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all available ISO files. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listIsos.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_load_balancer_rule_instances.rb b/lib/fog/cloudstack/requests/compute/list_load_balancer_rule_instances.rb index 9cc21248c..3ef1d8776 100644 --- a/lib/fog/cloudstack/requests/compute/list_load_balancer_rule_instances.rb +++ b/lib/fog/cloudstack/requests/compute/list_load_balancer_rule_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists resource limits. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/listLoadBalancerRuleInstances.html] @@ -14,7 +13,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_load_balancer_rules.rb b/lib/fog/cloudstack/requests/compute/list_load_balancer_rules.rb index a8b8b4d7b..d6f7d2af8 100644 --- a/lib/fog/cloudstack/requests/compute/list_load_balancer_rules.rb +++ b/lib/fog/cloudstack/requests/compute/list_load_balancer_rules.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists resource limits. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listLoadBalancerRules.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_network_offerings.rb b/lib/fog/cloudstack/requests/compute/list_network_offerings.rb index 5e86dfb86..037d0ced9 100644 --- a/lib/fog/cloudstack/requests/compute/list_network_offerings.rb +++ b/lib/fog/cloudstack/requests/compute/list_network_offerings.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all available network offerings. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listNetworkOfferings.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_networks.rb b/lib/fog/cloudstack/requests/compute/list_networks.rb index bfb6b7c7f..ede3df9c4 100644 --- a/lib/fog/cloudstack/requests/compute/list_networks.rb +++ b/lib/fog/cloudstack/requests/compute/list_networks.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all available networks. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listNetworks.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_os_categories.rb b/lib/fog/cloudstack/requests/compute/list_os_categories.rb index 4f2be386f..086afba2a 100644 --- a/lib/fog/cloudstack/requests/compute/list_os_categories.rb +++ b/lib/fog/cloudstack/requests/compute/list_os_categories.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all supported OS categories for this cloud. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listOsCategories.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_os_types.rb b/lib/fog/cloudstack/requests/compute/list_os_types.rb index 4abcaa79e..530996e26 100644 --- a/lib/fog/cloudstack/requests/compute/list_os_types.rb +++ b/lib/fog/cloudstack/requests/compute/list_os_types.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all supported OS types for this cloud. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listOsTypes.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end class Mock @@ -22,7 +20,6 @@ module Fog os_types = self.data[:os_types] { "listostypesresponse" => { "count"=> os_types.count, "ostype"=> os_types.values } } end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_pods.rb b/lib/fog/cloudstack/requests/compute/list_pods.rb index 102e7d70a..ac6ebe4c3 100644 --- a/lib/fog/cloudstack/requests/compute/list_pods.rb +++ b/lib/fog/cloudstack/requests/compute/list_pods.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all Pods. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listPods.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_port_forwarding_rules.rb b/lib/fog/cloudstack/requests/compute/list_port_forwarding_rules.rb index 5bdde173b..ae70c7074 100644 --- a/lib/fog/cloudstack/requests/compute/list_port_forwarding_rules.rb +++ b/lib/fog/cloudstack/requests/compute/list_port_forwarding_rules.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists resource limits. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listPortForwardingRules.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_public_ip_addresses.rb b/lib/fog/cloudstack/requests/compute/list_public_ip_addresses.rb index 18ebe99f5..8b485b21e 100644 --- a/lib/fog/cloudstack/requests/compute/list_public_ip_addresses.rb +++ b/lib/fog/cloudstack/requests/compute/list_public_ip_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists resource limits. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listPublicIpAddresses.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_resource_limits.rb b/lib/fog/cloudstack/requests/compute/list_resource_limits.rb index 94c873d76..d6c179635 100644 --- a/lib/fog/cloudstack/requests/compute/list_resource_limits.rb +++ b/lib/fog/cloudstack/requests/compute/list_resource_limits.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists resource limits. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listResourceLimits.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_security_groups.rb b/lib/fog/cloudstack/requests/compute/list_security_groups.rb index 5a14110d3..85da7a3bf 100644 --- a/lib/fog/cloudstack/requests/compute/list_security_groups.rb +++ b/lib/fog/cloudstack/requests/compute/list_security_groups.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - def list_security_groups(options={}) options.merge!( 'command' => 'listSecurityGroups' @@ -10,7 +9,6 @@ module Fog request(options) end - end # Real class Mock diff --git a/lib/fog/cloudstack/requests/compute/list_service_offerings.rb b/lib/fog/cloudstack/requests/compute/list_service_offerings.rb index e138aca91..cb32ef9f2 100644 --- a/lib/fog/cloudstack/requests/compute/list_service_offerings.rb +++ b/lib/fog/cloudstack/requests/compute/list_service_offerings.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all available service offerings. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listServiceOfferings.html] @@ -13,11 +12,9 @@ module Fog request(options) end - end # Real class Mock - def list_service_offerings(options={}) flavors = [] if service_offering_id = options['id'] diff --git a/lib/fog/cloudstack/requests/compute/list_snapshot_policies.rb b/lib/fog/cloudstack/requests/compute/list_snapshot_policies.rb index d9ef1bf8c..12806f53a 100644 --- a/lib/fog/cloudstack/requests/compute/list_snapshot_policies.rb +++ b/lib/fog/cloudstack/requests/compute/list_snapshot_policies.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists domains and provides detailed information for listed domains. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listDomains.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_snapshots.rb b/lib/fog/cloudstack/requests/compute/list_snapshots.rb index df4651326..3ce6ac27a 100644 --- a/lib/fog/cloudstack/requests/compute/list_snapshots.rb +++ b/lib/fog/cloudstack/requests/compute/list_snapshots.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all available snapshots for the account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listSnapshots.html] @@ -13,11 +12,9 @@ module Fog request(options) end - end class Mock - def list_snapshots(options={}) snapshot_id = options.delete('id') if snapshot_id @@ -33,9 +30,7 @@ module Fog } } end - end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_ssh_key_pairs.rb b/lib/fog/cloudstack/requests/compute/list_ssh_key_pairs.rb index 9b4eb2086..5c1c73922 100644 --- a/lib/fog/cloudstack/requests/compute/list_ssh_key_pairs.rb +++ b/lib/fog/cloudstack/requests/compute/list_ssh_key_pairs.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # List registered keypairs. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listSSHKeyPairs.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_storage_pools.rb b/lib/fog/cloudstack/requests/compute/list_storage_pools.rb index e41b5fedb..4678fe639 100644 --- a/lib/fog/cloudstack/requests/compute/list_storage_pools.rb +++ b/lib/fog/cloudstack/requests/compute/list_storage_pools.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists storage pools. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listStoragePools.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_templates.rb b/lib/fog/cloudstack/requests/compute/list_templates.rb index 09020f51e..81fb6a543 100644 --- a/lib/fog/cloudstack/requests/compute/list_templates.rb +++ b/lib/fog/cloudstack/requests/compute/list_templates.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # List all public, private, and privileged templates. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listTemplates.html] @@ -13,11 +12,9 @@ module Fog request(options) end - end # Real class Mock - def list_templates(options={}) templates = self.data[:images].values diff --git a/lib/fog/cloudstack/requests/compute/list_usage_records.rb b/lib/fog/cloudstack/requests/compute/list_usage_records.rb index 0d169c96b..1425d524a 100644 --- a/lib/fog/cloudstack/requests/compute/list_usage_records.rb +++ b/lib/fog/cloudstack/requests/compute/list_usage_records.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists usage records for accounts. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listUsageRecords.html] @@ -21,7 +20,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_users.rb b/lib/fog/cloudstack/requests/compute/list_users.rb index 09c905882..bd92889fd 100644 --- a/lib/fog/cloudstack/requests/compute/list_users.rb +++ b/lib/fog/cloudstack/requests/compute/list_users.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists user accounts. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listUsers.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/list_virtual_machines.rb b/lib/fog/cloudstack/requests/compute/list_virtual_machines.rb index 7371a943f..a2503ea08 100644 --- a/lib/fog/cloudstack/requests/compute/list_virtual_machines.rb +++ b/lib/fog/cloudstack/requests/compute/list_virtual_machines.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # List the virtual machines owned by the account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listVirtualMachines.html] diff --git a/lib/fog/cloudstack/requests/compute/list_volumes.rb b/lib/fog/cloudstack/requests/compute/list_volumes.rb index d63bf1362..9b835bb35 100644 --- a/lib/fog/cloudstack/requests/compute/list_volumes.rb +++ b/lib/fog/cloudstack/requests/compute/list_volumes.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists all volumes. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listVolumes.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end # Real class Mock diff --git a/lib/fog/cloudstack/requests/compute/list_zones.rb b/lib/fog/cloudstack/requests/compute/list_zones.rb index e1b140c43..47a29e04a 100644 --- a/lib/fog/cloudstack/requests/compute/list_zones.rb +++ b/lib/fog/cloudstack/requests/compute/list_zones.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Lists zones. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listZones.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end # Real class Mock diff --git a/lib/fog/cloudstack/requests/compute/migrate_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/migrate_virtual_machine.rb index c888ff1f2..32e576e2f 100644 --- a/lib/fog/cloudstack/requests/compute/migrate_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/migrate_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Attempts Migration of a virtual machine to the host specified # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/migrateVirtualMachine.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/query_async_job_result.rb b/lib/fog/cloudstack/requests/compute/query_async_job_result.rb index b83ac5662..8bbb52c56 100644 --- a/lib/fog/cloudstack/requests/compute/query_async_job_result.rb +++ b/lib/fog/cloudstack/requests/compute/query_async_job_result.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - def query_async_job_result(options={}) options.merge!( 'command' => 'queryAsyncJobResult' @@ -10,7 +9,6 @@ module Fog request(options) end - end # Real class Mock @@ -26,7 +24,6 @@ module Fog {'queryasyncjobresultresponse' => job } end end - end end end diff --git a/lib/fog/cloudstack/requests/compute/reboot_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/reboot_virtual_machine.rb index c4f3dcd6d..eff00d404 100644 --- a/lib/fog/cloudstack/requests/compute/reboot_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/reboot_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates account information for the authenticated user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/rebootVirtualMachine.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end class Mock diff --git a/lib/fog/cloudstack/requests/compute/recover_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/recover_virtual_machine.rb index c4f60463a..3d4f1b9cf 100644 --- a/lib/fog/cloudstack/requests/compute/recover_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/recover_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Recovers a virtual machine. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/recoverVirtualMachine.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/register_ssh_key_pair.rb b/lib/fog/cloudstack/requests/compute/register_ssh_key_pair.rb index a8b9eba44..f7e1cd159 100644 --- a/lib/fog/cloudstack/requests/compute/register_ssh_key_pair.rb +++ b/lib/fog/cloudstack/requests/compute/register_ssh_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Registers an SSH key pair.. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/registerSSHKeyPair.html] @@ -12,7 +11,6 @@ module Fog ) request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/register_template.rb b/lib/fog/cloudstack/requests/compute/register_template.rb index f67201a78..e498ab491 100644 --- a/lib/fog/cloudstack/requests/compute/register_template.rb +++ b/lib/fog/cloudstack/requests/compute/register_template.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Registers an existing template into the cloud. # # {CloudStack API Reference}[http://download.cloud.com/releases/3.0.0/api_3.0.0/user/registerTemplate.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end # Real class Mock diff --git a/lib/fog/cloudstack/requests/compute/register_user_keys.rb b/lib/fog/cloudstack/requests/compute/register_user_keys.rb index f1443f4e2..9415cfafc 100644 --- a/lib/fog/cloudstack/requests/compute/register_user_keys.rb +++ b/lib/fog/cloudstack/requests/compute/register_user_keys.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Enables a user account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/registerUserKeys.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/remove_from_load_balancer_rule.rb b/lib/fog/cloudstack/requests/compute/remove_from_load_balancer_rule.rb index bc09ac9e7..539a3ebc5 100644 --- a/lib/fog/cloudstack/requests/compute/remove_from_load_balancer_rule.rb +++ b/lib/fog/cloudstack/requests/compute/remove_from_load_balancer_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Removes a virtual machine or a list of virtual machines from a load balancer rule. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/removeFromLoadBalancerRule.html] @@ -17,7 +16,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/reset_password_for_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/reset_password_for_virtual_machine.rb index 00671aa2e..3bfb8d1a0 100644 --- a/lib/fog/cloudstack/requests/compute/reset_password_for_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/reset_password_for_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Returns an encrypted password for the VM # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/resetPasswordForVirtualMachine.html] @@ -14,7 +13,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/revoke_security_group_ingress.rb b/lib/fog/cloudstack/requests/compute/revoke_security_group_ingress.rb index b5fcd82b2..24b094b52 100644 --- a/lib/fog/cloudstack/requests/compute/revoke_security_group_ingress.rb +++ b/lib/fog/cloudstack/requests/compute/revoke_security_group_ingress.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - def revoke_security_group_ingress(options={}) options.merge!( 'command' => 'revokeSecurityGroupIngress' @@ -10,7 +9,6 @@ module Fog request(options) end - end # Real class Mock @@ -39,7 +37,6 @@ module Fog {"revokesecuritygroupingress" => { "jobid" => job_id }} end - end end end diff --git a/lib/fog/cloudstack/requests/compute/start_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/start_virtual_machine.rb index b53363e07..9e9543b84 100644 --- a/lib/fog/cloudstack/requests/compute/start_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/start_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates account information for the authenticated user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/startVirtualMachine.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/stop_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/stop_virtual_machine.rb index 94e9c5a6f..04f282c6a 100644 --- a/lib/fog/cloudstack/requests/compute/stop_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/stop_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates account information for the authenticated user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/stopVirtualMachine.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/update_account.rb b/lib/fog/cloudstack/requests/compute/update_account.rb index 2e8a238ff..8810b4ceb 100644 --- a/lib/fog/cloudstack/requests/compute/update_account.rb +++ b/lib/fog/cloudstack/requests/compute/update_account.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates account information for the authenticated user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateAccount.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/update_domain.rb b/lib/fog/cloudstack/requests/compute/update_domain.rb index d19039e0d..a09e51af8 100644 --- a/lib/fog/cloudstack/requests/compute/update_domain.rb +++ b/lib/fog/cloudstack/requests/compute/update_domain.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates a domain with a new name. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateDomain.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/update_resource_count.rb b/lib/fog/cloudstack/requests/compute/update_resource_count.rb index a7c4133e6..9107e89a2 100644 --- a/lib/fog/cloudstack/requests/compute/update_resource_count.rb +++ b/lib/fog/cloudstack/requests/compute/update_resource_count.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates a user account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateResourceCount.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/update_user.rb b/lib/fog/cloudstack/requests/compute/update_user.rb index 87b755f38..6cc4954f2 100644 --- a/lib/fog/cloudstack/requests/compute/update_user.rb +++ b/lib/fog/cloudstack/requests/compute/update_user.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates a user account. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateUser.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/cloudstack/requests/compute/update_virtual_machine.rb b/lib/fog/cloudstack/requests/compute/update_virtual_machine.rb index 0e85f82f8..a86529b3e 100644 --- a/lib/fog/cloudstack/requests/compute/update_virtual_machine.rb +++ b/lib/fog/cloudstack/requests/compute/update_virtual_machine.rb @@ -2,7 +2,6 @@ module Fog module Compute class Cloudstack class Real - # Updates account information for the authenticated user. # # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateAccount.html] @@ -13,7 +12,6 @@ module Fog request(options) end - end end end diff --git a/lib/fog/core/deprecated/connection.rb b/lib/fog/core/deprecated/connection.rb index 00246e2a8..46400f2ba 100644 --- a/lib/fog/core/deprecated/connection.rb +++ b/lib/fog/core/deprecated/connection.rb @@ -1,7 +1,6 @@ require "fog/xml" module Fog - # @deprecated Use {Fog::Core::Connection} or {XML::SAXParserConnection} if you # require the response body to be parsed. # diff --git a/lib/fog/core/deprecated_connection_accessors.rb b/lib/fog/core/deprecated_connection_accessors.rb index 4698b71aa..26ab0c495 100644 --- a/lib/fog/core/deprecated_connection_accessors.rb +++ b/lib/fog/core/deprecated_connection_accessors.rb @@ -35,7 +35,6 @@ module Fog def prepare_service_value(attributes) @service = attributes[:service] || attributes[:connection] end - end end end diff --git a/lib/fog/core/parser.rb b/lib/fog/core/parser.rb index e3fa57dfe..3c7c3dcce 100644 --- a/lib/fog/core/parser.rb +++ b/lib/fog/core/parser.rb @@ -3,7 +3,6 @@ require "nokogiri" module Fog module Parsers class Base < Nokogiri::XML::SAX::Document - attr_reader :response def initialize @@ -43,14 +42,12 @@ module Fog def value @value && @value.dup end - end end end module Fog class ToHashDocument < Nokogiri::XML::SAX::Document - def initialize @stack = [] end @@ -111,6 +108,5 @@ module Fog @stack.push(data) end end - end end diff --git a/lib/fog/digitalocean/compute.rb b/lib/fog/digitalocean/compute.rb index a74ee69bf..4dda8076b 100644 --- a/lib/fog/digitalocean/compute.rb +++ b/lib/fog/digitalocean/compute.rb @@ -3,7 +3,6 @@ require 'fog/digitalocean/core' module Fog module Compute class DigitalOcean < Fog::Service - requires :digitalocean_api_key requires :digitalocean_client_id @@ -42,7 +41,6 @@ module Fog # request :digitalocean_resize class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -67,11 +65,9 @@ module Fog def reset_data self.class.data.delete(@digitalocean_api_key) end - end class Real - def initialize(options={}) @digitalocean_api_key = options[:digitalocean_api_key] @digitalocean_client_id = options[:digitalocean_client_id] @@ -128,7 +124,6 @@ module Fog response end - end end end diff --git a/lib/fog/digitalocean/models/compute/flavor.rb b/lib/fog/digitalocean/models/compute/flavor.rb index 70a6e57de..b2b4735b2 100644 --- a/lib/fog/digitalocean/models/compute/flavor.rb +++ b/lib/fog/digitalocean/models/compute/flavor.rb @@ -4,10 +4,8 @@ module Fog module Compute class DigitalOcean class Flavor < Fog::Model - identity :id attribute :name - end end end diff --git a/lib/fog/digitalocean/models/compute/flavors.rb b/lib/fog/digitalocean/models/compute/flavors.rb index 333221594..c902c0a45 100644 --- a/lib/fog/digitalocean/models/compute/flavors.rb +++ b/lib/fog/digitalocean/models/compute/flavors.rb @@ -4,7 +4,6 @@ require 'fog/digitalocean/models/compute/flavor' module Fog module Compute class DigitalOcean - class Flavors < Fog::Collection model Fog::Compute::DigitalOcean::Flavor @@ -17,9 +16,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/digitalocean/models/compute/image.rb b/lib/fog/digitalocean/models/compute/image.rb index a6f9fd688..c643281e5 100644 --- a/lib/fog/digitalocean/models/compute/image.rb +++ b/lib/fog/digitalocean/models/compute/image.rb @@ -4,11 +4,9 @@ module Fog module Compute class DigitalOcean class Image < Fog::Model - identity :id attribute :name attribute :distribution - end end end diff --git a/lib/fog/digitalocean/models/compute/images.rb b/lib/fog/digitalocean/models/compute/images.rb index 1e08da3a9..8c81b559e 100644 --- a/lib/fog/digitalocean/models/compute/images.rb +++ b/lib/fog/digitalocean/models/compute/images.rb @@ -4,7 +4,6 @@ require 'fog/digitalocean/models/compute/image' module Fog module Compute class DigitalOcean - class Images < Fog::Collection model Fog::Compute::DigitalOcean::Image @@ -17,9 +16,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/digitalocean/models/compute/region.rb b/lib/fog/digitalocean/models/compute/region.rb index b5af26b18..0a4da24d2 100644 --- a/lib/fog/digitalocean/models/compute/region.rb +++ b/lib/fog/digitalocean/models/compute/region.rb @@ -4,10 +4,8 @@ module Fog module Compute class DigitalOcean class Region < Fog::Model - identity :id attribute :name - end end end diff --git a/lib/fog/digitalocean/models/compute/regions.rb b/lib/fog/digitalocean/models/compute/regions.rb index d5348ac6a..6c5a19580 100644 --- a/lib/fog/digitalocean/models/compute/regions.rb +++ b/lib/fog/digitalocean/models/compute/regions.rb @@ -4,7 +4,6 @@ require 'fog/digitalocean/models/compute/region' module Fog module Compute class DigitalOcean - class Regions < Fog::Collection model Fog::Compute::DigitalOcean::Region @@ -17,9 +16,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/digitalocean/models/compute/server.rb b/lib/fog/digitalocean/models/compute/server.rb index 226337fff..abe4e1aa7 100644 --- a/lib/fog/digitalocean/models/compute/server.rb +++ b/lib/fog/digitalocean/models/compute/server.rb @@ -3,11 +3,9 @@ require 'fog/compute/models/server' module Fog module Compute class DigitalOcean - # A DigitalOcean Droplet # class Server < Fog::Compute::Server - identity :id attribute :name attribute :state, :aliases => 'status' @@ -176,9 +174,7 @@ module Fog msg = 'DigitalOcean servers do not support updates' raise NotImplementedError.new(msg) end - end - end end end diff --git a/lib/fog/digitalocean/models/compute/servers.rb b/lib/fog/digitalocean/models/compute/servers.rb index e30815976..bdaf4e2b8 100644 --- a/lib/fog/digitalocean/models/compute/servers.rb +++ b/lib/fog/digitalocean/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/digitalocean/models/compute/server' module Fog module Compute class DigitalOcean - class Servers < Fog::Collection - model Fog::Compute::DigitalOcean::Server def all(filters = {}) @@ -61,9 +59,7 @@ module Fog raise ArgumentError, "either #{name}_key or #{name}_key_path is required to configure the server" end end - end - end end end diff --git a/lib/fog/digitalocean/models/compute/ssh_key.rb b/lib/fog/digitalocean/models/compute/ssh_key.rb index a698bb7dc..4ee1ceffb 100644 --- a/lib/fog/digitalocean/models/compute/ssh_key.rb +++ b/lib/fog/digitalocean/models/compute/ssh_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class SshKey < Fog::Model - identity :id attribute :name @@ -21,7 +20,6 @@ module Fog service.destroy_ssh_key id true end - end end end diff --git a/lib/fog/digitalocean/models/compute/ssh_keys.rb b/lib/fog/digitalocean/models/compute/ssh_keys.rb index 8b2c0ca56..0411a7886 100644 --- a/lib/fog/digitalocean/models/compute/ssh_keys.rb +++ b/lib/fog/digitalocean/models/compute/ssh_keys.rb @@ -4,7 +4,6 @@ module Fog module Compute class DigitalOcean class SshKeys < Fog::Collection - identity :href model Fog::Compute::DigitalOcean::SshKey diff --git a/lib/fog/digitalocean/requests/compute/create_server.rb b/lib/fog/digitalocean/requests/compute/create_server.rb index 577168369..1fca44277 100644 --- a/lib/fog/digitalocean/requests/compute/create_server.rb +++ b/lib/fog/digitalocean/requests/compute/create_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - # # FIXME: missing ssh keys support # @@ -33,11 +32,9 @@ module Fog :query => query_hash ) end - end class Mock - def create_server( name, size_id, image_id, @@ -72,7 +69,6 @@ module Fog self.data[:servers] << mock_data response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/create_ssh_key.rb b/lib/fog/digitalocean/requests/compute/create_ssh_key.rb index b64b5e71c..328d5f9b4 100644 --- a/lib/fog/digitalocean/requests/compute/create_ssh_key.rb +++ b/lib/fog/digitalocean/requests/compute/create_ssh_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def create_ssh_key( name, pub_key ) request( :expects => [200], @@ -11,11 +10,9 @@ module Fog :query => { 'name' => name, 'ssh_pub_key' => pub_key } ) end - end class Mock - def create_ssh_key( name, pub_key ) response = Excon::Response.new response.status = 200 @@ -31,7 +28,6 @@ module Fog self.data[:ssh_keys] << mock_data response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/destroy_server.rb b/lib/fog/digitalocean/requests/compute/destroy_server.rb index c86af6801..c1a9b7598 100644 --- a/lib/fog/digitalocean/requests/compute/destroy_server.rb +++ b/lib/fog/digitalocean/requests/compute/destroy_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - # # FIXME: missing ssh keys support # @@ -15,11 +14,9 @@ module Fog :query => {:scrub_data => '1' } ) end - end class Mock - def destroy_server( id ) response = Excon::Response.new response.status = 200 @@ -32,7 +29,6 @@ module Fog response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/destroy_ssh_key.rb b/lib/fog/digitalocean/requests/compute/destroy_ssh_key.rb index 1819f7076..155dee4e8 100644 --- a/lib/fog/digitalocean/requests/compute/destroy_ssh_key.rb +++ b/lib/fog/digitalocean/requests/compute/destroy_ssh_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - # # Delete a SSH public key from your account # @@ -15,11 +14,9 @@ module Fog :path => "ssh_keys/#{id}/destroy" ) end - end class Mock - def destroy_ssh_key(id) response = Excon::Response.new response.status = 200 @@ -30,7 +27,6 @@ module Fog end response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/get_server_details.rb b/lib/fog/digitalocean/requests/compute/get_server_details.rb index baad87a1e..062fde75a 100644 --- a/lib/fog/digitalocean/requests/compute/get_server_details.rb +++ b/lib/fog/digitalocean/requests/compute/get_server_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def get_server_details(server_id) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => "droplets/#{server_id}" ) end - end class Mock - def get_server_details(server_id) response = Excon::Response.new response.status = 200 @@ -28,7 +25,6 @@ module Fog response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/get_ssh_key.rb b/lib/fog/digitalocean/requests/compute/get_ssh_key.rb index e88b211bd..36518d1d8 100644 --- a/lib/fog/digitalocean/requests/compute/get_ssh_key.rb +++ b/lib/fog/digitalocean/requests/compute/get_ssh_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - # # This method shows a specific public SSH key in your account # that can be added to a droplet. @@ -16,11 +15,9 @@ module Fog :path => "ssh_keys/#{id}" ) end - end class Mock - def get_ssh_key(id) response = Excon::Response.new response.status = 200 @@ -32,7 +29,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/list_flavors.rb b/lib/fog/digitalocean/requests/compute/list_flavors.rb index 4ccc9ff46..0a73d3a40 100644 --- a/lib/fog/digitalocean/requests/compute/list_flavors.rb +++ b/lib/fog/digitalocean/requests/compute/list_flavors.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def list_flavors(options = {}) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => 'sizes' ) end - end class Mock - def list_flavors response = Excon::Response.new response.status = 200 @@ -31,7 +28,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/list_images.rb b/lib/fog/digitalocean/requests/compute/list_images.rb index 771e88628..01a25533e 100644 --- a/lib/fog/digitalocean/requests/compute/list_images.rb +++ b/lib/fog/digitalocean/requests/compute/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def list_images(options = {}) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => 'images' ) end - end class Mock - def list_images response = Excon::Response.new response.status = 200 @@ -42,7 +39,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/list_regions.rb b/lib/fog/digitalocean/requests/compute/list_regions.rb index 302cd449a..d7631f4d0 100644 --- a/lib/fog/digitalocean/requests/compute/list_regions.rb +++ b/lib/fog/digitalocean/requests/compute/list_regions.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def list_regions(options = {}) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => 'regions' ) end - end class Mock - def list_regions response = Excon::Response.new response.status = 200 @@ -31,7 +28,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/list_servers.rb b/lib/fog/digitalocean/requests/compute/list_servers.rb index 6062b6f6f..07f3c9b99 100644 --- a/lib/fog/digitalocean/requests/compute/list_servers.rb +++ b/lib/fog/digitalocean/requests/compute/list_servers.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def list_servers(options = {}) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => 'droplets' ) end - end class Mock - def list_servers response = Excon::Response.new response.status = 200 @@ -24,7 +21,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/list_ssh_keys.rb b/lib/fog/digitalocean/requests/compute/list_ssh_keys.rb index 2887643a8..446b9bd3f 100644 --- a/lib/fog/digitalocean/requests/compute/list_ssh_keys.rb +++ b/lib/fog/digitalocean/requests/compute/list_ssh_keys.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def list_ssh_keys(options = {}) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => 'ssh_keys' ) end - end class Mock - def list_ssh_keys response = Excon::Response.new response.status = 200 @@ -24,7 +21,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/power_cycle_server.rb b/lib/fog/digitalocean/requests/compute/power_cycle_server.rb index 62d9fc981..720118ea1 100644 --- a/lib/fog/digitalocean/requests/compute/power_cycle_server.rb +++ b/lib/fog/digitalocean/requests/compute/power_cycle_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def power_cycle_server( id ) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => "droplets/#{id}/power_cycle" ) end - end class Mock - def power_cycle_server( id ) response = Excon::Response.new response.status = 200 @@ -26,7 +23,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/power_off_server.rb b/lib/fog/digitalocean/requests/compute/power_off_server.rb index ac096eb82..b48dd7cd1 100644 --- a/lib/fog/digitalocean/requests/compute/power_off_server.rb +++ b/lib/fog/digitalocean/requests/compute/power_off_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def power_off_server( id ) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => "droplets/#{id}/power_off" ) end - end class Mock - def power_off_server( id ) response = Excon::Response.new response.status = 200 @@ -26,7 +23,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/power_on_server.rb b/lib/fog/digitalocean/requests/compute/power_on_server.rb index 03b145732..cd4f0a78f 100644 --- a/lib/fog/digitalocean/requests/compute/power_on_server.rb +++ b/lib/fog/digitalocean/requests/compute/power_on_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def power_on_server( id ) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => "droplets/#{id}/power_on" ) end - end class Mock - def power_on_server( id ) response = Excon::Response.new response.status = 200 @@ -26,7 +23,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/reboot_server.rb b/lib/fog/digitalocean/requests/compute/reboot_server.rb index 0e61f9821..e56ed2896 100644 --- a/lib/fog/digitalocean/requests/compute/reboot_server.rb +++ b/lib/fog/digitalocean/requests/compute/reboot_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def reboot_server( id ) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => "droplets/#{id}/reboot" ) end - end class Mock - def reboot_server( id ) response = Excon::Response.new response.status = 200 @@ -26,7 +23,6 @@ module Fog } response end - end end end diff --git a/lib/fog/digitalocean/requests/compute/shutdown_server.rb b/lib/fog/digitalocean/requests/compute/shutdown_server.rb index d108f2d5d..d3bd0762c 100644 --- a/lib/fog/digitalocean/requests/compute/shutdown_server.rb +++ b/lib/fog/digitalocean/requests/compute/shutdown_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class DigitalOcean class Real - def shutdown_server( id ) request( :expects => [200], @@ -10,11 +9,9 @@ module Fog :path => "droplets/#{id}/shutdown" ) end - end class Mock - def shutdown_server( id ) response = Excon::Response.new response.status = 200 @@ -29,7 +26,6 @@ module Fog } response end - end end end diff --git a/lib/fog/dnsimple/core.rb b/lib/fog/dnsimple/core.rb index 148cda5fc..6f9d0672e 100644 --- a/lib/fog/dnsimple/core.rb +++ b/lib/fog/dnsimple/core.rb @@ -3,10 +3,8 @@ require 'fog/json' module Fog module DNSimple - extend Fog::Provider service(:dns, 'DNS') - end end diff --git a/lib/fog/dnsimple/dns.rb b/lib/fog/dnsimple/dns.rb index cd53c7b70..81120f04f 100644 --- a/lib/fog/dnsimple/dns.rb +++ b/lib/fog/dnsimple/dns.rb @@ -3,7 +3,6 @@ require 'fog/dnsimple/core' module Fog module DNS class DNSimple < Fog::Service - recognizes :dnsimple_email, :dnsimple_password, :dnsimple_token, :dnsimple_domain, :dnsimple_url, :host, :path, :port, :scheme, :persistent model_path 'fog/dnsimple/models/dns' @@ -24,7 +23,6 @@ module Fog request :get_record class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -52,11 +50,9 @@ module Fog def reset_data self.class.data.delete(@dnsimple_email) end - end class Real - def initialize(options={}) @dnsimple_email = options[:dnsimple_email] @dnsimple_password = options[:dnsimple_password] diff --git a/lib/fog/dnsimple/models/dns/record.rb b/lib/fog/dnsimple/models/dns/record.rb index 65d7b610a..779e68d48 100644 --- a/lib/fog/dnsimple/models/dns/record.rb +++ b/lib/fog/dnsimple/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class DNSimple - class Record < Fog::Model extend Fog::Deprecation deprecate :ip, :value @@ -58,9 +57,7 @@ module Fog def zone=(new_zone) @zone = new_zone end - end - end end end diff --git a/lib/fog/dnsimple/models/dns/records.rb b/lib/fog/dnsimple/models/dns/records.rb index b49c258e0..496c7c562 100644 --- a/lib/fog/dnsimple/models/dns/records.rb +++ b/lib/fog/dnsimple/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/dnsimple/models/dns/record' module Fog module DNS class DNSimple - class Records < Fog::Collection - attribute :zone model Fog::DNS::DNSimple::Record @@ -30,9 +28,7 @@ module Fog requires :zone super({ :zone => zone }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/dnsimple/models/dns/zone.rb b/lib/fog/dnsimple/models/dns/zone.rb index 32dd18757..101dc9632 100644 --- a/lib/fog/dnsimple/models/dns/zone.rb +++ b/lib/fog/dnsimple/models/dns/zone.rb @@ -4,9 +4,7 @@ require 'fog/dnsimple/models/dns/records' module Fog module DNS class DNSimple - class Zone < Fog::Model - identity :id attribute :domain, :aliases => 'name' @@ -42,9 +40,7 @@ module Fog merge_attributes(data) true end - end - end end end diff --git a/lib/fog/dnsimple/models/dns/zones.rb b/lib/fog/dnsimple/models/dns/zones.rb index 1a48866f5..c3b493789 100644 --- a/lib/fog/dnsimple/models/dns/zones.rb +++ b/lib/fog/dnsimple/models/dns/zones.rb @@ -4,9 +4,7 @@ require 'fog/dnsimple/models/dns/zone' module Fog module DNS class DNSimple - class Zones < Fog::Collection - model Fog::DNS::DNSimple::Zone def all @@ -21,9 +19,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/dnsimple/requests/dns/create_domain.rb b/lib/fog/dnsimple/requests/dns/create_domain.rb index 558e2f6e1..4311e6a92 100644 --- a/lib/fog/dnsimple/requests/dns/create_domain.rb +++ b/lib/fog/dnsimple/requests/dns/create_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Create a single domain in DNSimple in your account. # # ==== Parameters @@ -26,11 +25,9 @@ module Fog :path => "/domains" ) end - end class Mock - def create_domain(name) body = { "domain" => { @@ -59,9 +56,7 @@ module Fog response.body = body response end - end - end end end diff --git a/lib/fog/dnsimple/requests/dns/create_record.rb b/lib/fog/dnsimple/requests/dns/create_record.rb index 1947c1116..ea0e18ca9 100644 --- a/lib/fog/dnsimple/requests/dns/create_record.rb +++ b/lib/fog/dnsimple/requests/dns/create_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Create a new host in the specified zone # # ==== Parameters @@ -36,11 +35,9 @@ module Fog :path => "/domains/#{domain}/records" ) end - end class Mock - def create_record(domain, name, type, content, options = {}) body = { "record" => { @@ -64,9 +61,7 @@ module Fog response.body = body response end - end - end end end diff --git a/lib/fog/dnsimple/requests/dns/delete_domain.rb b/lib/fog/dnsimple/requests/dns/delete_domain.rb index 1bb2869e2..ab0fce60f 100644 --- a/lib/fog/dnsimple/requests/dns/delete_domain.rb +++ b/lib/fog/dnsimple/requests/dns/delete_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Delete the given domain from your account. You may use # either the domain ID or the domain name. # @@ -19,11 +18,9 @@ module Fog :path => "/domains/#{domain}" ) end - end class Mock - def delete_domain(name) self.data[:records].delete name self.data[:domains].reject! { |domain| domain["domain"]["name"] == name } @@ -32,7 +29,6 @@ module Fog response.status = 200 response end - end end end diff --git a/lib/fog/dnsimple/requests/dns/delete_record.rb b/lib/fog/dnsimple/requests/dns/delete_record.rb index 68f1c664e..10ad19656 100644 --- a/lib/fog/dnsimple/requests/dns/delete_record.rb +++ b/lib/fog/dnsimple/requests/dns/delete_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Delete the record with the given ID for the given domain. # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "/domains/#{domain}/records/#{record_id}" ) end - end class Mock - def delete_record(domain, record_id) self.data[:records][domain].reject! { |record| record["record"]["id"] == record_id } @@ -27,9 +24,7 @@ module Fog response.status = 200 response end - end - end end end diff --git a/lib/fog/dnsimple/requests/dns/get_domain.rb b/lib/fog/dnsimple/requests/dns/get_domain.rb index e922e8ba5..996b86a7e 100644 --- a/lib/fog/dnsimple/requests/dns/get_domain.rb +++ b/lib/fog/dnsimple/requests/dns/get_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Get the details for a specific domain in your account. You # may pass either the domain numeric ID or the domain name # itself. @@ -21,11 +20,9 @@ module Fog :path => "/domains/#{domain}" ) end - end class Mock - def get_domain(id) domain = self.data[:domains].detect do |domain| domain["domain"]["id"] == id || domain["domain"]["name"] == id @@ -36,7 +33,6 @@ module Fog response.body = domain response end - end end end diff --git a/lib/fog/dnsimple/requests/dns/get_record.rb b/lib/fog/dnsimple/requests/dns/get_record.rb index 83ca5a33f..455424e32 100644 --- a/lib/fog/dnsimple/requests/dns/get_record.rb +++ b/lib/fog/dnsimple/requests/dns/get_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Gets record from given domain. # # ==== Parameters @@ -20,11 +19,9 @@ module Fog :path => "/domains/#{domain}/records/#{record_id}" ) end - end class Mock - def get_record(domain, record_id) response = Excon::Response.new diff --git a/lib/fog/dnsimple/requests/dns/list_domains.rb b/lib/fog/dnsimple/requests/dns/list_domains.rb index dda718604..04dcf2ccd 100644 --- a/lib/fog/dnsimple/requests/dns/list_domains.rb +++ b/lib/fog/dnsimple/requests/dns/list_domains.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Get the details for a specific domain in your account. You # may pass either the domain numeric ID or the domain name itself. # @@ -20,20 +19,16 @@ module Fog :path => '/domains' ) end - end class Mock - def list_domains response = Excon::Response.new response.status = 200 response.body = self.data[:domains] response end - end - end end end diff --git a/lib/fog/dnsimple/requests/dns/list_records.rb b/lib/fog/dnsimple/requests/dns/list_records.rb index b64f53a44..7036df4f1 100644 --- a/lib/fog/dnsimple/requests/dns/list_records.rb +++ b/lib/fog/dnsimple/requests/dns/list_records.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Get the list of records for the specific domain. # # ==== Parameters @@ -20,20 +19,16 @@ module Fog :path => "/domains/#{domain}/records" ) end - end class Mock - def list_records(domain) response = Excon::Response.new response.status = 200 response.body = self.data[:records][domain] || [] response end - end - end end end diff --git a/lib/fog/dnsimple/requests/dns/update_record.rb b/lib/fog/dnsimple/requests/dns/update_record.rb index c1cddb8d4..78d15d6ce 100644 --- a/lib/fog/dnsimple/requests/dns/update_record.rb +++ b/lib/fog/dnsimple/requests/dns/update_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSimple class Real - # Update the given record for the given domain. # # ==== Parameters @@ -30,11 +29,9 @@ module Fog :path => "/domains/#{domain}/records/#{record_id}" ) end - end class Mock - def update_record(domain, record_id, options) record = self.data[:records][domain].detect { |record| record["record"]["id"] == record_id } response = Excon::Response.new @@ -50,7 +47,6 @@ module Fog response end - end end end diff --git a/lib/fog/dnsmadeeasy/core.rb b/lib/fog/dnsmadeeasy/core.rb index 3efa1a188..edcceaac7 100644 --- a/lib/fog/dnsmadeeasy/core.rb +++ b/lib/fog/dnsmadeeasy/core.rb @@ -3,10 +3,8 @@ require 'fog/json' module Fog module DNSMadeEasy - extend Fog::Provider service(:dns, 'DNS') - end end diff --git a/lib/fog/dnsmadeeasy/dns.rb b/lib/fog/dnsmadeeasy/dns.rb index 9c5dc8c78..199e18841 100644 --- a/lib/fog/dnsmadeeasy/dns.rb +++ b/lib/fog/dnsmadeeasy/dns.rb @@ -3,7 +3,6 @@ require 'fog/dnsmadeeasy/core' module Fog module DNS class DNSMadeEasy < Fog::Service - requires :dnsmadeeasy_api_key, :dnsmadeeasy_secret_key recognizes :host, :path, :port, :scheme, :persistent @@ -59,7 +58,6 @@ module Fog end class Real - # Initialize connection to DNS Made Easy # # ==== Notes @@ -121,7 +119,6 @@ module Fog end response - end def signature(params) diff --git a/lib/fog/dnsmadeeasy/models/dns/record.rb b/lib/fog/dnsmadeeasy/models/dns/record.rb index 0cf151007..c99e371b3 100644 --- a/lib/fog/dnsmadeeasy/models/dns/record.rb +++ b/lib/fog/dnsmadeeasy/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class DNSMadeEasy - class Record < Fog::Model extend Fog::Deprecation deprecate :ip, :value @@ -72,9 +71,7 @@ module Fog def zone=(new_zone) @zone = new_zone end - end - end end end diff --git a/lib/fog/dnsmadeeasy/models/dns/records.rb b/lib/fog/dnsmadeeasy/models/dns/records.rb index 92ba0f9c4..865012031 100644 --- a/lib/fog/dnsmadeeasy/models/dns/records.rb +++ b/lib/fog/dnsmadeeasy/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/dnsmadeeasy/models/dns/record' module Fog module DNS class DNSMadeEasy - class Records < Fog::Collection - attribute :zone model Fog::DNS::DNSMadeEasy::Record @@ -28,9 +26,7 @@ module Fog requires :zone super({ :zone => zone }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/dnsmadeeasy/models/dns/zone.rb b/lib/fog/dnsmadeeasy/models/dns/zone.rb index e9a44e9bc..2cdb96836 100644 --- a/lib/fog/dnsmadeeasy/models/dns/zone.rb +++ b/lib/fog/dnsmadeeasy/models/dns/zone.rb @@ -4,9 +4,7 @@ require 'fog/dnsmadeeasy/models/dns/records' module Fog module DNS class DNSMadeEasy - class Zone < Fog::Model - identity :id attribute :domain, :aliases => 'name' attribute :gtd_enabled, :aliases => 'gtdEnabled' @@ -34,9 +32,7 @@ module Fog merge_attributes(data) true end - end - end end end diff --git a/lib/fog/dnsmadeeasy/models/dns/zones.rb b/lib/fog/dnsmadeeasy/models/dns/zones.rb index 6377c9498..1525d9752 100644 --- a/lib/fog/dnsmadeeasy/models/dns/zones.rb +++ b/lib/fog/dnsmadeeasy/models/dns/zones.rb @@ -4,9 +4,7 @@ require 'fog/dnsmadeeasy/models/dns/zone' module Fog module DNS class DNSMadeEasy - class Zones < Fog::Collection - model Fog::DNS::DNSMadeEasy::Zone def all @@ -22,9 +20,7 @@ module Fog rescue Fog::Service::NotFound nil end - end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/create_domain.rb b/lib/fog/dnsmadeeasy/requests/dns/create_domain.rb index c0277cde1..696174de9 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/create_domain.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/create_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Creates a domain entry with the specified name. Returns errors if name is not valid or conflicts with another domain. # # ==== Parameters @@ -22,7 +21,6 @@ module Fog :path => "/V1.2/domains/#{domain}" ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/create_record.rb b/lib/fog/dnsmadeeasy/requests/dns/create_record.rb index 69027e1c0..f263e7aa5 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/create_record.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/create_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Creates a record with the representation specified in the request content. Returns errors if record is not valid. # Note that a record ID will be generated by the system with this request and any ID that is sent will be ignored. Records are not modifiable for domains that are locked to a template. # @@ -38,7 +37,6 @@ module Fog # * hardLink<~Boolean> # * 'status'<~Integer> - 201 - record successfully created, 400 - record not valid, see errors in response content, 404 - domain not found def create_record(domain, name, type, data, options = {}) - body = { "name" => name, "type" => type, @@ -55,7 +53,6 @@ module Fog :body => Fog::JSON.encode(body) ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/create_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/create_secondary.rb index b66cc2f5a..9d2684a14 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/create_secondary.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/create_secondary.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Creates a secondary entry with the specified name. Returns errors if name is not valid or conflicts with another domain. # # ==== Parameters @@ -17,7 +16,6 @@ module Fog # * gtdLocation<~String> Global Traffic Director location. Values: DEFAULT, US_EAST, US_WEST, EUROPE # * status<~Integer> - 201 - secondary entry successfully created or modified, 400 - secondary entry name or IP addresses not valid, see errors in response content def create_secondary(secondary_name, ip_addresses) - body = { "ip" => [*ip_addresses] } @@ -29,7 +27,6 @@ module Fog :body => Fog::JSON.encode(body) ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/delete_all_domains.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_all_domains.rb index c8737ae05..c8d42fce7 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/delete_all_domains.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/delete_all_domains.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Deletes all domains for your account. # # ==== Returns @@ -16,7 +15,6 @@ module Fog :path => '/V1.2/domains' ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/delete_all_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_all_secondary.rb index 063fb4eb6..cd7cfb575 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/delete_all_secondary.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/delete_all_secondary.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Deletes all secondary entries for your account. # # ==== Returns @@ -15,7 +14,6 @@ module Fog :path => '/V1.2/secondary' ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/delete_domain.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_domain.rb index 82746eb30..3f2394003 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/delete_domain.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/delete_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Delete the given domain from your account. # # ==== Parameters @@ -18,7 +17,6 @@ module Fog :path => "/V1.2/domains/#{domain}" ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/delete_record.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_record.rb index 2116f74e1..6260833a3 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/delete_record.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/delete_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Deletes the record with the specified id. Note that records are not modifiable for domains that are locked to a template. # # ==== Parameters @@ -19,7 +18,6 @@ module Fog :path => "/V1.2/domains/#{domain}/records/#{record_id}" ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/delete_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_secondary.rb index 239cdef16..a0136e88d 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/delete_secondary.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/delete_secondary.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Deletes the specified secondary entry. # # ==== Parameters @@ -18,7 +17,6 @@ module Fog :path => "/V1.2/secondary/#{secondary_name}" ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/get_domain.rb b/lib/fog/dnsmadeeasy/requests/dns/get_domain.rb index 481a9d627..c8304380d 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/get_domain.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/get_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Get the details for a specific domain in your account. # # ==== Parameters @@ -22,7 +21,6 @@ module Fog :path => "/V1.2/domains/#{domain}" ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/get_record.rb b/lib/fog/dnsmadeeasy/requests/dns/get_record.rb index b5117a045..96602ed28 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/get_record.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/get_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Returns a record object representing the record with the specified id. # # ==== Parameters @@ -31,7 +30,6 @@ module Fog :path => "/V1.2/domains/#{domain}/records/#{record_id}" ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/get_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/get_secondary.rb index 830e4b703..9590345da 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/get_secondary.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/get_secondary.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Returns the secondary entry object representation of the specified secondary entry. # # ==== Parameters @@ -22,7 +21,6 @@ module Fog :path => "/V1.2/secondary/#{secondary_name}" ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/list_domains.rb b/lib/fog/dnsmadeeasy/requests/dns/list_domains.rb index 5409fba41..663e8e5c0 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/list_domains.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/list_domains.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Returns a list of all domain names for your account. # # ==== Returns @@ -17,7 +16,6 @@ module Fog :path => '/V1.2/domains' ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/list_records.rb b/lib/fog/dnsmadeeasy/requests/dns/list_records.rb index b5b31ebd6..7d80237df 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/list_records.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/list_records.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Returns a list of record objects containing all records for the specified domain # # ==== Parameters @@ -35,7 +34,6 @@ module Fog :query => options ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/list_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/list_secondary.rb index 177cc4365..a51835098 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/list_secondary.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/list_secondary.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Returns a list of all secondary entry names for your account. # # ==== Returns @@ -17,7 +16,6 @@ module Fog :path => '/V1.2/secondary' ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/update_record.rb b/lib/fog/dnsmadeeasy/requests/dns/update_record.rb index dd585ecdc..e5375fccf 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/update_record.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/update_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Updates a record with the representation specified in the request content. Returns errors if record is not valid. # Note that a record ID will be generated by the system with this request and any ID that is sent will be ignored. Records are not modifiable for domains that are locked to a template. # @@ -49,7 +48,6 @@ module Fog :body => Fog::JSON.encode(options) ) end - end end end diff --git a/lib/fog/dnsmadeeasy/requests/dns/update_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/update_secondary.rb index 8f95df131..0fbc3e5d3 100644 --- a/lib/fog/dnsmadeeasy/requests/dns/update_secondary.rb +++ b/lib/fog/dnsmadeeasy/requests/dns/update_secondary.rb @@ -2,7 +2,6 @@ module Fog module DNS class DNSMadeEasy class Real - # Modifies a secondary entry with the specified name. Returns errors if name is not valid or conflicts with another domain. # # ==== Parameters @@ -17,7 +16,6 @@ module Fog # * gtdLocation<~String> Global Traffic Director location. Values: DEFAULT, US_EAST, US_WEST, EUROPE # * status<~Integer> - 201 - secondary entry successfully created or modified, 400 - secondary entry name or IP addresses not valid, see errors in response content def update_secondary(secondary_name, ip_addresses) - body = { "ip" => [*ip_addresses] } @@ -29,7 +27,6 @@ module Fog :body => Fog::JSON.encode(body) ) end - end end end diff --git a/lib/fog/dreamhost/core.rb b/lib/fog/dreamhost/core.rb index 8d1d4c0fe..034c24534 100644 --- a/lib/fog/dreamhost/core.rb +++ b/lib/fog/dreamhost/core.rb @@ -3,10 +3,8 @@ require 'fog/json' module Fog module Dreamhost - extend Fog::Provider service(:dns, 'DNS') - end end diff --git a/lib/fog/dreamhost/dns.rb b/lib/fog/dreamhost/dns.rb index 3f6e5ec38..498572cdb 100644 --- a/lib/fog/dreamhost/dns.rb +++ b/lib/fog/dreamhost/dns.rb @@ -3,7 +3,6 @@ require 'fog/dreamhost/core' module Fog module DNS class Dreamhost < Fog::Service - requires :dreamhost_api_key model_path 'fog/dreamhost/models/dns' @@ -18,7 +17,6 @@ module Fog request :delete_record class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = {} @@ -40,11 +38,9 @@ module Fog def reset_data self.class.data.delete end - end class Real - def initialize(options={}) @dreamhost_api_key = options[:dreamhost_api_key] if options[:dreamhost_url] diff --git a/lib/fog/dreamhost/models/dns/record.rb b/lib/fog/dreamhost/models/dns/record.rb index 2aea5c072..25518e580 100644 --- a/lib/fog/dreamhost/models/dns/record.rb +++ b/lib/fog/dreamhost/models/dns/record.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module DNS class Dreamhost - class Record < Fog::Model - identity :name, :aliases => 'record' attribute :value @@ -27,9 +25,7 @@ module Fog merge_attributes(data) true end - end - end end end diff --git a/lib/fog/dreamhost/models/dns/records.rb b/lib/fog/dreamhost/models/dns/records.rb index 5f374bfcd..305037132 100644 --- a/lib/fog/dreamhost/models/dns/records.rb +++ b/lib/fog/dreamhost/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/dreamhost/models/dns/record' module Fog module DNS class Dreamhost - class Records < Fog::Collection - model Fog::DNS::Dreamhost::Record def all(filter = {}) @@ -25,14 +23,12 @@ module Fog rescue Excon::Errors::NotFound nil end - end def new(attributes = {}) requires :zone super({ :zone => zone }.merge!(attributes)) end - end end end diff --git a/lib/fog/dreamhost/models/dns/zone.rb b/lib/fog/dreamhost/models/dns/zone.rb index 1f46f3224..bbeac96d9 100644 --- a/lib/fog/dreamhost/models/dns/zone.rb +++ b/lib/fog/dreamhost/models/dns/zone.rb @@ -4,7 +4,6 @@ require 'fog/dreamhost/models/dns/records' module Fog module DNS class Dreamhost - # # Dreamhost API has no concept of 'Zone', but we # can emulate it. @@ -12,7 +11,6 @@ module Fog # http://wiki.dreamhost.com/API/Dns_commands # class Zone < Fog::Model - identity :id attribute :domain, :aliases => 'name' @@ -51,9 +49,7 @@ module Fog def save raise NotImplementedError.new end - end - end end end diff --git a/lib/fog/dreamhost/models/dns/zones.rb b/lib/fog/dreamhost/models/dns/zones.rb index 8255966f5..e2958b21d 100644 --- a/lib/fog/dreamhost/models/dns/zones.rb +++ b/lib/fog/dreamhost/models/dns/zones.rb @@ -4,7 +4,6 @@ require 'fog/dreamhost/models/dns/zone' module Fog module DNS class Dreamhost - # # Dreamhost API has no concept of 'Zone', but we # can emulate it. @@ -12,7 +11,6 @@ module Fog # http://wiki.dreamhost.com/API/Dns_commands # class Zones < Fog::Collection - model Fog::DNS::Dreamhost::Zone def all @@ -33,9 +31,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/dreamhost/requests/dns/create_record.rb b/lib/fog/dreamhost/requests/dns/create_record.rb index aeb919e9f..38d982b65 100644 --- a/lib/fog/dreamhost/requests/dns/create_record.rb +++ b/lib/fog/dreamhost/requests/dns/create_record.rb @@ -1,17 +1,13 @@ module Fog module DNS class Dreamhost - class Mock - def create_record(record, type, value, comment = "") Fog::Mock.not_implemented end - end class Real - def create_record(record, type, value, comment = "") request( :expects => 200, :method => 'GET', @@ -25,7 +21,6 @@ module Fog } ) end - end end end diff --git a/lib/fog/dreamhost/requests/dns/delete_record.rb b/lib/fog/dreamhost/requests/dns/delete_record.rb index bba688aba..e413ac94f 100644 --- a/lib/fog/dreamhost/requests/dns/delete_record.rb +++ b/lib/fog/dreamhost/requests/dns/delete_record.rb @@ -1,17 +1,13 @@ module Fog module DNS class Dreamhost - class Mock - def delete_record(name, type, value) raise Fog::Mock.not_implemented end - end class Real - def delete_record(name, type, value) request( :expects => 200, :method => "GET", @@ -24,7 +20,6 @@ module Fog } ) end - end end end diff --git a/lib/fog/dreamhost/requests/dns/list_records.rb b/lib/fog/dreamhost/requests/dns/list_records.rb index d736eb8b3..e5963bed3 100644 --- a/lib/fog/dreamhost/requests/dns/list_records.rb +++ b/lib/fog/dreamhost/requests/dns/list_records.rb @@ -1,24 +1,19 @@ module Fog module DNS class Dreamhost - class Mock - def request(*args) Fog::Mock.not_implemented end - end class Real - def list_records request( :expects => 200, :method => "GET", :path => "/", :query => { :cmd => 'dns-list_records' } ) end - end end end diff --git a/lib/fog/dynect/dns.rb b/lib/fog/dynect/dns.rb index 454e5d72b..594874105 100644 --- a/lib/fog/dynect/dns.rb +++ b/lib/fog/dynect/dns.rb @@ -3,7 +3,6 @@ require 'fog/dynect/core' module Fog module DNS class Dynect < Fog::Service - requires :dynect_customer, :dynect_username, :dynect_password recognizes :timeout, :persistent recognizes :provider # remove post deprecation @@ -139,7 +138,6 @@ module Fog response end end - end end end diff --git a/lib/fog/dynect/models/dns/record.rb b/lib/fog/dynect/models/dns/record.rb index 7c3d42089..1ecaad4d4 100644 --- a/lib/fog/dynect/models/dns/record.rb +++ b/lib/fog/dynect/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class Dynect - class Record < Fog::Model extend Fog::Deprecation @@ -58,9 +57,7 @@ module Fog def zone=(new_zone) @zone = new_zone end - end - end end end diff --git a/lib/fog/dynect/models/dns/records.rb b/lib/fog/dynect/models/dns/records.rb index 2a202ea3a..f0690cdc3 100644 --- a/lib/fog/dynect/models/dns/records.rb +++ b/lib/fog/dynect/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/dynect/models/dns/record' module Fog module DNS class Dynect - class Records < Fog::Collection - attribute :zone model Fog::DNS::Dynect::Record @@ -57,9 +55,7 @@ module Fog requires :zone super({:zone => zone}.merge!(attributes)) end - end - end end end diff --git a/lib/fog/dynect/models/dns/zone.rb b/lib/fog/dynect/models/dns/zone.rb index f22c65443..e14f62292 100644 --- a/lib/fog/dynect/models/dns/zone.rb +++ b/lib/fog/dynect/models/dns/zone.rb @@ -4,9 +4,7 @@ require 'fog/dynect/models/dns/records' module Fog module DNS class Dynect - class Zone < Fog::Model - identity :domain attribute :domain, :aliases => 'zone' @@ -52,9 +50,7 @@ module Fog merge_attributes(data) true end - end - end end end diff --git a/lib/fog/dynect/models/dns/zones.rb b/lib/fog/dynect/models/dns/zones.rb index d3c33555f..b0ef2c749 100644 --- a/lib/fog/dynect/models/dns/zones.rb +++ b/lib/fog/dynect/models/dns/zones.rb @@ -4,9 +4,7 @@ require 'fog/dynect/models/dns/zone' module Fog module DNS class Dynect - class Zones < Fog::Collection - model Fog::DNS::Dynect::Zone def all @@ -21,9 +19,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/dynect/requests/dns/delete_record.rb b/lib/fog/dynect/requests/dns/delete_record.rb index 75d12b2b1..9cbc6f663 100644 --- a/lib/fog/dynect/requests/dns/delete_record.rb +++ b/lib/fog/dynect/requests/dns/delete_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Delete a record # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/delete_zone.rb b/lib/fog/dynect/requests/dns/delete_zone.rb index 6f1f237c5..1e54accae 100644 --- a/lib/fog/dynect/requests/dns/delete_zone.rb +++ b/lib/fog/dynect/requests/dns/delete_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Delete a zone # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/get_all_records.rb b/lib/fog/dynect/requests/dns/get_all_records.rb index 38dd45c93..b2e0cde98 100644 --- a/lib/fog/dynect/requests/dns/get_all_records.rb +++ b/lib/fog/dynect/requests/dns/get_all_records.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Get one or more node lists # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/get_node_list.rb b/lib/fog/dynect/requests/dns/get_node_list.rb index 3418c2153..125acb7fc 100644 --- a/lib/fog/dynect/requests/dns/get_node_list.rb +++ b/lib/fog/dynect/requests/dns/get_node_list.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Get one or more node lists # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/get_record.rb b/lib/fog/dynect/requests/dns/get_record.rb index 1892306ae..cb5753cd2 100644 --- a/lib/fog/dynect/requests/dns/get_record.rb +++ b/lib/fog/dynect/requests/dns/get_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # List records of a given type # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/get_zone.rb b/lib/fog/dynect/requests/dns/get_zone.rb index 14fefaf1a..6147f41d9 100644 --- a/lib/fog/dynect/requests/dns/get_zone.rb +++ b/lib/fog/dynect/requests/dns/get_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Get one or more zones # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/post_record.rb b/lib/fog/dynect/requests/dns/post_record.rb index fbcbaaa17..126bec00f 100644 --- a/lib/fog/dynect/requests/dns/post_record.rb +++ b/lib/fog/dynect/requests/dns/post_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Create a record # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/post_session.rb b/lib/fog/dynect/requests/dns/post_session.rb index 4d2cf1973..3aa3d82f3 100644 --- a/lib/fog/dynect/requests/dns/post_session.rb +++ b/lib/fog/dynect/requests/dns/post_session.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - def post_session request( :expects => 200, diff --git a/lib/fog/dynect/requests/dns/post_zone.rb b/lib/fog/dynect/requests/dns/post_zone.rb index 501b1f2aa..579b6424a 100644 --- a/lib/fog/dynect/requests/dns/post_zone.rb +++ b/lib/fog/dynect/requests/dns/post_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Create a zone # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/put_record.rb b/lib/fog/dynect/requests/dns/put_record.rb index 7d8c9fd54..5f5f6a313 100644 --- a/lib/fog/dynect/requests/dns/put_record.rb +++ b/lib/fog/dynect/requests/dns/put_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Update or replace a record # # ==== Parameters diff --git a/lib/fog/dynect/requests/dns/put_zone.rb b/lib/fog/dynect/requests/dns/put_zone.rb index 817b8cb78..c421061b9 100644 --- a/lib/fog/dynect/requests/dns/put_zone.rb +++ b/lib/fog/dynect/requests/dns/put_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Dynect class Real - # Update a zone # # ==== Parameters diff --git a/lib/fog/ecloud/collection.rb b/lib/fog/ecloud/collection.rb index 03ff2932d..62b49b428 100644 --- a/lib/fog/ecloud/collection.rb +++ b/lib/fog/ecloud/collection.rb @@ -1,7 +1,6 @@ module Fog module Ecloud class Collection < Fog::Collection - def load(objects) objects = [ objects ] if objects.is_a?(Hash) super @@ -20,7 +19,6 @@ module Fog raise Fog::Errors::Error.new(msg) end end - end end end diff --git a/lib/fog/ecloud/compute.rb b/lib/fog/ecloud/compute.rb index 2e3ebf395..fcfd10271 100644 --- a/lib/fog/ecloud/compute.rb +++ b/lib/fog/ecloud/compute.rb @@ -247,7 +247,6 @@ module Fog request :virtual_machine_attach_disk module Shared - attr_accessor :base_path attr_reader :versions_uri @@ -284,7 +283,6 @@ module Fog end end - def initialize(options = {}) require 'fog/core/parser' @base_path = options[:base_path] || '/cloudapi/ecloud' @@ -392,7 +390,6 @@ module Fog Base64.encode64(@hmac.sign(string)).chomp end - # section 5.6.3.2 in the ~1000 page pdf spec def canonicalize_headers(headers) tmp = headers.inject({}) {|ret, h| ret[h.first.downcase] = h.last if h.first.match(/^x-tmrk/i) ; ret } @@ -411,7 +408,6 @@ module Fog end end - class Mock include Shared @@ -517,7 +513,6 @@ module Fog } } - public_ip = { :id => public_ip_id, :href => "/cloudapi/ecloud/publicips/#{public_ip_id}", @@ -607,7 +602,6 @@ module Fog network[:IpAddresses][:IpAddress].push(ip_address).push(ip_address2) - short_name = "solaris10_64guest" operating_system = { :short_name => short_name, @@ -684,7 +678,6 @@ module Fog } } - template = { :id => template_id, :href => "/cloudapi/ecloud/templates/#{template_id}/computepools/#{compute_pool_id}", @@ -767,7 +760,6 @@ module Fog :environment_id => environment_id } - { :compute_pools => {compute_pool_id => compute_pool}, :environments => {environment_id => environment}, diff --git a/lib/fog/ecloud/generate_collection.rb b/lib/fog/ecloud/generate_collection.rb index cad674fd9..05084f9bc 100644 --- a/lib/fog/ecloud/generate_collection.rb +++ b/lib/fog/ecloud/generate_collection.rb @@ -6,7 +6,6 @@ class String end end - options = {} OptionParser.new do |opts| opts.banner = "Usage: #{__FILE__} [options]" @@ -26,7 +25,6 @@ METHOD end.join("\n ") end - if options[:attributes] attributes = options[:attributes].map do |a| a = "attribute :#{a[0]}, :aliases => :#{a[1] || a[0].camelize}" @@ -123,7 +121,6 @@ module Fog end MODEL - File.open(collection_file, 'w') { |f| f.write(collection) } File.open(model_file, 'w') { |f| f.write(model) } File.open(collection_request_file, 'w') { |f| f.write(collection_request) } diff --git a/lib/fog/ecloud/mock_data_classes.rb b/lib/fog/ecloud/mock_data_classes.rb index d724a1418..8f06c4d3b 100644 --- a/lib/fog/ecloud/mock_data_classes.rb +++ b/lib/fog/ecloud/mock_data_classes.rb @@ -96,7 +96,6 @@ module Fog find_href_prefixed_in(href, all_virtual_machines) end - def all_networks all_vdcs.map(&:networks).flatten end @@ -226,7 +225,6 @@ module Fog def environments @vdcs ||= [] end - end class MockVdc < Base diff --git a/lib/fog/ecloud/model.rb b/lib/fog/ecloud/model.rb index 12bd160a6..58d295e25 100644 --- a/lib/fog/ecloud/model.rb +++ b/lib/fog/ecloud/model.rb @@ -1,7 +1,6 @@ module Fog module Ecloud class Model < Fog::Model - attr_accessor :loaded alias_method :loaded?, :loaded @@ -16,7 +15,6 @@ module Fog reload end end - end end end diff --git a/lib/fog/ecloud/models/compute/admin_organizations.rb b/lib/fog/ecloud/models/compute/admin_organizations.rb index 06b66c721..8d89cb6d6 100644 --- a/lib/fog/ecloud/models/compute/admin_organizations.rb +++ b/lib/fog/ecloud/models/compute/admin_organizations.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class AdminOrganizations < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::AdminOrganization diff --git a/lib/fog/ecloud/models/compute/api_key.rb b/lib/fog/ecloud/models/compute/api_key.rb index d009f00e6..d2fc8ec61 100644 --- a/lib/fog/ecloud/models/compute/api_key.rb +++ b/lib/fog/ecloud/models/compute/api_key.rb @@ -11,7 +11,6 @@ module Fog attribute :status, :aliases => :Status attribute :private_key, :aliases => :PrivateKey - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/api_keys.rb b/lib/fog/ecloud/models/compute/api_keys.rb index cf4f89c85..f2760e1d8 100644 --- a/lib/fog/ecloud/models/compute/api_keys.rb +++ b/lib/fog/ecloud/models/compute/api_keys.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class ApiKeys < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::ApiKey diff --git a/lib/fog/ecloud/models/compute/associations.rb b/lib/fog/ecloud/models/compute/associations.rb index 16c18a2c1..8d73f5497 100644 --- a/lib/fog/ecloud/models/compute/associations.rb +++ b/lib/fog/ecloud/models/compute/associations.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Associations < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Association diff --git a/lib/fog/ecloud/models/compute/authentication_level.rb b/lib/fog/ecloud/models/compute/authentication_level.rb index 56dc6b5fb..443c7b19b 100644 --- a/lib/fog/ecloud/models/compute/authentication_level.rb +++ b/lib/fog/ecloud/models/compute/authentication_level.rb @@ -12,7 +12,6 @@ module Fog attribute :hmacsha256_enabled, :aliases => :HMACSHA256Enabled, :type => :boolean attribute :hmacsha512_enabled, :aliases => :HMACSHA512Enabled, :type => :boolean - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/authentication_levels.rb b/lib/fog/ecloud/models/compute/authentication_levels.rb index bd01fa2e7..bb1dca6cc 100644 --- a/lib/fog/ecloud/models/compute/authentication_levels.rb +++ b/lib/fog/ecloud/models/compute/authentication_levels.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class AuthenticationLevels < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::AuthenticationLevel diff --git a/lib/fog/ecloud/models/compute/backup_internet_services.rb b/lib/fog/ecloud/models/compute/backup_internet_services.rb index 426879428..e05343e64 100644 --- a/lib/fog/ecloud/models/compute/backup_internet_services.rb +++ b/lib/fog/ecloud/models/compute/backup_internet_services.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class BackupInternetServices < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::BackupInternetService diff --git a/lib/fog/ecloud/models/compute/catalog.rb b/lib/fog/ecloud/models/compute/catalog.rb index cdd27c14c..76f8d7266 100644 --- a/lib/fog/ecloud/models/compute/catalog.rb +++ b/lib/fog/ecloud/models/compute/catalog.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Catalog < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::CatalogItem diff --git a/lib/fog/ecloud/models/compute/catalog_configuration.rb b/lib/fog/ecloud/models/compute/catalog_configuration.rb index 8b06d6f09..b3580e84e 100644 --- a/lib/fog/ecloud/models/compute/catalog_configuration.rb +++ b/lib/fog/ecloud/models/compute/catalog_configuration.rb @@ -13,7 +13,6 @@ module Fog attribute :network_adapters, :aliases => :NetworkAdapters, :type => :integer attribute :network_mappings, :aliases => :NetworkMappings - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/catalog_configurations.rb b/lib/fog/ecloud/models/compute/catalog_configurations.rb index 6eb8b2bca..1c97006ff 100644 --- a/lib/fog/ecloud/models/compute/catalog_configurations.rb +++ b/lib/fog/ecloud/models/compute/catalog_configurations.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class CatalogConfigurations < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::CatalogConfiguration diff --git a/lib/fog/ecloud/models/compute/compute_pool.rb b/lib/fog/ecloud/models/compute/compute_pool.rb index eaad2b1a2..0eafd6796 100644 --- a/lib/fog/ecloud/models/compute/compute_pool.rb +++ b/lib/fog/ecloud/models/compute/compute_pool.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud class ComputePool < Fog::Ecloud::Model - identity :href attribute :href, :aliases => :Href diff --git a/lib/fog/ecloud/models/compute/compute_pools.rb b/lib/fog/ecloud/models/compute/compute_pools.rb index 2faaa1b59..1ce29b9de 100644 --- a/lib/fog/ecloud/models/compute/compute_pools.rb +++ b/lib/fog/ecloud/models/compute/compute_pools.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class ComputePools < Fog::Ecloud::Collection - undef_method :create attribute :href, :aliases => :Href diff --git a/lib/fog/ecloud/models/compute/cpu_usage_detail.rb b/lib/fog/ecloud/models/compute/cpu_usage_detail.rb index a50e96c12..b0719b15e 100644 --- a/lib/fog/ecloud/models/compute/cpu_usage_detail.rb +++ b/lib/fog/ecloud/models/compute/cpu_usage_detail.rb @@ -7,7 +7,6 @@ module Fog attribute :time, :aliases => :Time attribute :value, :aliases => :Value - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/cpu_usage_detail_summary.rb b/lib/fog/ecloud/models/compute/cpu_usage_detail_summary.rb index 1601305ef..cc95b0722 100644 --- a/lib/fog/ecloud/models/compute/cpu_usage_detail_summary.rb +++ b/lib/fog/ecloud/models/compute/cpu_usage_detail_summary.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class CpuUsageDetailSummary < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::CpuUsageDetail diff --git a/lib/fog/ecloud/models/compute/detached_disks.rb b/lib/fog/ecloud/models/compute/detached_disks.rb index b5eec82aa..10582e19d 100644 --- a/lib/fog/ecloud/models/compute/detached_disks.rb +++ b/lib/fog/ecloud/models/compute/detached_disks.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class DetachedDisks < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::DetachedDisk diff --git a/lib/fog/ecloud/models/compute/environment.rb b/lib/fog/ecloud/models/compute/environment.rb index e18045e62..11742ba67 100644 --- a/lib/fog/ecloud/models/compute/environment.rb +++ b/lib/fog/ecloud/models/compute/environment.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud class Environment < Fog::Ecloud::Model - identity :href ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd diff --git a/lib/fog/ecloud/models/compute/environments.rb b/lib/fog/ecloud/models/compute/environments.rb index 75b83b55c..701b2eec6 100644 --- a/lib/fog/ecloud/models/compute/environments.rb +++ b/lib/fog/ecloud/models/compute/environments.rb @@ -3,9 +3,7 @@ require 'fog/ecloud/models/compute/environment' module Fog module Compute class Ecloud - class Environments < Fog::Ecloud::Collection - model Fog::Compute::Ecloud::Environment undef_method :create @@ -35,7 +33,6 @@ module Fog end Vdcs = Environments - end end end diff --git a/lib/fog/ecloud/models/compute/firewall_acls.rb b/lib/fog/ecloud/models/compute/firewall_acls.rb index be3735e36..3185d5d80 100644 --- a/lib/fog/ecloud/models/compute/firewall_acls.rb +++ b/lib/fog/ecloud/models/compute/firewall_acls.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class FirewallAcls < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::FirewallAcl diff --git a/lib/fog/ecloud/models/compute/groups.rb b/lib/fog/ecloud/models/compute/groups.rb index 25a1e942b..3aa1d05a2 100644 --- a/lib/fog/ecloud/models/compute/groups.rb +++ b/lib/fog/ecloud/models/compute/groups.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Groups < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Group diff --git a/lib/fog/ecloud/models/compute/guest_processes.rb b/lib/fog/ecloud/models/compute/guest_processes.rb index c788bc94d..1d791627c 100644 --- a/lib/fog/ecloud/models/compute/guest_processes.rb +++ b/lib/fog/ecloud/models/compute/guest_processes.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class GuestProcesses < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::GuestProcess diff --git a/lib/fog/ecloud/models/compute/hardware_configurations.rb b/lib/fog/ecloud/models/compute/hardware_configurations.rb index 9e95f4ea4..a6e12e374 100644 --- a/lib/fog/ecloud/models/compute/hardware_configurations.rb +++ b/lib/fog/ecloud/models/compute/hardware_configurations.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class HardwareConfigurations < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::HardwareConfiguration diff --git a/lib/fog/ecloud/models/compute/internet_services.rb b/lib/fog/ecloud/models/compute/internet_services.rb index 363e4fb81..e4bfb698a 100644 --- a/lib/fog/ecloud/models/compute/internet_services.rb +++ b/lib/fog/ecloud/models/compute/internet_services.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class InternetServices < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::InternetService diff --git a/lib/fog/ecloud/models/compute/ip_addresses.rb b/lib/fog/ecloud/models/compute/ip_addresses.rb index 712e8d027..e4ae3d432 100644 --- a/lib/fog/ecloud/models/compute/ip_addresses.rb +++ b/lib/fog/ecloud/models/compute/ip_addresses.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class IpAddresses < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::IpAddress diff --git a/lib/fog/ecloud/models/compute/layouts.rb b/lib/fog/ecloud/models/compute/layouts.rb index b6a52a9e3..f36da9ab6 100644 --- a/lib/fog/ecloud/models/compute/layouts.rb +++ b/lib/fog/ecloud/models/compute/layouts.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Layouts < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Layout diff --git a/lib/fog/ecloud/models/compute/location.rb b/lib/fog/ecloud/models/compute/location.rb index d7df6d660..e374283c6 100644 --- a/lib/fog/ecloud/models/compute/location.rb +++ b/lib/fog/ecloud/models/compute/location.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud class Location < Fog::Ecloud::Model - identity :href ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd, :xmlns_i diff --git a/lib/fog/ecloud/models/compute/locations.rb b/lib/fog/ecloud/models/compute/locations.rb index 48a5046b1..bdb0c05b0 100644 --- a/lib/fog/ecloud/models/compute/locations.rb +++ b/lib/fog/ecloud/models/compute/locations.rb @@ -3,9 +3,7 @@ require 'fog/ecloud/models/compute/location' module Fog module Compute class Ecloud - class Locations < Fog::Ecloud::Collection - model Fog::Compute::Ecloud::Location undef_method :create @@ -24,7 +22,6 @@ module Fog rescue Fog::Errors::NotFound nil end - end end end diff --git a/lib/fog/ecloud/models/compute/login_banners.rb b/lib/fog/ecloud/models/compute/login_banners.rb index 280d8a457..f8a0d9054 100644 --- a/lib/fog/ecloud/models/compute/login_banners.rb +++ b/lib/fog/ecloud/models/compute/login_banners.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class LoginBanners < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::LoginBanner diff --git a/lib/fog/ecloud/models/compute/memory_usage_detail_summary.rb b/lib/fog/ecloud/models/compute/memory_usage_detail_summary.rb index 9175ec81a..2e596ec27 100644 --- a/lib/fog/ecloud/models/compute/memory_usage_detail_summary.rb +++ b/lib/fog/ecloud/models/compute/memory_usage_detail_summary.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class MemoryUsageDetailSummary < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::MemoryUsageDetail diff --git a/lib/fog/ecloud/models/compute/monitors.rb b/lib/fog/ecloud/models/compute/monitors.rb index a83f750dc..f37e4d5ef 100644 --- a/lib/fog/ecloud/models/compute/monitors.rb +++ b/lib/fog/ecloud/models/compute/monitors.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Monitors < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Monitor diff --git a/lib/fog/ecloud/models/compute/networks.rb b/lib/fog/ecloud/models/compute/networks.rb index e0c924a6c..10f14ff8c 100644 --- a/lib/fog/ecloud/models/compute/networks.rb +++ b/lib/fog/ecloud/models/compute/networks.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Networks < Fog::Ecloud::Collection - attribute :href, :aliases => :Href model Fog::Compute::Ecloud::Network diff --git a/lib/fog/ecloud/models/compute/nodes.rb b/lib/fog/ecloud/models/compute/nodes.rb index 4e8b633d0..6064c4be0 100644 --- a/lib/fog/ecloud/models/compute/nodes.rb +++ b/lib/fog/ecloud/models/compute/nodes.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Nodes < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Node diff --git a/lib/fog/ecloud/models/compute/operating_system.rb b/lib/fog/ecloud/models/compute/operating_system.rb index ed8c68c5b..df9c0f43b 100644 --- a/lib/fog/ecloud/models/compute/operating_system.rb +++ b/lib/fog/ecloud/models/compute/operating_system.rb @@ -7,7 +7,6 @@ module Fog attribute :name, :aliases => :Name attribute :type, :aliases => :Type - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/operating_system_families.rb b/lib/fog/ecloud/models/compute/operating_system_families.rb index ed8c41552..7e3659216 100644 --- a/lib/fog/ecloud/models/compute/operating_system_families.rb +++ b/lib/fog/ecloud/models/compute/operating_system_families.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class OperatingSystemFamilies < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::OperatingSystemFamily diff --git a/lib/fog/ecloud/models/compute/operating_systems.rb b/lib/fog/ecloud/models/compute/operating_systems.rb index d6e9cd6b0..542646785 100644 --- a/lib/fog/ecloud/models/compute/operating_systems.rb +++ b/lib/fog/ecloud/models/compute/operating_systems.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class OperatingSystems < Fog::Ecloud::Collection - model Fog::Compute::Ecloud::OperatingSystem identity :data diff --git a/lib/fog/ecloud/models/compute/organization.rb b/lib/fog/ecloud/models/compute/organization.rb index 28832105e..020cda1d5 100644 --- a/lib/fog/ecloud/models/compute/organization.rb +++ b/lib/fog/ecloud/models/compute/organization.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud class Organization < Fog::Ecloud::Model - identity :href ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd, :xmlns_i diff --git a/lib/fog/ecloud/models/compute/organizations.rb b/lib/fog/ecloud/models/compute/organizations.rb index d41c2dab0..212da2238 100644 --- a/lib/fog/ecloud/models/compute/organizations.rb +++ b/lib/fog/ecloud/models/compute/organizations.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Organizations < Fog::Ecloud::Collection - model Fog::Compute::Ecloud::Organization undef_method :create diff --git a/lib/fog/ecloud/models/compute/password_complexity_rules.rb b/lib/fog/ecloud/models/compute/password_complexity_rules.rb index e6751771a..44e0adb2d 100644 --- a/lib/fog/ecloud/models/compute/password_complexity_rules.rb +++ b/lib/fog/ecloud/models/compute/password_complexity_rules.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class PasswordComplexityRules < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::PasswordComplexityRule diff --git a/lib/fog/ecloud/models/compute/physical_device.rb b/lib/fog/ecloud/models/compute/physical_device.rb index 663b93162..d5739b519 100644 --- a/lib/fog/ecloud/models/compute/physical_device.rb +++ b/lib/fog/ecloud/models/compute/physical_device.rb @@ -12,7 +12,6 @@ module Fog attribute :classification, :aliases => :Classification attribute :model, :aliases => :Model - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/physical_devices.rb b/lib/fog/ecloud/models/compute/physical_devices.rb index ad44c7d6c..97ed57df3 100644 --- a/lib/fog/ecloud/models/compute/physical_devices.rb +++ b/lib/fog/ecloud/models/compute/physical_devices.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class PhysicalDevices < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::PhysicalDevice diff --git a/lib/fog/ecloud/models/compute/public_ips.rb b/lib/fog/ecloud/models/compute/public_ips.rb index 8bc262c36..a496cf5f0 100644 --- a/lib/fog/ecloud/models/compute/public_ips.rb +++ b/lib/fog/ecloud/models/compute/public_ips.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class PublicIps < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::PublicIp diff --git a/lib/fog/ecloud/models/compute/rnats.rb b/lib/fog/ecloud/models/compute/rnats.rb index c69796577..1427aebd1 100644 --- a/lib/fog/ecloud/models/compute/rnats.rb +++ b/lib/fog/ecloud/models/compute/rnats.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Rnats < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Rnat diff --git a/lib/fog/ecloud/models/compute/role.rb b/lib/fog/ecloud/models/compute/role.rb index 7233b1a41..83a6a25e3 100644 --- a/lib/fog/ecloud/models/compute/role.rb +++ b/lib/fog/ecloud/models/compute/role.rb @@ -14,7 +14,6 @@ module Fog attribute :is_admin, :aliases => :IsAdmin, :type => :boolean attribute :business_operations, :aliases => :BusinessOperations - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/roles.rb b/lib/fog/ecloud/models/compute/roles.rb index d908270ce..019c346f7 100644 --- a/lib/fog/ecloud/models/compute/roles.rb +++ b/lib/fog/ecloud/models/compute/roles.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Roles < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Role diff --git a/lib/fog/ecloud/models/compute/rows.rb b/lib/fog/ecloud/models/compute/rows.rb index 32f1a8a1b..547e0ab20 100644 --- a/lib/fog/ecloud/models/compute/rows.rb +++ b/lib/fog/ecloud/models/compute/rows.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Rows < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Row diff --git a/lib/fog/ecloud/models/compute/server_configuration_option.rb b/lib/fog/ecloud/models/compute/server_configuration_option.rb index 7e1cccd4c..90ee1e2eb 100644 --- a/lib/fog/ecloud/models/compute/server_configuration_option.rb +++ b/lib/fog/ecloud/models/compute/server_configuration_option.rb @@ -7,7 +7,6 @@ module Fog attribute :disk, :aliases => :Disk attribute :customization, :aliases => :Customization - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/server_configuration_options.rb b/lib/fog/ecloud/models/compute/server_configuration_options.rb index bffd8bd97..b1e8ee218 100644 --- a/lib/fog/ecloud/models/compute/server_configuration_options.rb +++ b/lib/fog/ecloud/models/compute/server_configuration_options.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class ServerConfigurationOptions < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::ServerConfigurationOption diff --git a/lib/fog/ecloud/models/compute/servers.rb b/lib/fog/ecloud/models/compute/servers.rb index f31041cf3..1eca374be 100644 --- a/lib/fog/ecloud/models/compute/servers.rb +++ b/lib/fog/ecloud/models/compute/servers.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Servers < Fog::Ecloud::Collection - model Fog::Compute::Ecloud::Server identity :href @@ -60,7 +59,6 @@ module Fog object = self.service.servers.new(data) object end - end end end diff --git a/lib/fog/ecloud/models/compute/ssh_key.rb b/lib/fog/ecloud/models/compute/ssh_key.rb index ad39d0821..c814dac08 100644 --- a/lib/fog/ecloud/models/compute/ssh_key.rb +++ b/lib/fog/ecloud/models/compute/ssh_key.rb @@ -10,7 +10,6 @@ module Fog attribute :default, :aliases => :Default, :type => :boolean attribute :finger_print, :aliases => :FingerPrint - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/ssh_keys.rb b/lib/fog/ecloud/models/compute/ssh_keys.rb index 0caf48ed2..733a93c23 100644 --- a/lib/fog/ecloud/models/compute/ssh_keys.rb +++ b/lib/fog/ecloud/models/compute/ssh_keys.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class SshKeys < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::SshKey diff --git a/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb b/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb index 03ded9a0e..deeffbe1e 100644 --- a/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb +++ b/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class StorageUsageDetailSummary < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::StorageUsageDetail diff --git a/lib/fog/ecloud/models/compute/support_ticket.rb b/lib/fog/ecloud/models/compute/support_ticket.rb index 7e3d8ccda..f4090d715 100644 --- a/lib/fog/ecloud/models/compute/support_ticket.rb +++ b/lib/fog/ecloud/models/compute/support_ticket.rb @@ -19,7 +19,6 @@ module Fog attribute :solution, :aliases => :Solution attribute :history, :aliases => :History - def id href.scan(/\d+/)[0] end diff --git a/lib/fog/ecloud/models/compute/support_tickets.rb b/lib/fog/ecloud/models/compute/support_tickets.rb index 9e27391bf..73a78a926 100644 --- a/lib/fog/ecloud/models/compute/support_tickets.rb +++ b/lib/fog/ecloud/models/compute/support_tickets.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class SupportTickets < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::SupportTicket diff --git a/lib/fog/ecloud/models/compute/tags.rb b/lib/fog/ecloud/models/compute/tags.rb index 407967c0c..cf9cda0f2 100644 --- a/lib/fog/ecloud/models/compute/tags.rb +++ b/lib/fog/ecloud/models/compute/tags.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Tags < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Tag diff --git a/lib/fog/ecloud/models/compute/tasks.rb b/lib/fog/ecloud/models/compute/tasks.rb index e3ba3d7d7..3773a314b 100644 --- a/lib/fog/ecloud/models/compute/tasks.rb +++ b/lib/fog/ecloud/models/compute/tasks.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Tasks < Fog::Ecloud::Collection - model Fog::Compute::Ecloud::Task identity :href diff --git a/lib/fog/ecloud/models/compute/templates.rb b/lib/fog/ecloud/models/compute/templates.rb index 55dc2cce3..0e5f5649d 100644 --- a/lib/fog/ecloud/models/compute/templates.rb +++ b/lib/fog/ecloud/models/compute/templates.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Templates < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::Template diff --git a/lib/fog/ecloud/models/compute/trusted_network_groups.rb b/lib/fog/ecloud/models/compute/trusted_network_groups.rb index 83070b4dc..ab5f8bb04 100644 --- a/lib/fog/ecloud/models/compute/trusted_network_groups.rb +++ b/lib/fog/ecloud/models/compute/trusted_network_groups.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class TrustedNetworkGroups < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::TrustedNetworkGroup diff --git a/lib/fog/ecloud/models/compute/users.rb b/lib/fog/ecloud/models/compute/users.rb index 176d6c6ab..86614077b 100644 --- a/lib/fog/ecloud/models/compute/users.rb +++ b/lib/fog/ecloud/models/compute/users.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class Users < Fog::Ecloud::Collection - identity :href model Fog::Compute::Ecloud::User diff --git a/lib/fog/ecloud/models/compute/virtual_machine_assigned_ips.rb b/lib/fog/ecloud/models/compute/virtual_machine_assigned_ips.rb index 6c5d5e50c..effad0d29 100644 --- a/lib/fog/ecloud/models/compute/virtual_machine_assigned_ips.rb +++ b/lib/fog/ecloud/models/compute/virtual_machine_assigned_ips.rb @@ -4,7 +4,6 @@ module Fog module Compute class Ecloud class VirtualMachineAssignedIps < Fog::Ecloud::Collection - identity :virtual_machine_id model Fog::Compute::Ecloud::VirtualMachineAssignedIp diff --git a/lib/fog/ecloud/requests/compute/admin_edit_authentication_levels.rb b/lib/fog/ecloud/requests/compute/admin_edit_authentication_levels.rb index 5cd20ff07..8e8e489b7 100644 --- a/lib/fog/ecloud/requests/compute/admin_edit_authentication_levels.rb +++ b/lib/fog/ecloud/requests/compute/admin_edit_authentication_levels.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud class Real - def authentication_levels_edit(data) validate_data([:basic, :sha1, :sha256, :sha512], data) body = build_authentication_levels_edit(data) diff --git a/lib/fog/ecloud/requests/compute/admin_edit_login_banner.rb b/lib/fog/ecloud/requests/compute/admin_edit_login_banner.rb index b55392872..a4d622b72 100644 --- a/lib/fog/ecloud/requests/compute/admin_edit_login_banner.rb +++ b/lib/fog/ecloud/requests/compute/admin_edit_login_banner.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud class Real - def login_banner_edit(data) validate_data([:display], data) body = build_login_banner_edit(data) @@ -18,7 +17,6 @@ module Fog private - def build_login_banner_edit(data) xml = Builder::XmlMarkup.new xml.LoginBanner do diff --git a/lib/fog/ecloud/requests/compute/admin_edit_password_complexity_rules.rb b/lib/fog/ecloud/requests/compute/admin_edit_password_complexity_rules.rb index 9e5fa0d2c..2a8b43d78 100644 --- a/lib/fog/ecloud/requests/compute/admin_edit_password_complexity_rules.rb +++ b/lib/fog/ecloud/requests/compute/admin_edit_password_complexity_rules.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud class Real - def password_complexity_rules_edit(data) validate_data([:rule_type], data) if data[:rule_type] == "Custom" @@ -22,7 +21,6 @@ module Fog private - def build_password_complexity_rules_edit(data) xml = Builder::XmlMarkup.new xml.PasswordComplexityRules do diff --git a/lib/fog/ecloud/requests/compute/backup_internet_service_delete.rb b/lib/fog/ecloud/requests/compute/backup_internet_service_delete.rb index 2e1c26316..b9565ee12 100644 --- a/lib/fog/ecloud/requests/compute/backup_internet_service_delete.rb +++ b/lib/fog/ecloud/requests/compute/backup_internet_service_delete.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :backup_internet_service_delete, 202, 'DELETE' end - end end end diff --git a/lib/fog/ecloud/requests/compute/compute_pool_edit.rb b/lib/fog/ecloud/requests/compute/compute_pool_edit.rb index f0a34b4b0..8b797e607 100644 --- a/lib/fog/ecloud/requests/compute/compute_pool_edit.rb +++ b/lib/fog/ecloud/requests/compute/compute_pool_edit.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def validate_edit_compute_pool_options(options) required_opts = [:name] unless required_opts.all? { |opt| options.has_key?(opt) } @@ -18,7 +17,6 @@ module Fog end class Real - def compute_pool_edit(options) validate_edit_compute_pool_options(options) body = build_compute_pool_body_edit(options) diff --git a/lib/fog/ecloud/requests/compute/firewall_acls_create.rb b/lib/fog/ecloud/requests/compute/firewall_acls_create.rb index 8f814ec0b..d4c89f8ef 100644 --- a/lib/fog/ecloud/requests/compute/firewall_acls_create.rb +++ b/lib/fog/ecloud/requests/compute/firewall_acls_create.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real include Shared diff --git a/lib/fog/ecloud/requests/compute/firewall_acls_delete.rb b/lib/fog/ecloud/requests/compute/firewall_acls_delete.rb index fd1b072b6..a0936ca67 100644 --- a/lib/fog/ecloud/requests/compute/firewall_acls_delete.rb +++ b/lib/fog/ecloud/requests/compute/firewall_acls_delete.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :firewall_acls_delete, 202, 'DELETE' end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_admin_organization.rb b/lib/fog/ecloud/requests/compute/get_admin_organization.rb index 4d7fa0125..035afdd1e 100644 --- a/lib/fog/ecloud/requests/compute/get_admin_organization.rb +++ b/lib/fog/ecloud/requests/compute/get_admin_organization.rb @@ -1,14 +1,12 @@ module Fog module Compute class Ecloud - class Real basic_request :get_admin_organization end class Mock def get_admin_organization(uri) - organization_id = id_from_uri(uri) admin_organization = self.data[:admin_organizations][organization_id] diff --git a/lib/fog/ecloud/requests/compute/get_api_key.rb b/lib/fog/ecloud/requests/compute/get_api_key.rb index ed08549df..7f7e1c918 100644 --- a/lib/fog/ecloud/requests/compute/get_api_key.rb +++ b/lib/fog/ecloud/requests/compute/get_api_key.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_api_key end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_api_keys.rb b/lib/fog/ecloud/requests/compute/get_api_keys.rb index ba89528dc..62fd3958f 100644 --- a/lib/fog/ecloud/requests/compute/get_api_keys.rb +++ b/lib/fog/ecloud/requests/compute/get_api_keys.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_api_keys end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_association.rb b/lib/fog/ecloud/requests/compute/get_association.rb index 4d32598c3..5c261e42c 100644 --- a/lib/fog/ecloud/requests/compute/get_association.rb +++ b/lib/fog/ecloud/requests/compute/get_association.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_association end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_associations.rb b/lib/fog/ecloud/requests/compute/get_associations.rb index c787f4111..11b57a347 100644 --- a/lib/fog/ecloud/requests/compute/get_associations.rb +++ b/lib/fog/ecloud/requests/compute/get_associations.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_associations end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_authentication_level.rb b/lib/fog/ecloud/requests/compute/get_authentication_level.rb index 3c381a117..4816b58a8 100644 --- a/lib/fog/ecloud/requests/compute/get_authentication_level.rb +++ b/lib/fog/ecloud/requests/compute/get_authentication_level.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_authentication_level end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_authentication_levels.rb b/lib/fog/ecloud/requests/compute/get_authentication_levels.rb index 9d2a121de..3f369e91d 100644 --- a/lib/fog/ecloud/requests/compute/get_authentication_levels.rb +++ b/lib/fog/ecloud/requests/compute/get_authentication_levels.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_authentication_levels end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_backup_internet_service.rb b/lib/fog/ecloud/requests/compute/get_backup_internet_service.rb index 63c825392..1f2a35ea7 100644 --- a/lib/fog/ecloud/requests/compute/get_backup_internet_service.rb +++ b/lib/fog/ecloud/requests/compute/get_backup_internet_service.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_backup_internet_service end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_backup_internet_services.rb b/lib/fog/ecloud/requests/compute/get_backup_internet_services.rb index f3dc0b432..38c9bc203 100644 --- a/lib/fog/ecloud/requests/compute/get_backup_internet_services.rb +++ b/lib/fog/ecloud/requests/compute/get_backup_internet_services.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_backup_internet_services end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_catalog.rb b/lib/fog/ecloud/requests/compute/get_catalog.rb index 8c97a0057..0aa84ec13 100644 --- a/lib/fog/ecloud/requests/compute/get_catalog.rb +++ b/lib/fog/ecloud/requests/compute/get_catalog.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_catalog end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_catalog_configuration.rb b/lib/fog/ecloud/requests/compute/get_catalog_configuration.rb index 7aea2df98..30407f94d 100644 --- a/lib/fog/ecloud/requests/compute/get_catalog_configuration.rb +++ b/lib/fog/ecloud/requests/compute/get_catalog_configuration.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_catalog_configuration end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_catalog_configurations.rb b/lib/fog/ecloud/requests/compute/get_catalog_configurations.rb index 43c1d65c8..63bf0afbc 100644 --- a/lib/fog/ecloud/requests/compute/get_catalog_configurations.rb +++ b/lib/fog/ecloud/requests/compute/get_catalog_configurations.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_catalog_configurations end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_catalog_item.rb b/lib/fog/ecloud/requests/compute/get_catalog_item.rb index a70a58469..336112979 100644 --- a/lib/fog/ecloud/requests/compute/get_catalog_item.rb +++ b/lib/fog/ecloud/requests/compute/get_catalog_item.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_catalog_item end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_compute_pool.rb b/lib/fog/ecloud/requests/compute/get_compute_pool.rb index 02e97ace2..69a7c4f31 100644 --- a/lib/fog/ecloud/requests/compute/get_compute_pool.rb +++ b/lib/fog/ecloud/requests/compute/get_compute_pool.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_compute_pool end diff --git a/lib/fog/ecloud/requests/compute/get_compute_pools.rb b/lib/fog/ecloud/requests/compute/get_compute_pools.rb index f1be76e32..a104dcc24 100644 --- a/lib/fog/ecloud/requests/compute/get_compute_pools.rb +++ b/lib/fog/ecloud/requests/compute/get_compute_pools.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_compute_pools end diff --git a/lib/fog/ecloud/requests/compute/get_cpu_usage_detail.rb b/lib/fog/ecloud/requests/compute/get_cpu_usage_detail.rb index 6b0e8ddb4..a3eae7eb4 100644 --- a/lib/fog/ecloud/requests/compute/get_cpu_usage_detail.rb +++ b/lib/fog/ecloud/requests/compute/get_cpu_usage_detail.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_cpu_usage_detail end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_cpu_usage_detail_summary.rb b/lib/fog/ecloud/requests/compute/get_cpu_usage_detail_summary.rb index 6f4e93258..945d31958 100644 --- a/lib/fog/ecloud/requests/compute/get_cpu_usage_detail_summary.rb +++ b/lib/fog/ecloud/requests/compute/get_cpu_usage_detail_summary.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_cpu_usage_detail_summary end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_detached_disks.rb b/lib/fog/ecloud/requests/compute/get_detached_disks.rb index b0ef60658..105ee7fb6 100644 --- a/lib/fog/ecloud/requests/compute/get_detached_disks.rb +++ b/lib/fog/ecloud/requests/compute/get_detached_disks.rb @@ -1,14 +1,12 @@ module Fog module Compute class Ecloud - class Real basic_request :get_detached_disks end class Mock def get_detached_disks(uri) - compute_pool_id = id_from_uri(uri) compute_pool = self.data[:compute_pools][compute_pool_id] diff --git a/lib/fog/ecloud/requests/compute/get_environment.rb b/lib/fog/ecloud/requests/compute/get_environment.rb index 105865c99..fa46d1f3a 100644 --- a/lib/fog/ecloud/requests/compute/get_environment.rb +++ b/lib/fog/ecloud/requests/compute/get_environment.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_environment end diff --git a/lib/fog/ecloud/requests/compute/get_firewall_acl.rb b/lib/fog/ecloud/requests/compute/get_firewall_acl.rb index b11894803..5271dc9d6 100644 --- a/lib/fog/ecloud/requests/compute/get_firewall_acl.rb +++ b/lib/fog/ecloud/requests/compute/get_firewall_acl.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_firewall_acl end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_firewall_acls.rb b/lib/fog/ecloud/requests/compute/get_firewall_acls.rb index 3254ffc4c..6135f9c8b 100644 --- a/lib/fog/ecloud/requests/compute/get_firewall_acls.rb +++ b/lib/fog/ecloud/requests/compute/get_firewall_acls.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_firewall_acls end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_guest_process.rb b/lib/fog/ecloud/requests/compute/get_guest_process.rb index fcb776749..f4f631d0f 100644 --- a/lib/fog/ecloud/requests/compute/get_guest_process.rb +++ b/lib/fog/ecloud/requests/compute/get_guest_process.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_guest_process end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_guest_processes.rb b/lib/fog/ecloud/requests/compute/get_guest_processes.rb index b3d1d9969..ecd209bc9 100644 --- a/lib/fog/ecloud/requests/compute/get_guest_processes.rb +++ b/lib/fog/ecloud/requests/compute/get_guest_processes.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_guest_processes end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_hardware_configuration.rb b/lib/fog/ecloud/requests/compute/get_hardware_configuration.rb index 0b2cd3c0a..212a0a078 100644 --- a/lib/fog/ecloud/requests/compute/get_hardware_configuration.rb +++ b/lib/fog/ecloud/requests/compute/get_hardware_configuration.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_hardware_configuration end diff --git a/lib/fog/ecloud/requests/compute/get_hardware_configurations.rb b/lib/fog/ecloud/requests/compute/get_hardware_configurations.rb index c6ab8e830..a38143123 100644 --- a/lib/fog/ecloud/requests/compute/get_hardware_configurations.rb +++ b/lib/fog/ecloud/requests/compute/get_hardware_configurations.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_hardware_configurations end diff --git a/lib/fog/ecloud/requests/compute/get_internet_service.rb b/lib/fog/ecloud/requests/compute/get_internet_service.rb index 68397a14a..eb2895211 100644 --- a/lib/fog/ecloud/requests/compute/get_internet_service.rb +++ b/lib/fog/ecloud/requests/compute/get_internet_service.rb @@ -1,14 +1,12 @@ module Fog module Compute class Ecloud - class Real basic_request :get_internet_service end class Mock def get_internet_service(uri) - internet_service_id = id_from_uri(uri) internet_service = self.data[:internet_services][internet_service_id.to_i] diff --git a/lib/fog/ecloud/requests/compute/get_internet_services.rb b/lib/fog/ecloud/requests/compute/get_internet_services.rb index 93ee7773b..f39f940e9 100644 --- a/lib/fog/ecloud/requests/compute/get_internet_services.rb +++ b/lib/fog/ecloud/requests/compute/get_internet_services.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_internet_services end diff --git a/lib/fog/ecloud/requests/compute/get_ip_address.rb b/lib/fog/ecloud/requests/compute/get_ip_address.rb index f4ec658fd..a81b22f63 100644 --- a/lib/fog/ecloud/requests/compute/get_ip_address.rb +++ b/lib/fog/ecloud/requests/compute/get_ip_address.rb @@ -1,14 +1,12 @@ module Fog module Compute class Ecloud - class Real basic_request :get_ip_address end class Mock def get_ip_address(uri) - network_id, ip_address_id = uri.match(/\/networks\/(\d+)\/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/).captures ip_address = self.data[:networks][network_id.to_i][:IpAddresses][:IpAddress].detect{|ip| ip[:name] == ip_address_id }.dup if ip_address diff --git a/lib/fog/ecloud/requests/compute/get_location.rb b/lib/fog/ecloud/requests/compute/get_location.rb index 732279e60..18e937d1b 100644 --- a/lib/fog/ecloud/requests/compute/get_location.rb +++ b/lib/fog/ecloud/requests/compute/get_location.rb @@ -1,12 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_location end - - end end end diff --git a/lib/fog/ecloud/requests/compute/get_locations.rb b/lib/fog/ecloud/requests/compute/get_locations.rb index 4c29ffccc..936dc4bdc 100644 --- a/lib/fog/ecloud/requests/compute/get_locations.rb +++ b/lib/fog/ecloud/requests/compute/get_locations.rb @@ -1,12 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_locations end - - end end end diff --git a/lib/fog/ecloud/requests/compute/get_login_banner.rb b/lib/fog/ecloud/requests/compute/get_login_banner.rb index 2f24959d2..d59fd13d1 100644 --- a/lib/fog/ecloud/requests/compute/get_login_banner.rb +++ b/lib/fog/ecloud/requests/compute/get_login_banner.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_login_banner end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_login_banners.rb b/lib/fog/ecloud/requests/compute/get_login_banners.rb index 47d3347a0..b5e86afe3 100644 --- a/lib/fog/ecloud/requests/compute/get_login_banners.rb +++ b/lib/fog/ecloud/requests/compute/get_login_banners.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_login_banners end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_memory_usage_detail.rb b/lib/fog/ecloud/requests/compute/get_memory_usage_detail.rb index 7a4da5ae8..faf38f4e4 100644 --- a/lib/fog/ecloud/requests/compute/get_memory_usage_detail.rb +++ b/lib/fog/ecloud/requests/compute/get_memory_usage_detail.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_memory_usage_detail end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_memory_usage_detail_summary.rb b/lib/fog/ecloud/requests/compute/get_memory_usage_detail_summary.rb index 8843d46dc..3bbab12f1 100644 --- a/lib/fog/ecloud/requests/compute/get_memory_usage_detail_summary.rb +++ b/lib/fog/ecloud/requests/compute/get_memory_usage_detail_summary.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_memory_usage_detail_summary end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_monitor.rb b/lib/fog/ecloud/requests/compute/get_monitor.rb index bcfa76c21..3a1ee3e98 100644 --- a/lib/fog/ecloud/requests/compute/get_monitor.rb +++ b/lib/fog/ecloud/requests/compute/get_monitor.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_monitor end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_monitors.rb b/lib/fog/ecloud/requests/compute/get_monitors.rb index 07b4cc98e..8e92d8e12 100644 --- a/lib/fog/ecloud/requests/compute/get_monitors.rb +++ b/lib/fog/ecloud/requests/compute/get_monitors.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_monitors end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_network.rb b/lib/fog/ecloud/requests/compute/get_network.rb index 5eb94ee0a..08d5bf7cd 100644 --- a/lib/fog/ecloud/requests/compute/get_network.rb +++ b/lib/fog/ecloud/requests/compute/get_network.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_network end diff --git a/lib/fog/ecloud/requests/compute/get_network_summary.rb b/lib/fog/ecloud/requests/compute/get_network_summary.rb index 9f8511866..fb78e8237 100644 --- a/lib/fog/ecloud/requests/compute/get_network_summary.rb +++ b/lib/fog/ecloud/requests/compute/get_network_summary.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_network_summary end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_networks.rb b/lib/fog/ecloud/requests/compute/get_networks.rb index 810371e1d..5f51fe33a 100644 --- a/lib/fog/ecloud/requests/compute/get_networks.rb +++ b/lib/fog/ecloud/requests/compute/get_networks.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_networks end diff --git a/lib/fog/ecloud/requests/compute/get_node.rb b/lib/fog/ecloud/requests/compute/get_node.rb index c8ac82fb9..6f59d5b96 100644 --- a/lib/fog/ecloud/requests/compute/get_node.rb +++ b/lib/fog/ecloud/requests/compute/get_node.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_node end diff --git a/lib/fog/ecloud/requests/compute/get_nodes.rb b/lib/fog/ecloud/requests/compute/get_nodes.rb index 1f7db7c82..03e95f673 100644 --- a/lib/fog/ecloud/requests/compute/get_nodes.rb +++ b/lib/fog/ecloud/requests/compute/get_nodes.rb @@ -1,14 +1,12 @@ module Fog module Compute class Ecloud - class Real basic_request :get_nodes end class Mock def get_nodes(uri) - internet_service_id = id_from_uri(uri) internet_service = self.data[:internet_services][internet_service_id] diff --git a/lib/fog/ecloud/requests/compute/get_operating_system.rb b/lib/fog/ecloud/requests/compute/get_operating_system.rb index 9f82d6ccc..3f8545d91 100644 --- a/lib/fog/ecloud/requests/compute/get_operating_system.rb +++ b/lib/fog/ecloud/requests/compute/get_operating_system.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_operating_system end diff --git a/lib/fog/ecloud/requests/compute/get_operating_system_families.rb b/lib/fog/ecloud/requests/compute/get_operating_system_families.rb index ddb9878f9..50c818f60 100644 --- a/lib/fog/ecloud/requests/compute/get_operating_system_families.rb +++ b/lib/fog/ecloud/requests/compute/get_operating_system_families.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_operating_system_families end diff --git a/lib/fog/ecloud/requests/compute/get_organization.rb b/lib/fog/ecloud/requests/compute/get_organization.rb index 5fba627a5..fc5a58dc4 100644 --- a/lib/fog/ecloud/requests/compute/get_organization.rb +++ b/lib/fog/ecloud/requests/compute/get_organization.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_organization end diff --git a/lib/fog/ecloud/requests/compute/get_password_complexity_rule.rb b/lib/fog/ecloud/requests/compute/get_password_complexity_rule.rb index 63d4be1cf..c9d1dcd1d 100644 --- a/lib/fog/ecloud/requests/compute/get_password_complexity_rule.rb +++ b/lib/fog/ecloud/requests/compute/get_password_complexity_rule.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_password_complexity_rule end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_password_complexity_rules.rb b/lib/fog/ecloud/requests/compute/get_password_complexity_rules.rb index e7a790712..e2b2d4d42 100644 --- a/lib/fog/ecloud/requests/compute/get_password_complexity_rules.rb +++ b/lib/fog/ecloud/requests/compute/get_password_complexity_rules.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_password_complexity_rules end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_physical_device.rb b/lib/fog/ecloud/requests/compute/get_physical_device.rb index 91cae1c61..0b58f0c76 100644 --- a/lib/fog/ecloud/requests/compute/get_physical_device.rb +++ b/lib/fog/ecloud/requests/compute/get_physical_device.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_physical_device end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_physical_devices.rb b/lib/fog/ecloud/requests/compute/get_physical_devices.rb index 96aec665c..9df37b1fd 100644 --- a/lib/fog/ecloud/requests/compute/get_physical_devices.rb +++ b/lib/fog/ecloud/requests/compute/get_physical_devices.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_physical_devices end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_process.rb b/lib/fog/ecloud/requests/compute/get_process.rb index e34a99f8c..add7e0d92 100644 --- a/lib/fog/ecloud/requests/compute/get_process.rb +++ b/lib/fog/ecloud/requests/compute/get_process.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_process end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_processes.rb b/lib/fog/ecloud/requests/compute/get_processes.rb index 655787141..c05857c6c 100644 --- a/lib/fog/ecloud/requests/compute/get_processes.rb +++ b/lib/fog/ecloud/requests/compute/get_processes.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_processes end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_public_ips.rb b/lib/fog/ecloud/requests/compute/get_public_ips.rb index bff594082..61bcdbe96 100644 --- a/lib/fog/ecloud/requests/compute/get_public_ips.rb +++ b/lib/fog/ecloud/requests/compute/get_public_ips.rb @@ -1,14 +1,12 @@ module Fog module Compute class Ecloud - class Real basic_request :get_public_ips end class Mock def get_public_ips(uri) - environment_id = id_from_uri(uri) environment = self.data[:environments][environment_id] diff --git a/lib/fog/ecloud/requests/compute/get_rnat.rb b/lib/fog/ecloud/requests/compute/get_rnat.rb index 0ce034bbc..4c99940a3 100644 --- a/lib/fog/ecloud/requests/compute/get_rnat.rb +++ b/lib/fog/ecloud/requests/compute/get_rnat.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_rnat end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_rnats.rb b/lib/fog/ecloud/requests/compute/get_rnats.rb index b3348a044..85edc2650 100644 --- a/lib/fog/ecloud/requests/compute/get_rnats.rb +++ b/lib/fog/ecloud/requests/compute/get_rnats.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_rnats end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_role.rb b/lib/fog/ecloud/requests/compute/get_role.rb index 3f3e18499..198e81d0e 100644 --- a/lib/fog/ecloud/requests/compute/get_role.rb +++ b/lib/fog/ecloud/requests/compute/get_role.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_role end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_roles.rb b/lib/fog/ecloud/requests/compute/get_roles.rb index 1a32e8308..aa8b92c7a 100644 --- a/lib/fog/ecloud/requests/compute/get_roles.rb +++ b/lib/fog/ecloud/requests/compute/get_roles.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_roles end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_server.rb b/lib/fog/ecloud/requests/compute/get_server.rb index e21579a01..df709a7a7 100644 --- a/lib/fog/ecloud/requests/compute/get_server.rb +++ b/lib/fog/ecloud/requests/compute/get_server.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_server end diff --git a/lib/fog/ecloud/requests/compute/get_server_configuration_option.rb b/lib/fog/ecloud/requests/compute/get_server_configuration_option.rb index a8078558e..c1c941167 100644 --- a/lib/fog/ecloud/requests/compute/get_server_configuration_option.rb +++ b/lib/fog/ecloud/requests/compute/get_server_configuration_option.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_server_configuration_option end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_server_configuration_options.rb b/lib/fog/ecloud/requests/compute/get_server_configuration_options.rb index 1b733e4e4..7047e3e3e 100644 --- a/lib/fog/ecloud/requests/compute/get_server_configuration_options.rb +++ b/lib/fog/ecloud/requests/compute/get_server_configuration_options.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_server_configuration_options end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_ssh_key.rb b/lib/fog/ecloud/requests/compute/get_ssh_key.rb index 7543c983a..805ec1d63 100644 --- a/lib/fog/ecloud/requests/compute/get_ssh_key.rb +++ b/lib/fog/ecloud/requests/compute/get_ssh_key.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_ssh_key end diff --git a/lib/fog/ecloud/requests/compute/get_ssh_keys.rb b/lib/fog/ecloud/requests/compute/get_ssh_keys.rb index 2c61114fc..a641f787b 100644 --- a/lib/fog/ecloud/requests/compute/get_ssh_keys.rb +++ b/lib/fog/ecloud/requests/compute/get_ssh_keys.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_ssh_keys end diff --git a/lib/fog/ecloud/requests/compute/get_storage_usage_detail.rb b/lib/fog/ecloud/requests/compute/get_storage_usage_detail.rb index 2fe2609a9..62b48026e 100644 --- a/lib/fog/ecloud/requests/compute/get_storage_usage_detail.rb +++ b/lib/fog/ecloud/requests/compute/get_storage_usage_detail.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_storage_usage_detail end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_storage_usage_detail_summary.rb b/lib/fog/ecloud/requests/compute/get_storage_usage_detail_summary.rb index 3f5836e99..ab4b458b2 100644 --- a/lib/fog/ecloud/requests/compute/get_storage_usage_detail_summary.rb +++ b/lib/fog/ecloud/requests/compute/get_storage_usage_detail_summary.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_storage_usage_detail_summary end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_support_ticket.rb b/lib/fog/ecloud/requests/compute/get_support_ticket.rb index 861347596..5f7b8459d 100644 --- a/lib/fog/ecloud/requests/compute/get_support_ticket.rb +++ b/lib/fog/ecloud/requests/compute/get_support_ticket.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_support_ticket end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_support_tickets.rb b/lib/fog/ecloud/requests/compute/get_support_tickets.rb index 29232a1ef..768506052 100644 --- a/lib/fog/ecloud/requests/compute/get_support_tickets.rb +++ b/lib/fog/ecloud/requests/compute/get_support_tickets.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_support_tickets end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_tag.rb b/lib/fog/ecloud/requests/compute/get_tag.rb index d830d8ff4..62d8fc7e6 100644 --- a/lib/fog/ecloud/requests/compute/get_tag.rb +++ b/lib/fog/ecloud/requests/compute/get_tag.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_tag end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_tags.rb b/lib/fog/ecloud/requests/compute/get_tags.rb index ea54d5f9f..22c96ffbc 100644 --- a/lib/fog/ecloud/requests/compute/get_tags.rb +++ b/lib/fog/ecloud/requests/compute/get_tags.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_tags end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_tasks.rb b/lib/fog/ecloud/requests/compute/get_tasks.rb index f8e015009..85f58fc03 100644 --- a/lib/fog/ecloud/requests/compute/get_tasks.rb +++ b/lib/fog/ecloud/requests/compute/get_tasks.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_tasks end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_template.rb b/lib/fog/ecloud/requests/compute/get_template.rb index 89ef02464..cfaf56a88 100644 --- a/lib/fog/ecloud/requests/compute/get_template.rb +++ b/lib/fog/ecloud/requests/compute/get_template.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_template end diff --git a/lib/fog/ecloud/requests/compute/get_templates.rb b/lib/fog/ecloud/requests/compute/get_templates.rb index ef44b3cfe..87b6360c9 100644 --- a/lib/fog/ecloud/requests/compute/get_templates.rb +++ b/lib/fog/ecloud/requests/compute/get_templates.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :get_templates end diff --git a/lib/fog/ecloud/requests/compute/get_trusted_network_group.rb b/lib/fog/ecloud/requests/compute/get_trusted_network_group.rb index 2396910a4..509e7e1bd 100644 --- a/lib/fog/ecloud/requests/compute/get_trusted_network_group.rb +++ b/lib/fog/ecloud/requests/compute/get_trusted_network_group.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_trusted_network_group end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_trusted_network_groups.rb b/lib/fog/ecloud/requests/compute/get_trusted_network_groups.rb index 60e5bf7c1..0ef7be22c 100644 --- a/lib/fog/ecloud/requests/compute/get_trusted_network_groups.rb +++ b/lib/fog/ecloud/requests/compute/get_trusted_network_groups.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_trusted_network_groups end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_user.rb b/lib/fog/ecloud/requests/compute/get_user.rb index 2eb486fea..ab1756119 100644 --- a/lib/fog/ecloud/requests/compute/get_user.rb +++ b/lib/fog/ecloud/requests/compute/get_user.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_user end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_users.rb b/lib/fog/ecloud/requests/compute/get_users.rb index eb3f0acba..42f6201d6 100644 --- a/lib/fog/ecloud/requests/compute/get_users.rb +++ b/lib/fog/ecloud/requests/compute/get_users.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :get_users end - end end end diff --git a/lib/fog/ecloud/requests/compute/get_virtual_machine_assigned_ips.rb b/lib/fog/ecloud/requests/compute/get_virtual_machine_assigned_ips.rb index 994185e3a..cf155e3be 100644 --- a/lib/fog/ecloud/requests/compute/get_virtual_machine_assigned_ips.rb +++ b/lib/fog/ecloud/requests/compute/get_virtual_machine_assigned_ips.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real def get_virtual_machine_assigned_ips(virtual_machine_id) request( @@ -21,7 +20,6 @@ module Fog networks = self.data[:networks].values.select{|n| n[:environment_id] == environment_id} networks = networks.map{|n| deep_copy(Fog::Ecloud.slice(n, :environment, :id))} - networks.each do |network| address = network[:IpAddresses][:IpAddress].map{|ia| ia[:name]} network[:IpAddresses][:IpAddress] = address.first diff --git a/lib/fog/ecloud/requests/compute/groups_movedown.rb b/lib/fog/ecloud/requests/compute/groups_movedown.rb index 4e4bbdf90..7d5876709 100644 --- a/lib/fog/ecloud/requests/compute/groups_movedown.rb +++ b/lib/fog/ecloud/requests/compute/groups_movedown.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :groups_movedown, 204, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/groups_moveup.rb b/lib/fog/ecloud/requests/compute/groups_moveup.rb index 03c01e42d..3b6db6262 100644 --- a/lib/fog/ecloud/requests/compute/groups_moveup.rb +++ b/lib/fog/ecloud/requests/compute/groups_moveup.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :groups_moveup, 204, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/internet_service_delete.rb b/lib/fog/ecloud/requests/compute/internet_service_delete.rb index 51410378e..6a6775b1c 100644 --- a/lib/fog/ecloud/requests/compute/internet_service_delete.rb +++ b/lib/fog/ecloud/requests/compute/internet_service_delete.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real basic_request :internet_service_delete, 202, 'DELETE' end diff --git a/lib/fog/ecloud/requests/compute/internet_service_edit.rb b/lib/fog/ecloud/requests/compute/internet_service_edit.rb index 5692c2f9d..9ea840e54 100644 --- a/lib/fog/ecloud/requests/compute/internet_service_edit.rb +++ b/lib/fog/ecloud/requests/compute/internet_service_edit.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def validate_edit_internet_service_options(options) required_opts = [:name, :enabled, :persistence] unless required_opts.all? { |opt| options.has_key?(opt) } @@ -41,7 +40,6 @@ module Fog end class Real - def node_service_edit(options) validate_edit_node_service_options(options) body = build_node_service_body_edit(options) diff --git a/lib/fog/ecloud/requests/compute/monitors_create_default.rb b/lib/fog/ecloud/requests/compute/monitors_create_default.rb index 31283dda7..2c5932f09 100644 --- a/lib/fog/ecloud/requests/compute/monitors_create_default.rb +++ b/lib/fog/ecloud/requests/compute/monitors_create_default.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :monitors_create_default, 201, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/monitors_create_loopback.rb b/lib/fog/ecloud/requests/compute/monitors_create_loopback.rb index e47fc9ed1..b72853039 100644 --- a/lib/fog/ecloud/requests/compute/monitors_create_loopback.rb +++ b/lib/fog/ecloud/requests/compute/monitors_create_loopback.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :monitors_create_loopback, 201, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/monitors_disable.rb b/lib/fog/ecloud/requests/compute/monitors_disable.rb index eb95c5618..fff720914 100644 --- a/lib/fog/ecloud/requests/compute/monitors_disable.rb +++ b/lib/fog/ecloud/requests/compute/monitors_disable.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :monitors_disable, 202, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/monitors_enable.rb b/lib/fog/ecloud/requests/compute/monitors_enable.rb index 2bf4c207d..1f01244d4 100644 --- a/lib/fog/ecloud/requests/compute/monitors_enable.rb +++ b/lib/fog/ecloud/requests/compute/monitors_enable.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :monitors_enable, 202, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/node_service_delete.rb b/lib/fog/ecloud/requests/compute/node_service_delete.rb index 364a5eeaf..b9437b1fe 100644 --- a/lib/fog/ecloud/requests/compute/node_service_delete.rb +++ b/lib/fog/ecloud/requests/compute/node_service_delete.rb @@ -1,14 +1,12 @@ module Fog module Compute class Ecloud - class Real basic_request :node_service_delete, 202, 'DELETE' end class Mock def node_service_delete(uri) - service_id = id_from_uri(uri) service = self.data[:node_services][service_id].dup diff --git a/lib/fog/ecloud/requests/compute/node_service_edit.rb b/lib/fog/ecloud/requests/compute/node_service_edit.rb index 93f7985be..165074cef 100644 --- a/lib/fog/ecloud/requests/compute/node_service_edit.rb +++ b/lib/fog/ecloud/requests/compute/node_service_edit.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def validate_edit_node_service_options(options) required_opts = [:name, :enabled] unless required_opts.all? { |opt| options.has_key?(opt) } @@ -22,7 +21,6 @@ module Fog end class Real - def node_service_edit(options) validate_edit_node_service_options(options) body = build_node_service_body_edit(options) diff --git a/lib/fog/ecloud/requests/compute/power_off.rb b/lib/fog/ecloud/requests/compute/power_off.rb index 304bab8f4..225448130 100644 --- a/lib/fog/ecloud/requests/compute/power_off.rb +++ b/lib/fog/ecloud/requests/compute/power_off.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :power_off, 202, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/power_on.rb b/lib/fog/ecloud/requests/compute/power_on.rb index b79ff2029..920351cfe 100644 --- a/lib/fog/ecloud/requests/compute/power_on.rb +++ b/lib/fog/ecloud/requests/compute/power_on.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :power_on, 202, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/power_reset.rb b/lib/fog/ecloud/requests/compute/power_reset.rb index c0590ca56..934333e22 100644 --- a/lib/fog/ecloud/requests/compute/power_reset.rb +++ b/lib/fog/ecloud/requests/compute/power_reset.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :power_reset, 202, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/power_shutdown.rb b/lib/fog/ecloud/requests/compute/power_shutdown.rb index 2fc249cfc..5ea0625c6 100644 --- a/lib/fog/ecloud/requests/compute/power_shutdown.rb +++ b/lib/fog/ecloud/requests/compute/power_shutdown.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :power_shutdown, 202, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/public_ip_activate.rb b/lib/fog/ecloud/requests/compute/public_ip_activate.rb index b4c6c1f1b..170155520 100644 --- a/lib/fog/ecloud/requests/compute/public_ip_activate.rb +++ b/lib/fog/ecloud/requests/compute/public_ip_activate.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :public_ip_activate, 201, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/rows_movedown.rb b/lib/fog/ecloud/requests/compute/rows_movedown.rb index 796ea1b5c..1332bd8dd 100644 --- a/lib/fog/ecloud/requests/compute/rows_movedown.rb +++ b/lib/fog/ecloud/requests/compute/rows_movedown.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :rows_movedown, 204, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/rows_moveup.rb b/lib/fog/ecloud/requests/compute/rows_moveup.rb index 8ebdc82dd..99c2b3125 100644 --- a/lib/fog/ecloud/requests/compute/rows_moveup.rb +++ b/lib/fog/ecloud/requests/compute/rows_moveup.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :rows_moveup, 204, 'POST' end - end end end diff --git a/lib/fog/ecloud/requests/compute/trusted_network_groups_create.rb b/lib/fog/ecloud/requests/compute/trusted_network_groups_create.rb index 9b1f2b3d1..7836410f9 100644 --- a/lib/fog/ecloud/requests/compute/trusted_network_groups_create.rb +++ b/lib/fog/ecloud/requests/compute/trusted_network_groups_create.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real include Shared @@ -11,7 +10,6 @@ module Fog raise ArgumentError.new("Required data missing: Either hosts or networks must be present") end - request( :body => generate_create_trusted_network_groups_request(data), :expects => 201, diff --git a/lib/fog/ecloud/requests/compute/trusted_network_groups_delete.rb b/lib/fog/ecloud/requests/compute/trusted_network_groups_delete.rb index 9973fc932..8d7cc82a4 100644 --- a/lib/fog/ecloud/requests/compute/trusted_network_groups_delete.rb +++ b/lib/fog/ecloud/requests/compute/trusted_network_groups_delete.rb @@ -1,11 +1,9 @@ module Fog module Compute class Ecloud - class Real basic_request :trusted_network_groups_delete, 202, 'DELETE' end - end end end diff --git a/lib/fog/ecloud/requests/compute/trusted_network_groups_edit.rb b/lib/fog/ecloud/requests/compute/trusted_network_groups_edit.rb index 80fa4352e..5a9e06445 100644 --- a/lib/fog/ecloud/requests/compute/trusted_network_groups_edit.rb +++ b/lib/fog/ecloud/requests/compute/trusted_network_groups_edit.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ecloud - class Real include Shared @@ -11,7 +10,6 @@ module Fog raise ArgumentError.new("Required data missing: Either hosts or networks must be present") end - request( :body => generate_edit_trusted_network_groups_request(data), :expects => 202, diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_attach_disk.rb b/lib/fog/ecloud/requests/compute/virtual_machine_attach_disk.rb index 31886717f..5733727a0 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_attach_disk.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_attach_disk.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def build_request_body_attach_disk(options) xml = Builder::XmlMarkup.new xml.AttachDisks(:name => options[:name]) do diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_copy.rb b/lib/fog/ecloud/requests/compute/virtual_machine_copy.rb index 0b79dad62..a78147874 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_copy.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_copy.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def validate_create_server_options_copy(template_uri, options) required_opts = [:name, :cpus, :memory, :row, :group, :customization, :network_uri, :source] if options[:customization] == :windows @@ -99,7 +98,6 @@ module Fog end class Real - def virtual_machine_copy(template_uri, options) options = validate_create_server_options_copy(template_uri, options) body = build_request_body_copy(options) diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_copy_identical.rb b/lib/fog/ecloud/requests/compute/virtual_machine_copy_identical.rb index c1698b784..fadcfe88d 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_copy_identical.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_copy_identical.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def validate_create_server_options_identical(template_uri, options) required_opts = [:name, :row, :group, :source] unless required_opts.all? { |opt| options.has_key?(opt) } @@ -26,7 +25,6 @@ module Fog end class Real - def virtual_machine_copy_identical(template_uri, options) options = validate_create_server_options_identical(template_uri, options) body = build_request_body_identical(options) diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_create_from_template.rb b/lib/fog/ecloud/requests/compute/virtual_machine_create_from_template.rb index a4d4d3a56..6fe74dce8 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_create_from_template.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_create_from_template.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def validate_create_server_options(template_uri, options) required_opts = [:name, :cpus, :memory, :row, :group, :customization, :network_uri] if options[:customization] == :windows diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_detach_disk.rb b/lib/fog/ecloud/requests/compute/virtual_machine_detach_disk.rb index df6d62d7b..e274821c5 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_detach_disk.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_detach_disk.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def build_request_body_detach_disk(options) xml = Builder::XmlMarkup.new xml.DetachDisk(:name => options[:name]) do diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_edit.rb b/lib/fog/ecloud/requests/compute/virtual_machine_edit.rb index ccab5f29b..524594cd5 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_edit.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_edit.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def validate_edit_server_options(options) required_opts = [:name] unless required_opts.all? { |opt| options.has_key?(opt) } @@ -28,7 +27,6 @@ module Fog end class Real - def virtual_machine_edit(vm_uri, options) validate_edit_server_options(options) body = build_request_body_edit(options) diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_edit_assigned_ips.rb b/lib/fog/ecloud/requests/compute/virtual_machine_edit_assigned_ips.rb index 510ae76f9..9a06e5de5 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_edit_assigned_ips.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_edit_assigned_ips.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def build_request_body_edit_assigned_ips(networks) xml = Builder::XmlMarkup.new xml.AssignedIpAddresses do @@ -22,7 +21,6 @@ module Fog end class Real - def virtual_machine_edit_assigned_ips(href, options) body = build_request_body_edit_assigned_ips(options) request( diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_edit_hardware_configuration.rb b/lib/fog/ecloud/requests/compute/virtual_machine_edit_hardware_configuration.rb index 0973ccdd4..02d503c24 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_edit_hardware_configuration.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_edit_hardware_configuration.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud class Real - def virtual_machine_edit_hardware_configuration(vm_uri, data) validate_data([:cpus, :memory, :disks, :nics], data) body = build_request_body_edit_hardware_configuration(data) @@ -51,7 +50,6 @@ module Fog class Mock def virtual_machine_edit_hardware_configuration(vm_uri, data) - server_id = vm_uri.match(/(\d+)/)[1] server = self.data[:servers][server_id.to_i] diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_import.rb b/lib/fog/ecloud/requests/compute/virtual_machine_import.rb index aa2e44089..5912392fd 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_import.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_import.rb @@ -2,7 +2,6 @@ module Fog module Compute class Ecloud module Shared - def validate_import_server_options(template_uri, options) required_opts = [:name, :cpus, :memory, :row, :group, :network_uri, :catalog_network_name] unless required_opts.all? { |opt| options.has_key?(opt) } @@ -48,7 +47,6 @@ module Fog end class Real - def virtual_machine_import(template_uri, options) options = validate_import_server_options(template_uri, options) diff --git a/lib/fog/ecloud/requests/compute/virtual_machine_upload_file.rb b/lib/fog/ecloud/requests/compute/virtual_machine_upload_file.rb index 1163330af..80de4ef03 100644 --- a/lib/fog/ecloud/requests/compute/virtual_machine_upload_file.rb +++ b/lib/fog/ecloud/requests/compute/virtual_machine_upload_file.rb @@ -2,18 +2,15 @@ module Fog module Compute class Ecloud module Shared - def validate_upload_file_options(options) required_opts = [:file, :path, :credentials] unless required_opts.all? { |opt| options.has_key?(opt) } raise ArgumentError.new("Required data missing: #{(required_opts - options.keys).map(&:inspect).join(", ")}") end end - end class Real - def virtual_machine_upload_file(vm_uri, options) validate_upload_file_options(options) request( diff --git a/lib/fog/fogdocker/compute.rb b/lib/fog/fogdocker/compute.rb index 673811ca3..257aa7974 100644 --- a/lib/fog/fogdocker/compute.rb +++ b/lib/fog/fogdocker/compute.rb @@ -3,7 +3,6 @@ require 'fog/fogdocker/core' module Fog module Compute class Fogdocker < Fog::Service - requires :docker_url recognizes :docker_username, :docker_password, :docker_email @@ -33,7 +32,6 @@ module Fog end class Real - def initialize(options={}) require 'docker' username = options[:docker_username] @@ -53,7 +51,6 @@ module Fog def camelize_hash_keys(hash) Hash[ hash.map {|k, v| [k.to_s.split('_').map {|w| w.capitalize}.join, v] }] end - end end end diff --git a/lib/fog/fogdocker/core.rb b/lib/fog/fogdocker/core.rb index 16e136467..1ecb56808 100644 --- a/lib/fog/fogdocker/core.rb +++ b/lib/fog/fogdocker/core.rb @@ -2,7 +2,6 @@ require 'fog/core' module Fog module Fogdocker - extend Fog::Provider module Errors @@ -12,6 +11,5 @@ module Fog end service(:compute, 'Compute') - end end \ No newline at end of file diff --git a/lib/fog/fogdocker/models/compute/image.rb b/lib/fog/fogdocker/models/compute/image.rb index 6842e3748..f25f66a48 100644 --- a/lib/fog/fogdocker/models/compute/image.rb +++ b/lib/fog/fogdocker/models/compute/image.rb @@ -1,9 +1,7 @@ module Fog module Compute class Fogdocker - class Image < Fog::Model - identity :id attr_accessor :info @@ -33,9 +31,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/fogdocker/models/compute/images.rb b/lib/fog/fogdocker/models/compute/images.rb index edaf4b012..2eff66472 100644 --- a/lib/fog/fogdocker/models/compute/images.rb +++ b/lib/fog/fogdocker/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/fogdocker/models/compute/image' module Fog module Compute class Fogdocker - class Images < Fog::Collection - model Fog::Compute::Fogdocker::Image def all(filters = {}) @@ -16,7 +14,6 @@ module Fog def get(id) new service.image_get(id) end - end end end diff --git a/lib/fog/fogdocker/models/compute/server.rb b/lib/fog/fogdocker/models/compute/server.rb index d562bf248..6a5faf0a5 100644 --- a/lib/fog/fogdocker/models/compute/server.rb +++ b/lib/fog/fogdocker/models/compute/server.rb @@ -5,7 +5,6 @@ module Fog class Fogdocker # fog server is a docker container class Server < Fog::Compute::Server - identity :id attr_accessor :info @@ -128,9 +127,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/fogdocker/models/compute/servers.rb b/lib/fog/fogdocker/models/compute/servers.rb index 990aa127e..79612fa89 100644 --- a/lib/fog/fogdocker/models/compute/servers.rb +++ b/lib/fog/fogdocker/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/fogdocker/models/compute/server' module Fog module Compute class Fogdocker - class Servers < Fog::Collection - model Fog::Compute::Fogdocker::Server def all(filters = {}) @@ -21,7 +19,6 @@ module Fog server = create(new_attributes) server end - end end end diff --git a/lib/fog/fogdocker/requests/compute/container_action.rb b/lib/fog/fogdocker/requests/compute/container_action.rb index a0c0637d2..718b387d6 100644 --- a/lib/fog/fogdocker/requests/compute/container_action.rb +++ b/lib/fog/fogdocker/requests/compute/container_action.rb @@ -2,24 +2,20 @@ module Fog module Compute class Fogdocker class Real - def container_action(options = {}) raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id raise ArgumentError, "action is a required parameter" unless options.has_key? :action container = Docker::Container.get(options[:id]) downcase_hash_keys container.send(options[:action]).json end - end class Mock - def container_action(options = {}) raise ArgumentError, "id is a required parameter" unless options.has_key? :id raise ArgumentError, "action is a required parameter" unless options.has_key? :action {'id' => 'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef3','state_running' => false} end - end end end diff --git a/lib/fog/fogdocker/requests/compute/container_all.rb b/lib/fog/fogdocker/requests/compute/container_all.rb index 4440d99dc..145cdef92 100644 --- a/lib/fog/fogdocker/requests/compute/container_all.rb +++ b/lib/fog/fogdocker/requests/compute/container_all.rb @@ -13,7 +13,6 @@ module Fog downcase_hash_keys(container.json) end end - end class Mock def container_all(filters = {}) diff --git a/lib/fog/fogdocker/requests/compute/container_commit.rb b/lib/fog/fogdocker/requests/compute/container_commit.rb index 495a055ae..6eb2a0b59 100644 --- a/lib/fog/fogdocker/requests/compute/container_commit.rb +++ b/lib/fog/fogdocker/requests/compute/container_commit.rb @@ -16,7 +16,6 @@ module Fog 'created' => 1389877693, 'size' => 3265536} end - end end end diff --git a/lib/fog/fogdocker/requests/compute/container_create.rb b/lib/fog/fogdocker/requests/compute/container_create.rb index c8a78f13f..9b1d87143 100644 --- a/lib/fog/fogdocker/requests/compute/container_create.rb +++ b/lib/fog/fogdocker/requests/compute/container_create.rb @@ -46,7 +46,6 @@ module Fog 'names' => ['/boring_engelbert'] } end - end end end diff --git a/lib/fog/fogdocker/requests/compute/container_delete.rb b/lib/fog/fogdocker/requests/compute/container_delete.rb index 3dd859c3a..9b7b30e0c 100644 --- a/lib/fog/fogdocker/requests/compute/container_delete.rb +++ b/lib/fog/fogdocker/requests/compute/container_delete.rb @@ -2,14 +2,12 @@ module Fog module Compute class Fogdocker class Real - def container_delete(options = {}) raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id container = Docker::Container.get(options[:id]) container.delete() true end - end class Mock @@ -17,7 +15,6 @@ module Fog raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id true end - end end end diff --git a/lib/fog/fogdocker/requests/compute/container_get.rb b/lib/fog/fogdocker/requests/compute/container_get.rb index e5f25c0cc..5f1e9f046 100644 --- a/lib/fog/fogdocker/requests/compute/container_get.rb +++ b/lib/fog/fogdocker/requests/compute/container_get.rb @@ -5,7 +5,6 @@ module Fog def container_get(id) downcase_hash_keys Docker::Container.get(id).json end - end class Mock def container_get(id) diff --git a/lib/fog/fogdocker/requests/compute/image_create.rb b/lib/fog/fogdocker/requests/compute/image_create.rb index 8c7a7a1c5..d2fd3fb6d 100644 --- a/lib/fog/fogdocker/requests/compute/image_create.rb +++ b/lib/fog/fogdocker/requests/compute/image_create.rb @@ -1,7 +1,6 @@ module Fog module Compute class Fogdocker - class Real def image_create(attrs) downcase_hash_keys Docker::Image.create(attrs).json @@ -12,7 +11,6 @@ module Fog def image_create(attrs) {'id'=>'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef2'} end - end end end diff --git a/lib/fog/fogdocker/requests/compute/image_delete.rb b/lib/fog/fogdocker/requests/compute/image_delete.rb index 4f8f6c666..32198f647 100644 --- a/lib/fog/fogdocker/requests/compute/image_delete.rb +++ b/lib/fog/fogdocker/requests/compute/image_delete.rb @@ -2,13 +2,11 @@ module Fog module Compute class Fogdocker class Real - def image_delete(options = {}) raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id image = Docker::Image.get(options[:id]) image.remove() end - end class Mock @@ -16,7 +14,6 @@ module Fog raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id "[{'Deleted':'b15c1423ba157d0f7ac83cba178390c421bb8d536e7e7857580fc10f2d53e1b9'}]" end - end end end diff --git a/lib/fog/fogdocker/requests/compute/image_get.rb b/lib/fog/fogdocker/requests/compute/image_get.rb index fde3fe856..075b1f1fb 100644 --- a/lib/fog/fogdocker/requests/compute/image_get.rb +++ b/lib/fog/fogdocker/requests/compute/image_get.rb @@ -5,7 +5,6 @@ module Fog def image_get(id) downcase_hash_keys Docker::Image.get(id).json end - end class Mock def image_get(id) diff --git a/lib/fog/glesys/compute.rb b/lib/fog/glesys/compute.rb index 0b79973f9..b1a5231d8 100644 --- a/lib/fog/glesys/compute.rb +++ b/lib/fog/glesys/compute.rb @@ -3,7 +3,6 @@ require 'fog/glesys/core' module Fog module Compute class Glesys < Fog::Service - requires :glesys_username, :glesys_api_key API_URL = "https://api.glesys.com" @@ -40,9 +39,7 @@ module Fog request :ip_add request :ip_remove - class Mock - def initialize(options={}) @api_url = options[:glesys_api_url] || API_URL @glesys_username = options[:glesys_username] @@ -66,11 +63,9 @@ module Fog def reset_data self.class.reset end - end class Real - def initialize(options) require 'base64' @@ -83,7 +78,6 @@ module Fog end def request(method_name, options = {}) - options.merge!( {:format => 'json'}) begin @@ -128,9 +122,7 @@ module Fog def urlencode(hash) hash.to_a.collect! { |k, v| "#{k}=#{v.to_s}" }.join("&") end - end - end end end diff --git a/lib/fog/glesys/core.rb b/lib/fog/glesys/core.rb index ec54dc038..7223d1e38 100644 --- a/lib/fog/glesys/core.rb +++ b/lib/fog/glesys/core.rb @@ -3,10 +3,8 @@ require 'fog/json' module Fog module Glesys - extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/lib/fog/glesys/models/compute/ip.rb b/lib/fog/glesys/models/compute/ip.rb index d3c9c0d5d..c3151b9d8 100644 --- a/lib/fog/glesys/models/compute/ip.rb +++ b/lib/fog/glesys/models/compute/ip.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Glesys - class Ip < Fog::Model - extend Fog::Deprecation identity :ip @@ -69,7 +67,6 @@ module Fog ).body["response"]["details"] merge_attributes data end - end end end diff --git a/lib/fog/glesys/models/compute/ips.rb b/lib/fog/glesys/models/compute/ips.rb index c955deef9..b242f34c6 100644 --- a/lib/fog/glesys/models/compute/ips.rb +++ b/lib/fog/glesys/models/compute/ips.rb @@ -4,9 +4,7 @@ require 'fog/glesys/models/compute/ip' module Fog module Compute class Glesys - class Ips < Fog::Collection - model Fog::Compute::Glesys::Ip attribute :serverid @@ -55,7 +53,6 @@ module Fog end def take(ip, options = {}) - default_options = { :attach => false } @@ -83,7 +80,6 @@ module Fog end def attach(ip, server_id=nil) - if server_id.nil? server_id = serverid end @@ -115,7 +111,6 @@ module Fog def ip_from_object(ip) ip.is_a?(Fog::Compute::Glesys::Ip) ? ip.ip : ip end - end end end diff --git a/lib/fog/glesys/models/compute/server.rb b/lib/fog/glesys/models/compute/server.rb index 034ee2e93..c43cd44ca 100644 --- a/lib/fog/glesys/models/compute/server.rb +++ b/lib/fog/glesys/models/compute/server.rb @@ -3,7 +3,6 @@ require 'fog/compute/models/server' module Fog module Compute class Glesys - class Server < Fog::Compute::Server extend Fog::Deprecation @@ -119,7 +118,6 @@ module Fog end def public_ip_address(options = {}) - return nil if iplist.nil? type = options[:type] || nil @@ -136,7 +134,6 @@ module Fog ips.first["ipaddress"] end end - end end end diff --git a/lib/fog/glesys/models/compute/servers.rb b/lib/fog/glesys/models/compute/servers.rb index ae959d120..186290f9b 100644 --- a/lib/fog/glesys/models/compute/servers.rb +++ b/lib/fog/glesys/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/glesys/models/compute/server' module Fog module Compute class Glesys - class Servers < Fog::Collection - model Fog::Compute::Glesys::Server def all @@ -38,9 +36,7 @@ module Fog return nil end end - end - end end end diff --git a/lib/fog/glesys/models/compute/templates.rb b/lib/fog/glesys/models/compute/templates.rb index 322d2bd57..5810a1f73 100644 --- a/lib/fog/glesys/models/compute/templates.rb +++ b/lib/fog/glesys/models/compute/templates.rb @@ -5,7 +5,6 @@ module Fog module Compute class Glesys class Templates < Fog::Collection - model Fog::Compute::Glesys::Template def all @@ -33,7 +32,6 @@ module Fog platforms.include?(platform.downcase.to_sym) end.collect{|platform, images| images}.flatten end - end end end diff --git a/lib/fog/glesys/requests/compute/create.rb b/lib/fog/glesys/requests/compute/create.rb index e972db2c0..4fd830de1 100644 --- a/lib/fog/glesys/requests/compute/create.rb +++ b/lib/fog/glesys/requests/compute/create.rb @@ -2,13 +2,10 @@ module Fog module Compute class Glesys class Real - def create(options = {}) request('server/create/',options) end - end - end end end diff --git a/lib/fog/glesys/requests/compute/destroy.rb b/lib/fog/glesys/requests/compute/destroy.rb index 97fdd501d..5fab6a61a 100644 --- a/lib/fog/glesys/requests/compute/destroy.rb +++ b/lib/fog/glesys/requests/compute/destroy.rb @@ -2,9 +2,7 @@ module Fog module Compute class Glesys class Real - def destroy(options) - if options[:keepip].nil? options[:keepip] = 0 end @@ -12,7 +10,6 @@ module Fog request("/server/destroy", options) end end - end end end diff --git a/lib/fog/glesys/requests/compute/ip_add.rb b/lib/fog/glesys/requests/compute/ip_add.rb index 157c66741..6324e5eb3 100644 --- a/lib/fog/glesys/requests/compute/ip_add.rb +++ b/lib/fog/glesys/requests/compute/ip_add.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def ip_add(params) request("/ip/add", params) end end - end end end diff --git a/lib/fog/glesys/requests/compute/ip_details.rb b/lib/fog/glesys/requests/compute/ip_details.rb index 5877a7e20..7e3cd956a 100644 --- a/lib/fog/glesys/requests/compute/ip_details.rb +++ b/lib/fog/glesys/requests/compute/ip_details.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def ip_details(params) request("/ip/details", params) end end - end end end diff --git a/lib/fog/glesys/requests/compute/ip_list_free.rb b/lib/fog/glesys/requests/compute/ip_list_free.rb index db8f94e9b..05493ee6d 100644 --- a/lib/fog/glesys/requests/compute/ip_list_free.rb +++ b/lib/fog/glesys/requests/compute/ip_list_free.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def ip_list_free(options = {}) request("/ip/listfree", options) end end - end end end diff --git a/lib/fog/glesys/requests/compute/ip_list_own.rb b/lib/fog/glesys/requests/compute/ip_list_own.rb index 72f3e9ba4..2cb632d9b 100644 --- a/lib/fog/glesys/requests/compute/ip_list_own.rb +++ b/lib/fog/glesys/requests/compute/ip_list_own.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def ip_list_own(options = {}) request("/ip/listown", options) end end - end end end diff --git a/lib/fog/glesys/requests/compute/ip_release.rb b/lib/fog/glesys/requests/compute/ip_release.rb index 425800c6c..3f6f2f4c7 100644 --- a/lib/fog/glesys/requests/compute/ip_release.rb +++ b/lib/fog/glesys/requests/compute/ip_release.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def ip_release(params) request("/ip/release", params) end end - end end end diff --git a/lib/fog/glesys/requests/compute/ip_remove.rb b/lib/fog/glesys/requests/compute/ip_remove.rb index d8a4bc440..0c0328045 100644 --- a/lib/fog/glesys/requests/compute/ip_remove.rb +++ b/lib/fog/glesys/requests/compute/ip_remove.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def ip_remove(params) request("/ip/remove", params) end end - end end end diff --git a/lib/fog/glesys/requests/compute/ip_take.rb b/lib/fog/glesys/requests/compute/ip_take.rb index 5949f734e..a0d60c5ac 100644 --- a/lib/fog/glesys/requests/compute/ip_take.rb +++ b/lib/fog/glesys/requests/compute/ip_take.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def ip_take(params) request("/ip/take", params) end end - end end end diff --git a/lib/fog/glesys/requests/compute/list_servers.rb b/lib/fog/glesys/requests/compute/list_servers.rb index d3373842e..ec26a9cf6 100644 --- a/lib/fog/glesys/requests/compute/list_servers.rb +++ b/lib/fog/glesys/requests/compute/list_servers.rb @@ -2,9 +2,7 @@ module Fog module Compute class Glesys class Real - def list_servers(serverid = nil, options = {}) - unless serverid.nil? options[:serverid] = serverid end @@ -12,7 +10,6 @@ module Fog request("/server/list", options) end end - end end end diff --git a/lib/fog/glesys/requests/compute/reboot.rb b/lib/fog/glesys/requests/compute/reboot.rb index c3e3d69ec..c6056c5c8 100644 --- a/lib/fog/glesys/requests/compute/reboot.rb +++ b/lib/fog/glesys/requests/compute/reboot.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def reboot(param) request("/server/reboot", param) end end - end end end diff --git a/lib/fog/glesys/requests/compute/server_details.rb b/lib/fog/glesys/requests/compute/server_details.rb index 6bd160afe..1a4deddf9 100644 --- a/lib/fog/glesys/requests/compute/server_details.rb +++ b/lib/fog/glesys/requests/compute/server_details.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def server_details(serverid, options = {}) request("/server/details", { :serverid => serverid }.merge!(options) ) end end - end end end diff --git a/lib/fog/glesys/requests/compute/server_status.rb b/lib/fog/glesys/requests/compute/server_status.rb index 87068d4de..b59297a89 100644 --- a/lib/fog/glesys/requests/compute/server_status.rb +++ b/lib/fog/glesys/requests/compute/server_status.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def server_status(serverid) request("/server/status", { :serverid => serverid } ) end end - end end end diff --git a/lib/fog/glesys/requests/compute/start.rb b/lib/fog/glesys/requests/compute/start.rb index c670bf5a7..b576890f7 100644 --- a/lib/fog/glesys/requests/compute/start.rb +++ b/lib/fog/glesys/requests/compute/start.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def start(param) request("/server/start", param) end end - end end end diff --git a/lib/fog/glesys/requests/compute/stop.rb b/lib/fog/glesys/requests/compute/stop.rb index 16311e4b5..42587be6a 100644 --- a/lib/fog/glesys/requests/compute/stop.rb +++ b/lib/fog/glesys/requests/compute/stop.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def stop(param) request("/server/stop", param) end end - end end end diff --git a/lib/fog/glesys/requests/compute/template_list.rb b/lib/fog/glesys/requests/compute/template_list.rb index 369d3eee2..c7460b01a 100644 --- a/lib/fog/glesys/requests/compute/template_list.rb +++ b/lib/fog/glesys/requests/compute/template_list.rb @@ -2,12 +2,10 @@ module Fog module Compute class Glesys class Real - def template_list request("/server/templates") end end - end end end diff --git a/lib/fog/go_grid/compute.rb b/lib/fog/go_grid/compute.rb index 01fbbbe0e..596ddeaec 100644 --- a/lib/fog/go_grid/compute.rb +++ b/lib/fog/go_grid/compute.rb @@ -3,7 +3,6 @@ require 'fog/go_grid/core' module Fog module Compute class GoGrid < Fog::Service - requires :go_grid_api_key, :go_grid_shared_secret recognizes :host, :path, :port, :scheme, :persistent @@ -30,7 +29,6 @@ module Fog request :support_password_list class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = {} @@ -53,11 +51,9 @@ module Fog def reset_data self.class.data.delete(@go_grid_api_key) end - end class Real - def initialize(options={}) require 'digest/md5' @go_grid_api_key = options[:go_grid_api_key] @@ -108,7 +104,6 @@ module Fog response end - end end end diff --git a/lib/fog/go_grid/core.rb b/lib/fog/go_grid/core.rb index 6cf895dca..6ab064e03 100644 --- a/lib/fog/go_grid/core.rb +++ b/lib/fog/go_grid/core.rb @@ -3,10 +3,8 @@ require 'fog/json' module Fog module GoGrid - extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/lib/fog/go_grid/models/compute/image.rb b/lib/fog/go_grid/models/compute/image.rb index 89430027a..dbcbcb258 100644 --- a/lib/fog/go_grid/models/compute/image.rb +++ b/lib/fog/go_grid/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class GoGrid - class Image < Fog::Model - identity :id attribute :name @@ -26,7 +24,6 @@ module Fog attribute :object_type, :aliases => 'object' attribute :owner - def server=(new_server) requires :id @@ -52,9 +49,7 @@ module Fog merge_attributes(data.body['image']) true end - end - end end end diff --git a/lib/fog/go_grid/models/compute/images.rb b/lib/fog/go_grid/models/compute/images.rb index 366191734..16a6a5588 100644 --- a/lib/fog/go_grid/models/compute/images.rb +++ b/lib/fog/go_grid/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/go_grid/models/compute/image' module Fog module Compute class GoGrid - class Images < Fog::Collection - model Fog::Compute::GoGrid::Image attribute :server @@ -25,9 +23,7 @@ module Fog rescue Fog::Compute::GoGrid::NotFound nil end - end - end end end diff --git a/lib/fog/go_grid/models/compute/password.rb b/lib/fog/go_grid/models/compute/password.rb index 4de125c8a..d1990a59d 100644 --- a/lib/fog/go_grid/models/compute/password.rb +++ b/lib/fog/go_grid/models/compute/password.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class GoGrid - class Password < Fog::Model - identity :id attribute :server_id @@ -41,10 +39,7 @@ module Fog merge_attributes(data.body) true end - end - end - end end diff --git a/lib/fog/go_grid/models/compute/passwords.rb b/lib/fog/go_grid/models/compute/passwords.rb index 9c58d791b..33f676268 100644 --- a/lib/fog/go_grid/models/compute/passwords.rb +++ b/lib/fog/go_grid/models/compute/passwords.rb @@ -4,9 +4,7 @@ require 'fog/go_grid/models/compute/password' module Fog module Compute class GoGrid - class Passwords < Fog::Collection - model Fog::Compute::GoGrid::Password def all @@ -28,9 +26,7 @@ module Fog rescue Fog::Compute::GoGrid::NotFound nil end - end - end end end diff --git a/lib/fog/go_grid/models/compute/server.rb b/lib/fog/go_grid/models/compute/server.rb index c08ad36d6..3a9ab9eb7 100644 --- a/lib/fog/go_grid/models/compute/server.rb +++ b/lib/fog/go_grid/models/compute/server.rb @@ -3,7 +3,6 @@ require 'fog/compute/models/server' module Fog module Compute class GoGrid - class BlockInstantiationError < StandardError; end class Server < Fog::Compute::Server @@ -89,10 +88,7 @@ module Fog def adminPass=(new_admin_pass) @password = new_admin_pass end - end - end - end end diff --git a/lib/fog/go_grid/models/compute/servers.rb b/lib/fog/go_grid/models/compute/servers.rb index 11230e5d5..2adf379d8 100644 --- a/lib/fog/go_grid/models/compute/servers.rb +++ b/lib/fog/go_grid/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/go_grid/models/compute/server' module Fog module Compute class GoGrid - class Servers < Fog::Collection - model Fog::Compute::GoGrid::Server def all @@ -28,9 +26,7 @@ module Fog rescue Fog::Compute::GoGrid::NotFound nil end - end - end end end diff --git a/lib/fog/go_grid/requests/compute/common_lookup_list.rb b/lib/fog/go_grid/requests/compute/common_lookup_list.rb index 3a4369693..88e342b12 100644 --- a/lib/fog/go_grid/requests/compute/common_lookup_list.rb +++ b/lib/fog/go_grid/requests/compute/common_lookup_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # List options and lookups # # ==== Parameters @@ -21,7 +20,6 @@ module Fog :query => {'lookup' => lookup}.merge!(options) ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_image_get.rb b/lib/fog/go_grid/requests/compute/grid_image_get.rb index a932c6b7e..018041faa 100644 --- a/lib/fog/go_grid/requests/compute/grid_image_get.rb +++ b/lib/fog/go_grid/requests/compute/grid_image_get.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # List images # # ==== Parameters @@ -21,11 +20,9 @@ module Fog :query => options ) end - end class Mock - def grid_image_get(options={}) #response = Excon::Response.new @@ -34,7 +31,6 @@ module Fog # case image['state'] # when 'Available' end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_image_list.rb b/lib/fog/go_grid/requests/compute/grid_image_list.rb index f32e28e76..0de0173b0 100644 --- a/lib/fog/go_grid/requests/compute/grid_image_list.rb +++ b/lib/fog/go_grid/requests/compute/grid_image_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # List images # # ==== Parameters @@ -24,11 +23,9 @@ module Fog :query => options ) end - end class Mock - def grid_image_list(options={}) #response = Excon::Response.new @@ -37,7 +34,6 @@ module Fog # case image['state'] # when 'Available' end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_ip_list.rb b/lib/fog/go_grid/requests/compute/grid_ip_list.rb index ec09589d2..8ab6eeac2 100644 --- a/lib/fog/go_grid/requests/compute/grid_ip_list.rb +++ b/lib/fog/go_grid/requests/compute/grid_ip_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # List ips # # ==== Parameters @@ -23,7 +22,6 @@ module Fog :query => options ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb b/lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb index ded413ebf..f1a41768e 100644 --- a/lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb +++ b/lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # List load balancers # # ==== Parameters @@ -21,7 +20,6 @@ module Fog :query => options ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_server_add.rb b/lib/fog/go_grid/requests/compute/grid_server_add.rb index 379110b04..ce7b552f2 100644 --- a/lib/fog/go_grid/requests/compute/grid_server_add.rb +++ b/lib/fog/go_grid/requests/compute/grid_server_add.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # Create a new server # # ==== Parameters @@ -29,7 +28,6 @@ module Fog }.merge!(options) ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_server_delete.rb b/lib/fog/go_grid/requests/compute/grid_server_delete.rb index 23ec34fd4..360abffa0 100644 --- a/lib/fog/go_grid/requests/compute/grid_server_delete.rb +++ b/lib/fog/go_grid/requests/compute/grid_server_delete.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # Delete a server # # ==== Parameters @@ -18,7 +17,6 @@ module Fog :query => {'server' => server} ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_server_get.rb b/lib/fog/go_grid/requests/compute/grid_server_get.rb index 0b4c73581..2c1be2341 100644 --- a/lib/fog/go_grid/requests/compute/grid_server_get.rb +++ b/lib/fog/go_grid/requests/compute/grid_server_get.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # Get one or more servers by name # # ==== Parameters @@ -18,7 +17,6 @@ module Fog :query => {'server' => [*servers]} ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_server_list.rb b/lib/fog/go_grid/requests/compute/grid_server_list.rb index 1d2cff60b..b2b33fa38 100644 --- a/lib/fog/go_grid/requests/compute/grid_server_list.rb +++ b/lib/fog/go_grid/requests/compute/grid_server_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # List servers # # ==== Parameters @@ -23,7 +22,6 @@ module Fog :query => options ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/grid_server_power.rb b/lib/fog/go_grid/requests/compute/grid_server_power.rb index 1823bebc7..3184dbae2 100644 --- a/lib/fog/go_grid/requests/compute/grid_server_power.rb +++ b/lib/fog/go_grid/requests/compute/grid_server_power.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # Start, Stop or Restart a server # # ==== Parameters @@ -19,7 +18,6 @@ module Fog :query => {'server' => server, 'power' => power} ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/support_password_get.rb b/lib/fog/go_grid/requests/compute/support_password_get.rb index be6a692f4..d3acad600 100644 --- a/lib/fog/go_grid/requests/compute/support_password_get.rb +++ b/lib/fog/go_grid/requests/compute/support_password_get.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # Get one or more passwords by id # # ==== Parameters @@ -21,7 +20,6 @@ module Fog }.merge!(options) ) end - end end end diff --git a/lib/fog/go_grid/requests/compute/support_password_list.rb b/lib/fog/go_grid/requests/compute/support_password_list.rb index 6248ac65a..0789c307f 100644 --- a/lib/fog/go_grid/requests/compute/support_password_list.rb +++ b/lib/fog/go_grid/requests/compute/support_password_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class GoGrid class Real - # List passwords # # ==== Parameters @@ -23,7 +22,6 @@ module Fog :query => options ) end - end end end diff --git a/lib/fog/google/compute.rb b/lib/fog/google/compute.rb index 616c892a0..545802fa1 100644 --- a/lib/fog/google/compute.rb +++ b/lib/fog/google/compute.rb @@ -3,7 +3,6 @@ require 'fog/google/core' module Fog module Compute class Google < Fog::Service - requires :google_project recognizes :app_name, :app_version, :google_client_email, :google_key_location, :google_key_string, :google_client @@ -917,7 +916,6 @@ module Fog attr_reader :compute, :api_url def initialize(options) - # NOTE: loaded here to avoid requiring this as a core Fog dependency begin require 'google/api_client' @@ -1027,7 +1025,6 @@ module Fog end RUNNING = 'RUNNING' - end end end diff --git a/lib/fog/google/core.rb b/lib/fog/google/core.rb index d7cbeb4e3..17a1b35e6 100644 --- a/lib/fog/google/core.rb +++ b/lib/fog/google/core.rb @@ -3,14 +3,12 @@ require 'fog/xml' module Fog module Google - extend Fog::Provider service(:compute, 'Compute') service(:storage, 'Storage') class Mock - def self.etag hex(32) end @@ -19,7 +17,6 @@ module Fog max = ('f' * length).to_i(16) rand(max).to_s(16) end - end end end diff --git a/lib/fog/google/examples/get_list_snapshots.rb b/lib/fog/google/examples/get_list_snapshots.rb index 91f265186..2dcb67a93 100644 --- a/lib/fog/google/examples/get_list_snapshots.rb +++ b/lib/fog/google/examples/get_list_snapshots.rb @@ -1,5 +1,4 @@ def test - connection = Fog::Compute.new({ :provider => "Google" }) # puts 'Listing snapshots...' @@ -16,5 +15,4 @@ def test raise 'Could not GET the snapshot' unless snap # puts snap.inspect end - end diff --git a/lib/fog/google/examples/load-balance.rb b/lib/fog/google/examples/load-balance.rb index 96e331dcd..8d1c43c9d 100644 --- a/lib/fog/google/examples/load-balance.rb +++ b/lib/fog/google/examples/load-balance.rb @@ -5,7 +5,6 @@ def test zone = 'us-central1-b' region = 'us-central1' - # Setup gce = Fog::Compute.new provider: 'Google' servers = [] @@ -72,7 +71,6 @@ def test # TODO(bensonk): Install apache, create individualized htdocs, and run some # actual requests through the load balancer. - # Cleanup begin rule.destroy diff --git a/lib/fog/google/models/compute/address.rb b/lib/fog/google/models/compute/address.rb index a53fd254c..eabc6b890 100755 --- a/lib/fog/google/models/compute/address.rb +++ b/lib/fog/google/models/compute/address.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class Google - ## # Represents an Address resource # @@ -90,7 +89,6 @@ module Fog end end end - end end end diff --git a/lib/fog/google/models/compute/addresses.rb b/lib/fog/google/models/compute/addresses.rb index f79172c05..074bb15b3 100755 --- a/lib/fog/google/models/compute/addresses.rb +++ b/lib/fog/google/models/compute/addresses.rb @@ -4,7 +4,6 @@ require 'fog/google/models/compute/address' module Fog module Compute class Google - class Addresses < Fog::Collection model Fog::Compute::Google::Address @@ -36,7 +35,6 @@ module Fog new(address.first['addresses'].first) end end - end end end diff --git a/lib/fog/google/models/compute/disk.rb b/lib/fog/google/models/compute/disk.rb index 5583be2e0..eab43f9ed 100644 --- a/lib/fog/google/models/compute/disk.rb +++ b/lib/fog/google/models/compute/disk.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class Disk < Fog::Model - identity :name attribute :kind @@ -114,7 +112,6 @@ module Fog end RUNNING_STATE = "READY" - end end end diff --git a/lib/fog/google/models/compute/disks.rb b/lib/fog/google/models/compute/disks.rb index b230bb39c..00705b19d 100644 --- a/lib/fog/google/models/compute/disks.rb +++ b/lib/fog/google/models/compute/disks.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/disk' module Fog module Compute class Google - class Disks < Fog::Collection - model Fog::Compute::Google::Disk def all(filters={}) @@ -37,9 +35,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/google/models/compute/firewall.rb b/lib/fog/google/models/compute/firewall.rb index 424c9bda8..5bdbc9b43 100644 --- a/lib/fog/google/models/compute/firewall.rb +++ b/lib/fog/google/models/compute/firewall.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class Google - ## # Represents a Firewall resource # @@ -42,7 +41,6 @@ module Fog operation end end - end end end diff --git a/lib/fog/google/models/compute/firewalls.rb b/lib/fog/google/models/compute/firewalls.rb index 875e1a794..a12c44d2c 100644 --- a/lib/fog/google/models/compute/firewalls.rb +++ b/lib/fog/google/models/compute/firewalls.rb @@ -4,7 +4,6 @@ require 'fog/google/models/compute/firewall' module Fog module Compute class Google - class Firewalls < Fog::Collection model Fog::Compute::Google::Firewall @@ -21,7 +20,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/google/models/compute/flavor.rb b/lib/fog/google/models/compute/flavor.rb index cd7870fb3..b0e022228 100644 --- a/lib/fog/google/models/compute/flavor.rb +++ b/lib/fog/google/models/compute/flavor.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class Flavor < Fog::Model - identity :name attribute :kind @@ -30,7 +28,6 @@ module Fog self end end - end end end diff --git a/lib/fog/google/models/compute/flavors.rb b/lib/fog/google/models/compute/flavors.rb index d85c15d85..ede439869 100644 --- a/lib/fog/google/models/compute/flavors.rb +++ b/lib/fog/google/models/compute/flavors.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/flavor' module Fog module Compute class Google - class Flavors < Fog::Collection - model Fog::Compute::Google::Flavor def all(filters = {}) @@ -27,9 +25,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/google/models/compute/forwarding_rule.rb b/lib/fog/google/models/compute/forwarding_rule.rb index 64d527371..d8bebd3b9 100644 --- a/lib/fog/google/models/compute/forwarding_rule.rb +++ b/lib/fog/google/models/compute/forwarding_rule.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class ForwardingRule < Fog::Model - identity :name attribute :kind, :aliases => 'kind' diff --git a/lib/fog/google/models/compute/forwarding_rules.rb b/lib/fog/google/models/compute/forwarding_rules.rb index 2c4f4cbe2..0db9e2dc0 100644 --- a/lib/fog/google/models/compute/forwarding_rules.rb +++ b/lib/fog/google/models/compute/forwarding_rules.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/forwarding_rule' module Fog module Compute class Google - class ForwardingRules < Fog::Collection - model Fog::Compute::Google::ForwardingRule def all(filters={}) @@ -37,9 +35,7 @@ module Fog return nil if response.nil? new(response.body) end - end - end end end diff --git a/lib/fog/google/models/compute/http_health_check.rb b/lib/fog/google/models/compute/http_health_check.rb index 08ef2673e..75256d0e0 100644 --- a/lib/fog/google/models/compute/http_health_check.rb +++ b/lib/fog/google/models/compute/http_health_check.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class HttpHealthCheck < Fog::Model - identity :name attribute :kind, :aliases => 'kind' diff --git a/lib/fog/google/models/compute/http_health_checks.rb b/lib/fog/google/models/compute/http_health_checks.rb index e6c0457d0..1b9ca2666 100644 --- a/lib/fog/google/models/compute/http_health_checks.rb +++ b/lib/fog/google/models/compute/http_health_checks.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/http_health_check' module Fog module Compute class Google - class HttpHealthChecks < Fog::Collection - model Fog::Compute::Google::HttpHealthCheck def all(filters={}) @@ -18,9 +16,7 @@ module Fog response = service.get_http_health_check(identity) new(response.body) unless response.nil? end - end - end end end diff --git a/lib/fog/google/models/compute/image.rb b/lib/fog/google/models/compute/image.rb index 21e0168b0..a789d8b9e 100644 --- a/lib/fog/google/models/compute/image.rb +++ b/lib/fog/google/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class Image < Fog::Model - identity :name attribute :id @@ -36,6 +34,7 @@ module Fog def preferred_kernel=(args) Fog::Logger.deprecation("preferred_kernel= is no longer used [light_black](#{caller.first})[/]") end + def preferred_kernel Fog::Logger.deprecation("preferred_kernel is no longer used [light_black](#{caller.first})[/]") nil @@ -84,7 +83,6 @@ module Fog def resource_url "#{self.project}/global/images/#{name}" end - end end end diff --git a/lib/fog/google/models/compute/images.rb b/lib/fog/google/models/compute/images.rb index 6d7ea2c8c..4c7fd755f 100644 --- a/lib/fog/google/models/compute/images.rb +++ b/lib/fog/google/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/image' module Fog module Compute class Google - class Images < Fog::Collection - model Fog::Compute::Google::Image # NOTE: Not everyone has access to these projects because of the @@ -64,7 +62,6 @@ module Fog new(data) end - end end end diff --git a/lib/fog/google/models/compute/network.rb b/lib/fog/google/models/compute/network.rb index 5d129d932..735e1667f 100644 --- a/lib/fog/google/models/compute/network.rb +++ b/lib/fog/google/models/compute/network.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class Google - ## # Represents a Network resource # @@ -39,7 +38,6 @@ module Fog operation end end - end end end diff --git a/lib/fog/google/models/compute/networks.rb b/lib/fog/google/models/compute/networks.rb index 6f58df528..3a9e5acfa 100644 --- a/lib/fog/google/models/compute/networks.rb +++ b/lib/fog/google/models/compute/networks.rb @@ -4,7 +4,6 @@ require 'fog/google/models/compute/network' module Fog module Compute class Google - class Networks < Fog::Collection model Fog::Compute::Google::Network @@ -21,7 +20,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/google/models/compute/operation.rb b/lib/fog/google/models/compute/operation.rb index e5ce1184b..877469999 100644 --- a/lib/fog/google/models/compute/operation.rb +++ b/lib/fog/google/models/compute/operation.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class Operation < Fog::Model - identity :name attribute :kind @@ -71,7 +69,6 @@ module Fog PENDING_STATE = "PENDING" RUNNING_STATE = "RUNNING" DONE_STATE = "DONE" - end end end diff --git a/lib/fog/google/models/compute/operations.rb b/lib/fog/google/models/compute/operations.rb index 948f88096..177ec71e0 100644 --- a/lib/fog/google/models/compute/operations.rb +++ b/lib/fog/google/models/compute/operations.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/operation' module Fog module Compute class Google - class Operations < Fog::Collection - model Fog::Compute::Google::Operation def all(filters = {}) @@ -33,9 +31,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/google/models/compute/project.rb b/lib/fog/google/models/compute/project.rb index 2dbf0c1ca..3a5adf30e 100644 --- a/lib/fog/google/models/compute/project.rb +++ b/lib/fog/google/models/compute/project.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class Google - ## # Represents a Project resource # @@ -26,7 +25,6 @@ module Fog Fog::Compute::Google::Operations.new(:service => service).get(data.body['name']) end end - end end end diff --git a/lib/fog/google/models/compute/projects.rb b/lib/fog/google/models/compute/projects.rb index f027dff88..371ac4ce7 100644 --- a/lib/fog/google/models/compute/projects.rb +++ b/lib/fog/google/models/compute/projects.rb @@ -4,7 +4,6 @@ require 'fog/google/models/compute/project' module Fog module Compute class Google - class Projects < Fog::Collection model Fog::Compute::Google::Project @@ -16,7 +15,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/google/models/compute/region.rb b/lib/fog/google/models/compute/region.rb index b4e4c6f92..6eb60a154 100755 --- a/lib/fog/google/models/compute/region.rb +++ b/lib/fog/google/models/compute/region.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class Google - ## # Represents a Region resource # @@ -28,7 +27,6 @@ module Fog self.status == UP_STATE end end - end end end diff --git a/lib/fog/google/models/compute/regions.rb b/lib/fog/google/models/compute/regions.rb index 9684cbfcf..c33c30763 100755 --- a/lib/fog/google/models/compute/regions.rb +++ b/lib/fog/google/models/compute/regions.rb @@ -4,7 +4,6 @@ require 'fog/google/models/compute/region' module Fog module Compute class Google - class Regions < Fog::Collection model Fog::Compute::Google::Region @@ -21,7 +20,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/google/models/compute/route.rb b/lib/fog/google/models/compute/route.rb index 3468ccbfc..f21d5b2a5 100644 --- a/lib/fog/google/models/compute/route.rb +++ b/lib/fog/google/models/compute/route.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class Google - ## # Represents a Route resource # @@ -46,7 +45,6 @@ module Fog operation end end - end end end diff --git a/lib/fog/google/models/compute/routes.rb b/lib/fog/google/models/compute/routes.rb index ff21a4436..3e35a3213 100644 --- a/lib/fog/google/models/compute/routes.rb +++ b/lib/fog/google/models/compute/routes.rb @@ -4,7 +4,6 @@ require 'fog/google/models/compute/route' module Fog module Compute class Google - class Routes < Fog::Collection model Fog::Compute::Google::Route @@ -21,7 +20,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/google/models/compute/server.rb b/lib/fog/google/models/compute/server.rb index 4790a9176..f7e9403b2 100644 --- a/lib/fog/google/models/compute/server.rb +++ b/lib/fog/google/models/compute/server.rb @@ -4,9 +4,7 @@ require 'net/ssh/proxy/command' module Fog module Compute class Google - class Server < Fog::Compute::Server - identity :name attribute :kind @@ -50,6 +48,7 @@ module Fog def kernel=(args) Fog::Logger.deprecation("kernel= is no longer used [light_black](#{caller.first})[/]") end + def kernel Fog::Logger.deprecation("kernel is no longer used [light_black](#{caller.first})[/]") nil @@ -193,7 +192,6 @@ module Fog return self.metadata end - def reload data = service.get_server(self.name, zone_name).body self.merge_attributes(data) @@ -240,7 +238,6 @@ module Fog operation.wait_for { !pending? } reload end - end end end diff --git a/lib/fog/google/models/compute/servers.rb b/lib/fog/google/models/compute/servers.rb index 767de2688..9bb401fec 100644 --- a/lib/fog/google/models/compute/servers.rb +++ b/lib/fog/google/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/server' module Fog module Compute class Google - class Servers < Fog::Collection - model Fog::Compute::Google::Server def all(filters={}) diff --git a/lib/fog/google/models/compute/snapshot.rb b/lib/fog/google/models/compute/snapshot.rb index d99648ec9..e7f11995f 100644 --- a/lib/fog/google/models/compute/snapshot.rb +++ b/lib/fog/google/models/compute/snapshot.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class Snapshot < Fog::Model - identity :name attribute :kind @@ -44,9 +42,7 @@ module Fog def resource_url "#{self.service.project}/global/snapshots/#{name}" end - end - end end end diff --git a/lib/fog/google/models/compute/snapshots.rb b/lib/fog/google/models/compute/snapshots.rb index 030c1e666..89050a0ce 100644 --- a/lib/fog/google/models/compute/snapshots.rb +++ b/lib/fog/google/models/compute/snapshots.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/snapshot' module Fog module Compute class Google - class Snapshots < Fog::Collection - model Fog::Compute::Google::Snapshot def all @@ -22,9 +20,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/google/models/compute/target_pool.rb b/lib/fog/google/models/compute/target_pool.rb index 1aa46ce34..c49c0d7b7 100644 --- a/lib/fog/google/models/compute/target_pool.rb +++ b/lib/fog/google/models/compute/target_pool.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class TargetPool < Fog::Model - identity :name attribute :kind, :aliases => 'kind' @@ -20,7 +18,6 @@ module Fog attribute :failover_ratio, :aliases => "failoverRatio" attribute :backup_pool, :aliases => "backupPool" - def save requires :name, :region diff --git a/lib/fog/google/models/compute/target_pools.rb b/lib/fog/google/models/compute/target_pools.rb index cc760f22c..a393ec12a 100644 --- a/lib/fog/google/models/compute/target_pools.rb +++ b/lib/fog/google/models/compute/target_pools.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/target_pool' module Fog module Compute class Google - class TargetPools < Fog::Collection - model Fog::Compute::Google::TargetPool def all(filters={}) @@ -37,9 +35,7 @@ module Fog return nil if response.nil? new(response.body) end - end - end end end diff --git a/lib/fog/google/models/compute/zone.rb b/lib/fog/google/models/compute/zone.rb index 5bb042f9c..8a1f9bf03 100644 --- a/lib/fog/google/models/compute/zone.rb +++ b/lib/fog/google/models/compute/zone.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Google - class Zone < Fog::Model - identity :name attribute :description attribute :status @@ -19,7 +17,6 @@ module Fog def up? self.status == "UP" end - end end end diff --git a/lib/fog/google/models/compute/zones.rb b/lib/fog/google/models/compute/zones.rb index 15712ab0f..2f9c85e95 100644 --- a/lib/fog/google/models/compute/zones.rb +++ b/lib/fog/google/models/compute/zones.rb @@ -4,9 +4,7 @@ require 'fog/google/models/compute/zone' module Fog module Compute class Google - class Zones < Fog::Collection - model Fog::Compute::Google::Zone def all @@ -20,7 +18,6 @@ module Fog rescue Fog::Errors::NotFound nil end - end end end diff --git a/lib/fog/google/models/storage/directories.rb b/lib/fog/google/models/storage/directories.rb index bba238ac1..6112db613 100644 --- a/lib/fog/google/models/storage/directories.rb +++ b/lib/fog/google/models/storage/directories.rb @@ -4,9 +4,7 @@ require 'fog/google/models/storage/directory' module Fog module Storage class Google - class Directories < Fog::Collection - model Fog::Storage::Google::Directory def all @@ -35,9 +33,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/google/models/storage/directory.rb b/lib/fog/google/models/storage/directory.rb index a80f2cc0e..52eb7381a 100644 --- a/lib/fog/google/models/storage/directory.rb +++ b/lib/fog/google/models/storage/directory.rb @@ -4,9 +4,7 @@ require 'fog/google/models/storage/files' module Fog module Storage class Google - class Directory < Fog::Model - identity :key, :aliases => ['Name', 'name'] attribute :creation_date, :aliases => 'CreationDate' @@ -70,9 +68,7 @@ module Fog service.put_bucket(key, options) true end - end - end end end diff --git a/lib/fog/google/models/storage/file.rb b/lib/fog/google/models/storage/file.rb index d8317c408..02ce0632f 100644 --- a/lib/fog/google/models/storage/file.rb +++ b/lib/fog/google/models/storage/file.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Storage class Google - class File < Fog::Model - identity :key, :aliases => 'Key' attribute :cache_control, :aliases => 'Cache-Control' @@ -140,9 +138,7 @@ module Fog def directory=(new_directory) @directory = new_directory end - end - end end end diff --git a/lib/fog/google/models/storage/files.rb b/lib/fog/google/models/storage/files.rb index 7b335d03f..408e5e9bb 100644 --- a/lib/fog/google/models/storage/files.rb +++ b/lib/fog/google/models/storage/files.rb @@ -4,7 +4,6 @@ require 'fog/google/models/storage/file' module Fog module Storage class Google - class Files < Fog::Collection extend Fog::Deprecation deprecate :get_url, :get_https_url @@ -95,9 +94,7 @@ module Fog requires :directory super({ :directory => directory }.merge(attributes)) end - end - end end end diff --git a/lib/fog/google/parsers/storage/access_control_list.rb b/lib/fog/google/parsers/storage/access_control_list.rb index 75811a81b..b2f4e1ecf 100644 --- a/lib/fog/google/parsers/storage/access_control_list.rb +++ b/lib/fog/google/parsers/storage/access_control_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module Google - class AccessControlList < Fog::Parsers::Base - def reset @in_entries = false @entry = { 'Scope' => {} } @@ -39,9 +37,7 @@ module Fog @entry[name] = value end end - end - end end end diff --git a/lib/fog/google/parsers/storage/copy_object.rb b/lib/fog/google/parsers/storage/copy_object.rb index e127bcbdb..6b84f5a92 100644 --- a/lib/fog/google/parsers/storage/copy_object.rb +++ b/lib/fog/google/parsers/storage/copy_object.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module Google - class CopyObject < Fog::Parsers::Base - def end_element(name) case name when 'ETag' @@ -13,9 +11,7 @@ module Fog @response[name] = Time.parse(value) end end - end - end end end diff --git a/lib/fog/google/parsers/storage/get_bucket.rb b/lib/fog/google/parsers/storage/get_bucket.rb index 1eb57c9a4..be29249d9 100644 --- a/lib/fog/google/parsers/storage/get_bucket.rb +++ b/lib/fog/google/parsers/storage/get_bucket.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module Google - class GetBucket < Fog::Parsers::Base - def reset @object = { 'Owner' => {} } @response = { 'Contents' => [], 'CommonPrefixes' => [] } @@ -53,9 +51,7 @@ module Fog @object[name] = value end end - end - end end end diff --git a/lib/fog/google/parsers/storage/get_bucket_logging.rb b/lib/fog/google/parsers/storage/get_bucket_logging.rb index 82d738e6e..65f1c87e4 100644 --- a/lib/fog/google/parsers/storage/get_bucket_logging.rb +++ b/lib/fog/google/parsers/storage/get_bucket_logging.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module Google - class AccessControlList < Fog::Parsers::Base - def reset @grant = { 'Grantee' => {} } @response = { 'BucketLoggingStatus' => {} } @@ -31,9 +29,7 @@ module Fog @grant['Grantee'][name] = value end end - end - end end end diff --git a/lib/fog/google/parsers/storage/get_bucket_object_versions.rb b/lib/fog/google/parsers/storage/get_bucket_object_versions.rb index 641c2eb89..289caa753 100644 --- a/lib/fog/google/parsers/storage/get_bucket_object_versions.rb +++ b/lib/fog/google/parsers/storage/get_bucket_object_versions.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module Google - class GetBucketObjectVersions < Fog::Parsers::Base - def reset @delete_marker = { 'Owner' => {} } @version = { 'Owner' => {} } @@ -79,9 +77,7 @@ module Fog end[name] = value end end - end - end end end diff --git a/lib/fog/google/parsers/storage/get_bucket_versioning.rb b/lib/fog/google/parsers/storage/get_bucket_versioning.rb index ba0a4ad95..e54e6214b 100644 --- a/lib/fog/google/parsers/storage/get_bucket_versioning.rb +++ b/lib/fog/google/parsers/storage/get_bucket_versioning.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module Google - class GetBucketVersioning < Fog::Parsers::Base - def reset @response = { 'VersioningConfiguration' => {} } end @@ -15,9 +13,7 @@ module Fog @response['VersioningConfiguration'][name] = value end end - end - end end end diff --git a/lib/fog/google/parsers/storage/get_request_payment.rb b/lib/fog/google/parsers/storage/get_request_payment.rb index 27e7b8dd9..a726d5c72 100644 --- a/lib/fog/google/parsers/storage/get_request_payment.rb +++ b/lib/fog/google/parsers/storage/get_request_payment.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Storage module Google - class GetRequestPayment < Fog::Parsers::Base - def end_element(name) case name when 'Payer' @response[name] = value end end - end - end end end diff --git a/lib/fog/google/parsers/storage/get_service.rb b/lib/fog/google/parsers/storage/get_service.rb index c31b94332..8d96d8669 100644 --- a/lib/fog/google/parsers/storage/get_service.rb +++ b/lib/fog/google/parsers/storage/get_service.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module Google - class GetService < Fog::Parsers::Base - def reset @bucket = {} @response = { 'Owner' => {}, 'Buckets' => [] } @@ -23,9 +21,7 @@ module Fog @bucket[name] = value end end - end - end end end diff --git a/lib/fog/google/requests/compute/add_server_access_config.rb b/lib/fog/google/requests/compute/add_server_access_config.rb index 61e8cda8e..77d07fd44 100644 --- a/lib/fog/google/requests/compute/add_server_access_config.rb +++ b/lib/fog/google/requests/compute/add_server_access_config.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def add_server_access_config(identity, zone, nic, options = {}) Fog::Mock.not_implemented @@ -29,7 +28,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/add_target_pool_health_checks.rb b/lib/fog/google/requests/compute/add_target_pool_health_checks.rb index e2e723ba9..fdeb63e4d 100644 --- a/lib/fog/google/requests/compute/add_target_pool_health_checks.rb +++ b/lib/fog/google/requests/compute/add_target_pool_health_checks.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def add_target_pool_health_checks(target_pool, health_checks) Fog::Mock.not_implemented end - end class Real - def add_target_pool_health_checks(target_pool, health_checks) api_method = @compute.target_pools.add_health_check parameters = { @@ -26,9 +22,7 @@ module Fog result = self.build_result(api_method, parameters, body_object=body) self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/add_target_pool_instances.rb b/lib/fog/google/requests/compute/add_target_pool_instances.rb index 5a0924d54..7a9321f50 100644 --- a/lib/fog/google/requests/compute/add_target_pool_instances.rb +++ b/lib/fog/google/requests/compute/add_target_pool_instances.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def add_target_pool_instances(target_pool, instances) Fog::Mock.not_implemented end - end class Real - def add_target_pool_instances(target_pool, instances) api_method = @compute.target_pools.add_instance parameters = { @@ -26,9 +22,7 @@ module Fog result = self.build_result(api_method, parameters, body_object=body) self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/attach_disk.rb b/lib/fog/google/requests/compute/attach_disk.rb index 860b43ae5..0a8d8aa02 100644 --- a/lib/fog/google/requests/compute/attach_disk.rb +++ b/lib/fog/google/requests/compute/attach_disk.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def attach_disk(instance, zone, source, options = {}) Fog::Mock.not_implemented @@ -9,7 +8,6 @@ module Fog end class Real - def attach_disk(instance, zone, source, options = {}) api_method = @compute.instances.attach_disk parameters = { diff --git a/lib/fog/google/requests/compute/delete_address.rb b/lib/fog/google/requests/compute/delete_address.rb index 9cef11fff..647d5a213 100644 --- a/lib/fog/google/requests/compute/delete_address.rb +++ b/lib/fog/google/requests/compute/delete_address.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def delete_address(address_name, region_name) Fog::Mock.not_implemented end - end class Real - def delete_address(address_name, region_name) api_method = @compute.addresses.delete parameters = { @@ -23,9 +19,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_disk.rb b/lib/fog/google/requests/compute/delete_disk.rb index feb43d07a..8b6b2e086 100644 --- a/lib/fog/google/requests/compute/delete_disk.rb +++ b/lib/fog/google/requests/compute/delete_disk.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def delete_disk(disk_name, zone_name) get_disk(disk_name, zone_name) @@ -27,11 +25,9 @@ module Fog build_response(:body => self.data[:operations][operation]) end - end class Real - def delete_disk(disk_name, zone_name) if zone_name.start_with? 'http' zone_name = zone_name.split('/')[-1] @@ -47,9 +43,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_firewall.rb b/lib/fog/google/requests/compute/delete_firewall.rb index aae2f31ba..36418e3b5 100644 --- a/lib/fog/google/requests/compute/delete_firewall.rb +++ b/lib/fog/google/requests/compute/delete_firewall.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def delete_firewall(firewall_name) Fog::Mock.not_implemented end - end class Real - def delete_firewall(firewall_name) api_method = @compute.firewalls.delete parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_forwarding_rule.rb b/lib/fog/google/requests/compute/delete_forwarding_rule.rb index 01bacc8a4..e3ef7773f 100644 --- a/lib/fog/google/requests/compute/delete_forwarding_rule.rb +++ b/lib/fog/google/requests/compute/delete_forwarding_rule.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def delete_forwarding_rule(forwarding_rule_name, region_name) Fog::Mock.not_implemented end - end class Real @@ -28,9 +25,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_global_operation.rb b/lib/fog/google/requests/compute/delete_global_operation.rb index 09829f7ed..ca6ee56b0 100644 --- a/lib/fog/google/requests/compute/delete_global_operation.rb +++ b/lib/fog/google/requests/compute/delete_global_operation.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def delete_global_operation(operation) Fog::Mock.not_implemented end - end class Real diff --git a/lib/fog/google/requests/compute/delete_http_health_check.rb b/lib/fog/google/requests/compute/delete_http_health_check.rb index 145f88e74..8c13fdb54 100644 --- a/lib/fog/google/requests/compute/delete_http_health_check.rb +++ b/lib/fog/google/requests/compute/delete_http_health_check.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def delete_http_health_check(name) Fog::Mock.not_implemented end - end class Real - def delete_http_health_check(name) api_method = @compute.http_health_checks.delete parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_image.rb b/lib/fog/google/requests/compute/delete_image.rb index b68f83524..49ae3abdd 100644 --- a/lib/fog/google/requests/compute/delete_image.rb +++ b/lib/fog/google/requests/compute/delete_image.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def delete_image(image_name) Fog::Mock.not_implemented end - end class Real - def delete_image(image_name) api_method = @compute.images.delete parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_network.rb b/lib/fog/google/requests/compute/delete_network.rb index 0ffed6f08..6715ac576 100644 --- a/lib/fog/google/requests/compute/delete_network.rb +++ b/lib/fog/google/requests/compute/delete_network.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def delete_network(network_name) Fog::Mock.not_implemented end - end class Real - def delete_network(network_name) api_method = @compute.networks.delete parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_region_operation.rb b/lib/fog/google/requests/compute/delete_region_operation.rb index 7a7c548b0..67452caeb 100644 --- a/lib/fog/google/requests/compute/delete_region_operation.rb +++ b/lib/fog/google/requests/compute/delete_region_operation.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def delete_region_operation(region, operation) Fog::Mock.not_implemented end - end class Real diff --git a/lib/fog/google/requests/compute/delete_route.rb b/lib/fog/google/requests/compute/delete_route.rb index a5788c6ab..43653fc65 100644 --- a/lib/fog/google/requests/compute/delete_route.rb +++ b/lib/fog/google/requests/compute/delete_route.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def delete_route(identity) Fog::Mock.not_implemented @@ -20,7 +19,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/delete_server.rb b/lib/fog/google/requests/compute/delete_server.rb index 8c1868530..203e73783 100644 --- a/lib/fog/google/requests/compute/delete_server.rb +++ b/lib/fog/google/requests/compute/delete_server.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - module Shared def find_zone(zone_name) if zone_name.nil? @@ -48,7 +47,6 @@ module Fog build_response(:body => self.data[:operations][operation]) end - end class Real @@ -66,9 +64,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_server_access_config.rb b/lib/fog/google/requests/compute/delete_server_access_config.rb index 50f32b416..22053e831 100644 --- a/lib/fog/google/requests/compute/delete_server_access_config.rb +++ b/lib/fog/google/requests/compute/delete_server_access_config.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def delete_server_access_config(identity, zone, nic, options = {}) Fog::Mock.not_implemented @@ -23,7 +22,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/delete_snapshot.rb b/lib/fog/google/requests/compute/delete_snapshot.rb index 3991321da..ee160a268 100644 --- a/lib/fog/google/requests/compute/delete_snapshot.rb +++ b/lib/fog/google/requests/compute/delete_snapshot.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def delete_snapshot(snapshot_name) Fog::Mock.not_implemented end - end class Real - def delete_snapshot(snapshot_name) api_method = @compute.snapshots.delete parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_target_pool.rb b/lib/fog/google/requests/compute/delete_target_pool.rb index 2371aca23..4194cb124 100644 --- a/lib/fog/google/requests/compute/delete_target_pool.rb +++ b/lib/fog/google/requests/compute/delete_target_pool.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def delete_target_pool(target_pool_name, region_name) Fog::Mock.not_implemented end - end class Real @@ -28,9 +25,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/delete_zone_operation.rb b/lib/fog/google/requests/compute/delete_zone_operation.rb index 7b93db7eb..4d5a6f82f 100644 --- a/lib/fog/google/requests/compute/delete_zone_operation.rb +++ b/lib/fog/google/requests/compute/delete_zone_operation.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def delete_zone_operation(zone, operation) Fog::Mock.not_implemented end - end class Real diff --git a/lib/fog/google/requests/compute/detach_disk.rb b/lib/fog/google/requests/compute/detach_disk.rb index bcc1938e0..9d682479b 100644 --- a/lib/fog/google/requests/compute/detach_disk.rb +++ b/lib/fog/google/requests/compute/detach_disk.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def detach_disk(instance, zone, deviceName) Fog::Mock.not_implemented @@ -9,7 +8,6 @@ module Fog end class Real - def detach_disk(instance, zone, deviceName) api_method = @compute.instances.detach_disk parameters = { @@ -22,9 +20,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_address.rb b/lib/fog/google/requests/compute/get_address.rb index 48c6221b3..22cd58f1c 100644 --- a/lib/fog/google/requests/compute/get_address.rb +++ b/lib/fog/google/requests/compute/get_address.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def get_address(address_name, region_name) Fog::Mock.not_implemented end - end class Real - def get_address(address_name, region_name) api_method = @compute.addresses.get parameters = { @@ -23,9 +19,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_disk.rb b/lib/fog/google/requests/compute/get_disk.rb index 9a21e8344..fefbf7cf0 100644 --- a/lib/fog/google/requests/compute/get_disk.rb +++ b/lib/fog/google/requests/compute/get_disk.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def get_disk(disk_name, zone_name) disk = self.data[:disks][disk_name] if zone_name.start_with? 'http' @@ -31,11 +29,9 @@ module Fog build_response(:body => disk) end - end class Real - def get_disk(disk_name, zone_name) if zone_name.start_with? 'http' zone_name = zone_name.split('/')[-1] @@ -51,9 +47,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_firewall.rb b/lib/fog/google/requests/compute/get_firewall.rb index 0836d3670..408c19861 100644 --- a/lib/fog/google/requests/compute/get_firewall.rb +++ b/lib/fog/google/requests/compute/get_firewall.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def get_firewall(firewall_name) Fog::Mock.not_implemented end - end class Real - def get_firewall(firewall_name) api_method = @compute.firewalls.get parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_forwarding_rule.rb b/lib/fog/google/requests/compute/get_forwarding_rule.rb index 23919b356..e3edb3b90 100644 --- a/lib/fog/google/requests/compute/get_forwarding_rule.rb +++ b/lib/fog/google/requests/compute/get_forwarding_rule.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def get_forwarding_rule(forwarding_rule_name, region_name) Fog::Mock.not_implemented @@ -9,7 +8,6 @@ module Fog end class Real - def get_forwarding_rule(forwarding_rule_name, region_name) if region_name.start_with? 'http' region_name = region_name.split('/')[-1] @@ -25,9 +23,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_global_operation.rb b/lib/fog/google/requests/compute/get_global_operation.rb index 1872e1ca1..9391f082f 100644 --- a/lib/fog/google/requests/compute/get_global_operation.rb +++ b/lib/fog/google/requests/compute/get_global_operation.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def get_global_operation(operation) Fog::Mock.not_implemented end - end class Real diff --git a/lib/fog/google/requests/compute/get_http_health_check.rb b/lib/fog/google/requests/compute/get_http_health_check.rb index b85400c7f..34346e7f6 100644 --- a/lib/fog/google/requests/compute/get_http_health_check.rb +++ b/lib/fog/google/requests/compute/get_http_health_check.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def get_http_health_check(name) Fog::Mock.not_implemented end - end class Real - def get_http_health_check(name) api_method = @compute.http_health_checks.get parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_image.rb b/lib/fog/google/requests/compute/get_image.rb index 3b19fc41f..c3f2b3adb 100644 --- a/lib/fog/google/requests/compute/get_image.rb +++ b/lib/fog/google/requests/compute/get_image.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def get_image(image_name, project=@project) image = data(project)[:images][image_name] || { "error" => { @@ -20,11 +18,9 @@ module Fog } build_response(:body => image) end - end class Real - def get_image(image_name, project=@project) api_method = @compute.images.get parameters = { @@ -35,9 +31,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_machine_type.rb b/lib/fog/google/requests/compute/get_machine_type.rb index fb32555bc..b642cf1a6 100644 --- a/lib/fog/google/requests/compute/get_machine_type.rb +++ b/lib/fog/google/requests/compute/get_machine_type.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def get_machine_type(machine_type_name, zone_name = nil) zone_name = self.data[:zones].keys.first if zone_name.nil? get_zone(zone_name) @@ -22,11 +20,9 @@ module Fog } build_response(:body => machine_type) end - end class Real - def get_machine_type(machine_type_name, zone_name = nil) zone_name = list_zones.body['items'].first['name'] if zone_name.nil? if zone_name.start_with? 'http' @@ -42,9 +38,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_network.rb b/lib/fog/google/requests/compute/get_network.rb index 3982f1c3d..c8d1360eb 100644 --- a/lib/fog/google/requests/compute/get_network.rb +++ b/lib/fog/google/requests/compute/get_network.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def get_network(network_name) Fog::Mock.not_implemented end - end class Real - def get_network(network_name) api_method = @compute.networks.get parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_project.rb b/lib/fog/google/requests/compute/get_project.rb index e70dddf01..a0086c5df 100644 --- a/lib/fog/google/requests/compute/get_project.rb +++ b/lib/fog/google/requests/compute/get_project.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def get_project(identity) Fog::Mock.not_implemented @@ -19,7 +18,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/get_region.rb b/lib/fog/google/requests/compute/get_region.rb index db028fd00..351907103 100755 --- a/lib/fog/google/requests/compute/get_region.rb +++ b/lib/fog/google/requests/compute/get_region.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def get_region(identity) regions = Fog::Compute[:google].list_regions @@ -24,7 +23,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/get_region_operation.rb b/lib/fog/google/requests/compute/get_region_operation.rb index 9a933ee0e..874883dda 100644 --- a/lib/fog/google/requests/compute/get_region_operation.rb +++ b/lib/fog/google/requests/compute/get_region_operation.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def get_region_operation(region_name, operation) Fog::Mock.not_implemented end - end class Real @@ -28,9 +25,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_route.rb b/lib/fog/google/requests/compute/get_route.rb index 14575b1b6..94bc66a51 100644 --- a/lib/fog/google/requests/compute/get_route.rb +++ b/lib/fog/google/requests/compute/get_route.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def get_route(identity) Fog::Mock.not_implemented @@ -20,7 +19,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/get_server.rb b/lib/fog/google/requests/compute/get_server.rb index 10a65aed9..7d2444a62 100644 --- a/lib/fog/google/requests/compute/get_server.rb +++ b/lib/fog/google/requests/compute/get_server.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def get_server(server_name, zone_name) server = self.data[:servers][server_name] get_zone(zone_name) @@ -52,11 +50,9 @@ module Fog build_response(:body => server) end - end class Real - def get_server(server_name, zone_name) if zone_name.is_a? Excon::Response zone = zone_name.body["name"] @@ -74,9 +70,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_server_serial_port_output.rb b/lib/fog/google/requests/compute/get_server_serial_port_output.rb index 1c216d9b0..13dc5e61e 100644 --- a/lib/fog/google/requests/compute/get_server_serial_port_output.rb +++ b/lib/fog/google/requests/compute/get_server_serial_port_output.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def get_server_serial_port_output(identity, zone) Fog::Mock.not_implemented @@ -21,7 +20,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/get_snapshot.rb b/lib/fog/google/requests/compute/get_snapshot.rb index 1b3a2ba9d..ac17bce7f 100644 --- a/lib/fog/google/requests/compute/get_snapshot.rb +++ b/lib/fog/google/requests/compute/get_snapshot.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def get_snapshot(snap_name) Fog::Mock.not_implemented end - end class Real - def get_snapshot(snap_name, project=@project) if snap_name.nil? raise ArgumentError.new "snap_name must not be nil." @@ -26,9 +22,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_target_pool.rb b/lib/fog/google/requests/compute/get_target_pool.rb index fd9b8e3b4..1b260c29b 100644 --- a/lib/fog/google/requests/compute/get_target_pool.rb +++ b/lib/fog/google/requests/compute/get_target_pool.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def get_target_pool(target_pool_name, region_name) Fog::Mock.not_implemented @@ -9,7 +8,6 @@ module Fog end class Real - def get_target_pool(target_pool_name, region_name) if region_name.start_with? 'http' region_name = region_name.split('/')[-1] @@ -25,9 +23,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_target_pool_health.rb b/lib/fog/google/requests/compute/get_target_pool_health.rb index 4f6e7889c..8b53b0d62 100644 --- a/lib/fog/google/requests/compute/get_target_pool_health.rb +++ b/lib/fog/google/requests/compute/get_target_pool_health.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def get_target_pool_health(target_pool) Fog::Mock.not_implemented end - end class Real - def get_target_pool_health(target_pool) api_method = @compute.target_pools.get_health parameters = { @@ -27,9 +23,7 @@ module Fog end Hash[health_results] end - end - end end end diff --git a/lib/fog/google/requests/compute/get_zone.rb b/lib/fog/google/requests/compute/get_zone.rb index 3ffe99274..54a590d53 100644 --- a/lib/fog/google/requests/compute/get_zone.rb +++ b/lib/fog/google/requests/compute/get_zone.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def get_zone(zone_name) zone = self.data[:zones][zone_name] || { "error" => { @@ -20,11 +18,9 @@ module Fog } build_response(:body => zone) end - end class Real - def get_zone(zone_name) api_method = @compute.zones.get parameters = { @@ -35,9 +31,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/get_zone_operation.rb b/lib/fog/google/requests/compute/get_zone_operation.rb index a119dcf0c..01f37624e 100644 --- a/lib/fog/google/requests/compute/get_zone_operation.rb +++ b/lib/fog/google/requests/compute/get_zone_operation.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def get_zone_operation(zone_name, operation) operation = self.data[:operations][operation] if operation diff --git a/lib/fog/google/requests/compute/insert_address.rb b/lib/fog/google/requests/compute/insert_address.rb index 469219aac..0fc8071e0 100644 --- a/lib/fog/google/requests/compute/insert_address.rb +++ b/lib/fog/google/requests/compute/insert_address.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def insert_address(address_name, region_name, options = {}) Fog::Mock.not_implemented end - end class Real - def insert_address(address_name, region_name, options = {}) api_method = @compute.addresses.insert parameters = { diff --git a/lib/fog/google/requests/compute/insert_disk.rb b/lib/fog/google/requests/compute/insert_disk.rb index 00c6fe9d3..a660ea45f 100644 --- a/lib/fog/google/requests/compute/insert_disk.rb +++ b/lib/fog/google/requests/compute/insert_disk.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def insert_disk(disk_name, zone_name, image_name=nil, options={}) # check that image and zone exist image = nil @@ -59,11 +57,9 @@ module Fog build_response(:body => self.data[:operations][operation]) end - end class Real - def insert_disk(disk_name, zone_name, image_name=nil, opts={}) api_method = @compute.disks.insert parameters = { @@ -107,9 +103,7 @@ module Fog body_object) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/insert_firewall.rb b/lib/fog/google/requests/compute/insert_firewall.rb index 03f0699be..892e85175 100644 --- a/lib/fog/google/requests/compute/insert_firewall.rb +++ b/lib/fog/google/requests/compute/insert_firewall.rb @@ -1,16 +1,13 @@ module Fog module Compute class Google - class Mock def insert_firewall(firewall_name, allowed, network = @default_network, options = {}) Fog::Mock.not_implemented end - end class Real - def insert_firewall(firewall_name, allowed, network = @default_network, options = {}) unless network.start_with? 'http' network = "#{@api_url}#{@project}/global/networks/#{network}" @@ -41,9 +38,7 @@ module Fog result = self.build_result(api_method, parameters, body_object) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/insert_forwarding_rule.rb b/lib/fog/google/requests/compute/insert_forwarding_rule.rb index d8c4df3a3..d2884e98d 100644 --- a/lib/fog/google/requests/compute/insert_forwarding_rule.rb +++ b/lib/fog/google/requests/compute/insert_forwarding_rule.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def insert_forwarding_rule(forwarding_rule_name, region_name) Fog::Mock.not_implemented end - end class Real - def insert_forwarding_rule(forwarding_rule_name, region_name, opts = {}) api_method = @compute.forwarding_rules.insert parameters = { diff --git a/lib/fog/google/requests/compute/insert_http_health_check.rb b/lib/fog/google/requests/compute/insert_http_health_check.rb index 08320d058..8f0ad9305 100644 --- a/lib/fog/google/requests/compute/insert_http_health_check.rb +++ b/lib/fog/google/requests/compute/insert_http_health_check.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def insert_http_health_check(name, options={}) Fog::Mock.not_implemented end - end class Real - def insert_http_health_check(name, opts={}) api_method = @compute.http_health_checks.insert parameters = { @@ -24,9 +20,7 @@ module Fog result = self.build_result(api_method, parameters, body_object) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/insert_image.rb b/lib/fog/google/requests/compute/insert_image.rb index 11471a1df..c8b900c9e 100644 --- a/lib/fog/google/requests/compute/insert_image.rb +++ b/lib/fog/google/requests/compute/insert_image.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def insert_image(image_name, options={}) Fog::Mock.not_implemented end - end class Real - def insert_image(image_name, options={}) api_method = @compute.images.insert @@ -33,9 +29,7 @@ module Fog body_object=body_object) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/insert_network.rb b/lib/fog/google/requests/compute/insert_network.rb index 17dfb8a3b..bee3350e4 100644 --- a/lib/fog/google/requests/compute/insert_network.rb +++ b/lib/fog/google/requests/compute/insert_network.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def insert_network(network_name, ip_range, options = {}) Fog::Mock.not_implemented end - end class Real - def insert_network(network_name, ip_range, options = {}) api_method = @compute.networks.insert parameters = { @@ -28,9 +24,7 @@ module Fog result = self.build_result(api_method, parameters, body_object) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/insert_route.rb b/lib/fog/google/requests/compute/insert_route.rb index eac2e31d8..dffa267e4 100644 --- a/lib/fog/google/requests/compute/insert_route.rb +++ b/lib/fog/google/requests/compute/insert_route.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def insert_route(name, network, dest_range, priority, options = {}) Fog::Mock.not_implemented @@ -32,7 +31,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/insert_server.rb b/lib/fog/google/requests/compute/insert_server.rb index e3ba37d8c..b6dbb6fa0 100644 --- a/lib/fog/google/requests/compute/insert_server.rb +++ b/lib/fog/google/requests/compute/insert_server.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock include Shared @@ -25,7 +24,6 @@ module Fog end def insert_server(server_name, zone_name, options={}, *deprecated_args) - # check that zone exists get_zone(zone_name) @@ -92,7 +90,6 @@ module Fog build_response(:body => self.data[:operations][operation]) end - end class Real diff --git a/lib/fog/google/requests/compute/insert_snapshot.rb b/lib/fog/google/requests/compute/insert_snapshot.rb index da9f85ce3..ac1ddd6c3 100644 --- a/lib/fog/google/requests/compute/insert_snapshot.rb +++ b/lib/fog/google/requests/compute/insert_snapshot.rb @@ -1,19 +1,14 @@ module Fog module Compute class Google - class Mock - def insert_snapshot(snap_name) Fog::Mock.not_implemented end - end class Real - def insert_snapshot(disk_name, zone_name, project=@project, opts={}) - # This is unfortunate, since we might be called from 2 contexts # 1. disk.snapshot <-- here validation of disk_name is not needed # 2. snapshot.create <-- here we must validate the disk_name @@ -41,9 +36,7 @@ module Fog body_object) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/insert_target_pool.rb b/lib/fog/google/requests/compute/insert_target_pool.rb index f5c1b6678..bd27edfc6 100644 --- a/lib/fog/google/requests/compute/insert_target_pool.rb +++ b/lib/fog/google/requests/compute/insert_target_pool.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def insert_target_pool(target_pool_name, region_name) Fog::Mock.not_implemented end - end class Real - def insert_target_pool(target_pool_name, region_name, opts = {}) api_method = @compute.target_pools.insert parameters = { diff --git a/lib/fog/google/requests/compute/list_addresses.rb b/lib/fog/google/requests/compute/list_addresses.rb index 5b62fb09d..babadfb5b 100644 --- a/lib/fog/google/requests/compute/list_addresses.rb +++ b/lib/fog/google/requests/compute/list_addresses.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def list_addresses(region_name) Fog::Mock.not_implemented end - end class Real - def list_addresses(region_name) api_method = @compute.addresses.list parameters = { diff --git a/lib/fog/google/requests/compute/list_aggregated_addresses.rb b/lib/fog/google/requests/compute/list_aggregated_addresses.rb index 71e5fafee..fb3a26f17 100644 --- a/lib/fog/google/requests/compute/list_aggregated_addresses.rb +++ b/lib/fog/google/requests/compute/list_aggregated_addresses.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def list_aggregated_addresses(options = {}) Fog::Mock.not_implemented @@ -20,7 +19,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/list_aggregated_disks.rb b/lib/fog/google/requests/compute/list_aggregated_disks.rb index 7c03ed0fb..213f94d26 100644 --- a/lib/fog/google/requests/compute/list_aggregated_disks.rb +++ b/lib/fog/google/requests/compute/list_aggregated_disks.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def list_aggregated_disks(options = {}) # Create a Hash of unique zones from the disks Array previously filled when disks are created @@ -37,7 +36,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/list_aggregated_machine_types.rb b/lib/fog/google/requests/compute/list_aggregated_machine_types.rb index bdbf08b81..e8c46a688 100644 --- a/lib/fog/google/requests/compute/list_aggregated_machine_types.rb +++ b/lib/fog/google/requests/compute/list_aggregated_machine_types.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def list_aggregated_machine_types Fog::Mock.not_implemented @@ -19,7 +18,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/list_aggregated_servers.rb b/lib/fog/google/requests/compute/list_aggregated_servers.rb index f4aefef0b..86cdb8c7a 100644 --- a/lib/fog/google/requests/compute/list_aggregated_servers.rb +++ b/lib/fog/google/requests/compute/list_aggregated_servers.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def list_aggregated_servers(options = {}) # Create a Hash of unique zones from the servers Array previously filled when servers are created @@ -37,7 +36,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/list_disks.rb b/lib/fog/google/requests/compute/list_disks.rb index c3ad5eda4..d891029ad 100644 --- a/lib/fog/google/requests/compute/list_disks.rb +++ b/lib/fog/google/requests/compute/list_disks.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def list_disks(zone_name) disks = self.data[:disks].values.select{|d| d["zone"].split("/")[-1] == zone_name} build_response(:body => { @@ -13,11 +11,9 @@ module Fog "items" => disks }) end - end class Real - def list_disks(zone_name) api_method = @compute.disks.list parameters = { @@ -28,9 +24,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_firewalls.rb b/lib/fog/google/requests/compute/list_firewalls.rb index 7b0bc618a..ee8953a06 100644 --- a/lib/fog/google/requests/compute/list_firewalls.rb +++ b/lib/fog/google/requests/compute/list_firewalls.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def list_firewalls Fog::Mock.not_implemented end - end class Real - def list_firewalls api_method = @compute.firewalls.list parameters = { @@ -21,9 +17,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_forwarding_rules.rb b/lib/fog/google/requests/compute/list_forwarding_rules.rb index fd9d9ef70..67170e0c9 100644 --- a/lib/fog/google/requests/compute/list_forwarding_rules.rb +++ b/lib/fog/google/requests/compute/list_forwarding_rules.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def list_forwarding_rules(region_name) forwarding_rules = self.data[:forwarding_rules].values.select{|d| d["region"].split("/")[-1] == region_name} build_response(:body => { @@ -13,11 +11,9 @@ module Fog "items" => forwarding_rules }) end - end class Real - def list_forwarding_rules(region_name) api_method = @compute.forwarding_rules.list parameters = { @@ -28,9 +24,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_global_operations.rb b/lib/fog/google/requests/compute/list_global_operations.rb index 97a5bf48f..e5ddca0bc 100644 --- a/lib/fog/google/requests/compute/list_global_operations.rb +++ b/lib/fog/google/requests/compute/list_global_operations.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def list_global_operations Fog::Mock.not_implemented end - end class Real diff --git a/lib/fog/google/requests/compute/list_http_health_checks.rb b/lib/fog/google/requests/compute/list_http_health_checks.rb index 29a986a76..926404dc1 100644 --- a/lib/fog/google/requests/compute/list_http_health_checks.rb +++ b/lib/fog/google/requests/compute/list_http_health_checks.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def list_http_health_checks Fog::Mock.not_implemented end - end class Real - def list_http_health_checks api_method = @compute.http_health_checks.list parameters = { @@ -21,9 +17,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_images.rb b/lib/fog/google/requests/compute/list_images.rb index c5f89b07c..7989a3804 100644 --- a/lib/fog/google/requests/compute/list_images.rb +++ b/lib/fog/google/requests/compute/list_images.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def list_images(project=@project) images = data(project)[:images].values build_response(:body => { @@ -13,11 +11,9 @@ module Fog "items" => images }) end - end class Real - def list_images(project=nil) api_method = @compute.images.list project=@project if project.nil? @@ -28,9 +24,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_machine_types.rb b/lib/fog/google/requests/compute/list_machine_types.rb index c680645a7..65fd50be0 100644 --- a/lib/fog/google/requests/compute/list_machine_types.rb +++ b/lib/fog/google/requests/compute/list_machine_types.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def list_machine_types(zone_name) get_zone(zone_name) machine_types = data[:machine_types][zone_name].values @@ -14,11 +12,9 @@ module Fog "items" => machine_types }) end - end class Real - def list_machine_types(zone_name) api_method = @compute.machine_types.list parameters = { @@ -29,9 +25,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_networks.rb b/lib/fog/google/requests/compute/list_networks.rb index 29ee28155..f95fffbe4 100644 --- a/lib/fog/google/requests/compute/list_networks.rb +++ b/lib/fog/google/requests/compute/list_networks.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def list_networks Fog::Mock.not_implemented end - end class Real - def list_networks api_method = @compute.networks.list parameters = { @@ -21,9 +17,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_region_operations.rb b/lib/fog/google/requests/compute/list_region_operations.rb index 45a127ed2..743b71174 100644 --- a/lib/fog/google/requests/compute/list_region_operations.rb +++ b/lib/fog/google/requests/compute/list_region_operations.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def list_region_operations(region) Fog::Mock.not_implemented end - end class Real diff --git a/lib/fog/google/requests/compute/list_regions.rb b/lib/fog/google/requests/compute/list_regions.rb index 048545eee..b6b778a43 100644 --- a/lib/fog/google/requests/compute/list_regions.rb +++ b/lib/fog/google/requests/compute/list_regions.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def list_regions build_response(:body => { "kind" => "compute#regionList", @@ -70,11 +68,9 @@ module Fog ] }) end - end class Real - def list_regions api_method = @compute.regions.list parameters = { @@ -84,9 +80,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_routes.rb b/lib/fog/google/requests/compute/list_routes.rb index a4eb0b8af..1717b2dd7 100644 --- a/lib/fog/google/requests/compute/list_routes.rb +++ b/lib/fog/google/requests/compute/list_routes.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def list_routes(options = {}) Fog::Mock.not_implemented @@ -19,7 +18,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/list_servers.rb b/lib/fog/google/requests/compute/list_servers.rb index 4735aeb34..f3d798ac2 100644 --- a/lib/fog/google/requests/compute/list_servers.rb +++ b/lib/fog/google/requests/compute/list_servers.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def list_servers(zone_name) get_zone(zone_name) zone = self.data[:zones][zone_name] @@ -15,11 +13,9 @@ module Fog "items" => servers }) end - end class Real - def list_servers(zone_name) api_method = @compute.instances.list parameters = { @@ -30,9 +26,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_snapshots.rb b/lib/fog/google/requests/compute/list_snapshots.rb index 2c3a982e6..53e983cee 100644 --- a/lib/fog/google/requests/compute/list_snapshots.rb +++ b/lib/fog/google/requests/compute/list_snapshots.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def list_snapshots Fog::Mock.not_implemented end - end class Real - def list_snapshots(project=nil) api_method = @compute.snapshots.list project=@project if project.nil? @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_target_pools.rb b/lib/fog/google/requests/compute/list_target_pools.rb index f9aa036d0..4681b42ac 100644 --- a/lib/fog/google/requests/compute/list_target_pools.rb +++ b/lib/fog/google/requests/compute/list_target_pools.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def list_target_pools(region_name) Fog::Mock.not_implemented end - end class Real - def list_target_pools(region_name) api_method = @compute.target_pools.list parameters = { @@ -22,9 +18,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/list_zone_operations.rb b/lib/fog/google/requests/compute/list_zone_operations.rb index 13898bc82..0ff17d59f 100644 --- a/lib/fog/google/requests/compute/list_zone_operations.rb +++ b/lib/fog/google/requests/compute/list_zone_operations.rb @@ -1,13 +1,10 @@ module Fog module Compute class Google - class Mock - def list_zone_operations(zone) Fog::Mock.not_implemented end - end class Real diff --git a/lib/fog/google/requests/compute/list_zones.rb b/lib/fog/google/requests/compute/list_zones.rb index 9ab2429a5..1d519d71b 100644 --- a/lib/fog/google/requests/compute/list_zones.rb +++ b/lib/fog/google/requests/compute/list_zones.rb @@ -1,9 +1,7 @@ module Fog module Compute class Google - class Mock - def list_zones zones = self.data[:zones].values build_response(:body => { @@ -13,11 +11,9 @@ module Fog "items" => zones }) end - end class Real - def list_zones api_method = @compute.zones.list parameters = { @@ -27,9 +23,7 @@ module Fog result = self.build_result(api_method, parameters) response = self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/remove_target_pool_health_checks.rb b/lib/fog/google/requests/compute/remove_target_pool_health_checks.rb index c338bf926..a425c370f 100644 --- a/lib/fog/google/requests/compute/remove_target_pool_health_checks.rb +++ b/lib/fog/google/requests/compute/remove_target_pool_health_checks.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def remove_target_pool_health_checks(target_pool, health_checks) Fog::Mock.not_implemented end - end class Real - def remove_target_pool_health_checks(target_pool, health_checks) api_method = @compute.target_pools.remove_health_check parameters = { @@ -26,9 +22,7 @@ module Fog result = self.build_result(api_method, parameters, body_object=body) self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/remove_target_pool_instance.rb b/lib/fog/google/requests/compute/remove_target_pool_instance.rb index 00194315d..e2357c949 100644 --- a/lib/fog/google/requests/compute/remove_target_pool_instance.rb +++ b/lib/fog/google/requests/compute/remove_target_pool_instance.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def set_metadata(instance, zone, fingerprint, metadata={}) Fog::Mock.not_implemented end - end class Real - def remove_target_pool_instances(target_pool, instances) api_method = @compute.target_pools.remove_instance parameters = { @@ -26,9 +22,7 @@ module Fog result = self.build_result(api_method, parameters, body_object=body) self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/remove_target_pool_instances.rb b/lib/fog/google/requests/compute/remove_target_pool_instances.rb index f882d8473..a98207cc2 100644 --- a/lib/fog/google/requests/compute/remove_target_pool_instances.rb +++ b/lib/fog/google/requests/compute/remove_target_pool_instances.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def remove_target_pool_instances(target_pool, instances) Fog::Mock.not_implemented end - end class Real - def remove_target_pool_instances(target_pool, instances) api_method = @compute.target_pools.remove_instance parameters = { @@ -26,9 +22,7 @@ module Fog result = self.build_result(api_method, parameters, body_object=body) self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/reset_server.rb b/lib/fog/google/requests/compute/reset_server.rb index 1536b45f1..f52a10834 100644 --- a/lib/fog/google/requests/compute/reset_server.rb +++ b/lib/fog/google/requests/compute/reset_server.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def reset_server(identity, zone) Fog::Mock.not_implemented @@ -21,7 +20,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/set_common_instance_metadata.rb b/lib/fog/google/requests/compute/set_common_instance_metadata.rb index f760af5dc..e97b4b8d9 100644 --- a/lib/fog/google/requests/compute/set_common_instance_metadata.rb +++ b/lib/fog/google/requests/compute/set_common_instance_metadata.rb @@ -1,12 +1,10 @@ module Fog module Compute class Google - class Mock def set_common_instance_metadata(identity, current_fingerprint, metadata = {}) Fog::Mock.not_implemented end - end class Real @@ -24,7 +22,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/set_forwarding_rule_target.rb b/lib/fog/google/requests/compute/set_forwarding_rule_target.rb index e6cfad623..b8e58ccc4 100644 --- a/lib/fog/google/requests/compute/set_forwarding_rule_target.rb +++ b/lib/fog/google/requests/compute/set_forwarding_rule_target.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def set_forwarding_rule_target(rule, target) Fog::Mock.not_implemented @@ -9,7 +8,6 @@ module Fog end class Real - def set_forwarding_rule_target(rule, target) api_method = @compute.forwarding_rules.set_target parameters = { @@ -24,9 +22,7 @@ module Fog result = self.build_result(api_method, parameters, body_object=body) self.build_response(result) end - end - end end end diff --git a/lib/fog/google/requests/compute/set_metadata.rb b/lib/fog/google/requests/compute/set_metadata.rb index 5a231d785..d2f75d73b 100644 --- a/lib/fog/google/requests/compute/set_metadata.rb +++ b/lib/fog/google/requests/compute/set_metadata.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def set_metadata(instance, zone, fingerprint, metadata={}) Fog::Mock.not_implemented end - end class Real - # Set an instance metadata # # ==== Parameters diff --git a/lib/fog/google/requests/compute/set_server_disk_auto_delete.rb b/lib/fog/google/requests/compute/set_server_disk_auto_delete.rb index 489660bc6..c14966087 100644 --- a/lib/fog/google/requests/compute/set_server_disk_auto_delete.rb +++ b/lib/fog/google/requests/compute/set_server_disk_auto_delete.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def set_server_disk_auto_delete(identity, zone, auto_delete, device_name) Fog::Mock.not_implemented @@ -23,7 +22,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/set_server_scheduling.rb b/lib/fog/google/requests/compute/set_server_scheduling.rb index dc6d71da3..9fb67e74b 100644 --- a/lib/fog/google/requests/compute/set_server_scheduling.rb +++ b/lib/fog/google/requests/compute/set_server_scheduling.rb @@ -1,7 +1,6 @@ module Fog module Compute class Google - class Mock def set_server_scheduling(identity, zone, on_host_maintenance, automatic_restart) Fog::Mock.not_implemented @@ -26,7 +25,6 @@ module Fog response = self.build_response(result) end end - end end end diff --git a/lib/fog/google/requests/compute/set_tags.rb b/lib/fog/google/requests/compute/set_tags.rb index 7176ffb26..faf66b6f0 100644 --- a/lib/fog/google/requests/compute/set_tags.rb +++ b/lib/fog/google/requests/compute/set_tags.rb @@ -1,17 +1,13 @@ module Fog module Compute class Google - class Mock - def set_tags(instance, zone, tags=[]) Fog::Mock.not_implemented end - end class Real - def set_tags(instance, zone, fingerprint, tags=[]) api_method = @compute.instances.set_tags parameters = { diff --git a/lib/fog/google/requests/storage/copy_object.rb b/lib/fog/google/requests/storage/copy_object.rb index b8eb5a623..f18effe4a 100644 --- a/lib/fog/google/requests/storage/copy_object.rb +++ b/lib/fog/google/requests/storage/copy_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - require 'fog/google/parsers/storage/copy_object' # Copy an object from one Google Storage bucket to another @@ -36,11 +35,9 @@ module Fog :path => CGI.escape(target_object_name) }) end - end class Mock - def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {}) response = Excon::Response.new source_bucket = self.data[:buckets][source_bucket_name] @@ -65,7 +62,6 @@ module Fog response end - end end end diff --git a/lib/fog/google/requests/storage/delete_bucket.rb b/lib/fog/google/requests/storage/delete_bucket.rb index 101acbb1f..cdd3c5a57 100644 --- a/lib/fog/google/requests/storage/delete_bucket.rb +++ b/lib/fog/google/requests/storage/delete_bucket.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Delete an Google Storage bucket # # ==== Parameters @@ -19,11 +18,9 @@ module Fog :method => 'DELETE' }) end - end class Mock - def delete_bucket(bucket_name) response = Excon::Response.new if self.data[:buckets][bucket_name].nil? @@ -38,9 +35,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/google/requests/storage/delete_object.rb b/lib/fog/google/requests/storage/delete_object.rb index 334375132..85068d25b 100644 --- a/lib/fog/google/requests/storage/delete_object.rb +++ b/lib/fog/google/requests/storage/delete_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Delete an object from Google Storage # # ==== Parameters @@ -22,11 +21,9 @@ module Fog :path => CGI.escape(object_name) }) end - end class Mock - def delete_object(bucket_name, object_name) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -43,7 +40,6 @@ module Fog end response end - end end end diff --git a/lib/fog/google/requests/storage/get_bucket.rb b/lib/fog/google/requests/storage/get_bucket.rb index 212e73587..5bf9427df 100644 --- a/lib/fog/google/requests/storage/get_bucket.rb +++ b/lib/fog/google/requests/storage/get_bucket.rb @@ -3,7 +3,6 @@ module Fog module Storage class Google class Real - require 'fog/google/parsers/storage/get_bucket' # List information about objects in an Google Storage bucket @@ -51,11 +50,9 @@ module Fog :query => options }) end - end class Mock - def get_bucket(bucket_name, options = {}) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -103,7 +100,6 @@ module Fog end response end - end end end diff --git a/lib/fog/google/requests/storage/get_bucket_acl.rb b/lib/fog/google/requests/storage/get_bucket_acl.rb index b6930cc3f..4a2b5c57d 100644 --- a/lib/fog/google/requests/storage/get_bucket_acl.rb +++ b/lib/fog/google/requests/storage/get_bucket_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - require 'fog/google/parsers/storage/access_control_list' # Get access control list for an Google Storage bucket @@ -40,11 +39,9 @@ module Fog :query => {'acl' => nil} }) end - end class Mock - def get_bucket_acl(bucket_name) response = Excon::Response.new if acl = self.data[:acls][:bucket][bucket_name] @@ -56,7 +53,6 @@ module Fog end response end - end end end diff --git a/lib/fog/google/requests/storage/get_object.rb b/lib/fog/google/requests/storage/get_object.rb index a2ac2879a..fb89ed71d 100644 --- a/lib/fog/google/requests/storage/get_object.rb +++ b/lib/fog/google/requests/storage/get_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Get an object from Google Storage # # ==== Parameters @@ -57,11 +56,9 @@ module Fog :path => CGI.escape(object_name), })) end - end class Mock - def get_object(bucket_name, object_name, options = {}, &block) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -105,7 +102,6 @@ module Fog end response end - end end end diff --git a/lib/fog/google/requests/storage/get_object_acl.rb b/lib/fog/google/requests/storage/get_object_acl.rb index 0023ad8e4..2f70a7e99 100644 --- a/lib/fog/google/requests/storage/get_object_acl.rb +++ b/lib/fog/google/requests/storage/get_object_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - require 'fog/google/parsers/storage/access_control_list' # Get access control list for an Google Storage object @@ -51,11 +50,9 @@ module Fog :query => query }) end - end class Mock - def get_object_acl(bucket_name, object_name) response = Excon::Response.new if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name] @@ -67,7 +64,6 @@ module Fog end response end - end end end diff --git a/lib/fog/google/requests/storage/get_object_http_url.rb b/lib/fog/google/requests/storage/get_object_http_url.rb index e6b0fbfa0..b11a33100 100644 --- a/lib/fog/google/requests/storage/get_object_http_url.rb +++ b/lib/fog/google/requests/storage/get_object_http_url.rb @@ -1,9 +1,7 @@ module Fog module Storage class Google - module GetObjectHttpUrl - def get_object_http_url(bucket_name, object_name, expires) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -18,11 +16,9 @@ module Fog :path => "#{bucket_name}/#{object_name}" }, expires) end - end class Real - # Get an expiring object http url from S3 # # ==== Parameters @@ -38,13 +34,10 @@ module Fog # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include GetObjectHttpUrl - end class Mock # :nodoc:all - include GetObjectHttpUrl - end end end diff --git a/lib/fog/google/requests/storage/get_object_https_url.rb b/lib/fog/google/requests/storage/get_object_https_url.rb index 07f7ad219..9bb92260c 100644 --- a/lib/fog/google/requests/storage/get_object_https_url.rb +++ b/lib/fog/google/requests/storage/get_object_https_url.rb @@ -1,9 +1,7 @@ module Fog module Storage class Google - module GetObjectHttpsUrl - def get_object_https_url(bucket_name, object_name, expires) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -18,11 +16,9 @@ module Fog :path => "#{bucket_name}/#{object_name}" }, expires) end - end class Real - # Get an expiring object https url from Google Storage # # ==== Parameters @@ -38,13 +34,10 @@ module Fog # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include GetObjectHttpsUrl - end class Mock # :nodoc:all - include GetObjectHttpsUrl - end end end diff --git a/lib/fog/google/requests/storage/get_object_torrent.rb b/lib/fog/google/requests/storage/get_object_torrent.rb index 08c51be9c..98d8e4073 100644 --- a/lib/fog/google/requests/storage/get_object_torrent.rb +++ b/lib/fog/google/requests/storage/get_object_torrent.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Get torrent for an Google Storage object # # ==== Parameters @@ -40,7 +39,6 @@ module Fog :query => {'torrent' => nil} }) end - end end end diff --git a/lib/fog/google/requests/storage/get_object_url.rb b/lib/fog/google/requests/storage/get_object_url.rb index 40f085aab..ebfb43744 100644 --- a/lib/fog/google/requests/storage/get_object_url.rb +++ b/lib/fog/google/requests/storage/get_object_url.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Get an expiring object url from Google Storage # # ==== Parameters @@ -21,16 +20,13 @@ module Fog Fog::Logger.deprecation("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})") get_object_https_url(bucket_name, object_name, expires) end - end class Mock # :nodoc:all - def get_object_url(bucket_name, object_name, expires) Fog::Logger.deprecation("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})") get_object_https_url(bucket_name, object_name, expires) end - end end end diff --git a/lib/fog/google/requests/storage/get_service.rb b/lib/fog/google/requests/storage/get_service.rb index bbbb2f9ee..d2050ba68 100644 --- a/lib/fog/google/requests/storage/get_service.rb +++ b/lib/fog/google/requests/storage/get_service.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - require 'fog/google/parsers/storage/get_service' # List information about Google Storage buckets for authorized user @@ -27,11 +26,9 @@ module Fog :url => @host }) end - end class Mock - def get_service response = Excon::Response.new response.headers['Status'] = 200 @@ -46,7 +43,6 @@ module Fog } response end - end end end diff --git a/lib/fog/google/requests/storage/head_object.rb b/lib/fog/google/requests/storage/head_object.rb index 16e03525e..8fa7e6d17 100644 --- a/lib/fog/google/requests/storage/head_object.rb +++ b/lib/fog/google/requests/storage/head_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Get headers for an object from Google Storage # # ==== Parameters @@ -47,17 +46,14 @@ module Fog :query => query }) end - end class Mock - def head_object(bucket_name, object_name, options = {}) response = get_object(bucket_name, object_name, options) response.body = nil response end - end end end diff --git a/lib/fog/google/requests/storage/put_bucket.rb b/lib/fog/google/requests/storage/put_bucket.rb index 6980aadc3..29b74ad9c 100644 --- a/lib/fog/google/requests/storage/put_bucket.rb +++ b/lib/fog/google/requests/storage/put_bucket.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Create an Google Storage bucket # # ==== Parameters @@ -34,11 +33,9 @@ DATA :method => 'PUT' }) end - end class Mock - def put_bucket(bucket_name, options = {}) acl = options['x-goog-acl'] || 'private' if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) @@ -68,7 +65,6 @@ DATA end response end - end end end diff --git a/lib/fog/google/requests/storage/put_bucket_acl.rb b/lib/fog/google/requests/storage/put_bucket_acl.rb index f168d38da..d73882d40 100644 --- a/lib/fog/google/requests/storage/put_bucket_acl.rb +++ b/lib/fog/google/requests/storage/put_bucket_acl.rb @@ -1,7 +1,6 @@ module Fog module Storage class Google - class Mock def put_bucket_acl(bucket_name, acl) Fog::Mock.not_implemented @@ -9,10 +8,8 @@ module Fog end class Real - # Change access control list for an Google Storage bucket def put_bucket_acl(bucket_name, acl) - data = <<-DATA @@ -34,7 +31,6 @@ DATA }) end - private def tag(name, value) @@ -56,9 +52,7 @@ DATA tag('Entry', scope_tag(entry['Scope']) + tag('Permission', entry['Permission'])) end.join("\n") end - end - end end end diff --git a/lib/fog/google/requests/storage/put_object.rb b/lib/fog/google/requests/storage/put_object.rb index ec5ceffe1..a061c9d22 100644 --- a/lib/fog/google/requests/storage/put_object.rb +++ b/lib/fog/google/requests/storage/put_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Create an object in an Google Storage bucket # # ==== Parameters @@ -36,11 +35,9 @@ module Fog :path => CGI.escape(object_name) }) end - end class Mock - def put_object(bucket_name, object_name, data, options = {}) acl = options['x-goog-acl'] || 'private' if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) @@ -86,7 +83,6 @@ module Fog end response end - end end end diff --git a/lib/fog/google/requests/storage/put_object_acl.rb b/lib/fog/google/requests/storage/put_object_acl.rb index 3dfd479c7..7b1e3f60b 100644 --- a/lib/fog/google/requests/storage/put_object_acl.rb +++ b/lib/fog/google/requests/storage/put_object_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # TODO: move this methods to helper to use them with put_bucket_acl request def tag(name, value) "<#{name}>#{value}" @@ -25,7 +24,6 @@ module Fog end def put_object_acl(bucket_name, object_name, acl) - data = <<-DATA @@ -46,9 +44,7 @@ DATA :query => {'acl' => nil}, :path => CGI.escape(object_name) }) - end - end end end diff --git a/lib/fog/google/requests/storage/put_object_url.rb b/lib/fog/google/requests/storage/put_object_url.rb index 6674a459b..796ffe415 100644 --- a/lib/fog/google/requests/storage/put_object_url.rb +++ b/lib/fog/google/requests/storage/put_object_url.rb @@ -2,7 +2,6 @@ module Fog module Storage class Google class Real - # Get an expiring object url from Google Storage for putting an object # # ==== Parameters @@ -28,11 +27,9 @@ module Fog :path => "#{bucket_name}/#{object_name}" }, expires) end - end class Mock - def put_object_url(bucket_name, object_name, expires, headers = {}) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -47,7 +44,6 @@ module Fog :path => "#{bucket_name}/#{object_name}" }, expires) end - end end end diff --git a/lib/fog/google/storage.rb b/lib/fog/google/storage.rb index 2816cc4ff..efd3bd259 100644 --- a/lib/fog/google/storage.rb +++ b/lib/fog/google/storage.rb @@ -3,7 +3,6 @@ require 'fog/google/core' module Fog module Storage class Google < Fog::Service - requires :google_storage_access_key_id, :google_storage_secret_access_key recognizes :host, :port, :scheme, :persistent, :path_style @@ -34,8 +33,6 @@ module Fog request :put_object_url module Utils - - def http_url(params, expires) "http://" << host_path_query(params, expires) end @@ -94,7 +91,6 @@ module Fog params[:port] ||= @port params end - end class Mock @@ -192,10 +188,8 @@ module Fog def signature(params) "foo" end - end - class Real include Utils diff --git a/lib/fog/hp/block_storage.rb b/lib/fog/hp/block_storage.rb index 9789066be..34723df4a 100644 --- a/lib/fog/hp/block_storage.rb +++ b/lib/fog/hp/block_storage.rb @@ -3,7 +3,6 @@ require 'fog/hp/core' module Fog module HP class BlockStorage < Fog::Service - requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :credentials, :hp_service_type recognizes :persistent, :connection_options @@ -34,7 +33,6 @@ module Fog request :list_snapshots module Utils - def compute @compute ||= Fog::Compute.new( :provider => 'HP', @@ -47,7 +45,6 @@ module Fog :connection_options => @connection_options ) end - end class Mock @@ -85,7 +82,6 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real @@ -168,7 +164,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/block_storage_v2.rb b/lib/fog/hp/block_storage_v2.rb index 904be49da..ab0810ec0 100644 --- a/lib/fog/hp/block_storage_v2.rb +++ b/lib/fog/hp/block_storage_v2.rb @@ -3,7 +3,6 @@ require 'fog/hp/core' module Fog module HP class BlockStorageV2 < Fog::Service - requires :hp_access_key, :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :credentials, :hp_service_type recognizes :persistent, :connection_options @@ -40,7 +39,6 @@ module Fog request :restore_volume_backup module Utils - def compute @compute ||= Fog::Compute.new( :provider => 'HP', @@ -54,7 +52,6 @@ module Fog :connection_options => @connection_options ) end - end class Mock @@ -85,7 +82,6 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real @@ -157,7 +153,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/cdn.rb b/lib/fog/hp/cdn.rb index 1f8da9b05..464c20ad1 100644 --- a/lib/fog/hp/cdn.rb +++ b/lib/fog/hp/cdn.rb @@ -4,7 +4,6 @@ require 'fog/cdn' module Fog module CDN class HP < Fog::Service - requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :hp_cdn_uri, :credentials, :hp_service_type recognizes :hp_use_upass_auth_style, :hp_auth_version, :user_agent @@ -23,7 +22,6 @@ module Fog request :delete_container module Utils - end class Mock @@ -60,7 +58,6 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real @@ -151,7 +148,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/compute.rb b/lib/fog/hp/compute.rb index 50286bc3f..fdd270c20 100644 --- a/lib/fog/hp/compute.rb +++ b/lib/fog/hp/compute.rb @@ -3,7 +3,6 @@ require 'fog/hp/core' module Fog module Compute class HP < Fog::Service - requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :credentials, :hp_service_type recognizes :hp_use_upass_auth_style, :hp_auth_version, :user_agent @@ -83,7 +82,6 @@ module Fog request :update_server module Utils - # extract windows password from log def extract_password_from_log(log_text) encrypted_text = "" @@ -121,7 +119,6 @@ module Fog from_base64 = Base64.decode64(encrypted_text) private_key.private_decrypt(from_base64).strip end - end class Mock @@ -169,7 +166,6 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real @@ -250,7 +246,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/compute_v2.rb b/lib/fog/hp/compute_v2.rb index a7abc7f54..96b9b4a80 100644 --- a/lib/fog/hp/compute_v2.rb +++ b/lib/fog/hp/compute_v2.rb @@ -3,7 +3,6 @@ require 'fog/hp/core' module Fog module Compute class HPV2 < Fog::Service - requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :credentials, :hp_service_type recognizes :hp_use_upass_auth_style, :hp_auth_version, :user_agent @@ -83,7 +82,6 @@ module Fog request :update_server module Utils - # extract windows password from log def extract_password_from_log(log_text) encrypted_text = "" @@ -121,7 +119,6 @@ module Fog from_base64 = Base64.decode64(encrypted_text) private_key.private_decrypt(from_base64).strip end - end class Mock @@ -226,7 +223,6 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real @@ -304,7 +300,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/core.rb b/lib/fog/hp/core.rb index 497165632..b9acacb60 100644 --- a/lib/fog/hp/core.rb +++ b/lib/fog/hp/core.rb @@ -4,7 +4,6 @@ require 'fog/hp/simple_http_instrumentor' module Fog module HP - # define a specific version for the HP Provider unless const_defined?(:VERSION) VERSION = '0.0.22' @@ -346,8 +345,6 @@ module Fog end mac_add.join(':') end - end - end end diff --git a/lib/fog/hp/dns.rb b/lib/fog/hp/dns.rb index 639771170..99b005b91 100644 --- a/lib/fog/hp/dns.rb +++ b/lib/fog/hp/dns.rb @@ -3,7 +3,6 @@ require 'fog/hp/core' module Fog module HP class DNS < Fog::Service - requires :hp_access_key, :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :credentials, :hp_service_type recognizes :persistent, :connection_options @@ -31,7 +30,6 @@ module Fog request :update_record class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -56,7 +54,6 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real @@ -127,9 +124,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/lb.rb b/lib/fog/hp/lb.rb index e066d208a..b4e4a78f2 100644 --- a/lib/fog/hp/lb.rb +++ b/lib/fog/hp/lb.rb @@ -3,7 +3,6 @@ require 'fog/hp/core' module Fog module HP class LB < Fog::Service - requires :hp_access_key, :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :credentials, :hp_service_type recognizes :persistent, :connection_options @@ -41,8 +40,6 @@ module Fog request :update_load_balancer_node class Mock - - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -91,13 +88,11 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real attr_reader :credentials - def initialize(options={}) @hp_access_key = options[:hp_access_key] @hp_secret_key = options[:hp_secret_key] @@ -162,9 +157,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/models/block_storage/bootable_volumes.rb b/lib/fog/hp/models/block_storage/bootable_volumes.rb index f40eb170b..e6bb9a1b5 100644 --- a/lib/fog/hp/models/block_storage/bootable_volumes.rb +++ b/lib/fog/hp/models/block_storage/bootable_volumes.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/block_storage/volume' module Fog module HP class BlockStorage - class BootableVolumes < Fog::Collection - model Fog::HP::BlockStorage::Volume def all @@ -20,9 +18,7 @@ module Fog rescue Fog::HP::BlockStorage::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/block_storage/snapshot.rb b/lib/fog/hp/models/block_storage/snapshot.rb index 39c4dcfdc..773ae9703 100644 --- a/lib/fog/hp/models/block_storage/snapshot.rb +++ b/lib/fog/hp/models/block_storage/snapshot.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module HP class BlockStorage - class Snapshot < Fog::Model - identity :id attribute :name, :aliases => 'displayName' @@ -48,9 +46,7 @@ module Fog merge_attributes(data.body['snapshot']) true end - end - end end end diff --git a/lib/fog/hp/models/block_storage/snapshots.rb b/lib/fog/hp/models/block_storage/snapshots.rb index c0a7135d5..c2ab4597e 100644 --- a/lib/fog/hp/models/block_storage/snapshots.rb +++ b/lib/fog/hp/models/block_storage/snapshots.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/block_storage/snapshot' module Fog module HP class BlockStorage - class Snapshots < Fog::Collection - model Fog::HP::BlockStorage::Snapshot def all @@ -21,9 +19,7 @@ module Fog rescue Fog::HP::BlockStorage::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/block_storage/volume.rb b/lib/fog/hp/models/block_storage/volume.rb index 88a342704..177df8450 100644 --- a/lib/fog/hp/models/block_storage/volume.rb +++ b/lib/fog/hp/models/block_storage/volume.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module HP class BlockStorage - class Volume < Fog::Model - identity :id attribute :name, :aliases => 'displayName' @@ -94,9 +92,7 @@ module Fog merge_attributes(data.body['volume']) true end - end - end end end diff --git a/lib/fog/hp/models/block_storage/volumes.rb b/lib/fog/hp/models/block_storage/volumes.rb index a9db39783..3160c6df9 100644 --- a/lib/fog/hp/models/block_storage/volumes.rb +++ b/lib/fog/hp/models/block_storage/volumes.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/block_storage/volume' module Fog module HP class BlockStorage - class Volumes < Fog::Collection - model Fog::HP::BlockStorage::Volume def all @@ -20,9 +18,7 @@ module Fog rescue Fog::HP::BlockStorage::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/block_storage_v2/snapshot.rb b/lib/fog/hp/models/block_storage_v2/snapshot.rb index 07baacae1..38b49c436 100644 --- a/lib/fog/hp/models/block_storage_v2/snapshot.rb +++ b/lib/fog/hp/models/block_storage_v2/snapshot.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module HP class BlockStorageV2 - class Snapshot < Fog::Model - identity :id attribute :name, :aliases => 'display_name' @@ -68,9 +66,7 @@ module Fog merge_attributes(data.body['snapshot']) true end - end - end end end diff --git a/lib/fog/hp/models/block_storage_v2/snapshots.rb b/lib/fog/hp/models/block_storage_v2/snapshots.rb index ad021742c..423d17d00 100644 --- a/lib/fog/hp/models/block_storage_v2/snapshots.rb +++ b/lib/fog/hp/models/block_storage_v2/snapshots.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/block_storage_v2/snapshot' module Fog module HP class BlockStorageV2 - class Snapshots < Fog::Collection - attribute :filters model Fog::HP::BlockStorageV2::Snapshot @@ -35,9 +33,7 @@ module Fog rescue Fog::HP::BlockStorageV2::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/block_storage_v2/volume.rb b/lib/fog/hp/models/block_storage_v2/volume.rb index 528d167be..bce72f6a4 100644 --- a/lib/fog/hp/models/block_storage_v2/volume.rb +++ b/lib/fog/hp/models/block_storage_v2/volume.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module HP class BlockStorageV2 - class Volume < Fog::Model - identity :id attribute :name, :aliases => 'display_name' @@ -131,9 +129,7 @@ module Fog merge_attributes(data.body['volume']) true end - end - end end end diff --git a/lib/fog/hp/models/block_storage_v2/volume_backup.rb b/lib/fog/hp/models/block_storage_v2/volume_backup.rb index 65a1b9146..499b30270 100644 --- a/lib/fog/hp/models/block_storage_v2/volume_backup.rb +++ b/lib/fog/hp/models/block_storage_v2/volume_backup.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module HP class BlockStorageV2 - class VolumeBackup < Fog::Model - identity :id attribute :name @@ -50,9 +48,7 @@ module Fog merge_attributes(service.create_volume_backup(volume_id, attributes).body['backup']) true end - end - end end end diff --git a/lib/fog/hp/models/block_storage_v2/volume_backups.rb b/lib/fog/hp/models/block_storage_v2/volume_backups.rb index c0c527f47..22949ad63 100644 --- a/lib/fog/hp/models/block_storage_v2/volume_backups.rb +++ b/lib/fog/hp/models/block_storage_v2/volume_backups.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/block_storage_v2/volume_backup' module Fog module HP class BlockStorageV2 - class VolumeBackups < Fog::Collection - attribute :filters model Fog::HP::BlockStorageV2::VolumeBackup @@ -34,9 +32,7 @@ module Fog rescue Fog::HP::BlockStorageV2::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/block_storage_v2/volumes.rb b/lib/fog/hp/models/block_storage_v2/volumes.rb index 7e3873136..6ec472931 100644 --- a/lib/fog/hp/models/block_storage_v2/volumes.rb +++ b/lib/fog/hp/models/block_storage_v2/volumes.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/block_storage_v2/volume' module Fog module HP class BlockStorageV2 - class Volumes < Fog::Collection - attribute :filters model Fog::HP::BlockStorageV2::Volume @@ -34,9 +32,7 @@ module Fog rescue Fog::HP::BlockStorageV2::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute/address.rb b/lib/fog/hp/models/compute/address.rb index d8d9156cf..a6b44d2bc 100644 --- a/lib/fog/hp/models/compute/address.rb +++ b/lib/fog/hp/models/compute/address.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class HP - class Address < Fog::Model - identity :id attribute :ip @@ -62,9 +60,7 @@ module Fog end self.instance_id = nil end - end - end end end diff --git a/lib/fog/hp/models/compute/addresses.rb b/lib/fog/hp/models/compute/addresses.rb index 1d75e62c9..d1563004d 100644 --- a/lib/fog/hp/models/compute/addresses.rb +++ b/lib/fog/hp/models/compute/addresses.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute/address' module Fog module Compute class HP - class Addresses < Fog::Collection - model Fog::Compute::HP::Address def all @@ -21,9 +19,7 @@ module Fog rescue Fog::Compute::HP::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute/flavor.rb b/lib/fog/hp/models/compute/flavor.rb index ebf47f79d..731af3df8 100644 --- a/lib/fog/hp/models/compute/flavor.rb +++ b/lib/fog/hp/models/compute/flavor.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class HP - class Flavor < Fog::Model - identity :id attribute :disk @@ -16,9 +14,7 @@ module Fog #def bits # 64 #end - end - end end end diff --git a/lib/fog/hp/models/compute/flavors.rb b/lib/fog/hp/models/compute/flavors.rb index e20b1526b..4ddfe53e6 100644 --- a/lib/fog/hp/models/compute/flavors.rb +++ b/lib/fog/hp/models/compute/flavors.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute/flavor' module Fog module Compute class HP - class Flavors < Fog::Collection - model Fog::Compute::HP::Flavor def all @@ -20,9 +18,7 @@ module Fog rescue Fog::Compute::HP::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute/image.rb b/lib/fog/hp/models/compute/image.rb index cd78d5be8..efafbc1c6 100644 --- a/lib/fog/hp/models/compute/image.rb +++ b/lib/fog/hp/models/compute/image.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute/metadata' module Fog module Compute class HP - class Image < Fog::Model - identity :id attribute :name @@ -68,9 +66,7 @@ module Fog def ready? status == 'ACTIVE' end - end - end end end diff --git a/lib/fog/hp/models/compute/images.rb b/lib/fog/hp/models/compute/images.rb index 9ce22f14d..7bf4a4b7c 100644 --- a/lib/fog/hp/models/compute/images.rb +++ b/lib/fog/hp/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute/image' module Fog module Compute class HP - class Images < Fog::Collection - model Fog::Compute::HP::Image def all @@ -21,9 +19,7 @@ module Fog rescue Fog::Compute::HP::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute/key_pair.rb b/lib/fog/hp/models/compute/key_pair.rb index 95204cfd9..3914f5e5e 100644 --- a/lib/fog/hp/models/compute/key_pair.rb +++ b/lib/fog/hp/models/compute/key_pair.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class HP - class KeyPair < Fog::Model - identity :name attribute :fingerprint @@ -47,7 +45,6 @@ module Fog def writable? !!(private_key && ENV.has_key?('HOME')) end - end end end diff --git a/lib/fog/hp/models/compute/key_pairs.rb b/lib/fog/hp/models/compute/key_pairs.rb index ba4c2af4f..ae6413cf2 100644 --- a/lib/fog/hp/models/compute/key_pairs.rb +++ b/lib/fog/hp/models/compute/key_pairs.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute/key_pair' module Fog module Compute class HP - class KeyPairs < Fog::Collection - model Fog::Compute::HP::KeyPair def all @@ -24,7 +22,6 @@ module Fog rescue Fog::Compute::HP::NotFound nil end - end end end diff --git a/lib/fog/hp/models/compute/meta.rb b/lib/fog/hp/models/compute/meta.rb index df8f7f445..265ecbb28 100644 --- a/lib/fog/hp/models/compute/meta.rb +++ b/lib/fog/hp/models/compute/meta.rb @@ -5,7 +5,6 @@ module Fog module Compute class HP class Meta < Fog::Model - include Fog::Compute::HP::MetaParent identity :key @@ -22,7 +21,6 @@ module Fog service.update_meta(collection_name, @parent.id, key, value) true end - end end end diff --git a/lib/fog/hp/models/compute/metadata.rb b/lib/fog/hp/models/compute/metadata.rb index f7c911b57..454f0d5ba 100644 --- a/lib/fog/hp/models/compute/metadata.rb +++ b/lib/fog/hp/models/compute/metadata.rb @@ -7,9 +7,7 @@ require 'fog/hp/models/compute/server' module Fog module Compute class HP - class Metadata < Fog::Collection - model Fog::Compute::HP::Meta include Fog::Compute::HP::MetaParent @@ -56,7 +54,6 @@ module Fog service.update_metadata(collection_name, @parent.id, meta_hash(data)) end - private def meta_hash(data=nil) if data.nil? @@ -71,9 +68,7 @@ module Fog end data end - end - end end end diff --git a/lib/fog/hp/models/compute/security_group.rb b/lib/fog/hp/models/compute/security_group.rb index d6e6d9ad8..d6d025aea 100644 --- a/lib/fog/hp/models/compute/security_group.rb +++ b/lib/fog/hp/models/compute/security_group.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class HP - class SecurityGroup < Fog::Model - identity :id attribute :name diff --git a/lib/fog/hp/models/compute/security_groups.rb b/lib/fog/hp/models/compute/security_groups.rb index f8f40a0c3..3cabbf478 100644 --- a/lib/fog/hp/models/compute/security_groups.rb +++ b/lib/fog/hp/models/compute/security_groups.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute/security_group' module Fog module Compute class HP - class SecurityGroups < Fog::Collection - model Fog::Compute::HP::SecurityGroup def all @@ -22,7 +20,6 @@ module Fog rescue Fog::Compute::HP::NotFound nil end - end end end diff --git a/lib/fog/hp/models/compute/server.rb b/lib/fog/hp/models/compute/server.rb index 582121151..853f1cf66 100644 --- a/lib/fog/hp/models/compute/server.rb +++ b/lib/fog/hp/models/compute/server.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute/metadata' module Fog module Compute class HP - class Server < Fog::Compute::Server - identity :id attribute :addresses @@ -289,10 +287,7 @@ module Fog def adminPass=(new_admin_pass) @password = new_admin_pass end - end - end end - end diff --git a/lib/fog/hp/models/compute/servers.rb b/lib/fog/hp/models/compute/servers.rb index a0de0f1f6..b115a8fb4 100644 --- a/lib/fog/hp/models/compute/servers.rb +++ b/lib/fog/hp/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute/server' module Fog module Compute class HP - class Servers < Fog::Collection - model Fog::Compute::HP::Server def all @@ -28,9 +26,7 @@ module Fog rescue Fog::Compute::HP::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/address.rb b/lib/fog/hp/models/compute_v2/address.rb index 711b54191..d55a00fda 100644 --- a/lib/fog/hp/models/compute_v2/address.rb +++ b/lib/fog/hp/models/compute_v2/address.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class HPV2 - class Address < Fog::Model - identity :id attribute :ip @@ -62,9 +60,7 @@ module Fog end self.instance_id = nil end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/addresses.rb b/lib/fog/hp/models/compute_v2/addresses.rb index 139c44b62..f88e3d3db 100644 --- a/lib/fog/hp/models/compute_v2/addresses.rb +++ b/lib/fog/hp/models/compute_v2/addresses.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute_v2/address' module Fog module Compute class HPV2 - class Addresses < Fog::Collection - model Fog::Compute::HPV2::Address def all @@ -21,9 +19,7 @@ module Fog rescue Fog::Compute::HPV2::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/availability_zone.rb b/lib/fog/hp/models/compute_v2/availability_zone.rb index 48893f890..f3d15487d 100644 --- a/lib/fog/hp/models/compute_v2/availability_zone.rb +++ b/lib/fog/hp/models/compute_v2/availability_zone.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class HPV2 - class AvailabilityZone < Fog::Model - identity :name, :aliases => 'zoneName' attribute :zoneState @@ -14,9 +12,7 @@ module Fog def available? zoneState['available'] end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/availability_zones.rb b/lib/fog/hp/models/compute_v2/availability_zones.rb index caf9608fd..9ae0507c7 100644 --- a/lib/fog/hp/models/compute_v2/availability_zones.rb +++ b/lib/fog/hp/models/compute_v2/availability_zones.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute_v2/availability_zone' module Fog module Compute class HPV2 - class AvailabilityZones < Fog::Collection - model Fog::Compute::HPV2::AvailabilityZone def all @@ -21,9 +19,7 @@ module Fog rescue Fog::Compute::HPV2::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/flavor.rb b/lib/fog/hp/models/compute_v2/flavor.rb index e0f0055d5..1f394c3c3 100644 --- a/lib/fog/hp/models/compute_v2/flavor.rb +++ b/lib/fog/hp/models/compute_v2/flavor.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class HPV2 - class Flavor < Fog::Model - identity :id attribute :name @@ -14,9 +12,7 @@ module Fog attribute :cores, :aliases => 'vcpus' attribute :ephemeral_disk, :aliases => 'OS-FLV-EXT-DATA:ephemeral' attribute :links - end - end end end diff --git a/lib/fog/hp/models/compute_v2/flavors.rb b/lib/fog/hp/models/compute_v2/flavors.rb index 014b82e50..1e87a51c3 100644 --- a/lib/fog/hp/models/compute_v2/flavors.rb +++ b/lib/fog/hp/models/compute_v2/flavors.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute_v2/flavor' module Fog module Compute class HPV2 - class Flavors < Fog::Collection - attribute :filters model Fog::Compute::HPV2::Flavor @@ -34,9 +32,7 @@ module Fog rescue Fog::Compute::HPV2::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/image.rb b/lib/fog/hp/models/compute_v2/image.rb index 31e316ade..7d6178a46 100644 --- a/lib/fog/hp/models/compute_v2/image.rb +++ b/lib/fog/hp/models/compute_v2/image.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute_v2/metadata' module Fog module Compute class HPV2 - class Image < Fog::Model - identity :id attribute :name @@ -78,10 +76,7 @@ module Fog m = @metadata.detect {|md| md.key == 'architecture'} m.value unless m.nil? end - - end - end end end diff --git a/lib/fog/hp/models/compute_v2/images.rb b/lib/fog/hp/models/compute_v2/images.rb index 1c0c0819e..642388348 100644 --- a/lib/fog/hp/models/compute_v2/images.rb +++ b/lib/fog/hp/models/compute_v2/images.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute_v2/image' module Fog module Compute class HPV2 - class Images < Fog::Collection - attribute :filters model Fog::Compute::HPV2::Image @@ -35,9 +33,7 @@ module Fog rescue Fog::Compute::HPV2::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/key_pair.rb b/lib/fog/hp/models/compute_v2/key_pair.rb index 4936ed2ec..fef873aec 100644 --- a/lib/fog/hp/models/compute_v2/key_pair.rb +++ b/lib/fog/hp/models/compute_v2/key_pair.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class HPV2 - class KeyPair < Fog::Model - identity :name attribute :fingerprint @@ -47,7 +45,6 @@ module Fog def writable? !!(private_key && ENV.has_key?('HOME')) end - end end end diff --git a/lib/fog/hp/models/compute_v2/key_pairs.rb b/lib/fog/hp/models/compute_v2/key_pairs.rb index ce80c61e2..e8bb4cda0 100644 --- a/lib/fog/hp/models/compute_v2/key_pairs.rb +++ b/lib/fog/hp/models/compute_v2/key_pairs.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute_v2/key_pair' module Fog module Compute class HPV2 - class KeyPairs < Fog::Collection - model Fog::Compute::HPV2::KeyPair def all @@ -24,7 +22,6 @@ module Fog rescue Fog::Compute::HPV2::NotFound nil end - end end end diff --git a/lib/fog/hp/models/compute_v2/meta.rb b/lib/fog/hp/models/compute_v2/meta.rb index ea276b25f..16044f632 100644 --- a/lib/fog/hp/models/compute_v2/meta.rb +++ b/lib/fog/hp/models/compute_v2/meta.rb @@ -5,7 +5,6 @@ module Fog module Compute class HPV2 class Meta < Fog::Model - include Fog::Compute::HPV2::MetaParent identity :key @@ -22,7 +21,6 @@ module Fog service.update_meta(collection_name, @parent.id, key, value) true end - end end end diff --git a/lib/fog/hp/models/compute_v2/meta_parent.rb b/lib/fog/hp/models/compute_v2/meta_parent.rb index 1020bfbb9..493180623 100644 --- a/lib/fog/hp/models/compute_v2/meta_parent.rb +++ b/lib/fog/hp/models/compute_v2/meta_parent.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 module MetaParent - def parent @parent end @@ -26,7 +25,6 @@ module Fog metas.each { |meta| hash.store(meta.key, meta.value) } hash end - end end end diff --git a/lib/fog/hp/models/compute_v2/metadata.rb b/lib/fog/hp/models/compute_v2/metadata.rb index 88fc2659c..9b5640c12 100644 --- a/lib/fog/hp/models/compute_v2/metadata.rb +++ b/lib/fog/hp/models/compute_v2/metadata.rb @@ -7,9 +7,7 @@ require 'fog/hp/models/compute_v2/server' module Fog module Compute class HPV2 - class Metadata < Fog::Collection - model Fog::Compute::HPV2::Meta include Fog::Compute::HPV2::MetaParent @@ -56,7 +54,6 @@ module Fog service.update_metadata(collection_name, @parent.id, meta_hash(data)) end - private def meta_hash(data=nil) if data.nil? @@ -71,9 +68,7 @@ module Fog end data end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/server.rb b/lib/fog/hp/models/compute_v2/server.rb index 1ab4b02b0..9b709eb0b 100644 --- a/lib/fog/hp/models/compute_v2/server.rb +++ b/lib/fog/hp/models/compute_v2/server.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute_v2/metadata' module Fog module Compute class HPV2 - class Server < Fog::Compute::Server - identity :id attribute :addresses @@ -330,10 +328,7 @@ module Fog return '' if net.first.nil? net.first[0] end - end - end end - end diff --git a/lib/fog/hp/models/compute_v2/servers.rb b/lib/fog/hp/models/compute_v2/servers.rb index e00b509e1..7150df23b 100644 --- a/lib/fog/hp/models/compute_v2/servers.rb +++ b/lib/fog/hp/models/compute_v2/servers.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/compute_v2/server' module Fog module Compute class HPV2 - class Servers < Fog::Collection - attribute :filters model Fog::Compute::HPV2::Server @@ -48,9 +46,7 @@ module Fog rescue Fog::Compute::HPV2::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/compute_v2/volume_attachment.rb b/lib/fog/hp/models/compute_v2/volume_attachment.rb index 45cda0d83..9b98881c5 100644 --- a/lib/fog/hp/models/compute_v2/volume_attachment.rb +++ b/lib/fog/hp/models/compute_v2/volume_attachment.rb @@ -4,7 +4,6 @@ module Fog module Compute class HPV2 class VolumeAttachment < Fog::Model - identity :id attribute :server_id, :aliases => 'serverId' diff --git a/lib/fog/hp/models/compute_v2/volume_attachments.rb b/lib/fog/hp/models/compute_v2/volume_attachments.rb index a2e33abb7..315261101 100644 --- a/lib/fog/hp/models/compute_v2/volume_attachments.rb +++ b/lib/fog/hp/models/compute_v2/volume_attachments.rb @@ -5,7 +5,6 @@ module Fog module Compute class HPV2 class VolumeAttachments < Fog::Collection - model Fog::Compute::HPV2::VolumeAttachment attr_accessor :server diff --git a/lib/fog/hp/models/dns/domain.rb b/lib/fog/hp/models/dns/domain.rb index ff5d04d13..04af968b5 100644 --- a/lib/fog/hp/models/dns/domain.rb +++ b/lib/fog/hp/models/dns/domain.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class DNS - class Domain < Fog::Model identity :id @@ -48,7 +47,6 @@ module Fog merge_attributes(service.update_domain(id, attributes).body) true end - end end end diff --git a/lib/fog/hp/models/dns/domains.rb b/lib/fog/hp/models/dns/domains.rb index 4f1aa9811..ddc5af3e2 100644 --- a/lib/fog/hp/models/dns/domains.rb +++ b/lib/fog/hp/models/dns/domains.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/dns/domain' module Fog module HP class DNS - class Domains < Fog::Collection - model Fog::HP::DNS::Domain def all @@ -21,7 +19,6 @@ module Fog rescue Fog::HP::DNS::NotFound nil end - end end end diff --git a/lib/fog/hp/models/dns/record.rb b/lib/fog/hp/models/dns/record.rb index cce958afc..f4f6200e7 100644 --- a/lib/fog/hp/models/dns/record.rb +++ b/lib/fog/hp/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class DNS - class Record < Fog::Model identity :id @@ -52,7 +51,6 @@ module Fog merge_attributes(service.update_record(self.domain_id, id, attributes).body) true end - end end end diff --git a/lib/fog/hp/models/dns/records.rb b/lib/fog/hp/models/dns/records.rb index 7752e4d79..377948d0f 100644 --- a/lib/fog/hp/models/dns/records.rb +++ b/lib/fog/hp/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/dns/record' module Fog module HP class DNS - class Records < Fog::Collection - model Fog::HP::DNS::Record attr_accessor :domain @@ -25,7 +23,6 @@ module Fog rescue Fog::HP::DNS::NotFound nil end - end end end diff --git a/lib/fog/hp/models/lb/algorithm.rb b/lib/fog/hp/models/lb/algorithm.rb index c7ba60fea..751d86af2 100644 --- a/lib/fog/hp/models/lb/algorithm.rb +++ b/lib/fog/hp/models/lb/algorithm.rb @@ -17,7 +17,6 @@ module Fog def save raise Fog::HP::LB::NotFound.new('Operation not allowed.') end - end end end diff --git a/lib/fog/hp/models/lb/algorithms.rb b/lib/fog/hp/models/lb/algorithms.rb index 6a97a2c18..ff072099f 100644 --- a/lib/fog/hp/models/lb/algorithms.rb +++ b/lib/fog/hp/models/lb/algorithms.rb @@ -19,7 +19,6 @@ module Fog rescue Fog::HP::LB::NotFound nil end - end end end diff --git a/lib/fog/hp/models/lb/load_balancer.rb b/lib/fog/hp/models/lb/load_balancer.rb index cc641415c..89ad85617 100644 --- a/lib/fog/hp/models/lb/load_balancer.rb +++ b/lib/fog/hp/models/lb/load_balancer.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class LB - class LoadBalancer < Fog::Model identity :id diff --git a/lib/fog/hp/models/lb/load_balancers.rb b/lib/fog/hp/models/lb/load_balancers.rb index 490e1e825..5e9a40998 100644 --- a/lib/fog/hp/models/lb/load_balancers.rb +++ b/lib/fog/hp/models/lb/load_balancers.rb @@ -19,7 +19,6 @@ module Fog rescue Fog::HP::LB::NotFound nil end - end end end diff --git a/lib/fog/hp/models/lb/node.rb b/lib/fog/hp/models/lb/node.rb index a6d480061..df91aad37 100644 --- a/lib/fog/hp/models/lb/node.rb +++ b/lib/fog/hp/models/lb/node.rb @@ -4,7 +4,6 @@ module Fog module HP class LB class Node < Fog::Model - identity :id attribute :address @@ -46,7 +45,6 @@ module Fog service.update_load_balancer_node(load_balancer.id, id, condition) true end - end end end diff --git a/lib/fog/hp/models/lb/nodes.rb b/lib/fog/hp/models/lb/nodes.rb index 443e83aa4..435801695 100644 --- a/lib/fog/hp/models/lb/nodes.rb +++ b/lib/fog/hp/models/lb/nodes.rb @@ -5,7 +5,6 @@ module Fog module HP class LB class Nodes < Fog::Collection - model Fog::HP::LB::Node attr_accessor :load_balancer @@ -23,7 +22,6 @@ module Fog rescue Fog::HP::LB::NotFound nil end - end end end diff --git a/lib/fog/hp/models/lb/protocol.rb b/lib/fog/hp/models/lb/protocol.rb index 2ff0bdb21..dc44c8982 100644 --- a/lib/fog/hp/models/lb/protocol.rb +++ b/lib/fog/hp/models/lb/protocol.rb @@ -18,7 +18,6 @@ module Fog def save raise Fog::HP::LB::NotFound.new('Operation not allowed.') end - end end end diff --git a/lib/fog/hp/models/lb/protocols.rb b/lib/fog/hp/models/lb/protocols.rb index dbb94a348..c0dd8fac4 100644 --- a/lib/fog/hp/models/lb/protocols.rb +++ b/lib/fog/hp/models/lb/protocols.rb @@ -19,7 +19,6 @@ module Fog rescue Fog::HP::LB::NotFound nil end - end end end diff --git a/lib/fog/hp/models/lb/virtual_ip.rb b/lib/fog/hp/models/lb/virtual_ip.rb index f52b1a9a1..177c2f8b8 100644 --- a/lib/fog/hp/models/lb/virtual_ip.rb +++ b/lib/fog/hp/models/lb/virtual_ip.rb @@ -27,7 +27,6 @@ module Fog def load_balancer collection.load_balancer end - end end end diff --git a/lib/fog/hp/models/lb/virtual_ips.rb b/lib/fog/hp/models/lb/virtual_ips.rb index 95d84e31d..821eca6ab 100644 --- a/lib/fog/hp/models/lb/virtual_ips.rb +++ b/lib/fog/hp/models/lb/virtual_ips.rb @@ -5,7 +5,6 @@ module Fog module HP class LB class VirtualIps < Fog::Collection - model Fog::HP::LB::VirtualIp attr_accessor :load_balancer @@ -26,7 +25,6 @@ module Fog rescue Fog::HP::LB::NotFound nil end - end end end diff --git a/lib/fog/hp/models/meta_parent.rb b/lib/fog/hp/models/meta_parent.rb index 108e59508..02ef7cbbd 100644 --- a/lib/fog/hp/models/meta_parent.rb +++ b/lib/fog/hp/models/meta_parent.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP module MetaParent - def parent @parent end @@ -26,7 +25,6 @@ module Fog metas.each { |meta| hash.store(meta.key, meta.value) } hash end - end end end diff --git a/lib/fog/hp/models/network/floating_ip.rb b/lib/fog/hp/models/network/floating_ip.rb index d59405b63..fc705c28e 100644 --- a/lib/fog/hp/models/network/floating_ip.rb +++ b/lib/fog/hp/models/network/floating_ip.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class Network - class FloatingIp < Fog::Model identity :id @@ -38,7 +37,6 @@ module Fog merge_attributes(service.create_floating_ip(floating_network_id, attributes).body['floatingip']) true end - end end end diff --git a/lib/fog/hp/models/network/floating_ips.rb b/lib/fog/hp/models/network/floating_ips.rb index 5a75d4ade..872096e5a 100644 --- a/lib/fog/hp/models/network/floating_ips.rb +++ b/lib/fog/hp/models/network/floating_ips.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/network/floating_ip' module Fog module HP class Network - class FloatingIps < Fog::Collection - attribute :filters model Fog::HP::Network::FloatingIp @@ -29,7 +27,6 @@ module Fog rescue Fog::HP::Network::NotFound nil end - end end end diff --git a/lib/fog/hp/models/network/network.rb b/lib/fog/hp/models/network/network.rb index 63b4cfc19..cfeaeb4a5 100644 --- a/lib/fog/hp/models/network/network.rb +++ b/lib/fog/hp/models/network/network.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class Network - class Network < Fog::Model identity :id @@ -49,7 +48,6 @@ module Fog merge_attributes(service.update_network(id, attributes).body['network']) true end - end end end diff --git a/lib/fog/hp/models/network/networks.rb b/lib/fog/hp/models/network/networks.rb index fc574ce17..976da9f66 100644 --- a/lib/fog/hp/models/network/networks.rb +++ b/lib/fog/hp/models/network/networks.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/network/network' module Fog module HP class Network - class Networks < Fog::Collection - attribute :filters model Fog::HP::Network::Network @@ -29,7 +27,6 @@ module Fog rescue Fog::HP::Network::NotFound nil end - end end end diff --git a/lib/fog/hp/models/network/port.rb b/lib/fog/hp/models/network/port.rb index 7c33566d3..312486027 100644 --- a/lib/fog/hp/models/network/port.rb +++ b/lib/fog/hp/models/network/port.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class Network - class Port < Fog::Model identity :id @@ -46,8 +45,6 @@ module Fog merge_attributes(service.update_port(id, attributes).body['port']) true end - - end end end diff --git a/lib/fog/hp/models/network/ports.rb b/lib/fog/hp/models/network/ports.rb index 4fc32ba40..d2399a475 100644 --- a/lib/fog/hp/models/network/ports.rb +++ b/lib/fog/hp/models/network/ports.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/network/port' module Fog module HP class Network - class Ports < Fog::Collection - attribute :filters model Fog::HP::Network::Port @@ -29,7 +27,6 @@ module Fog rescue Fog::HP::Network::NotFound nil end - end end end diff --git a/lib/fog/hp/models/network/router.rb b/lib/fog/hp/models/network/router.rb index 131e8a882..5f612bcc5 100644 --- a/lib/fog/hp/models/network/router.rb +++ b/lib/fog/hp/models/network/router.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class Network - class Router < Fog::Model identity :id @@ -59,7 +58,6 @@ module Fog merge_attributes(service.update_router(id, attributes).body['router']) true end - end end end diff --git a/lib/fog/hp/models/network/routers.rb b/lib/fog/hp/models/network/routers.rb index 236e45e34..89b8192a2 100644 --- a/lib/fog/hp/models/network/routers.rb +++ b/lib/fog/hp/models/network/routers.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/network/router' module Fog module HP class Network - class Routers < Fog::Collection - attribute :filters model Fog::HP::Network::Router @@ -29,7 +27,6 @@ module Fog rescue Fog::HP::Network::NotFound nil end - end end end diff --git a/lib/fog/hp/models/network/security_group.rb b/lib/fog/hp/models/network/security_group.rb index 6e20ecc10..7bfd3481d 100644 --- a/lib/fog/hp/models/network/security_group.rb +++ b/lib/fog/hp/models/network/security_group.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class Network - class SecurityGroup < Fog::Model identity :id @@ -23,7 +22,6 @@ module Fog merge_attributes(service.create_security_group(attributes).body['security_group']) true end - end end end diff --git a/lib/fog/hp/models/network/security_group_rule.rb b/lib/fog/hp/models/network/security_group_rule.rb index b8f192d42..60b4a6e3e 100644 --- a/lib/fog/hp/models/network/security_group_rule.rb +++ b/lib/fog/hp/models/network/security_group_rule.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class Network - class SecurityGroupRule < Fog::Model identity :id @@ -28,7 +27,6 @@ module Fog merge_attributes(service.create_security_group_rule(security_group_id, direction, attributes).body['security_group_rule']) true end - end end end diff --git a/lib/fog/hp/models/network/security_group_rules.rb b/lib/fog/hp/models/network/security_group_rules.rb index f960779a2..ecdebf671 100644 --- a/lib/fog/hp/models/network/security_group_rules.rb +++ b/lib/fog/hp/models/network/security_group_rules.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/network/security_group_rule' module Fog module HP class Network - class SecurityGroupRules < Fog::Collection - attribute :filters model Fog::HP::Network::SecurityGroupRule @@ -29,7 +27,6 @@ module Fog rescue Fog::HP::Network::NotFound nil end - end end end diff --git a/lib/fog/hp/models/network/security_groups.rb b/lib/fog/hp/models/network/security_groups.rb index c2fe1b4cd..76b864785 100644 --- a/lib/fog/hp/models/network/security_groups.rb +++ b/lib/fog/hp/models/network/security_groups.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/network/security_group' module Fog module HP class Network - class SecurityGroups < Fog::Collection - attribute :filters model Fog::HP::Network::SecurityGroup @@ -29,7 +27,6 @@ module Fog rescue Fog::HP::Network::NotFound nil end - end end end diff --git a/lib/fog/hp/models/network/subnet.rb b/lib/fog/hp/models/network/subnet.rb index 69406a841..ed8b40a36 100644 --- a/lib/fog/hp/models/network/subnet.rb +++ b/lib/fog/hp/models/network/subnet.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module HP class Network - class Subnet < Fog::Model identity :id @@ -42,7 +41,6 @@ module Fog merge_attributes(service.update_subnet(id, attributes).body['subnet']) true end - end end end diff --git a/lib/fog/hp/models/network/subnets.rb b/lib/fog/hp/models/network/subnets.rb index 7e233a133..a305a77d1 100644 --- a/lib/fog/hp/models/network/subnets.rb +++ b/lib/fog/hp/models/network/subnets.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/network/subnet' module Fog module HP class Network - class Subnets < Fog::Collection - attribute :filters model Fog::HP::Network::Subnet @@ -29,7 +27,6 @@ module Fog rescue Fog::HP::Network::NotFound nil end - end end end diff --git a/lib/fog/hp/models/storage/directories.rb b/lib/fog/hp/models/storage/directories.rb index 5db1dc646..35b05030e 100644 --- a/lib/fog/hp/models/storage/directories.rb +++ b/lib/fog/hp/models/storage/directories.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/storage/directory' module Fog module Storage class HP - class Directories < Fog::Collection - model Fog::Storage::HP::Directory def all @@ -67,9 +65,7 @@ module Fog end directory end - end - end end end diff --git a/lib/fog/hp/models/storage/directory.rb b/lib/fog/hp/models/storage/directory.rb index a03f57c61..f92fd54b7 100644 --- a/lib/fog/hp/models/storage/directory.rb +++ b/lib/fog/hp/models/storage/directory.rb @@ -5,9 +5,7 @@ require 'fog/hp/models/storage/metadata' module Fog module Storage class HP - class Directory < Fog::Model - identity :key, :aliases => 'name' attribute :bytes, :aliases => 'X-Container-Bytes-Used' @@ -301,9 +299,7 @@ module Fog end true end - end - end end end diff --git a/lib/fog/hp/models/storage/file.rb b/lib/fog/hp/models/storage/file.rb index 7c234bf86..dd5ff3b71 100644 --- a/lib/fog/hp/models/storage/file.rb +++ b/lib/fog/hp/models/storage/file.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Storage class HP - class File < Fog::Model - identity :key, :aliases => 'name' attribute :content_length, :aliases => ['bytes', 'Content-Length'], :type => :integer @@ -101,9 +99,7 @@ module Fog def directory=(new_directory) @directory = new_directory end - end - end end end diff --git a/lib/fog/hp/models/storage/files.rb b/lib/fog/hp/models/storage/files.rb index e628bb24b..6ff8e227a 100644 --- a/lib/fog/hp/models/storage/files.rb +++ b/lib/fog/hp/models/storage/files.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/storage/file' module Fog module Storage class HP - class Files < Fog::Collection - attribute :directory attribute :limit attribute :marker @@ -125,9 +123,7 @@ module Fog requires :directory super({ :directory => directory }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/hp/models/storage/meta.rb b/lib/fog/hp/models/storage/meta.rb index 6c348dcd4..623c7d6c6 100644 --- a/lib/fog/hp/models/storage/meta.rb +++ b/lib/fog/hp/models/storage/meta.rb @@ -5,7 +5,6 @@ module Fog module Storage class HP class Meta < Fog::Model - include Fog::Storage::HP::MetaParent identity :key @@ -22,7 +21,6 @@ module Fog true end end - end end end diff --git a/lib/fog/hp/models/storage/meta_parent.rb b/lib/fog/hp/models/storage/meta_parent.rb index b45cc03ac..acae253fc 100644 --- a/lib/fog/hp/models/storage/meta_parent.rb +++ b/lib/fog/hp/models/storage/meta_parent.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP module MetaParent - def parent @parent end @@ -16,7 +15,6 @@ module Fog metas.each { |meta| hash.store(meta.key, meta.value) } hash end - end end end diff --git a/lib/fog/hp/models/storage/metadata.rb b/lib/fog/hp/models/storage/metadata.rb index d29a05fd9..bb05cd809 100644 --- a/lib/fog/hp/models/storage/metadata.rb +++ b/lib/fog/hp/models/storage/metadata.rb @@ -5,9 +5,7 @@ require 'fog/hp/models/storage/meta' module Fog module Storage class HP - class Metadata < Fog::Collection - model Fog::Storage::HP::Meta include Fog::Storage::HP::MetaParent @@ -59,7 +57,6 @@ module Fog end end - private def meta_hash(data=nil) if data.nil? @@ -74,9 +71,7 @@ module Fog end data end - end - end end end diff --git a/lib/fog/hp/models/storage/shared_directories.rb b/lib/fog/hp/models/storage/shared_directories.rb index c105b6807..d0bcdcb51 100644 --- a/lib/fog/hp/models/storage/shared_directories.rb +++ b/lib/fog/hp/models/storage/shared_directories.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/storage/shared_directory' module Fog module Storage class HP - class SharedDirectories < Fog::Collection - model Fog::Storage::HP::SharedDirectory def all @@ -47,9 +45,7 @@ module Fog rescue Fog::Storage::HP::NotFound nil end - end - end end end diff --git a/lib/fog/hp/models/storage/shared_directory.rb b/lib/fog/hp/models/storage/shared_directory.rb index fed94c13e..8de71a6ba 100644 --- a/lib/fog/hp/models/storage/shared_directory.rb +++ b/lib/fog/hp/models/storage/shared_directory.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/storage/shared_files' module Fog module Storage class HP - class SharedDirectory < Fog::Model - identity :url attribute :bytes, :aliases => 'X-Container-Bytes-Used' @@ -33,7 +31,6 @@ module Fog false end end - end end end diff --git a/lib/fog/hp/models/storage/shared_file.rb b/lib/fog/hp/models/storage/shared_file.rb index a1e1beeeb..8832950dc 100644 --- a/lib/fog/hp/models/storage/shared_file.rb +++ b/lib/fog/hp/models/storage/shared_file.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Storage class HP - class SharedFile < Fog::Model - identity :key, :aliases => 'name' attribute :url @@ -61,7 +59,6 @@ module Fog @shared_directory = new_shared_directory end end - end end end diff --git a/lib/fog/hp/models/storage/shared_files.rb b/lib/fog/hp/models/storage/shared_files.rb index da65392fe..503901346 100644 --- a/lib/fog/hp/models/storage/shared_files.rb +++ b/lib/fog/hp/models/storage/shared_files.rb @@ -4,9 +4,7 @@ require 'fog/hp/models/storage/shared_file' module Fog module Storage class HP - class SharedFiles < Fog::Collection - attribute :shared_directory model Fog::Storage::HP::SharedFile @@ -56,9 +54,7 @@ module Fog requires :shared_directory super({ :shared_directory => shared_directory }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/hp/network.rb b/lib/fog/hp/network.rb index 994e23322..3cc8059ef 100644 --- a/lib/fog/hp/network.rb +++ b/lib/fog/hp/network.rb @@ -3,7 +3,6 @@ require 'fog/hp/core' module Fog module HP class Network < Fog::Service - requires :hp_access_key, :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :credentials, :hp_service_type recognizes :persistent, :connection_options @@ -66,7 +65,6 @@ module Fog request :update_subnet module Utils - end class Mock @@ -113,7 +111,6 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real @@ -189,9 +186,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/block_storage/create_snapshot.rb b/lib/fog/hp/requests/block_storage/create_snapshot.rb index eb117f77b..1f3d08ec2 100644 --- a/lib/fog/hp/requests/block_storage/create_snapshot.rb +++ b/lib/fog/hp/requests/block_storage/create_snapshot.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # Create a new block storage snapshot # # ==== Parameters @@ -44,11 +43,9 @@ module Fog :path => "os-snapshots" ) end - end class Mock # :nodoc:all - def create_snapshot(name, description, volume_id, options={}) response = Excon::Response.new if self.data[:volumes][volume_id] @@ -70,7 +67,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage/create_volume.rb b/lib/fog/hp/requests/block_storage/create_volume.rb index 9ee592e34..8fb9952fc 100644 --- a/lib/fog/hp/requests/block_storage/create_volume.rb +++ b/lib/fog/hp/requests/block_storage/create_volume.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # Create a new block storage volume # # ==== Parameters @@ -50,11 +49,9 @@ module Fog :path => "os-volumes" ) end - end class Mock # :nodoc:all - def create_volume(name, description, size, options={}) if options['snapshotId'] && options['imageRef'] raise Fog::Errors::BadRequest.new("Snapshot and image cannot be specified together.") @@ -81,7 +78,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/block_storage/delete_snapshot.rb b/lib/fog/hp/requests/block_storage/delete_snapshot.rb index 6b18f3a47..ccfa9e9a1 100644 --- a/lib/fog/hp/requests/block_storage/delete_snapshot.rb +++ b/lib/fog/hp/requests/block_storage/delete_snapshot.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # Delete an existing block storage snapshot # # ==== Parameters @@ -16,11 +15,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def delete_snapshot(snapshot_id) response = Excon::Response.new if self.data[:snapshots][snapshot_id] @@ -32,7 +29,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage/delete_volume.rb b/lib/fog/hp/requests/block_storage/delete_volume.rb index 00ff20287..3460b9f7d 100644 --- a/lib/fog/hp/requests/block_storage/delete_volume.rb +++ b/lib/fog/hp/requests/block_storage/delete_volume.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # Delete an existing block storage volume # # ==== Parameters @@ -16,11 +15,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def delete_volume(volume_id) response = Excon::Response.new if self.data[:volumes][volume_id] @@ -32,7 +29,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage/get_bootable_volume_details.rb b/lib/fog/hp/requests/block_storage/get_bootable_volume_details.rb index f77af01f7..a85700340 100644 --- a/lib/fog/hp/requests/block_storage/get_bootable_volume_details.rb +++ b/lib/fog/hp/requests/block_storage/get_bootable_volume_details.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # Get details for existing block storage bootable volume # # ==== Parameters @@ -33,11 +32,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_bootable_volume_details(volume_id) unless volume_id raise ArgumentError.new('volume_id is required') @@ -50,10 +47,8 @@ module Fog else raise Fog::HP::BlockStorage::NotFound end - end end - end end end diff --git a/lib/fog/hp/requests/block_storage/get_snapshot_details.rb b/lib/fog/hp/requests/block_storage/get_snapshot_details.rb index beecefd1d..81520148f 100644 --- a/lib/fog/hp/requests/block_storage/get_snapshot_details.rb +++ b/lib/fog/hp/requests/block_storage/get_snapshot_details.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # Get details for existing block storage snapshot # # ==== Parameters @@ -28,11 +27,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_snapshot_details(snapshot_id) unless snapshot_id raise ArgumentError.new('snapshot_id is required') @@ -45,10 +42,8 @@ module Fog else raise Fog::HP::BlockStorage::NotFound end - end end - end end end diff --git a/lib/fog/hp/requests/block_storage/get_volume_details.rb b/lib/fog/hp/requests/block_storage/get_volume_details.rb index 0eff5b6f9..7237a5ae9 100644 --- a/lib/fog/hp/requests/block_storage/get_volume_details.rb +++ b/lib/fog/hp/requests/block_storage/get_volume_details.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # Get details for existing block storage volume # # ==== Parameters @@ -32,11 +31,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_volume_details(volume_id) unless volume_id raise ArgumentError.new('volume_id is required') @@ -49,10 +46,8 @@ module Fog else raise Fog::HP::BlockStorage::NotFound end - end end - end end end diff --git a/lib/fog/hp/requests/block_storage/list_bootable_volumes.rb b/lib/fog/hp/requests/block_storage/list_bootable_volumes.rb index 8621aedb8..caa47a355 100644 --- a/lib/fog/hp/requests/block_storage/list_bootable_volumes.rb +++ b/lib/fog/hp/requests/block_storage/list_bootable_volumes.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # List existing block storage bootbale volumes # # ==== Parameters @@ -32,11 +31,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_bootable_volumes response = Excon::Response.new volumes = [] @@ -47,7 +44,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage/list_snapshots.rb b/lib/fog/hp/requests/block_storage/list_snapshots.rb index b90a38e28..83f559615 100644 --- a/lib/fog/hp/requests/block_storage/list_snapshots.rb +++ b/lib/fog/hp/requests/block_storage/list_snapshots.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # List existing block storage snapshots # # ==== Parameters @@ -27,11 +26,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_snapshots response = Excon::Response.new snapshots = [] @@ -42,7 +39,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage/list_volumes.rb b/lib/fog/hp/requests/block_storage/list_volumes.rb index 0f84c31b5..6cb1f0a43 100644 --- a/lib/fog/hp/requests/block_storage/list_volumes.rb +++ b/lib/fog/hp/requests/block_storage/list_volumes.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorage class Real - # List existing block storage volumes # # ==== Parameters @@ -31,11 +30,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_volumes response = Excon::Response.new volumes = [] @@ -46,7 +43,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/create_snapshot.rb b/lib/fog/hp/requests/block_storage_v2/create_snapshot.rb index 70e4ab0bb..fe2c6dfe3 100644 --- a/lib/fog/hp/requests/block_storage_v2/create_snapshot.rb +++ b/lib/fog/hp/requests/block_storage_v2/create_snapshot.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Create a new block storage snapshot # The snapshot is created in the same availability_zone as the specified volume # @@ -44,11 +43,9 @@ module Fog :path => 'snapshots' ) end - end class Mock # :nodoc:all - def create_snapshot(volume_id, options={}) response = Excon::Response.new if self.data[:volumes][volume_id] @@ -70,7 +67,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/create_volume.rb b/lib/fog/hp/requests/block_storage_v2/create_volume.rb index e996dfcdd..70674081a 100644 --- a/lib/fog/hp/requests/block_storage_v2/create_volume.rb +++ b/lib/fog/hp/requests/block_storage_v2/create_volume.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Create a new block storage volume # # ==== Parameters @@ -52,11 +51,9 @@ module Fog :path => 'volumes' ) end - end class Mock # :nodoc:all - def create_volume(options={}) if options['snapshot_id'] && options['imageRef'] && options['source_volid'] raise Fog::Errors::BadRequest.new('The snapshot_id, imageRef and the source_volid parameters are mutually exclusive, and only one should be specified in the request.') @@ -84,7 +81,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/create_volume_backup.rb b/lib/fog/hp/requests/block_storage_v2/create_volume_backup.rb index 4889bc4d9..e95faa270 100644 --- a/lib/fog/hp/requests/block_storage_v2/create_volume_backup.rb +++ b/lib/fog/hp/requests/block_storage_v2/create_volume_backup.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Create a new block storage volume backup # # ==== Parameters @@ -38,11 +37,9 @@ module Fog :path => 'backups' ) end - end class Mock # :nodoc:all - def create_volume_backup(volume_id, options={}) response = Excon::Response.new tenant_id = Fog::Mock.random_numbers(14).to_s @@ -77,7 +74,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/delete_snapshot.rb b/lib/fog/hp/requests/block_storage_v2/delete_snapshot.rb index 15cfd8b55..572c0d886 100644 --- a/lib/fog/hp/requests/block_storage_v2/delete_snapshot.rb +++ b/lib/fog/hp/requests/block_storage_v2/delete_snapshot.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Delete an existing block storage snapshot # # ==== Parameters @@ -16,11 +15,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def delete_snapshot(snapshot_id) response = Excon::Response.new if self.data[:snapshots][snapshot_id] @@ -32,7 +29,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/delete_volume.rb b/lib/fog/hp/requests/block_storage_v2/delete_volume.rb index b87ae8b20..b026320b3 100644 --- a/lib/fog/hp/requests/block_storage_v2/delete_volume.rb +++ b/lib/fog/hp/requests/block_storage_v2/delete_volume.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Delete an existing block storage volume # # ==== Parameters @@ -16,11 +15,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def delete_volume(volume_id) response = Excon::Response.new if self.data[:volumes][volume_id] @@ -32,7 +29,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/delete_volume_backup.rb b/lib/fog/hp/requests/block_storage_v2/delete_volume_backup.rb index a57196028..d3a23456a 100644 --- a/lib/fog/hp/requests/block_storage_v2/delete_volume_backup.rb +++ b/lib/fog/hp/requests/block_storage_v2/delete_volume_backup.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Delete an existing block storage volume backup # # ==== Parameters @@ -16,11 +15,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def delete_volume_backup(backup_id) response = Excon::Response.new if self.data[:volume_backups][backup_id] @@ -32,7 +29,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/get_snapshot_details.rb b/lib/fog/hp/requests/block_storage_v2/get_snapshot_details.rb index 8ba252537..aa38a97a3 100644 --- a/lib/fog/hp/requests/block_storage_v2/get_snapshot_details.rb +++ b/lib/fog/hp/requests/block_storage_v2/get_snapshot_details.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Get details for existing block storage snapshot # # ==== Parameters @@ -28,11 +27,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_snapshot_details(snapshot_id) unless snapshot_id raise ArgumentError.new('snapshot_id is required') @@ -45,10 +42,8 @@ module Fog else raise Fog::HP::BlockStorageV2::NotFound end - end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/get_volume_backup_details.rb b/lib/fog/hp/requests/block_storage_v2/get_volume_backup_details.rb index 279312ed4..f94557845 100644 --- a/lib/fog/hp/requests/block_storage_v2/get_volume_backup_details.rb +++ b/lib/fog/hp/requests/block_storage_v2/get_volume_backup_details.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Get details for existing block storage volume backup # # ==== Parameters @@ -32,11 +31,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_volume_backup_details(backup_id) response = Excon::Response.new if backup = self.data[:volume_backups][backup_id] @@ -46,10 +43,8 @@ module Fog else raise Fog::HP::BlockStorageV2::NotFound end - end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/get_volume_details.rb b/lib/fog/hp/requests/block_storage_v2/get_volume_details.rb index 468315618..0c2bfd2c9 100644 --- a/lib/fog/hp/requests/block_storage_v2/get_volume_details.rb +++ b/lib/fog/hp/requests/block_storage_v2/get_volume_details.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Get details for existing block storage volume # # ==== Parameters @@ -32,11 +31,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_volume_details(volume_id) unless volume_id raise ArgumentError.new('volume_id is required') @@ -49,10 +46,8 @@ module Fog else raise Fog::HP::BlockStorageV2::NotFound end - end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/list_snapshots.rb b/lib/fog/hp/requests/block_storage_v2/list_snapshots.rb index 81ac53ba1..f60009a3b 100644 --- a/lib/fog/hp/requests/block_storage_v2/list_snapshots.rb +++ b/lib/fog/hp/requests/block_storage_v2/list_snapshots.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # List existing block storage snapshots # # ==== Parameters @@ -33,11 +32,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_snapshots(options={}) response = Excon::Response.new snapshots = [] @@ -51,7 +48,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/list_snapshots_detail.rb b/lib/fog/hp/requests/block_storage_v2/list_snapshots_detail.rb index 8db74da96..919bfdfce 100644 --- a/lib/fog/hp/requests/block_storage_v2/list_snapshots_detail.rb +++ b/lib/fog/hp/requests/block_storage_v2/list_snapshots_detail.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # List existing block storage snapshots with details # # ==== Parameters @@ -33,11 +32,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_snapshots_detail(options={}) response = Excon::Response.new snapshots = [] @@ -48,7 +45,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/list_volume_backups.rb b/lib/fog/hp/requests/block_storage_v2/list_volume_backups.rb index 89054dde7..79f5cccc8 100644 --- a/lib/fog/hp/requests/block_storage_v2/list_volume_backups.rb +++ b/lib/fog/hp/requests/block_storage_v2/list_volume_backups.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # List existing block storage volume backups # # ==== Parameters @@ -28,11 +27,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_volume_backups(options = {}) response = Excon::Response.new backups = [] @@ -46,7 +43,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/list_volume_backups_detail.rb b/lib/fog/hp/requests/block_storage_v2/list_volume_backups_detail.rb index 8ad031ce9..25259963b 100644 --- a/lib/fog/hp/requests/block_storage_v2/list_volume_backups_detail.rb +++ b/lib/fog/hp/requests/block_storage_v2/list_volume_backups_detail.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # List details about existing block storage volume backups # # ==== Parameters @@ -37,11 +36,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_volume_backups_detail(options = {}) response = Excon::Response.new backups = [] @@ -52,7 +49,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/list_volumes.rb b/lib/fog/hp/requests/block_storage_v2/list_volumes.rb index 654dd518d..fe035d358 100644 --- a/lib/fog/hp/requests/block_storage_v2/list_volumes.rb +++ b/lib/fog/hp/requests/block_storage_v2/list_volumes.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # List existing block storage volumes # # ==== Parameters @@ -37,11 +36,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_volumes(options = {}) response = Excon::Response.new volumes = [] @@ -55,7 +52,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/list_volumes_detail.rb b/lib/fog/hp/requests/block_storage_v2/list_volumes_detail.rb index cac7733c3..1abafed86 100644 --- a/lib/fog/hp/requests/block_storage_v2/list_volumes_detail.rb +++ b/lib/fog/hp/requests/block_storage_v2/list_volumes_detail.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # List details about existing block storage volumes # # ==== Parameters @@ -38,11 +37,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_volumes_detail(options = {}) response = Excon::Response.new volumes = [] @@ -53,7 +50,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/restore_volume_backup.rb b/lib/fog/hp/requests/block_storage_v2/restore_volume_backup.rb index e741e1f6e..4c59ba183 100644 --- a/lib/fog/hp/requests/block_storage_v2/restore_volume_backup.rb +++ b/lib/fog/hp/requests/block_storage_v2/restore_volume_backup.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Restore an existing block storage volume backup to an existing or new volume # # If a volume is specified, that volume will be overwritten with the backup data from the backup. @@ -32,11 +31,9 @@ module Fog :path => "backups/#{backup_id}/restore" ) end - end class Mock # :nodoc:all - def restore_volume_backup(backup_id, options={}) volume_id = options['volume_id'] @@ -91,7 +88,6 @@ module Fog } end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/update_snapshot.rb b/lib/fog/hp/requests/block_storage_v2/update_snapshot.rb index 8394e4071..23d9a7171 100644 --- a/lib/fog/hp/requests/block_storage_v2/update_snapshot.rb +++ b/lib/fog/hp/requests/block_storage_v2/update_snapshot.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Update an existing block storage snapshot # # ==== Parameters @@ -40,11 +39,9 @@ module Fog :path => "snapshots/#{snapshot_id}" ) end - end class Mock # :nodoc:all - def update_snapshot(snapshot_id, options={}) unless snapshot_id raise ArgumentError.new('snapshot_id is required') @@ -60,10 +57,8 @@ module Fog else raise Fog::HP::BlockStorageV2::NotFound end - end end - end end end diff --git a/lib/fog/hp/requests/block_storage_v2/update_volume.rb b/lib/fog/hp/requests/block_storage_v2/update_volume.rb index 432ba8b44..d05d9e0b3 100644 --- a/lib/fog/hp/requests/block_storage_v2/update_volume.rb +++ b/lib/fog/hp/requests/block_storage_v2/update_volume.rb @@ -2,7 +2,6 @@ module Fog module HP class BlockStorageV2 class Real - # Update an existing block storage volume # # ==== Parameters @@ -45,11 +44,9 @@ module Fog :path => "volumes/#{volume_id}" ) end - end class Mock # :nodoc:all - def update_volume(volume_id, options={}) response = Excon::Response.new if volume = self.data[:volumes][volume_id] @@ -64,7 +61,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/cdn/delete_container.rb b/lib/fog/hp/requests/cdn/delete_container.rb index 3ff4be9fc..ef4b21a26 100644 --- a/lib/fog/hp/requests/cdn/delete_container.rb +++ b/lib/fog/hp/requests/cdn/delete_container.rb @@ -2,7 +2,6 @@ module Fog module CDN class HP class Real - # Delete an existing container # # ==== Parameters @@ -16,7 +15,6 @@ module Fog ) response end - end class Mock # :nodoc:all @@ -32,7 +30,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/cdn/get_containers.rb b/lib/fog/hp/requests/cdn/get_containers.rb index 6e78c26b4..53dd541aa 100644 --- a/lib/fog/hp/requests/cdn/get_containers.rb +++ b/lib/fog/hp/requests/cdn/get_containers.rb @@ -2,7 +2,6 @@ module Fog module CDN class HP class Real - # List existing cdn-enabled storage containers # # ==== Parameters @@ -24,11 +23,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_containers(options = {}) response = Excon::Response.new data = self.data[:cdn_containers].map {|_,v| v} @@ -36,9 +33,7 @@ module Fog response.status = 200 response end - end - end end end diff --git a/lib/fog/hp/requests/cdn/head_container.rb b/lib/fog/hp/requests/cdn/head_container.rb index c9c043473..14601a89c 100644 --- a/lib/fog/hp/requests/cdn/head_container.rb +++ b/lib/fog/hp/requests/cdn/head_container.rb @@ -2,7 +2,6 @@ module Fog module CDN class HP class Real - # List cdn properties for a container # # ==== Parameters @@ -24,7 +23,6 @@ module Fog ) response end - end class Mock # :nodoc:all @@ -44,7 +42,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/cdn/post_container.rb b/lib/fog/hp/requests/cdn/post_container.rb index fd99c592b..f1026226a 100644 --- a/lib/fog/hp/requests/cdn/post_container.rb +++ b/lib/fog/hp/requests/cdn/post_container.rb @@ -2,7 +2,6 @@ module Fog module CDN class HP class Real - # modify CDN properties for a container # # ==== Parameters @@ -21,7 +20,6 @@ module Fog ) response end - end class Mock # :nodoc:all @@ -46,7 +44,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/cdn/put_container.rb b/lib/fog/hp/requests/cdn/put_container.rb index 66eda2088..ec96dbe9c 100644 --- a/lib/fog/hp/requests/cdn/put_container.rb +++ b/lib/fog/hp/requests/cdn/put_container.rb @@ -2,7 +2,6 @@ module Fog module CDN class HP class Real - # enable CDN for a container # # ==== Parameters @@ -21,7 +20,6 @@ module Fog ) response end - end class Mock # :nodoc:all @@ -47,7 +45,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/compute/allocate_address.rb b/lib/fog/hp/requests/compute/allocate_address.rb index 9627a1f50..cc1cca5e5 100644 --- a/lib/fog/hp/requests/compute/allocate_address.rb +++ b/lib/fog/hp/requests/compute/allocate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Acquires a floating IP address # # ==== Returns @@ -14,7 +13,6 @@ module Fog # * 'instance_id'<~String> - Id of the associated server instance # * 'fixed_ip'<~String> - Fixed IP of the address def allocate_address - request( :body => nil, :expects => 200, @@ -22,11 +20,9 @@ module Fog :path => 'os-floating-ips.json' ) end - end class Mock - def allocate_address response = Excon::Response.new response.status = 200 @@ -42,7 +38,6 @@ module Fog response.body = { 'floating_ip' => data } response end - end end end diff --git a/lib/fog/hp/requests/compute/associate_address.rb b/lib/fog/hp/requests/compute/associate_address.rb index cf9c838f4..14bce3b0b 100644 --- a/lib/fog/hp/requests/compute/associate_address.rb +++ b/lib/fog/hp/requests/compute/associate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Associate a floating IP address with existing server # # ==== Parameters @@ -13,11 +12,9 @@ module Fog body = { 'addFloatingIp' => { 'server' => server_id, 'address' => ip_address }} server_action(server_id, body) end - end class Mock - def associate_address(server_id, ip_address) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -35,7 +32,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute/attach_volume.rb b/lib/fog/hp/requests/compute/attach_volume.rb index 7635b6d37..103865d60 100644 --- a/lib/fog/hp/requests/compute/attach_volume.rb +++ b/lib/fog/hp/requests/compute/attach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Attach a block storage volume to an existing server # # ==== Parameters @@ -31,11 +30,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def attach_volume(server_id, volume_id, device) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -71,7 +68,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute/change_password_server.rb b/lib/fog/hp/requests/compute/change_password_server.rb index 677b6bc13..87ec58ac1 100644 --- a/lib/fog/hp/requests/compute/change_password_server.rb +++ b/lib/fog/hp/requests/compute/change_password_server.rb @@ -2,16 +2,13 @@ module Fog module Compute class HP class Real - def change_password_server(server_id, admin_password) body = { 'changePassword' => { 'adminPass' => admin_password }} server_action(server_id, body) end - end class Mock - def change_password_server(server_id, admin_password) response = Excon::Response.new if list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -26,7 +23,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute/confirm_resized_server.rb b/lib/fog/hp/requests/compute/confirm_resized_server.rb index 78df7df71..ba9ecc98d 100644 --- a/lib/fog/hp/requests/compute/confirm_resized_server.rb +++ b/lib/fog/hp/requests/compute/confirm_resized_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Confirm resizing # # ==== Parameters @@ -12,11 +11,9 @@ module Fog body = { 'confirmResize' => nil } server_action(server_id, body, 204) end - end class Mock - def confirm_resized_server(server_id) response = Excon::Response.new response.status = 204 @@ -27,7 +24,6 @@ module Fog response end - end end end diff --git a/lib/fog/hp/requests/compute/create_image.rb b/lib/fog/hp/requests/compute/create_image.rb index 5ca03bf27..4e548dd1d 100644 --- a/lib/fog/hp/requests/compute/create_image.rb +++ b/lib/fog/hp/requests/compute/create_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Create an image from an existing server # # ==== Parameters @@ -23,11 +22,9 @@ module Fog } server_action(server_id, body) end - end class Mock - def create_image(server_id, name, metadata = {}) response = Excon::Response.new response.status = 202 @@ -52,7 +49,6 @@ module Fog response.body = "" # { 'image' => data } no data is sent response end - end end end diff --git a/lib/fog/hp/requests/compute/create_key_pair.rb b/lib/fog/hp/requests/compute/create_key_pair.rb index 4205515af..baed65a53 100644 --- a/lib/fog/hp/requests/compute/create_key_pair.rb +++ b/lib/fog/hp/requests/compute/create_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Create a new keypair # # ==== Parameters @@ -43,11 +42,9 @@ module Fog :path => 'os-keypairs.json' ) end - end class Mock - def create_key_pair(key_name, public_key = nil) response = Excon::Response.new unless self.data[:key_pairs][key_name] @@ -73,9 +70,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/compute/create_persistent_server.rb b/lib/fog/hp/requests/compute/create_persistent_server.rb index 87186fa43..7095b6ec3 100644 --- a/lib/fog/hp/requests/compute/create_persistent_server.rb +++ b/lib/fog/hp/requests/compute/create_persistent_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Create a new persistent server i.e. use a bootable volume instead of an image # # ==== Parameters @@ -113,11 +112,9 @@ module Fog :path => 'os-volumes_boot' ) end - end class Mock - def create_persistent_server(name, flavor_id, block_device_mapping = [], options = {}) response = Excon::Response.new @@ -159,9 +156,7 @@ module Fog response.status = 400 raise(Excon::Errors::BadRequest, "No boot volume or boot image specified") end - end - end end end diff --git a/lib/fog/hp/requests/compute/create_security_group.rb b/lib/fog/hp/requests/compute/create_security_group.rb index ad024bfc3..b188cd786 100644 --- a/lib/fog/hp/requests/compute/create_security_group.rb +++ b/lib/fog/hp/requests/compute/create_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Create a new security group # # ==== Parameters @@ -44,11 +43,9 @@ module Fog :path => 'os-security-groups.json' ) end - end class Mock - def create_security_group(name, description) # all spaces are removed name = name.strip @@ -75,9 +72,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/compute/create_security_group_rule.rb b/lib/fog/hp/requests/compute/create_security_group_rule.rb index 2cba1c620..7c2313222 100644 --- a/lib/fog/hp/requests/compute/create_security_group_rule.rb +++ b/lib/fog/hp/requests/compute/create_security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Create a new security group rule and attach it to a security group # # ==== Parameters @@ -37,11 +36,9 @@ module Fog :path => 'os-security-group-rules.json' ) end - end class Mock - def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id=nil) response = Excon::Response.new group = self.data[:security_groups][parent_group_id] @@ -67,9 +64,7 @@ module Fog raise Fog::Compute::HP::NotFound end end - end - end end end diff --git a/lib/fog/hp/requests/compute/create_server.rb b/lib/fog/hp/requests/compute/create_server.rb index 26e10c652..75c32f6e9 100644 --- a/lib/fog/hp/requests/compute/create_server.rb +++ b/lib/fog/hp/requests/compute/create_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Create a new server # # ==== Parameters @@ -98,11 +97,9 @@ module Fog :path => 'servers.json' ) end - end class Mock - def create_server(name, flavor_id, image_id, options = {}) response = Excon::Response.new response.status = 202 @@ -139,7 +136,6 @@ module Fog response.body = { 'server' => data.merge({'adminPass' => 'password'}) } response end - end end end diff --git a/lib/fog/hp/requests/compute/delete_image.rb b/lib/fog/hp/requests/compute/delete_image.rb index 0664417ef..c2ff502aa 100644 --- a/lib/fog/hp/requests/compute/delete_image.rb +++ b/lib/fog/hp/requests/compute/delete_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Delete an image # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "images/#{image_id}" ) end - end class Mock - def delete_image(image_id) response = Excon::Response.new if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id} @@ -36,9 +33,7 @@ module Fog response.status = 500 raise(Excon::Errors.status_error({:expects => 202}, response)) end - end - end end end diff --git a/lib/fog/hp/requests/compute/delete_key_pair.rb b/lib/fog/hp/requests/compute/delete_key_pair.rb index 8e02fc3a4..c4b8f48ce 100644 --- a/lib/fog/hp/requests/compute/delete_key_pair.rb +++ b/lib/fog/hp/requests/compute/delete_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Delete a keypair # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "os-keypairs/#{key_name}" ) end - end class Mock - def delete_key_pair(key_name) response = Excon::Response.new if self.data[:key_pairs][key_name] @@ -32,7 +29,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/delete_meta.rb b/lib/fog/hp/requests/compute/delete_meta.rb index 7c71f249b..1e39d98c3 100644 --- a/lib/fog/hp/requests/compute/delete_meta.rb +++ b/lib/fog/hp/requests/compute/delete_meta.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Delete metadata item for specific collections # # ==== Parameters @@ -21,11 +20,9 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def delete_meta(collection_name, parent_id, key) if collection_name == "images" then if get_image_details(parent_id) @@ -47,9 +44,7 @@ module Fog response.status = 204 response end - end - end end end diff --git a/lib/fog/hp/requests/compute/delete_security_group.rb b/lib/fog/hp/requests/compute/delete_security_group.rb index 4c14c2fcb..64dd47285 100644 --- a/lib/fog/hp/requests/compute/delete_security_group.rb +++ b/lib/fog/hp/requests/compute/delete_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Delete a security group # # ==== Parameters @@ -17,11 +16,9 @@ module Fog :path => "os-security-groups/#{security_group_id}" ) end - end class Mock - def delete_security_group(security_group_id) response = Excon::Response.new if self.data[:security_groups][security_group_id] @@ -34,7 +31,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/delete_security_group_rule.rb b/lib/fog/hp/requests/compute/delete_security_group_rule.rb index af74d6f1d..2bb271c23 100644 --- a/lib/fog/hp/requests/compute/delete_security_group_rule.rb +++ b/lib/fog/hp/requests/compute/delete_security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Delete a security group rule # # ==== Parameters @@ -16,11 +15,9 @@ module Fog :path => "os-security-group-rules/#{security_group_rule_id}" ) end - end class Mock - def delete_security_group_rule(security_group_rule_id) response = Excon::Response.new @@ -40,9 +37,7 @@ module Fog else raise Fog::Compute::HP::NotFound end - end - end end end diff --git a/lib/fog/hp/requests/compute/delete_server.rb b/lib/fog/hp/requests/compute/delete_server.rb index 9b5d554f6..5317bacfb 100644 --- a/lib/fog/hp/requests/compute/delete_server.rb +++ b/lib/fog/hp/requests/compute/delete_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Delete an existing server # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "servers/#{server_id}" ) end - end class Mock - def delete_server(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -36,7 +33,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/detach_volume.rb b/lib/fog/hp/requests/compute/detach_volume.rb index 0f07c5e30..b73422441 100644 --- a/lib/fog/hp/requests/compute/detach_volume.rb +++ b/lib/fog/hp/requests/compute/detach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Detach a block storage volume from an existing server # # ==== Parameters @@ -20,11 +19,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def detach_volume(server_id, volume_id) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -40,7 +37,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute/disassociate_address.rb b/lib/fog/hp/requests/compute/disassociate_address.rb index 4b2964e8b..e4d47aed9 100644 --- a/lib/fog/hp/requests/compute/disassociate_address.rb +++ b/lib/fog/hp/requests/compute/disassociate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Disassociate a floating IP address with existing server # # ==== Parameters @@ -13,11 +12,9 @@ module Fog body = { 'removeFloatingIp' => { 'server' => server_id, 'address' => ip_address }} server_action(server_id, body) end - end class Mock - def disassociate_address(server_id, ip_address) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -32,7 +29,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute/get_address.rb b/lib/fog/hp/requests/compute/get_address.rb index e7ceb7234..8c2720e42 100644 --- a/lib/fog/hp/requests/compute/get_address.rb +++ b/lib/fog/hp/requests/compute/get_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Get details about an existing floating IP address # # ==== Parameters @@ -23,11 +22,9 @@ module Fog :path => "os-floating-ips/#{address_id}" ) end - end class Mock - def get_address(address_id) response = Excon::Response.new if address = self.data[:addresses][address_id] @@ -38,7 +35,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/get_console_output.rb b/lib/fog/hp/requests/compute/get_console_output.rb index 475cc971f..dc7f8ebcb 100644 --- a/lib/fog/hp/requests/compute/get_console_output.rb +++ b/lib/fog/hp/requests/compute/get_console_output.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Retrieve console output for specified instance # # ==== Parameters @@ -17,11 +16,9 @@ module Fog body = { 'os-getConsoleOutput' => { 'length' => num_lines }} server_action(server_id, body, 200) end - end class Mock - def get_console_output(server_id, num_lines) output = "" response = Excon::Response.new @@ -34,7 +31,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute/get_flavor_details.rb b/lib/fog/hp/requests/compute/get_flavor_details.rb index b8a112799..6bae124a3 100644 --- a/lib/fog/hp/requests/compute/get_flavor_details.rb +++ b/lib/fog/hp/requests/compute/get_flavor_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Get details for flavor by id # # ==== Returns @@ -19,11 +18,9 @@ module Fog :path => "flavors/#{flavor_id}.json" ) end - end class Mock - def get_flavor_details(flavor_id) response = Excon::Response.new flavor = { @@ -44,7 +41,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/get_image_details.rb b/lib/fog/hp/requests/compute/get_image_details.rb index e1b264aef..78fc611e6 100644 --- a/lib/fog/hp/requests/compute/get_image_details.rb +++ b/lib/fog/hp/requests/compute/get_image_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Get details for image by id # # ==== Returns @@ -20,11 +19,9 @@ module Fog :path => "images/#{image_id}.json" ) end - end class Mock - def get_image_details(image_id) response = Excon::Response.new if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id} @@ -35,9 +32,7 @@ module Fog raise Fog::Compute::HP::NotFound end end - end - end end end diff --git a/lib/fog/hp/requests/compute/get_meta.rb b/lib/fog/hp/requests/compute/get_meta.rb index 17ea3234d..fe3ad9bd0 100644 --- a/lib/fog/hp/requests/compute/get_meta.rb +++ b/lib/fog/hp/requests/compute/get_meta.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Get metadata item for specific collections # # ==== Parameters @@ -22,11 +21,9 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def get_meta(collection_name, parent_id, key) if collection_name == "images" then if get_image_details(parent_id) @@ -49,9 +46,7 @@ module Fog response.body = { 'meta' => { key => midata } } response end - end - end end end diff --git a/lib/fog/hp/requests/compute/get_security_group.rb b/lib/fog/hp/requests/compute/get_security_group.rb index 7362d1d97..7ca20a7ad 100644 --- a/lib/fog/hp/requests/compute/get_security_group.rb +++ b/lib/fog/hp/requests/compute/get_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Get details about a security group # # ==== Parameters @@ -35,11 +34,9 @@ module Fog :path => "os-security-groups/#{security_group_id}" ) end - end class Mock - def get_security_group(security_group_id) response = Excon::Response.new if sec_group = self.data[:security_groups][security_group_id] @@ -50,7 +47,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/get_server_details.rb b/lib/fog/hp/requests/compute/get_server_details.rb index 823c02603..6865be967 100644 --- a/lib/fog/hp/requests/compute/get_server_details.rb +++ b/lib/fog/hp/requests/compute/get_server_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Get details about a server # # ==== Parameters @@ -30,11 +29,9 @@ module Fog :path => "servers/#{server_id}.json" ) end - end class Mock - def get_server_details(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -45,7 +42,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/get_vnc_console.rb b/lib/fog/hp/requests/compute/get_vnc_console.rb index d034057e7..15e204ecb 100644 --- a/lib/fog/hp/requests/compute/get_vnc_console.rb +++ b/lib/fog/hp/requests/compute/get_vnc_console.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Retrieve VNC console for the specified instance # # ==== Parameters @@ -19,11 +18,9 @@ module Fog body = { 'os-getVNCConsole' => { 'type' => type }} server_action(server_id, body, 200) end - end class Mock - def get_vnc_console(server_id, type='novnc') output = { 'type' => type, @@ -38,7 +35,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute/get_windows_password.rb b/lib/fog/hp/requests/compute/get_windows_password.rb index 58aebbf15..5b47cf9b2 100644 --- a/lib/fog/hp/requests/compute/get_windows_password.rb +++ b/lib/fog/hp/requests/compute/get_windows_password.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Retrieves the encrypted administrator password for a server running Windows. # # ==== Parameters @@ -17,11 +16,9 @@ module Fog # decrypt the log output to extract the encrypted, base64-encoded password encrypted_password = extract_password_from_log(log_output) end - end class Mock - def get_windows_password(server_id) # need to mock out the private key as well private_key = OpenSSL::PKey::RSA.generate(1024) diff --git a/lib/fog/hp/requests/compute/list_addresses.rb b/lib/fog/hp/requests/compute/list_addresses.rb index 1d5d683e3..7c48e7513 100644 --- a/lib/fog/hp/requests/compute/list_addresses.rb +++ b/lib/fog/hp/requests/compute/list_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all floating IP addresses # # ==== Returns @@ -20,11 +19,9 @@ module Fog :path => "os-floating-ips.json" ) end - end class Mock - def list_addresses response = Excon::Response.new addresses = [] @@ -34,7 +31,6 @@ module Fog response.body = { 'floating_ips' => addresses } response end - end end end diff --git a/lib/fog/hp/requests/compute/list_flavors.rb b/lib/fog/hp/requests/compute/list_flavors.rb index fc17593c5..6fd6ae314 100644 --- a/lib/fog/hp/requests/compute/list_flavors.rb +++ b/lib/fog/hp/requests/compute/list_flavors.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all flavors (IDs and names only) # # ==== Returns @@ -17,11 +16,9 @@ module Fog :path => 'flavors.json' ) end - end class Mock - def list_flavors response = Excon::Response.new response.status = 200 @@ -37,7 +34,6 @@ module Fog } response end - end end end diff --git a/lib/fog/hp/requests/compute/list_flavors_detail.rb b/lib/fog/hp/requests/compute/list_flavors_detail.rb index 890ef929e..7eee9f733 100644 --- a/lib/fog/hp/requests/compute/list_flavors_detail.rb +++ b/lib/fog/hp/requests/compute/list_flavors_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all flavors # # ==== Returns @@ -19,11 +18,9 @@ module Fog :path => 'flavors/detail.json' ) end - end class Mock - def list_flavors_detail response = Excon::Response.new response.status = 200 @@ -39,7 +36,6 @@ module Fog } response end - end end end diff --git a/lib/fog/hp/requests/compute/list_images.rb b/lib/fog/hp/requests/compute/list_images.rb index 4f96fd83e..5e2efb2e9 100644 --- a/lib/fog/hp/requests/compute/list_images.rb +++ b/lib/fog/hp/requests/compute/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all images (IDs and names only) # # ==== Returns @@ -17,11 +16,9 @@ module Fog :path => 'images.json' ) end - end class Mock - def list_images response = Excon::Response.new data = list_images_detail.body['images'] @@ -33,7 +30,6 @@ module Fog response.body = { 'images' => images } response end - end end end diff --git a/lib/fog/hp/requests/compute/list_images_detail.rb b/lib/fog/hp/requests/compute/list_images_detail.rb index b70d38b12..6bb405633 100644 --- a/lib/fog/hp/requests/compute/list_images_detail.rb +++ b/lib/fog/hp/requests/compute/list_images_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all images # # ==== Returns @@ -20,11 +19,9 @@ module Fog :path => 'images/detail.json' ) end - end class Mock - def list_images_detail response = Excon::Response.new @@ -42,7 +39,6 @@ module Fog response.body = { 'images' => images.map {|image| image.reject {|key, value| !['id', 'name', 'links', 'metadata', 'progress' ,'status', 'created', 'updated'].include?(key)}} } response end - end end end diff --git a/lib/fog/hp/requests/compute/list_key_pairs.rb b/lib/fog/hp/requests/compute/list_key_pairs.rb index 77adeba27..9f209824f 100644 --- a/lib/fog/hp/requests/compute/list_key_pairs.rb +++ b/lib/fog/hp/requests/compute/list_key_pairs.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all key pairs # # ==== Returns @@ -22,11 +21,9 @@ module Fog :path => 'os-keypairs.json' ) end - end class Mock - def list_key_pairs response = Excon::Response.new @@ -37,7 +34,6 @@ module Fog response.body = { 'keypairs' => key_pairs } response end - end end end diff --git a/lib/fog/hp/requests/compute/list_metadata.rb b/lib/fog/hp/requests/compute/list_metadata.rb index cd27836ea..0c35aa1c6 100644 --- a/lib/fog/hp/requests/compute/list_metadata.rb +++ b/lib/fog/hp/requests/compute/list_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List metadata for specific collections # # ==== Parameters @@ -21,11 +20,9 @@ module Fog :path => "/#{collection_name}/#{parent_id}/metadata.json" ) end - end class Mock - def list_metadata(collection_name, parent_id) mdata = {} if collection_name == "images" then @@ -49,7 +46,6 @@ module Fog response.body = {'metadata' => mdata} response end - end end end diff --git a/lib/fog/hp/requests/compute/list_security_groups.rb b/lib/fog/hp/requests/compute/list_security_groups.rb index 5b053846b..b33000249 100644 --- a/lib/fog/hp/requests/compute/list_security_groups.rb +++ b/lib/fog/hp/requests/compute/list_security_groups.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all security groups # # ==== Returns @@ -32,11 +31,9 @@ module Fog :path => 'os-security-groups.json' ) end - end class Mock - def list_security_groups response = Excon::Response.new @@ -47,7 +44,6 @@ module Fog response.body = { 'security_groups' => sec_groups } response end - end end end diff --git a/lib/fog/hp/requests/compute/list_server_addresses.rb b/lib/fog/hp/requests/compute/list_server_addresses.rb index 5a364b23a..279630334 100644 --- a/lib/fog/hp/requests/compute/list_server_addresses.rb +++ b/lib/fog/hp/requests/compute/list_server_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all server addresses # # ==== Parameters @@ -20,11 +19,9 @@ module Fog :path => "servers/#{server_id}/ips.json" ) end - end class Mock - def list_server_addresses(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -35,7 +32,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/list_server_private_addresses.rb b/lib/fog/hp/requests/compute/list_server_private_addresses.rb index bbb0238d5..c1dc944ce 100644 --- a/lib/fog/hp/requests/compute/list_server_private_addresses.rb +++ b/lib/fog/hp/requests/compute/list_server_private_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List private server addresses # # ==== Parameters @@ -29,11 +28,9 @@ module Fog response.body = { 'private' => private_address } response end - end class Mock - def list_server_private_addresses(server_id, network_name) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -51,7 +48,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/list_server_public_addresses.rb b/lib/fog/hp/requests/compute/list_server_public_addresses.rb index d5eaf683e..89f8b5491 100644 --- a/lib/fog/hp/requests/compute/list_server_public_addresses.rb +++ b/lib/fog/hp/requests/compute/list_server_public_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List public server addresses # # ==== Parameters @@ -29,11 +28,9 @@ module Fog response.body = { 'public' => public_address } response end - end class Mock - def list_server_public_addresses(server_id, network_name) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -51,7 +48,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/list_server_volumes.rb b/lib/fog/hp/requests/compute/list_server_volumes.rb index e8422dda8..ad2b3134d 100644 --- a/lib/fog/hp/requests/compute/list_server_volumes.rb +++ b/lib/fog/hp/requests/compute/list_server_volumes.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all volumes attached to a server # # ==== Parameters @@ -25,11 +24,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_server_volumes(server_id) response = Excon::Response.new volumes = [] @@ -42,7 +39,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/list_servers.rb b/lib/fog/hp/requests/compute/list_servers.rb index 83e87a472..54029fccf 100644 --- a/lib/fog/hp/requests/compute/list_servers.rb +++ b/lib/fog/hp/requests/compute/list_servers.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all servers (IDs and names only) # # ==== Returns @@ -18,11 +17,9 @@ module Fog :path => 'servers.json' ) end - end class Mock - def list_servers response = Excon::Response.new data = list_servers_detail.body['servers'] @@ -34,7 +31,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/hp/requests/compute/list_servers_detail.rb b/lib/fog/hp/requests/compute/list_servers_detail.rb index 320f31c28..9b105e87a 100644 --- a/lib/fog/hp/requests/compute/list_servers_detail.rb +++ b/lib/fog/hp/requests/compute/list_servers_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # List all servers details # # ==== Returns @@ -27,11 +26,9 @@ module Fog :path => 'servers/detail.json' ) end - end class Mock - def list_servers_detail response = Excon::Response.new @@ -49,7 +46,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/hp/requests/compute/reboot_server.rb b/lib/fog/hp/requests/compute/reboot_server.rb index 082f92066..fe20aa0ef 100644 --- a/lib/fog/hp/requests/compute/reboot_server.rb +++ b/lib/fog/hp/requests/compute/reboot_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Reboot an existing server # # ==== Parameters @@ -13,11 +12,9 @@ module Fog body = { 'reboot' => { 'type' => type }} server_action(server_id, body) end - end class Mock - def reboot_server(server_id, type = 'SOFT') response = Excon::Response.new if list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -27,7 +24,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute/rebuild_server.rb b/lib/fog/hp/requests/compute/rebuild_server.rb index 875298731..c1b4f6c5c 100644 --- a/lib/fog/hp/requests/compute/rebuild_server.rb +++ b/lib/fog/hp/requests/compute/rebuild_server.rb @@ -2,9 +2,7 @@ module Fog module Compute class HP class Real - def rebuild_server(server_id, image_ref, name, admin_pass=nil, metadata=nil, personality=nil) - body = { 'rebuild' => { 'imageRef' => image_ref, 'name' => name @@ -14,18 +12,15 @@ module Fog body['rebuild']['personality'] = personality if personality server_action(server_id, body, 202) end - end class Mock - def rebuild_server(server_id, image_ref, name, admin_pass=nil, metadata=nil, personality=nil) response = get_server_details(server_id) response.body['server']['status'] = "REBUILD" response.status = 202 response end - end end end diff --git a/lib/fog/hp/requests/compute/release_address.rb b/lib/fog/hp/requests/compute/release_address.rb index 586c6619d..ae1e07294 100644 --- a/lib/fog/hp/requests/compute/release_address.rb +++ b/lib/fog/hp/requests/compute/release_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Release an existing floating IP address # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "os-floating-ips/#{address_id}" ) end - end class Mock - def release_address(address_id) response = Excon::Response.new if self.data[:addresses][address_id] @@ -32,7 +29,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute/resize_server.rb b/lib/fog/hp/requests/compute/resize_server.rb index 24000d1f6..1af5d9ff3 100644 --- a/lib/fog/hp/requests/compute/resize_server.rb +++ b/lib/fog/hp/requests/compute/resize_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Reboot an existing server # # ==== Parameters @@ -13,11 +12,9 @@ module Fog body = { 'resize' => { 'flavorRef' => flavor_id }} server_action(server_id, body) end - end class Mock - # FIXME: should probably transition instead of skipping to VERIFY_RESIZE def resize_server(server_id, flavor_id) response = Excon::Response.new @@ -32,7 +29,6 @@ module Fog response end - end end end diff --git a/lib/fog/hp/requests/compute/revert_resized_server.rb b/lib/fog/hp/requests/compute/revert_resized_server.rb index fa5514f4b..30e0a7549 100644 --- a/lib/fog/hp/requests/compute/revert_resized_server.rb +++ b/lib/fog/hp/requests/compute/revert_resized_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Revert resizing # # ==== Parameters @@ -12,11 +11,9 @@ module Fog body = { 'revertResize' => nil } server_action(server_id, body) end - end class Mock - def revert_resized_server(server_id) response = Excon::Response.new response.status = 202 @@ -28,7 +25,6 @@ module Fog response end - end end end diff --git a/lib/fog/hp/requests/compute/server_action.rb b/lib/fog/hp/requests/compute/server_action.rb index debe1c15b..0e591221e 100644 --- a/lib/fog/hp/requests/compute/server_action.rb +++ b/lib/fog/hp/requests/compute/server_action.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Server actions for an existing server # # ==== Parameters @@ -18,7 +17,6 @@ module Fog :path => "servers/#{server_id}/action.json" ) end - end end end diff --git a/lib/fog/hp/requests/compute/set_metadata.rb b/lib/fog/hp/requests/compute/set_metadata.rb index 09ac0fe46..9f69e524b 100644 --- a/lib/fog/hp/requests/compute/set_metadata.rb +++ b/lib/fog/hp/requests/compute/set_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Set metadata for specific collections # # ==== Parameters @@ -23,13 +22,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata" ) end - end class Mock - def set_metadata(collection_name, parent_id, metadata = {}) - if collection_name == "images" then if get_image_details(parent_id) self.data[:images][parent_id]['metadata'] = metadata @@ -50,11 +46,8 @@ module Fog response.body = { "metadata" => metadata } response.status = 200 response - end - end - end end end diff --git a/lib/fog/hp/requests/compute/update_meta.rb b/lib/fog/hp/requests/compute/update_meta.rb index f03f8c89e..78969311f 100644 --- a/lib/fog/hp/requests/compute/update_meta.rb +++ b/lib/fog/hp/requests/compute/update_meta.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Set or update metadata item for specific collections # # ==== Parameters @@ -24,13 +23,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def update_meta(collection_name, parent_id, key, value) - if collection_name == "images" then if get_image_details(parent_id) self.data[:images][parent_id]['metadata'][key] = value @@ -51,11 +47,8 @@ module Fog response.body = { "meta" => { key => value } } response.status = 200 response - end - end - end end end diff --git a/lib/fog/hp/requests/compute/update_metadata.rb b/lib/fog/hp/requests/compute/update_metadata.rb index cac456e2e..fbd90414e 100644 --- a/lib/fog/hp/requests/compute/update_metadata.rb +++ b/lib/fog/hp/requests/compute/update_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Update metadata for specific collections # # ==== Parameters @@ -23,13 +22,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata.json" ) end - end class Mock - def update_metadata(collection_name, parent_id, metadata = {}) - if collection_name == "images" then if get_image_details(parent_id) newmetadata = self.data[:images][parent_id]['metadata'].merge!(metadata) @@ -50,11 +46,8 @@ module Fog response.body = { "metadata" => newmetadata } response.status = 200 response - end - end - end end end diff --git a/lib/fog/hp/requests/compute/update_server.rb b/lib/fog/hp/requests/compute/update_server.rb index 3641f8159..32c69e654 100644 --- a/lib/fog/hp/requests/compute/update_server.rb +++ b/lib/fog/hp/requests/compute/update_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HP class Real - # Update an existing server # # ==== Parameters @@ -18,11 +17,9 @@ module Fog :path => "servers/#{server_id}.json" ) end - end class Mock - def update_server(server_id, options) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -35,7 +32,6 @@ module Fog raise Fog::Compute::HP::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/add_security_group.rb b/lib/fog/hp/requests/compute_v2/add_security_group.rb index 5d4a336a5..142b024fe 100644 --- a/lib/fog/hp/requests/compute_v2/add_security_group.rb +++ b/lib/fog/hp/requests/compute_v2/add_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Add an existing security group to an existing server # # ==== Parameters @@ -13,11 +12,9 @@ module Fog body = { 'addSecurityGroup' => { 'name' => sg_name }} server_action(server_id, body) end - end class Mock - def add_security_group(server_id, sg_name) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -33,7 +30,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/allocate_address.rb b/lib/fog/hp/requests/compute_v2/allocate_address.rb index 63580084f..526c19428 100644 --- a/lib/fog/hp/requests/compute_v2/allocate_address.rb +++ b/lib/fog/hp/requests/compute_v2/allocate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Acquires a floating IP address # # Note: This method will proxy the call to the Network (Quantum) service, @@ -18,7 +17,6 @@ module Fog # * 'instance_id'<~String> - Id of the associated server instance # * 'fixed_ip'<~String> - Fixed IP of the address def allocate_address - request( :body => nil, :expects => 200, @@ -26,11 +24,9 @@ module Fog :path => 'os-floating-ips' ) end - end class Mock - def allocate_address response = Excon::Response.new response.status = 200 @@ -46,7 +42,6 @@ module Fog response.body = { 'floating_ip' => data } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/associate_address.rb b/lib/fog/hp/requests/compute_v2/associate_address.rb index 5e865c370..054e54f63 100644 --- a/lib/fog/hp/requests/compute_v2/associate_address.rb +++ b/lib/fog/hp/requests/compute_v2/associate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Associate a floating IP address with an existing server # # Note: This method will proxy the call to the Network (Quantum) service, @@ -17,11 +16,9 @@ module Fog body = { 'addFloatingIp' => { 'server' => server_id, 'address' => ip_address }} server_action(server_id, body) end - end class Mock - def associate_address(server_id, ip_address) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -39,7 +36,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/attach_volume.rb b/lib/fog/hp/requests/compute_v2/attach_volume.rb index a83eaf269..6e764b1c7 100644 --- a/lib/fog/hp/requests/compute_v2/attach_volume.rb +++ b/lib/fog/hp/requests/compute_v2/attach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Attach a block storage volume to an existing server # # ==== Parameters @@ -31,11 +30,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def attach_volume(server_id, volume_id, device) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -73,7 +70,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/create_image.rb b/lib/fog/hp/requests/compute_v2/create_image.rb index f3f3ab60d..4226dfdda 100644 --- a/lib/fog/hp/requests/compute_v2/create_image.rb +++ b/lib/fog/hp/requests/compute_v2/create_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Create an image from an existing server # # ==== Parameters @@ -20,11 +19,9 @@ module Fog } server_action(server_id, body) end - end class Mock - def create_image(server_id, name, metadata = {}) response = Excon::Response.new if list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -55,7 +52,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/create_key_pair.rb b/lib/fog/hp/requests/compute_v2/create_key_pair.rb index 3aea8f2a4..bb7e77275 100644 --- a/lib/fog/hp/requests/compute_v2/create_key_pair.rb +++ b/lib/fog/hp/requests/compute_v2/create_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Create a new keypair # # ==== Parameters @@ -41,11 +40,9 @@ module Fog :path => 'os-keypairs' ) end - end class Mock - def create_key_pair(key_name, public_key = nil) response = Excon::Response.new response.status = 200 @@ -65,9 +62,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/create_persistent_server.rb b/lib/fog/hp/requests/compute_v2/create_persistent_server.rb index 2123c3a1a..c502a6dd8 100644 --- a/lib/fog/hp/requests/compute_v2/create_persistent_server.rb +++ b/lib/fog/hp/requests/compute_v2/create_persistent_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Create a new persistent server i.e. use a bootable volume instead of an image # # ==== Parameters @@ -111,7 +110,6 @@ module Fog end end - request( :body => Fog::JSON.encode(data), :expects => 202, @@ -119,11 +117,9 @@ module Fog :path => 'os-volumes_boot' ) end - end class Mock - def create_persistent_server(name, flavor_id, block_device_mapping, options = {}) response = Excon::Response.new @@ -174,9 +170,7 @@ module Fog response.status = 400 raise(Excon::Errors::BadRequest, 'No boot volume or boot image specified') end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/create_server.rb b/lib/fog/hp/requests/compute_v2/create_server.rb index 383047f76..3f10323c1 100644 --- a/lib/fog/hp/requests/compute_v2/create_server.rb +++ b/lib/fog/hp/requests/compute_v2/create_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Create a new server # # ==== Parameters @@ -110,11 +109,9 @@ module Fog :path => 'servers' ) end - end class Mock - def create_server(name, flavor_id, image_id, options = {}) response = Excon::Response.new response.status = 202 @@ -161,7 +158,6 @@ module Fog response.body = { 'server' => data.merge({'adminPass' => 'password'}) } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/delete_image.rb b/lib/fog/hp/requests/compute_v2/delete_image.rb index 6cf101715..a98719274 100644 --- a/lib/fog/hp/requests/compute_v2/delete_image.rb +++ b/lib/fog/hp/requests/compute_v2/delete_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Delete an image # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "images/#{image_id}" ) end - end class Mock - def delete_image(image_id) response = Excon::Response.new if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id} @@ -35,9 +32,7 @@ module Fog else raise Fog::Compute::HPV2::NotFound end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/delete_key_pair.rb b/lib/fog/hp/requests/compute_v2/delete_key_pair.rb index 3101e77f5..c50f78cd4 100644 --- a/lib/fog/hp/requests/compute_v2/delete_key_pair.rb +++ b/lib/fog/hp/requests/compute_v2/delete_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Delete a keypair # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "os-keypairs/#{key_name}" ) end - end class Mock - def delete_key_pair(key_name) response = Excon::Response.new if self.data[:key_pairs][key_name] @@ -31,7 +28,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/delete_meta.rb b/lib/fog/hp/requests/compute_v2/delete_meta.rb index 54ccbf622..084b2aaa3 100644 --- a/lib/fog/hp/requests/compute_v2/delete_meta.rb +++ b/lib/fog/hp/requests/compute_v2/delete_meta.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Delete metadata item for specific collections # # ==== Parameters @@ -21,11 +20,9 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def delete_meta(collection_name, parent_id, key) if collection_name == "images" then if get_image_details(parent_id) @@ -47,9 +44,7 @@ module Fog response.status = 204 response end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/delete_server.rb b/lib/fog/hp/requests/compute_v2/delete_server.rb index 9199d4646..e8c128211 100644 --- a/lib/fog/hp/requests/compute_v2/delete_server.rb +++ b/lib/fog/hp/requests/compute_v2/delete_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Delete an existing server # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "servers/#{server_id}" ) end - end class Mock - def delete_server(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -36,7 +33,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/detach_volume.rb b/lib/fog/hp/requests/compute_v2/detach_volume.rb index 27612d0f8..db7bb688e 100644 --- a/lib/fog/hp/requests/compute_v2/detach_volume.rb +++ b/lib/fog/hp/requests/compute_v2/detach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Detach a block storage volume from an existing server # # ==== Parameters @@ -20,11 +19,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def detach_volume(server_id, volume_id) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -40,7 +37,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/disassociate_address.rb b/lib/fog/hp/requests/compute_v2/disassociate_address.rb index a1a5f45ff..c74977ece 100644 --- a/lib/fog/hp/requests/compute_v2/disassociate_address.rb +++ b/lib/fog/hp/requests/compute_v2/disassociate_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Disassociate a floating IP address with an existing server # # ==== Parameters @@ -13,11 +12,9 @@ module Fog body = { 'removeFloatingIp' => { 'server' => server_id, 'address' => ip_address }} server_action(server_id, body) end - end class Mock - def disassociate_address(server_id, ip_address) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -32,7 +29,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_address.rb b/lib/fog/hp/requests/compute_v2/get_address.rb index 104b2e41e..5eb35a092 100644 --- a/lib/fog/hp/requests/compute_v2/get_address.rb +++ b/lib/fog/hp/requests/compute_v2/get_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Get details about an existing floating IP address # # Note: This method will proxy the call to the Network (Quantum) service, @@ -26,11 +25,9 @@ module Fog :path => "os-floating-ips/#{address_id}" ) end - end class Mock - def get_address(address_id) response = Excon::Response.new if address = self.data[:addresses][address_id] @@ -41,7 +38,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_console_output.rb b/lib/fog/hp/requests/compute_v2/get_console_output.rb index 2c08539d1..10be8eb97 100644 --- a/lib/fog/hp/requests/compute_v2/get_console_output.rb +++ b/lib/fog/hp/requests/compute_v2/get_console_output.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Retrieve console output for specified instance # # ==== Parameters @@ -17,11 +16,9 @@ module Fog body = { 'os-getConsoleOutput' => { 'length' => num_lines }} server_action(server_id, body, 200) end - end class Mock - def get_console_output(server_id, num_lines) output = "" response = Excon::Response.new @@ -34,7 +31,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_flavor_details.rb b/lib/fog/hp/requests/compute_v2/get_flavor_details.rb index 551f71ed5..f2b292cab 100644 --- a/lib/fog/hp/requests/compute_v2/get_flavor_details.rb +++ b/lib/fog/hp/requests/compute_v2/get_flavor_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Get details for flavor by id # # ==== Parameters @@ -25,11 +24,9 @@ module Fog :path => "flavors/#{flavor_id}" ) end - end class Mock - def get_flavor_details(flavor_id) response = Excon::Response.new flavor = { @@ -50,7 +47,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_image_details.rb b/lib/fog/hp/requests/compute_v2/get_image_details.rb index 7bf26fb5c..92de0f647 100644 --- a/lib/fog/hp/requests/compute_v2/get_image_details.rb +++ b/lib/fog/hp/requests/compute_v2/get_image_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Get details for image by id # # ==== Parameters @@ -32,11 +31,9 @@ module Fog :path => "images/#{image_id}" ) end - end class Mock - def get_image_details(image_id) response = Excon::Response.new if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id} @@ -47,9 +44,7 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_key_pair.rb b/lib/fog/hp/requests/compute_v2/get_key_pair.rb index f5b3a5dc8..1da040893 100644 --- a/lib/fog/hp/requests/compute_v2/get_key_pair.rb +++ b/lib/fog/hp/requests/compute_v2/get_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Get details about a key pair # # ==== Parameters @@ -22,11 +21,9 @@ module Fog :path => "os-keypairs/#{key_name}" ) end - end class Mock - def get_key_pair(key_name) response = Excon::Response.new if key_pair = self.data[:key_pairs][key_name] @@ -37,7 +34,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_meta.rb b/lib/fog/hp/requests/compute_v2/get_meta.rb index feefa0d0b..fb3908129 100644 --- a/lib/fog/hp/requests/compute_v2/get_meta.rb +++ b/lib/fog/hp/requests/compute_v2/get_meta.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Get metadata item for specific collections # # ==== Parameters @@ -22,11 +21,9 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def get_meta(collection_name, parent_id, key) if collection_name == "images" then if get_image_details(parent_id) @@ -49,9 +46,7 @@ module Fog response.body = { 'meta' => { key => midata } } response end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_server_details.rb b/lib/fog/hp/requests/compute_v2/get_server_details.rb index f7ba1de2f..d500351f2 100644 --- a/lib/fog/hp/requests/compute_v2/get_server_details.rb +++ b/lib/fog/hp/requests/compute_v2/get_server_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Get details about a server # # ==== Parameters @@ -50,11 +49,9 @@ module Fog :path => "servers/#{server_id}" ) end - end class Mock - def get_server_details(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -65,7 +62,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_server_volume_details.rb b/lib/fog/hp/requests/compute_v2/get_server_volume_details.rb index 41ce08367..5c7b860fc 100644 --- a/lib/fog/hp/requests/compute_v2/get_server_volume_details.rb +++ b/lib/fog/hp/requests/compute_v2/get_server_volume_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Get a block storage volume attachments for an existing server # # ==== Parameters @@ -20,11 +19,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_server_volume_details(server_id, volume_id) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -40,7 +37,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_vnc_console.rb b/lib/fog/hp/requests/compute_v2/get_vnc_console.rb index e17781929..207f9953f 100644 --- a/lib/fog/hp/requests/compute_v2/get_vnc_console.rb +++ b/lib/fog/hp/requests/compute_v2/get_vnc_console.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Retrieve VNC console for the specified instance # # ==== Parameters @@ -19,11 +18,9 @@ module Fog body = { 'os-getVNCConsole' => { 'type' => type }} server_action(server_id, body, 200) end - end class Mock - def get_vnc_console(server_id, type='novnc') output = { 'type' => type, @@ -38,7 +35,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/get_windows_password.rb b/lib/fog/hp/requests/compute_v2/get_windows_password.rb index 956eb9d88..7e699c6b1 100644 --- a/lib/fog/hp/requests/compute_v2/get_windows_password.rb +++ b/lib/fog/hp/requests/compute_v2/get_windows_password.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Retrieves the encrypted administrator password for a server running Windows. # # ==== Parameters @@ -17,11 +16,9 @@ module Fog # decrypt the log output to extract the encrypted, base64-encoded password encrypted_password = extract_password_from_log(log_output) end - end class Mock - def get_windows_password(server_id) # need to mock out the private key as well private_key = OpenSSL::PKey::RSA.generate(1024) diff --git a/lib/fog/hp/requests/compute_v2/list_addresses.rb b/lib/fog/hp/requests/compute_v2/list_addresses.rb index 0a3fa62c1..4d802158e 100644 --- a/lib/fog/hp/requests/compute_v2/list_addresses.rb +++ b/lib/fog/hp/requests/compute_v2/list_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all Floating IP addresses # # Note: This method will proxy the call to the Network (Quantum) service, @@ -23,11 +22,9 @@ module Fog :path => 'os-floating-ips' ) end - end class Mock - def list_addresses response = Excon::Response.new addresses = [] @@ -37,7 +34,6 @@ module Fog response.body = { 'floating_ips' => addresses } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_availability_zones.rb b/lib/fog/hp/requests/compute_v2/list_availability_zones.rb index f0133b440..239709c3c 100644 --- a/lib/fog/hp/requests/compute_v2/list_availability_zones.rb +++ b/lib/fog/hp/requests/compute_v2/list_availability_zones.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all availability zones # # ==== Returns @@ -20,11 +19,9 @@ module Fog :path => 'os-availability-zone' ) end - end class Mock - def list_availability_zones response = Excon::Response.new response.status = 200 @@ -40,7 +37,6 @@ module Fog } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_flavors.rb b/lib/fog/hp/requests/compute_v2/list_flavors.rb index b010c655c..9afc32ddf 100644 --- a/lib/fog/hp/requests/compute_v2/list_flavors.rb +++ b/lib/fog/hp/requests/compute_v2/list_flavors.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all flavors (IDs and names only) # # ==== Parameters @@ -26,11 +25,9 @@ module Fog :query => options ) end - end class Mock - def list_flavors response = Excon::Response.new response.status = 200 @@ -46,7 +43,6 @@ module Fog } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_flavors_detail.rb b/lib/fog/hp/requests/compute_v2/list_flavors_detail.rb index f1a763762..b8b0307b6 100644 --- a/lib/fog/hp/requests/compute_v2/list_flavors_detail.rb +++ b/lib/fog/hp/requests/compute_v2/list_flavors_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all flavors # # ==== Parameters @@ -26,11 +25,9 @@ module Fog :query => options ) end - end class Mock - def list_flavors_detail(options = {}) response = Excon::Response.new response.status = 200 @@ -46,7 +43,6 @@ module Fog } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_images.rb b/lib/fog/hp/requests/compute_v2/list_images.rb index 2dd93f374..c1d1cd577 100644 --- a/lib/fog/hp/requests/compute_v2/list_images.rb +++ b/lib/fog/hp/requests/compute_v2/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all images (IDs and names only) # # ==== Parameters @@ -29,11 +28,9 @@ module Fog :query => options ) end - end class Mock - def list_images(options = {}) response = Excon::Response.new data = list_images_detail.body['images'] @@ -45,7 +42,6 @@ module Fog response.body = { 'images' => images } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_images_detail.rb b/lib/fog/hp/requests/compute_v2/list_images_detail.rb index 168f6b411..cf6e76808 100644 --- a/lib/fog/hp/requests/compute_v2/list_images_detail.rb +++ b/lib/fog/hp/requests/compute_v2/list_images_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all images # # ==== Parameters @@ -39,11 +38,9 @@ module Fog :query => options ) end - end class Mock - def list_images_detail(options = {}) response = Excon::Response.new @@ -59,7 +56,6 @@ module Fog response.body = { 'images' => images } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_key_pairs.rb b/lib/fog/hp/requests/compute_v2/list_key_pairs.rb index 2e710d6b8..849d16298 100644 --- a/lib/fog/hp/requests/compute_v2/list_key_pairs.rb +++ b/lib/fog/hp/requests/compute_v2/list_key_pairs.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all key pairs # # ==== Returns @@ -20,11 +19,9 @@ module Fog :path => 'os-keypairs' ) end - end class Mock - def list_key_pairs response = Excon::Response.new @@ -35,7 +32,6 @@ module Fog response.body = { 'keypairs' => key_pairs } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_limits.rb b/lib/fog/hp/requests/compute_v2/list_limits.rb index d214ab2ee..464fae352 100644 --- a/lib/fog/hp/requests/compute_v2/list_limits.rb +++ b/lib/fog/hp/requests/compute_v2/list_limits.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List the limits on resources on a per tenant basis (absolute and rate limits) # # ==== Returns @@ -42,11 +41,9 @@ module Fog :path => 'limits' ) end - end class Mock - def list_limits response = Excon::Response.new limits = self.data[:limits].values @@ -55,7 +52,6 @@ module Fog response.body = { 'limits' => limits } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_metadata.rb b/lib/fog/hp/requests/compute_v2/list_metadata.rb index 1dbe4640e..588320968 100644 --- a/lib/fog/hp/requests/compute_v2/list_metadata.rb +++ b/lib/fog/hp/requests/compute_v2/list_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List metadata for specific collections # # ==== Parameters @@ -21,11 +20,9 @@ module Fog :path => "/#{collection_name}/#{parent_id}/metadata" ) end - end class Mock - def list_metadata(collection_name, parent_id) mdata = {} if collection_name == "images" then @@ -49,7 +46,6 @@ module Fog response.body = {'metadata' => mdata} response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_server_addresses.rb b/lib/fog/hp/requests/compute_v2/list_server_addresses.rb index 9e7bd7680..72fecda69 100644 --- a/lib/fog/hp/requests/compute_v2/list_server_addresses.rb +++ b/lib/fog/hp/requests/compute_v2/list_server_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all server addresses # # ==== Parameters @@ -20,11 +19,9 @@ module Fog :path => "servers/#{server_id}/ips" ) end - end class Mock - def list_server_addresses(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -35,7 +32,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_server_addresses_by_network.rb b/lib/fog/hp/requests/compute_v2/list_server_addresses_by_network.rb index b02fdaf6d..d9ffcddb0 100644 --- a/lib/fog/hp/requests/compute_v2/list_server_addresses_by_network.rb +++ b/lib/fog/hp/requests/compute_v2/list_server_addresses_by_network.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List private server addresses # # ==== Parameters @@ -22,11 +21,9 @@ module Fog :path => "servers/#{server_id}/ips/#{Fog::HP.escape(network_name)}" ) end - end class Mock - def list_server_addresses_by_network(server_id, network_name) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -39,7 +36,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_server_volumes.rb b/lib/fog/hp/requests/compute_v2/list_server_volumes.rb index 7ea7c5988..90e556a3e 100644 --- a/lib/fog/hp/requests/compute_v2/list_server_volumes.rb +++ b/lib/fog/hp/requests/compute_v2/list_server_volumes.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all volumes attached to a server # # ==== Parameters @@ -25,11 +24,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def list_server_volumes(server_id) response = Excon::Response.new volumes = [] @@ -42,7 +39,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_servers.rb b/lib/fog/hp/requests/compute_v2/list_servers.rb index 889faf50d..bfec09bed 100644 --- a/lib/fog/hp/requests/compute_v2/list_servers.rb +++ b/lib/fog/hp/requests/compute_v2/list_servers.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all servers (IDs and names only) # # ==== Parameters @@ -30,11 +29,9 @@ module Fog :query => options ) end - end class Mock - def list_servers(options = {}) response = Excon::Response.new data = list_servers_detail.body['servers'] @@ -46,7 +43,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/list_servers_detail.rb b/lib/fog/hp/requests/compute_v2/list_servers_detail.rb index f56b09972..1e6b311e2 100644 --- a/lib/fog/hp/requests/compute_v2/list_servers_detail.rb +++ b/lib/fog/hp/requests/compute_v2/list_servers_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # List all servers details # # ==== Parameters @@ -51,11 +50,9 @@ module Fog :query => options ) end - end class Mock - def list_servers_detail(options = {}) response = Excon::Response.new @@ -73,7 +70,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/reboot_server.rb b/lib/fog/hp/requests/compute_v2/reboot_server.rb index c518d0de6..f3714f1a3 100644 --- a/lib/fog/hp/requests/compute_v2/reboot_server.rb +++ b/lib/fog/hp/requests/compute_v2/reboot_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Reboot an existing server # # ==== Parameters @@ -12,11 +11,9 @@ module Fog body = { 'reboot' => { 'type' => type }} server_action(server_id, body) end - end class Mock - def reboot_server(server_id, type = 'SOFT') response = Excon::Response.new if list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -27,7 +24,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/rebuild_server.rb b/lib/fog/hp/requests/compute_v2/rebuild_server.rb index 3c21e4ba8..54d054bdd 100644 --- a/lib/fog/hp/requests/compute_v2/rebuild_server.rb +++ b/lib/fog/hp/requests/compute_v2/rebuild_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Rebuild an existing server # # ==== Parameters @@ -19,7 +18,6 @@ module Fog # * 'contents'<~String> - Contents of file (10kb total of contents) # * 'path'<~String> - Path to file (255 bytes total of path strings) def rebuild_server(server_id, image_id, name, options={}) - body = { 'rebuild' => { 'imageRef' => image_id, 'name' => name @@ -39,11 +37,9 @@ module Fog end server_action(server_id, body, 202) end - end class Mock - def rebuild_server(server_id, image_id, name, options={}) if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id} if response = get_server_details(server_id) @@ -75,7 +71,6 @@ module Fog raise Fog::Compute::HPV2::NotFound.new("Image with image_id #{image_id} not found.") end end - end end end diff --git a/lib/fog/hp/requests/compute_v2/release_address.rb b/lib/fog/hp/requests/compute_v2/release_address.rb index e379d9f6e..06e63f8f6 100644 --- a/lib/fog/hp/requests/compute_v2/release_address.rb +++ b/lib/fog/hp/requests/compute_v2/release_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Release an existing floating IP address # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "os-floating-ips/#{address_id}" ) end - end class Mock - def release_address(address_id) response = Excon::Response.new if self.data[:addresses][address_id] @@ -31,7 +28,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/remove_security_group.rb b/lib/fog/hp/requests/compute_v2/remove_security_group.rb index 5275c3759..0c5c409a1 100644 --- a/lib/fog/hp/requests/compute_v2/remove_security_group.rb +++ b/lib/fog/hp/requests/compute_v2/remove_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Remove an existing security group from an existing server # # ==== Parameters @@ -13,11 +12,9 @@ module Fog body = { 'removeSecurityGroup' => { 'name' => sg_name }} server_action(server_id, body) end - end class Mock - def remove_security_group(server_id, sg_name) response = Excon::Response.new if server = self.data[:servers][server_id] @@ -30,7 +27,6 @@ module Fog end response end - end end end diff --git a/lib/fog/hp/requests/compute_v2/server_action.rb b/lib/fog/hp/requests/compute_v2/server_action.rb index 7845a23f5..751b3e580 100644 --- a/lib/fog/hp/requests/compute_v2/server_action.rb +++ b/lib/fog/hp/requests/compute_v2/server_action.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Server actions for an existing server # # ==== Parameters @@ -18,7 +17,6 @@ module Fog :path => "servers/#{server_id}/action" ) end - end end end diff --git a/lib/fog/hp/requests/compute_v2/set_metadata.rb b/lib/fog/hp/requests/compute_v2/set_metadata.rb index edfd5ee52..0d48be779 100644 --- a/lib/fog/hp/requests/compute_v2/set_metadata.rb +++ b/lib/fog/hp/requests/compute_v2/set_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Set metadata for specific collections # # ==== Parameters @@ -23,13 +22,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata" ) end - end class Mock - def set_metadata(collection_name, parent_id, metadata = {}) - if collection_name == "images" then if get_image_details(parent_id) self.data[:images][parent_id]['metadata'] = metadata @@ -50,11 +46,8 @@ module Fog response.body = { "metadata" => metadata } response.status = 200 response - end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/update_meta.rb b/lib/fog/hp/requests/compute_v2/update_meta.rb index ecd318081..c12a66654 100644 --- a/lib/fog/hp/requests/compute_v2/update_meta.rb +++ b/lib/fog/hp/requests/compute_v2/update_meta.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Set or update metadata item for specific collections # # ==== Parameters @@ -24,13 +23,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def update_meta(collection_name, parent_id, key, value) - if collection_name == "images" then if get_image_details(parent_id) self.data[:images][parent_id]['metadata'][key] = value @@ -51,11 +47,8 @@ module Fog response.body = { "meta" => { key => value } } response.status = 200 response - end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/update_metadata.rb b/lib/fog/hp/requests/compute_v2/update_metadata.rb index cf4e8a348..a7461c765 100644 --- a/lib/fog/hp/requests/compute_v2/update_metadata.rb +++ b/lib/fog/hp/requests/compute_v2/update_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Update metadata for specific collections # # ==== Parameters @@ -23,13 +22,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata" ) end - end class Mock - def update_metadata(collection_name, parent_id, metadata = {}) - if collection_name == "images" then if get_image_details(parent_id) newmetadata = self.data[:images][parent_id]['metadata'].merge!(metadata) @@ -50,11 +46,8 @@ module Fog response.body = { "metadata" => newmetadata } response.status = 200 response - end - end - end end end diff --git a/lib/fog/hp/requests/compute_v2/update_server.rb b/lib/fog/hp/requests/compute_v2/update_server.rb index ee994260b..d2ea84e09 100644 --- a/lib/fog/hp/requests/compute_v2/update_server.rb +++ b/lib/fog/hp/requests/compute_v2/update_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class HPV2 class Real - # Update an existing server # # ==== Parameters @@ -46,11 +45,9 @@ module Fog :path => "servers/#{server_id}" ) end - end class Mock - def update_server(server_id, options) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -66,7 +63,6 @@ module Fog raise Fog::Compute::HPV2::NotFound end end - end end end diff --git a/lib/fog/hp/requests/dns/create_domain.rb b/lib/fog/hp/requests/dns/create_domain.rb index a0d248849..94212c51b 100644 --- a/lib/fog/hp/requests/dns/create_domain.rb +++ b/lib/fog/hp/requests/dns/create_domain.rb @@ -1,7 +1,6 @@ module Fog module HP class DNS - # Create a new DNS domain # # ==== Parameters diff --git a/lib/fog/hp/requests/dns/create_record.rb b/lib/fog/hp/requests/dns/create_record.rb index 614a97480..609a04fa1 100644 --- a/lib/fog/hp/requests/dns/create_record.rb +++ b/lib/fog/hp/requests/dns/create_record.rb @@ -2,7 +2,6 @@ module Fog module HP class DNS class Real - # Create a new DNS record # # ==== Parameters @@ -45,7 +44,6 @@ module Fog :method => 'POST', :path => "domains/#{domain_id}/records" ) - end end class Mock diff --git a/lib/fog/hp/requests/dns/delete_domain.rb b/lib/fog/hp/requests/dns/delete_domain.rb index 81acd27a8..3830ded83 100644 --- a/lib/fog/hp/requests/dns/delete_domain.rb +++ b/lib/fog/hp/requests/dns/delete_domain.rb @@ -1,9 +1,7 @@ module Fog module HP class DNS - class Real - # Delete a DNS domain # # ==== Parameters @@ -16,7 +14,6 @@ module Fog :path => "domains/#{domain_id}" ) end - end class Mock @@ -29,9 +26,7 @@ module Fog raise Fog::HP::DNS::NotFound end end - end - end end end diff --git a/lib/fog/hp/requests/dns/delete_record.rb b/lib/fog/hp/requests/dns/delete_record.rb index ff868affa..1a51f2edf 100644 --- a/lib/fog/hp/requests/dns/delete_record.rb +++ b/lib/fog/hp/requests/dns/delete_record.rb @@ -28,9 +28,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/dns/get_domain.rb b/lib/fog/hp/requests/dns/get_domain.rb index 80ed188f7..e51d6b3e0 100644 --- a/lib/fog/hp/requests/dns/get_domain.rb +++ b/lib/fog/hp/requests/dns/get_domain.rb @@ -1,7 +1,6 @@ module Fog module HP class DNS - # Get details for existing DNS domain # # ==== Parameters @@ -26,7 +25,6 @@ module Fog end end class Mock - def get_domain(domain_id) response = Excon::Response.new if domain = list_domains.body['domains'].detect { |_| _['id'] == domain_id } diff --git a/lib/fog/hp/requests/dns/get_record.rb b/lib/fog/hp/requests/dns/get_record.rb index ecef4aef9..84417a656 100644 --- a/lib/fog/hp/requests/dns/get_record.rb +++ b/lib/fog/hp/requests/dns/get_record.rb @@ -2,7 +2,6 @@ module Fog module HP class DNS class Real - # Get details of an existing DNS record # # ==== Parameters diff --git a/lib/fog/hp/requests/dns/get_servers_hosting_domain.rb b/lib/fog/hp/requests/dns/get_servers_hosting_domain.rb index 0ef6b3303..cd3093565 100644 --- a/lib/fog/hp/requests/dns/get_servers_hosting_domain.rb +++ b/lib/fog/hp/requests/dns/get_servers_hosting_domain.rb @@ -24,11 +24,9 @@ module Fog :path => "domains/#{domain_id}/servers" ) end - end class Mock - def get_servers_hosting_domain(domain_id) response = Excon::Response.new if list_domains.body['domains'].detect { |_| _['id'] == domain_id } diff --git a/lib/fog/hp/requests/dns/list_domains.rb b/lib/fog/hp/requests/dns/list_domains.rb index 2dff79a29..60c7bf254 100644 --- a/lib/fog/hp/requests/dns/list_domains.rb +++ b/lib/fog/hp/requests/dns/list_domains.rb @@ -20,7 +20,6 @@ module Fog :path => 'domains' ) end - end class Mock @@ -31,7 +30,6 @@ module Fog response.body = { 'domains' => domains } response end - end end end diff --git a/lib/fog/hp/requests/dns/list_records_in_a_domain.rb b/lib/fog/hp/requests/dns/list_records_in_a_domain.rb index 35bb7837c..934fa07f8 100644 --- a/lib/fog/hp/requests/dns/list_records_in_a_domain.rb +++ b/lib/fog/hp/requests/dns/list_records_in_a_domain.rb @@ -28,7 +28,6 @@ module Fog :path => "domains/#{domain_id}/records" ) end - end class Mock def list_records_in_a_domain(domain_id) @@ -49,7 +48,6 @@ module Fog records end end - end end end diff --git a/lib/fog/hp/requests/dns/update_domain.rb b/lib/fog/hp/requests/dns/update_domain.rb index 0873522d3..2ae192098 100644 --- a/lib/fog/hp/requests/dns/update_domain.rb +++ b/lib/fog/hp/requests/dns/update_domain.rb @@ -1,7 +1,6 @@ module Fog module HP class DNS - class Real # Update an existing DNS domain # diff --git a/lib/fog/hp/requests/dns/update_record.rb b/lib/fog/hp/requests/dns/update_record.rb index 9b60886a4..6313cb871 100644 --- a/lib/fog/hp/requests/dns/update_record.rb +++ b/lib/fog/hp/requests/dns/update_record.rb @@ -1,7 +1,6 @@ module Fog module HP class DNS - class Real # Update an existing DNS record # @@ -43,7 +42,6 @@ module Fog :path => "domains/#{domain_id}/records/#{record_id}" ) end - end class Mock @@ -62,9 +60,7 @@ module Fog raise Fog::HP::DNS::NotFound end end - end - end end end diff --git a/lib/fog/hp/requests/lb/create_load_balancer.rb b/lib/fog/hp/requests/lb/create_load_balancer.rb index 1743a442c..d03e52360 100644 --- a/lib/fog/hp/requests/lb/create_load_balancer.rb +++ b/lib/fog/hp/requests/lb/create_load_balancer.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # Create a new load balancer # # ==== Parameters diff --git a/lib/fog/hp/requests/lb/create_load_balancer_node.rb b/lib/fog/hp/requests/lb/create_load_balancer_node.rb index 316c4c778..5b787bee2 100644 --- a/lib/fog/hp/requests/lb/create_load_balancer_node.rb +++ b/lib/fog/hp/requests/lb/create_load_balancer_node.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # Create a new load balancer node # # ==== Parameters @@ -40,7 +39,6 @@ module Fog :method => 'POST', :path => "loadbalancers/#{load_balancer_id}/nodes" ) - end end class Mock @@ -63,10 +61,8 @@ module Fog else raise Fog::HP::LB::NotFound end - end end end - end end diff --git a/lib/fog/hp/requests/lb/delete_load_balancer.rb b/lib/fog/hp/requests/lb/delete_load_balancer.rb index 1b62f538a..779424912 100644 --- a/lib/fog/hp/requests/lb/delete_load_balancer.rb +++ b/lib/fog/hp/requests/lb/delete_load_balancer.rb @@ -1,14 +1,12 @@ module Fog module HP class LB - # Delete an existing load balancer # # ==== Parameters # * 'load_balancer_id'<~String> - UUId of load balancer to delete # class Real - def delete_load_balancer(load_balancer_id) request( :expects => 202, @@ -16,7 +14,6 @@ module Fog :path => "loadbalancers/#{load_balancer_id}" ) end - end class Mock @@ -29,7 +26,6 @@ module Fog raise Fog::HP::LB::NotFound end end - end end end diff --git a/lib/fog/hp/requests/lb/delete_load_balancer_node.rb b/lib/fog/hp/requests/lb/delete_load_balancer_node.rb index fd7d6d32b..e518c9e30 100644 --- a/lib/fog/hp/requests/lb/delete_load_balancer_node.rb +++ b/lib/fog/hp/requests/lb/delete_load_balancer_node.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # Delete an existing load balancer node # # ==== Parameters @@ -9,7 +8,6 @@ module Fog # * 'node_id'<~String> - UUId of node to delete # class Real - def delete_load_balancer_node(load_balancer_id, node_id) request( :expects => 202, @@ -17,10 +15,8 @@ module Fog :path => "loadbalancers/#{load_balancer_id}/nodes/#{node_id}" ) end - end class Mock - def delete_load_balancer_node(load_balancer_id, node_id) response = Excon::Response.new if get_load_balancer(load_balancer_id) diff --git a/lib/fog/hp/requests/lb/get_load_balancer.rb b/lib/fog/hp/requests/lb/get_load_balancer.rb index 508615bb3..4ca20e6a0 100644 --- a/lib/fog/hp/requests/lb/get_load_balancer.rb +++ b/lib/fog/hp/requests/lb/get_load_balancer.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # Get details for an existing load balancer # # ==== Parameters @@ -40,7 +39,6 @@ module Fog :path => "loadbalancers/#{load_balancer_id}" ) end - end class Mock def get_load_balancer(load_balancer_id) @@ -53,7 +51,6 @@ module Fog raise Fog::HP::LB::NotFound end end - end end end diff --git a/lib/fog/hp/requests/lb/get_load_balancer_node.rb b/lib/fog/hp/requests/lb/get_load_balancer_node.rb index 7ed11bb7e..a4763c442 100644 --- a/lib/fog/hp/requests/lb/get_load_balancer_node.rb +++ b/lib/fog/hp/requests/lb/get_load_balancer_node.rb @@ -2,7 +2,6 @@ module Fog module HP class LB class Real - # Get details for an existing load balancer node # # ==== Parameters @@ -40,14 +39,12 @@ module Fog else raise Fog::HP::LB::NotFound end - end def find_node(load_balancer_id, node_id) nodes = list_load_balancer_nodes(load_balancer_id).body['nodes'] nodes.detect {|n| n['id'] == node_id} end - end end end diff --git a/lib/fog/hp/requests/lb/list_algorithms.rb b/lib/fog/hp/requests/lb/list_algorithms.rb index 8842b5fb0..e10e6732e 100644 --- a/lib/fog/hp/requests/lb/list_algorithms.rb +++ b/lib/fog/hp/requests/lb/list_algorithms.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # List algorithms # # ==== Returns diff --git a/lib/fog/hp/requests/lb/list_limits.rb b/lib/fog/hp/requests/lb/list_limits.rb index ea3476b90..58cce9e5b 100644 --- a/lib/fog/hp/requests/lb/list_limits.rb +++ b/lib/fog/hp/requests/lb/list_limits.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # List limits # # ==== Returns @@ -15,7 +14,6 @@ module Fog # * 'maxVIPsPerLoadBalancer'<~Integer> - Limit of the virtual IPs per load balancer # * 'maxNodesPerLoadBalancer'<~Integer> - Limit of the nodes per load balancer class Real - def list_limits request( :expects => 200, @@ -23,7 +21,6 @@ module Fog :path => 'limits' ) end - end class Mock def list_limits @@ -33,7 +30,6 @@ module Fog response.body = { 'limits' => limits } response end - end end end diff --git a/lib/fog/hp/requests/lb/list_load_balancer_nodes.rb b/lib/fog/hp/requests/lb/list_load_balancer_nodes.rb index de68ee527..97d62c7a2 100644 --- a/lib/fog/hp/requests/lb/list_load_balancer_nodes.rb +++ b/lib/fog/hp/requests/lb/list_load_balancer_nodes.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # List all load balancer nodes # # ==== Returns @@ -34,7 +33,6 @@ module Fog raise Fog::HP::LB::NotFound end end - end end end diff --git a/lib/fog/hp/requests/lb/list_load_balancer_virtual_ips.rb b/lib/fog/hp/requests/lb/list_load_balancer_virtual_ips.rb index 9d2f18d92..5dbcca100 100644 --- a/lib/fog/hp/requests/lb/list_load_balancer_virtual_ips.rb +++ b/lib/fog/hp/requests/lb/list_load_balancer_virtual_ips.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # List virtual IPs for an existing load balancer # # ==== Parameters @@ -23,7 +22,6 @@ module Fog :path => "loadbalancers/#{load_balancer_id}/virtualips" ) end - end class Mock def list_load_balancer_virtual_ips(load_balancer_id) @@ -37,7 +35,6 @@ module Fog raise Fog::HP::LB::NotFound end end - end end end diff --git a/lib/fog/hp/requests/lb/list_load_balancers.rb b/lib/fog/hp/requests/lb/list_load_balancers.rb index 534dd64c2..fa17369b8 100644 --- a/lib/fog/hp/requests/lb/list_load_balancers.rb +++ b/lib/fog/hp/requests/lb/list_load_balancers.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # List all load balancers # # ==== Returns @@ -25,7 +24,6 @@ module Fog :path => 'loadbalancers' ) end - end class Mock def list_load_balancers diff --git a/lib/fog/hp/requests/lb/list_protocols.rb b/lib/fog/hp/requests/lb/list_protocols.rb index e08307913..5ad76dbf7 100644 --- a/lib/fog/hp/requests/lb/list_protocols.rb +++ b/lib/fog/hp/requests/lb/list_protocols.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # List protocols # # ==== Returns diff --git a/lib/fog/hp/requests/lb/list_versions.rb b/lib/fog/hp/requests/lb/list_versions.rb index dd262b09f..989cf58aa 100644 --- a/lib/fog/hp/requests/lb/list_versions.rb +++ b/lib/fog/hp/requests/lb/list_versions.rb @@ -2,7 +2,6 @@ module Fog module HP class LB class Real - def list_versions request( :expects => 200, @@ -12,7 +11,6 @@ module Fog end end class Mock - def list_versions response = Excon::Response.new versions = self.data[:versions].values @@ -20,7 +18,6 @@ module Fog response.body = { 'versions' => versions } response end - end end end diff --git a/lib/fog/hp/requests/lb/update_load_balancer.rb b/lib/fog/hp/requests/lb/update_load_balancer.rb index 0ce478618..899d38ce5 100644 --- a/lib/fog/hp/requests/lb/update_load_balancer.rb +++ b/lib/fog/hp/requests/lb/update_load_balancer.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # Update an existing load balancer # # ==== Parameters @@ -24,7 +23,6 @@ module Fog :path => "loadbalancers/#{load_balancer_id}" ) end - end class Mock def update_load_balancer(load_balancer_id, options={}) diff --git a/lib/fog/hp/requests/lb/update_load_balancer_node.rb b/lib/fog/hp/requests/lb/update_load_balancer_node.rb index 3846394de..44cff3314 100644 --- a/lib/fog/hp/requests/lb/update_load_balancer_node.rb +++ b/lib/fog/hp/requests/lb/update_load_balancer_node.rb @@ -1,7 +1,6 @@ module Fog module HP class LB - # Update an existing load balancer node # # ==== Parameters @@ -10,7 +9,6 @@ module Fog # * options<~Hash>: # * 'condition'<~String> - Condition for the node. Valid values are []'ENABLED', 'DISABLED'] class Real - def update_load_balancer_node(load_balancer_id, node_id, condition) data = { 'condition' => condition @@ -21,7 +19,6 @@ module Fog :method => 'PUT', :path => "loadbalancers/#{load_balancer_id}/nodes/#{node_id}" ) - end end class Mock @@ -52,7 +49,6 @@ module Fog new_nodes = nodes.reject {|n| n['id'] == node_id} new_nodes << node end - end end end diff --git a/lib/fog/hp/requests/network/add_router_interface.rb b/lib/fog/hp/requests/network/add_router_interface.rb index 99c0b864a..d9454fb85 100644 --- a/lib/fog/hp/requests/network/add_router_interface.rb +++ b/lib/fog/hp/requests/network/add_router_interface.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Add an internal router interface, thus attaching a subnet or a port to an existing router # @@ -69,7 +68,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/associate_floating_ip.rb b/lib/fog/hp/requests/network/associate_floating_ip.rb index b79b0d518..dbea4b8b8 100644 --- a/lib/fog/hp/requests/network/associate_floating_ip.rb +++ b/lib/fog/hp/requests/network/associate_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Associate port with floating ip # @@ -65,7 +64,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/create_floating_ip.rb b/lib/fog/hp/requests/network/create_floating_ip.rb index 5658eda08..5226236c2 100644 --- a/lib/fog/hp/requests/network/create_floating_ip.rb +++ b/lib/fog/hp/requests/network/create_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Create a new floating ip # @@ -63,7 +62,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/network/create_network.rb b/lib/fog/hp/requests/network/create_network.rb index c864adc27..cec0d4397 100644 --- a/lib/fog/hp/requests/network/create_network.rb +++ b/lib/fog/hp/requests/network/create_network.rb @@ -1,9 +1,7 @@ module Fog module HP class Network - class Real - # Create a new server # # ==== Parameters @@ -62,7 +60,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/network/create_port.rb b/lib/fog/hp/requests/network/create_port.rb index 1a3f08d6b..58d22fadd 100644 --- a/lib/fog/hp/requests/network/create_port.rb +++ b/lib/fog/hp/requests/network/create_port.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Create a new port # @@ -86,7 +85,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/create_router.rb b/lib/fog/hp/requests/network/create_router.rb index c4bb9963d..b06c7257c 100644 --- a/lib/fog/hp/requests/network/create_router.rb +++ b/lib/fog/hp/requests/network/create_router.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Create a new router # @@ -58,7 +57,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/network/create_security_group.rb b/lib/fog/hp/requests/network/create_security_group.rb index 07584e452..21b241828 100644 --- a/lib/fog/hp/requests/network/create_security_group.rb +++ b/lib/fog/hp/requests/network/create_security_group.rb @@ -2,7 +2,6 @@ module Fog module HP class Network class Real - # Create a new security group # # ==== Parameters @@ -45,11 +44,9 @@ module Fog :path => 'security-groups' ) end - end class Mock - def create_security_group(options = {}) # Spaces are NOT removed from name and description, as in case of compute sec groups tenant_id = Fog::Mock.random_numbers(14).to_s @@ -92,9 +89,7 @@ module Fog response.body = { 'security_group' => data } response end - end - end end end diff --git a/lib/fog/hp/requests/network/create_security_group_rule.rb b/lib/fog/hp/requests/network/create_security_group_rule.rb index 51c0335a9..d10dedb59 100644 --- a/lib/fog/hp/requests/network/create_security_group_rule.rb +++ b/lib/fog/hp/requests/network/create_security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module HP class Network class Real - # Create a new security group rule # # ==== Parameters @@ -51,11 +50,9 @@ module Fog :path => 'security-group-rules' ) end - end class Mock - def create_security_group_rule(security_group_id, direction, options = {}) response = Excon::Response.new data = { @@ -75,9 +72,7 @@ module Fog response.body = { 'security_group_rule' => data } response end - end - end end end diff --git a/lib/fog/hp/requests/network/create_subnet.rb b/lib/fog/hp/requests/network/create_subnet.rb index 76f808943..d833f3b7c 100644 --- a/lib/fog/hp/requests/network/create_subnet.rb +++ b/lib/fog/hp/requests/network/create_subnet.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Create a new subnet # @@ -91,7 +90,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/delete_floating_ip.rb b/lib/fog/hp/requests/network/delete_floating_ip.rb index 353075336..c0d5acdaa 100644 --- a/lib/fog/hp/requests/network/delete_floating_ip.rb +++ b/lib/fog/hp/requests/network/delete_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Delete an existing floating ip # @@ -28,7 +27,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/delete_network.rb b/lib/fog/hp/requests/network/delete_network.rb index 1ba2ee2db..5843fac3b 100644 --- a/lib/fog/hp/requests/network/delete_network.rb +++ b/lib/fog/hp/requests/network/delete_network.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Delete an existing network # @@ -28,7 +27,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/delete_port.rb b/lib/fog/hp/requests/network/delete_port.rb index 57bb69a98..27723b28b 100644 --- a/lib/fog/hp/requests/network/delete_port.rb +++ b/lib/fog/hp/requests/network/delete_port.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Delete an existing port # @@ -28,7 +27,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/delete_router.rb b/lib/fog/hp/requests/network/delete_router.rb index 96ce974a9..f87b77a40 100644 --- a/lib/fog/hp/requests/network/delete_router.rb +++ b/lib/fog/hp/requests/network/delete_router.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Delete an existing router # @@ -28,7 +27,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/delete_security_group.rb b/lib/fog/hp/requests/network/delete_security_group.rb index 3eadcb11c..bf7c2cdc1 100644 --- a/lib/fog/hp/requests/network/delete_security_group.rb +++ b/lib/fog/hp/requests/network/delete_security_group.rb @@ -2,7 +2,6 @@ module Fog module HP class Network class Real - # Delete a security group # # ==== Parameters @@ -14,11 +13,9 @@ module Fog :path => "security-groups/#{security_group_id}" ) end - end class Mock - def delete_security_group(security_group_id) response = Excon::Response.new if self.data[:security_groups][security_group_id] @@ -29,7 +26,6 @@ module Fog raise Fog::HP::Network::NotFound end end - end end end diff --git a/lib/fog/hp/requests/network/delete_security_group_rule.rb b/lib/fog/hp/requests/network/delete_security_group_rule.rb index c38a7a2cc..28654631b 100644 --- a/lib/fog/hp/requests/network/delete_security_group_rule.rb +++ b/lib/fog/hp/requests/network/delete_security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module HP class Network class Real - # Delete a security group rule # # ==== Parameters @@ -14,11 +13,9 @@ module Fog :path => "security-group-rules/#{security_group_rule_id}" ) end - end class Mock - def delete_security_group_rule(security_group_rule_id) response = Excon::Response.new if self.data[:security_group_rules][security_group_rule_id] @@ -29,7 +26,6 @@ module Fog raise Fog::HP::Network::NotFound end end - end end end diff --git a/lib/fog/hp/requests/network/delete_subnet.rb b/lib/fog/hp/requests/network/delete_subnet.rb index 08a9eeee5..361d11422 100644 --- a/lib/fog/hp/requests/network/delete_subnet.rb +++ b/lib/fog/hp/requests/network/delete_subnet.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Delete an existing subnet # @@ -28,7 +27,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/disassociate_floating_ip.rb b/lib/fog/hp/requests/network/disassociate_floating_ip.rb index c0940b780..6d1e09da6 100644 --- a/lib/fog/hp/requests/network/disassociate_floating_ip.rb +++ b/lib/fog/hp/requests/network/disassociate_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Associate port with floating ip # @@ -65,7 +64,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/get_floating_ip.rb b/lib/fog/hp/requests/network/get_floating_ip.rb index 8a3cf4066..44e73b8c6 100644 --- a/lib/fog/hp/requests/network/get_floating_ip.rb +++ b/lib/fog/hp/requests/network/get_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Get details for an existing floating ip by id # @@ -40,8 +39,6 @@ module Fog end end end - - end end end diff --git a/lib/fog/hp/requests/network/get_network.rb b/lib/fog/hp/requests/network/get_network.rb index a310f3c28..35091fa92 100644 --- a/lib/fog/hp/requests/network/get_network.rb +++ b/lib/fog/hp/requests/network/get_network.rb @@ -1,9 +1,7 @@ module Fog module HP class Network - class Real - # Get details for an existing network by id # # ==== Parameters @@ -43,7 +41,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/get_port.rb b/lib/fog/hp/requests/network/get_port.rb index 73f6153b4..80a15a995 100644 --- a/lib/fog/hp/requests/network/get_port.rb +++ b/lib/fog/hp/requests/network/get_port.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Get details for an existing port by id # @@ -47,7 +46,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/get_router.rb b/lib/fog/hp/requests/network/get_router.rb index b19c55777..adb722275 100644 --- a/lib/fog/hp/requests/network/get_router.rb +++ b/lib/fog/hp/requests/network/get_router.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Get details for an existing router by id # @@ -40,7 +39,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/get_security_group.rb b/lib/fog/hp/requests/network/get_security_group.rb index 4fca93c39..ded8c92c6 100644 --- a/lib/fog/hp/requests/network/get_security_group.rb +++ b/lib/fog/hp/requests/network/get_security_group.rb @@ -2,7 +2,6 @@ module Fog module HP class Network class Real - # Get details about a security group # # ==== Parameters @@ -34,11 +33,9 @@ module Fog :path => "security-groups/#{security_group_id}" ) end - end class Mock - def get_security_group(security_group_id) response = Excon::Response.new if sec_group = self.data[:security_groups][security_group_id] @@ -49,7 +46,6 @@ module Fog raise Fog::HP::Network::NotFound end end - end end end diff --git a/lib/fog/hp/requests/network/get_security_group_rule.rb b/lib/fog/hp/requests/network/get_security_group_rule.rb index 6250585f8..b97dcef01 100644 --- a/lib/fog/hp/requests/network/get_security_group_rule.rb +++ b/lib/fog/hp/requests/network/get_security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module HP class Network class Real - # Get details about a security group rule # # ==== Parameters @@ -29,11 +28,9 @@ module Fog :path => "security-group-rules/#{security_group_rule_id}" ) end - end class Mock - def get_security_group_rule(security_group_rule_id) response = Excon::Response.new if sec_group_rule = self.data[:security_group_rules][security_group_rule_id] @@ -44,7 +41,6 @@ module Fog raise Fog::HP::Network::NotFound end end - end end end diff --git a/lib/fog/hp/requests/network/get_subnet.rb b/lib/fog/hp/requests/network/get_subnet.rb index 2871a7d26..f91456d0a 100644 --- a/lib/fog/hp/requests/network/get_subnet.rb +++ b/lib/fog/hp/requests/network/get_subnet.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Gets an existing subnet by id # @@ -46,7 +45,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/list_floating_ips.rb b/lib/fog/hp/requests/network/list_floating_ips.rb index 2ff9b89a2..ecba8b66f 100644 --- a/lib/fog/hp/requests/network/list_floating_ips.rb +++ b/lib/fog/hp/requests/network/list_floating_ips.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # List existing floating ips # @@ -40,7 +39,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/network/list_networks.rb b/lib/fog/hp/requests/network/list_networks.rb index 4f2eb6ad5..02808218d 100644 --- a/lib/fog/hp/requests/network/list_networks.rb +++ b/lib/fog/hp/requests/network/list_networks.rb @@ -1,9 +1,7 @@ module Fog module HP class Network - class Real - # List existing networks # # ==== Parameters @@ -42,7 +40,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/network/list_ports.rb b/lib/fog/hp/requests/network/list_ports.rb index 5b878ee94..3660d49db 100644 --- a/lib/fog/hp/requests/network/list_ports.rb +++ b/lib/fog/hp/requests/network/list_ports.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # List existing ports # @@ -46,7 +45,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/network/list_routers.rb b/lib/fog/hp/requests/network/list_routers.rb index c58fd5175..1de1d82d9 100644 --- a/lib/fog/hp/requests/network/list_routers.rb +++ b/lib/fog/hp/requests/network/list_routers.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # List existing routers # @@ -39,7 +38,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/network/list_security_group_rules.rb b/lib/fog/hp/requests/network/list_security_group_rules.rb index be525f5e8..7b18cfd24 100644 --- a/lib/fog/hp/requests/network/list_security_group_rules.rb +++ b/lib/fog/hp/requests/network/list_security_group_rules.rb @@ -2,7 +2,6 @@ module Fog module HP class Network class Real - # List all security group rules # # ==== Parameters @@ -30,11 +29,9 @@ module Fog :query => options ) end - end class Mock - def list_security_group_rules(options = {}) response = Excon::Response.new @@ -45,7 +42,6 @@ module Fog response.body = { 'security_group_rules' => sec_group_rules } response end - end end end diff --git a/lib/fog/hp/requests/network/list_security_groups.rb b/lib/fog/hp/requests/network/list_security_groups.rb index c76551219..d73da336b 100644 --- a/lib/fog/hp/requests/network/list_security_groups.rb +++ b/lib/fog/hp/requests/network/list_security_groups.rb @@ -2,7 +2,6 @@ module Fog module HP class Network class Real - # List all security groups # # ==== Parameters @@ -35,11 +34,9 @@ module Fog :query => options ) end - end class Mock - def list_security_groups(options = {}) response = Excon::Response.new @@ -50,7 +47,6 @@ module Fog response.body = { 'security_groups' => sec_groups } response end - end end end diff --git a/lib/fog/hp/requests/network/list_subnets.rb b/lib/fog/hp/requests/network/list_subnets.rb index 0aca735e4..3f7715dcc 100644 --- a/lib/fog/hp/requests/network/list_subnets.rb +++ b/lib/fog/hp/requests/network/list_subnets.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # List existing subnets # @@ -45,7 +44,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/network/remove_router_interface.rb b/lib/fog/hp/requests/network/remove_router_interface.rb index 69e283660..272bd41ef 100644 --- a/lib/fog/hp/requests/network/remove_router_interface.rb +++ b/lib/fog/hp/requests/network/remove_router_interface.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Remove an internal router interface, thus detaching a subnet or a port from an existing router # @@ -61,7 +60,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/update_network.rb b/lib/fog/hp/requests/network/update_network.rb index 65c746f30..3a7bf1b21 100644 --- a/lib/fog/hp/requests/network/update_network.rb +++ b/lib/fog/hp/requests/network/update_network.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Update attributes for an existing network # @@ -56,7 +55,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/update_port.rb b/lib/fog/hp/requests/network/update_port.rb index 0062c76ce..ea8089411 100644 --- a/lib/fog/hp/requests/network/update_port.rb +++ b/lib/fog/hp/requests/network/update_port.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Update an existing port by id # @@ -69,7 +68,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/update_router.rb b/lib/fog/hp/requests/network/update_router.rb index e9c748bf6..580a11622 100644 --- a/lib/fog/hp/requests/network/update_router.rb +++ b/lib/fog/hp/requests/network/update_router.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Update an existing router by id # @@ -56,7 +55,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/network/update_subnet.rb b/lib/fog/hp/requests/network/update_subnet.rb index 16b359a92..cfb13c9b7 100644 --- a/lib/fog/hp/requests/network/update_subnet.rb +++ b/lib/fog/hp/requests/network/update_subnet.rb @@ -1,7 +1,6 @@ module Fog module HP class Network - class Real # Update an existing subnet # @@ -66,7 +65,6 @@ module Fog end end end - end end end diff --git a/lib/fog/hp/requests/storage/delete_container.rb b/lib/fog/hp/requests/storage/delete_container.rb index 636c7209e..d63127c7d 100644 --- a/lib/fog/hp/requests/storage/delete_container.rb +++ b/lib/fog/hp/requests/storage/delete_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Delete an existing container # # ==== Parameters @@ -16,11 +15,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def delete_container(container_name) response = Excon::Response.new if self.data[:containers][container_name].nil? @@ -35,9 +32,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/storage/delete_object.rb b/lib/fog/hp/requests/storage/delete_object.rb index 8ed786786..1dbda2404 100644 --- a/lib/fog/hp/requests/storage/delete_object.rb +++ b/lib/fog/hp/requests/storage/delete_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Delete an existing object # # ==== Parameters @@ -17,11 +16,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def delete_object(container_name, object_name, options = {}) response = Excon::Response.new if container = self.data[:containers][container_name] @@ -36,9 +33,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/storage/delete_shared_object.rb b/lib/fog/hp/requests/storage/delete_shared_object.rb index f17c5f94d..164f2b015 100644 --- a/lib/fog/hp/requests/storage/delete_shared_object.rb +++ b/lib/fog/hp/requests/storage/delete_shared_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Delete a shared object # # ==== Parameters @@ -20,19 +19,15 @@ module Fog ) response end - end class Mock # :nodoc:all - def delete_shared_object(shared_object_url) response = Excon::Response.new response.status = 204 response end - end - end end end diff --git a/lib/fog/hp/requests/storage/get_container.rb b/lib/fog/hp/requests/storage/get_container.rb index 0dd9c2727..3d5a3b52a 100644 --- a/lib/fog/hp/requests/storage/get_container.rb +++ b/lib/fog/hp/requests/storage/get_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Get details for container and total bytes stored # # ==== Parameters @@ -38,11 +37,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_container(container_name, options = {}) unless container_name raise ArgumentError.new('container_name is required') @@ -84,9 +81,7 @@ module Fog raise Fog::Storage::HP::NotFound end end - end - end end end diff --git a/lib/fog/hp/requests/storage/get_containers.rb b/lib/fog/hp/requests/storage/get_containers.rb index b94dcf850..9beb13df6 100644 --- a/lib/fog/hp/requests/storage/get_containers.rb +++ b/lib/fog/hp/requests/storage/get_containers.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # List existing storage containers # # ==== Parameters @@ -27,11 +26,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_containers(options = {}) response = Excon::Response.new acc_cont_count = 0 @@ -63,9 +60,7 @@ module Fog response.status = 200 response end - end - end end end diff --git a/lib/fog/hp/requests/storage/get_object.rb b/lib/fog/hp/requests/storage/get_object.rb index 9695ae692..18e2e4223 100644 --- a/lib/fog/hp/requests/storage/get_object.rb +++ b/lib/fog/hp/requests/storage/get_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Get details for an object # # ==== Parameters @@ -26,11 +25,9 @@ module Fog end response end - end class Mock # :nodoc:all - def get_object(container_name, object_name, options = {}, &block) unless container_name raise ArgumentError.new('container_name is required') @@ -77,9 +74,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/storage/get_object_temp_url.rb b/lib/fog/hp/requests/storage/get_object_temp_url.rb index 9781f10a7..318863290 100644 --- a/lib/fog/hp/requests/storage/get_object_temp_url.rb +++ b/lib/fog/hp/requests/storage/get_object_temp_url.rb @@ -1,9 +1,7 @@ module Fog module Storage class HP - class Real - # Generate a temporary url for an object # # ==== Parameters @@ -14,18 +12,15 @@ module Fog def get_object_temp_url(container, object, expires, method) generate_object_temp_url(container, object, expires, method) end - end class Mock # :nodoc:all - def get_object_temp_url(container, object, expires, method) @hp_storage_uri = "https://swift-cluster.example.com:443/v1/account" generate_object_temp_url(container, object, expires, method) end end - end end end diff --git a/lib/fog/hp/requests/storage/get_shared_container.rb b/lib/fog/hp/requests/storage/get_shared_container.rb index 6410f46af..a49cf1951 100644 --- a/lib/fog/hp/requests/storage/get_shared_container.rb +++ b/lib/fog/hp/requests/storage/get_shared_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Get details for a shared container # # ==== Parameters @@ -40,11 +39,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def get_shared_container(shared_container_url, options = {}) response = Excon::Response.new data = { @@ -65,11 +62,8 @@ module Fog 'X-Trans-Id' => "tx#{Fog::Mock.random_hex(32)}" } response - end - end - end end end diff --git a/lib/fog/hp/requests/storage/get_shared_object.rb b/lib/fog/hp/requests/storage/get_shared_object.rb index f2a7add5d..da84342d0 100644 --- a/lib/fog/hp/requests/storage/get_shared_object.rb +++ b/lib/fog/hp/requests/storage/get_shared_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Get details for a shared object # # ==== Parameters @@ -29,11 +28,9 @@ module Fog end response end - end class Mock # :nodoc:all - def get_shared_object(shared_object_url, &block) response = Excon::Response.new response.status = 200 @@ -58,9 +55,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/storage/head_container.rb b/lib/fog/hp/requests/storage/head_container.rb index 220864548..c1807704d 100644 --- a/lib/fog/hp/requests/storage/head_container.rb +++ b/lib/fog/hp/requests/storage/head_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # List number of objects and total bytes stored # # ==== Parameters @@ -22,20 +21,16 @@ module Fog ) response end - end class Mock # :nodoc:all - def head_container(container_name) response = get_container(container_name) response.body = nil response.status = 204 response end - end - end end end diff --git a/lib/fog/hp/requests/storage/head_containers.rb b/lib/fog/hp/requests/storage/head_containers.rb index fc6bfc4e9..053a94e2b 100644 --- a/lib/fog/hp/requests/storage/head_containers.rb +++ b/lib/fog/hp/requests/storage/head_containers.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # List number of containers and total bytes stored # # ==== Returns @@ -19,19 +18,15 @@ module Fog ) response end - end class Mock # :nodoc:all - def head_containers response = get_containers response.body = nil response end - end - end end end diff --git a/lib/fog/hp/requests/storage/head_object.rb b/lib/fog/hp/requests/storage/head_object.rb index badbd215c..a669dd2d3 100644 --- a/lib/fog/hp/requests/storage/head_object.rb +++ b/lib/fog/hp/requests/storage/head_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Get headers for object # # ==== Parameters @@ -17,20 +16,16 @@ module Fog }, false) response end - end class Mock # :nodoc:all - def head_object(container_name, object_name, options = {}) response = get_object(container_name, object_name, options) response.body = nil response.status = 200 response end - end - end end end diff --git a/lib/fog/hp/requests/storage/head_shared_container.rb b/lib/fog/hp/requests/storage/head_shared_container.rb index cf16a5db1..fe2071fc5 100644 --- a/lib/fog/hp/requests/storage/head_shared_container.rb +++ b/lib/fog/hp/requests/storage/head_shared_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # List number of objects and total bytes stored for a shared container # # ==== Parameters @@ -26,20 +25,16 @@ module Fog ) response end - end class Mock # :nodoc:all - def head_shared_container(shared_container_url) response = get_shared_container(shared_container_url) response.body = nil response.status = 204 response end - end - end end end diff --git a/lib/fog/hp/requests/storage/head_shared_object.rb b/lib/fog/hp/requests/storage/head_shared_object.rb index 855d2808a..f87b2ecda 100644 --- a/lib/fog/hp/requests/storage/head_shared_object.rb +++ b/lib/fog/hp/requests/storage/head_shared_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Get headers for shared object # # ==== Parameters @@ -20,20 +19,16 @@ module Fog }, false) response end - end class Mock # :nodoc:all - def head_shared_object(shared_object_url) response = get_shared_object(shared_object_url) response.body = nil response.status = 200 response end - end - end end end diff --git a/lib/fog/hp/requests/storage/post_container.rb b/lib/fog/hp/requests/storage/post_container.rb index ac213ca85..2f6fe2a5f 100644 --- a/lib/fog/hp/requests/storage/post_container.rb +++ b/lib/fog/hp/requests/storage/post_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Create or update metadata for an existing container # # ==== Parameters @@ -17,11 +16,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def post_container(container_name, headers = {}) if self.data[:containers][container_name].nil? raise Fog::Storage::HP::NotFound @@ -30,9 +27,7 @@ module Fog response.status = 204 response end - end - end end end diff --git a/lib/fog/hp/requests/storage/post_object.rb b/lib/fog/hp/requests/storage/post_object.rb index 9183a774a..a6b0e6769 100644 --- a/lib/fog/hp/requests/storage/post_object.rb +++ b/lib/fog/hp/requests/storage/post_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Create or update metadata for an existing object # # ==== Parameters @@ -18,11 +17,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def post_object(container_name, object_name, headers = {}) response = Excon::Response.new if container = self.data[:containers][container_name] @@ -48,9 +45,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/storage/put_container.rb b/lib/fog/hp/requests/storage/put_container.rb index 7bbb95d62..74f47e7fe 100644 --- a/lib/fog/hp/requests/storage/put_container.rb +++ b/lib/fog/hp/requests/storage/put_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Create a new container # # ==== Parameters @@ -17,7 +16,6 @@ module Fog ) response end - end class Mock # :nodoc:all @@ -42,7 +40,6 @@ module Fog response end end - end end end diff --git a/lib/fog/hp/requests/storage/put_object.rb b/lib/fog/hp/requests/storage/put_object.rb index 3a30d7dd0..30ee31a96 100644 --- a/lib/fog/hp/requests/storage/put_object.rb +++ b/lib/fog/hp/requests/storage/put_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Create a new object # # ==== Parameters @@ -34,11 +33,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def put_object(container_name, object_name, data, options = {}) response = Excon::Response.new ### Take care of case of copy operation @@ -97,9 +94,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/hp/requests/storage/put_shared_object.rb b/lib/fog/hp/requests/storage/put_shared_object.rb index cee3a9db0..2effe224b 100644 --- a/lib/fog/hp/requests/storage/put_shared_object.rb +++ b/lib/fog/hp/requests/storage/put_shared_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class HP class Real - # Create a new object in a shared container # # ==== Parameters @@ -40,11 +39,9 @@ module Fog ) response end - end class Mock # :nodoc:all - def put_shared_object(shared_container_url, object_name, data, options = {}, &block) response = Excon::Response.new data = Fog::Storage.parse_data(data) @@ -77,9 +74,7 @@ module Fog response end - end - end end end diff --git a/lib/fog/hp/simple_http_instrumentor.rb b/lib/fog/hp/simple_http_instrumentor.rb index f536b7316..db66e6384 100644 --- a/lib/fog/hp/simple_http_instrumentor.rb +++ b/lib/fog/hp/simple_http_instrumentor.rb @@ -53,7 +53,6 @@ module Excon yield end end - end end end diff --git a/lib/fog/hp/storage.rb b/lib/fog/hp/storage.rb index 24784b3d7..8135b6320 100644 --- a/lib/fog/hp/storage.rb +++ b/lib/fog/hp/storage.rb @@ -3,7 +3,6 @@ require 'fog/hp/core' module Fog module Storage class HP < Fog::Service - requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone recognizes :hp_auth_uri, :hp_cdn_ssl, :hp_cdn_uri, :credentials, :hp_service_type recognizes :persistent, :connection_options @@ -47,7 +46,6 @@ module Fog request :put_shared_object module Utils - def cdn unless @hp_cdn_uri.nil? @cdn ||= Fog::CDN.new( @@ -293,7 +291,6 @@ module Fog def reset_data self.class.data.delete(@hp_access_key) end - end class Real @@ -408,7 +405,6 @@ module Fog end response end - end end end diff --git a/lib/fog/ibm/compute.rb b/lib/fog/ibm/compute.rb index 592bae43d..3c4e00866 100644 --- a/lib/fog/ibm/compute.rb +++ b/lib/fog/ibm/compute.rb @@ -3,7 +3,6 @@ require 'fog/ibm/core' module Fog module Compute class IBM < Fog::Service - requires :ibm_username, :ibm_password recognizes :location @@ -81,7 +80,6 @@ module Fog end class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -226,9 +224,7 @@ module Fog } locations end - end - end end end diff --git a/lib/fog/ibm/core.rb b/lib/fog/ibm/core.rb index 7f2b14d78..e67104b93 100644 --- a/lib/fog/ibm/core.rb +++ b/lib/fog/ibm/core.rb @@ -3,7 +3,6 @@ require 'fog/json' module Fog module IBM - extend Fog::Provider service(:compute, 'Compute') @@ -17,7 +16,6 @@ module Fog end class Connection < Fog::XML::Connection - def initialize(user, password) @user = user @password = password @@ -54,7 +52,6 @@ module Fog class Mock class << self - def id Fog::Mock.random_numbers(7).to_i.to_s end @@ -169,9 +166,7 @@ module Fog "state" => 0 } end - end end - end end diff --git a/lib/fog/ibm/models/compute/address.rb b/lib/fog/ibm/models/compute/address.rb index ce40ddc81..2ab7c35f3 100644 --- a/lib/fog/ibm/models/compute/address.rb +++ b/lib/fog/ibm/models/compute/address.rb @@ -4,7 +4,6 @@ module Fog module Compute class IBM class Address < Fog::Model - STATES = { 0 => 'New', 1 => 'Allocating', diff --git a/lib/fog/ibm/models/compute/addresses.rb b/lib/fog/ibm/models/compute/addresses.rb index 68a849a0d..061289a89 100644 --- a/lib/fog/ibm/models/compute/addresses.rb +++ b/lib/fog/ibm/models/compute/addresses.rb @@ -4,9 +4,7 @@ require 'fog/ibm/models/compute/address' module Fog module Compute class IBM - class Addresses < Fog::Collection - model Fog::Compute::IBM::Address def all @@ -21,7 +19,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/ibm/models/compute/image.rb b/lib/fog/ibm/models/compute/image.rb index f8eb83362..175391c76 100644 --- a/lib/fog/ibm/models/compute/image.rb +++ b/lib/fog/ibm/models/compute/image.rb @@ -5,7 +5,6 @@ module Fog module Compute class IBM class Image < Fog::Model - STATES = { 0 => 'New', 1 => 'Available', @@ -63,7 +62,6 @@ module Fog requires :id service.delete_image(id).body['success'] end - end end end diff --git a/lib/fog/ibm/models/compute/images.rb b/lib/fog/ibm/models/compute/images.rb index 5c2304355..5d19ac85b 100644 --- a/lib/fog/ibm/models/compute/images.rb +++ b/lib/fog/ibm/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/ibm/models/compute/image' module Fog module Compute class IBM - class Images < Fog::Collection - model Fog::Compute::IBM::Image def all @@ -20,7 +18,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/ibm/models/compute/instance-types.rb b/lib/fog/ibm/models/compute/instance-types.rb index 694dcc23d..c8e2dd194 100644 --- a/lib/fog/ibm/models/compute/instance-types.rb +++ b/lib/fog/ibm/models/compute/instance-types.rb @@ -4,11 +4,8 @@ require 'fog/ibm/models/compute/instance-type' module Fog module Compute class IBM - class InstanceTypes < Fog::Collection - model Fog::Compute::IBM::InstanceType - end end end diff --git a/lib/fog/ibm/models/compute/keys.rb b/lib/fog/ibm/models/compute/keys.rb index 253aa0434..9fed64b2e 100644 --- a/lib/fog/ibm/models/compute/keys.rb +++ b/lib/fog/ibm/models/compute/keys.rb @@ -4,9 +4,7 @@ require 'fog/ibm/models/compute/key' module Fog module Compute class IBM - class Keys < Fog::Collection - model Fog::Compute::IBM::Key def all @@ -28,7 +26,6 @@ module Fog def default=(key_name) service.modify_key(key_name, 'default' => true) end - end end end diff --git a/lib/fog/ibm/models/compute/locations.rb b/lib/fog/ibm/models/compute/locations.rb index eba4cd0e8..8e6794ec7 100644 --- a/lib/fog/ibm/models/compute/locations.rb +++ b/lib/fog/ibm/models/compute/locations.rb @@ -4,9 +4,7 @@ require 'fog/ibm/models/compute/location' module Fog module Compute class IBM - class Locations < Fog::Collection - model Fog::Compute::IBM::Location def all @@ -20,7 +18,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/ibm/models/compute/server.rb b/lib/fog/ibm/models/compute/server.rb index d335b36e8..5220d154c 100644 --- a/lib/fog/ibm/models/compute/server.rb +++ b/lib/fog/ibm/models/compute/server.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class IBM - class Server < Fog::Compute::Server - STATES = { 0 => 'New', 1 => 'Provisioning', @@ -186,8 +184,6 @@ module Fog end alias :create_image :to_image end - end end - end diff --git a/lib/fog/ibm/models/compute/servers.rb b/lib/fog/ibm/models/compute/servers.rb index af38fb3e4..cea5d458b 100644 --- a/lib/fog/ibm/models/compute/servers.rb +++ b/lib/fog/ibm/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/ibm/models/compute/server' module Fog module Compute class IBM - class Servers < Fog::Collection - model Fog::Compute::IBM::Server def all @@ -20,7 +18,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/ibm/models/compute/vlan.rb b/lib/fog/ibm/models/compute/vlan.rb index 446a05bf1..aefb0f777 100644 --- a/lib/fog/ibm/models/compute/vlan.rb +++ b/lib/fog/ibm/models/compute/vlan.rb @@ -4,11 +4,9 @@ module Fog module Compute class IBM class Vlan < Fog::Model - identity :id attribute :name attribute :location - end end end diff --git a/lib/fog/ibm/models/compute/vlans.rb b/lib/fog/ibm/models/compute/vlans.rb index 58b75e116..080e235de 100644 --- a/lib/fog/ibm/models/compute/vlans.rb +++ b/lib/fog/ibm/models/compute/vlans.rb @@ -4,9 +4,7 @@ require 'fog/ibm/models/compute/vlan' module Fog module Compute class IBM - class Vlans < Fog::Collection - model Fog::Compute::IBM::Vlan def all @@ -21,7 +19,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/ibm/models/storage/offerings.rb b/lib/fog/ibm/models/storage/offerings.rb index 009cc5ad3..05171c390 100644 --- a/lib/fog/ibm/models/storage/offerings.rb +++ b/lib/fog/ibm/models/storage/offerings.rb @@ -4,15 +4,12 @@ require 'fog/ibm/models/storage/offering' module Fog module Storage class IBM - class Offerings < Fog::Collection - model Fog::Storage::IBM::Offering def all load(service.list_offerings.body['volumes']) end - end end end diff --git a/lib/fog/ibm/models/storage/volume.rb b/lib/fog/ibm/models/storage/volume.rb index 49f94c1b7..eead1924f 100644 --- a/lib/fog/ibm/models/storage/volume.rb +++ b/lib/fog/ibm/models/storage/volume.rb @@ -4,7 +4,6 @@ module Fog module Storage class IBM class Volume < Fog::Model - STATES = { 0 => 'New', 1 => 'Creating', @@ -91,7 +90,6 @@ module Fog def state STATES[attributes[:state]] end - end end end diff --git a/lib/fog/ibm/models/storage/volumes.rb b/lib/fog/ibm/models/storage/volumes.rb index 3bba5211c..9bcb37def 100644 --- a/lib/fog/ibm/models/storage/volumes.rb +++ b/lib/fog/ibm/models/storage/volumes.rb @@ -4,9 +4,7 @@ require 'fog/ibm/models/storage/volume' module Fog module Storage class IBM - class Volumes < Fog::Collection - model Fog::Storage::IBM::Volume def all @@ -20,7 +18,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/ibm/requests/compute/clone_image.rb b/lib/fog/ibm/requests/compute/clone_image.rb index 00546a315..50d3aad9f 100644 --- a/lib/fog/ibm/requests/compute/clone_image.rb +++ b/lib/fog/ibm/requests/compute/clone_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Clones image specified by image_id # # ==== Parameters @@ -25,10 +24,8 @@ module Fog } ) end - end class Mock - def clone_image(image_id, name, description) response = Excon::Response.new if image_exists? image_id @@ -41,7 +38,6 @@ module Fog end response end - end end end diff --git a/lib/fog/ibm/requests/compute/create_address.rb b/lib/fog/ibm/requests/compute/create_address.rb index 19c561359..7416153b5 100644 --- a/lib/fog/ibm/requests/compute/create_address.rb +++ b/lib/fog/ibm/requests/compute/create_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Requests a new static IP address to be created # # ==== Parameters @@ -30,11 +29,9 @@ module Fog } ) end - end class Mock - def create_address(location_id, offering_id="20001223", options={}) address = Fog::IBM::Mock.create_address(location_id, offering_id, options) self.data[:addresses][address['id']] = address @@ -43,7 +40,6 @@ module Fog response.body = address response end - end end end diff --git a/lib/fog/ibm/requests/compute/create_image.rb b/lib/fog/ibm/requests/compute/create_image.rb index a694ee3e9..07ce2a596 100644 --- a/lib/fog/ibm/requests/compute/create_image.rb +++ b/lib/fog/ibm/requests/compute/create_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Requests an image to be created from an Instance # # ==== Parameters @@ -32,11 +31,9 @@ module Fog } ) end - end class Mock - def create_image(instance_id, name, description) response = Excon::Response.new if instance_exists? instance_id @@ -49,7 +46,6 @@ module Fog end response end - end end end diff --git a/lib/fog/ibm/requests/compute/create_instance.rb b/lib/fog/ibm/requests/compute/create_instance.rb index 7f9c29d2e..77f06721f 100644 --- a/lib/fog/ibm/requests/compute/create_instance.rb +++ b/lib/fog/ibm/requests/compute/create_instance.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Requests a new Instance to be created. # # ==== Parameters @@ -57,11 +56,9 @@ module Fog :body => body_data ) end - end class Mock - def create_instance(name, image_id, instance_type, location, options={}) response = Excon::Response.new # Since we want to test error conditions, we have a little regex that traps specially formed @@ -78,7 +75,6 @@ module Fog response end end - end end end diff --git a/lib/fog/ibm/requests/compute/create_key.rb b/lib/fog/ibm/requests/compute/create_key.rb index 2d3fecc4c..85bd055e1 100644 --- a/lib/fog/ibm/requests/compute/create_key.rb +++ b/lib/fog/ibm/requests/compute/create_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Requests a new keypair to be created # # ==== Parameters @@ -27,11 +26,9 @@ module Fog } ) end - end class Mock - # SmartCloud returns the private key when create_key is called # We need to store both the private and public key for later use def create_key(name, public_key=nil) @@ -54,7 +51,6 @@ module Fog self.data[:private_keys][name] = attributes.merge("keyMaterial" => private_key.to_s) response end - end end end diff --git a/lib/fog/ibm/requests/compute/delete_address.rb b/lib/fog/ibm/requests/compute/delete_address.rb index 9ca80795b..c0b8ad6a6 100644 --- a/lib/fog/ibm/requests/compute/delete_address.rb +++ b/lib/fog/ibm/requests/compute/delete_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Deletes the Address that the authenticated user manages with the specified :address_id # # ==== Parameters @@ -19,11 +18,9 @@ module Fog :path => "/addresses/#{address_id}" ) end - end class Mock - def delete_address(address_id) response = Excon::Response.new if address_exists? address_id @@ -39,7 +36,6 @@ module Fog def address_exists?(address_id) self.data[:addresses].key? address_id end - end end end diff --git a/lib/fog/ibm/requests/compute/delete_image.rb b/lib/fog/ibm/requests/compute/delete_image.rb index 7db3b9529..f9e548dc0 100644 --- a/lib/fog/ibm/requests/compute/delete_image.rb +++ b/lib/fog/ibm/requests/compute/delete_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Deletes the image that the authenticated user manages with the specified :image_id # # ==== Parameters @@ -19,10 +18,8 @@ module Fog :path => "/offerings/image/#{image_id}" ) end - end class Mock - def delete_image(image_id) response = Excon::Response.new # TODO: We should probably check that an image is deleteable. @@ -36,7 +33,6 @@ module Fog end response end - end end end diff --git a/lib/fog/ibm/requests/compute/delete_instance.rb b/lib/fog/ibm/requests/compute/delete_instance.rb index 3b7dcc038..d5953994c 100644 --- a/lib/fog/ibm/requests/compute/delete_instance.rb +++ b/lib/fog/ibm/requests/compute/delete_instance.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Deletes the Instance that the authenticated user manages with the specified :instance_id # # ==== Parameters @@ -19,11 +18,9 @@ module Fog :path => "/instances/#{instance_id}" ) end - end class Mock - def delete_instance(instance_id) response = Excon::Response.new if deleteable? instance_id @@ -45,7 +42,6 @@ module Fog return false if [0, 1, 7, 14, 15].include?(instance["status"].to_i) true end - end end end diff --git a/lib/fog/ibm/requests/compute/delete_key.rb b/lib/fog/ibm/requests/compute/delete_key.rb index 9ab1388c4..4a27cdcd1 100644 --- a/lib/fog/ibm/requests/compute/delete_key.rb +++ b/lib/fog/ibm/requests/compute/delete_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Deletes the key specified with key_name # # ==== Parameters @@ -19,10 +18,8 @@ module Fog :path => "/keys/#{key_name}" ) end - end class Mock - def delete_key(key_name) response = Excon::Response.new if key_exists? key_name @@ -34,7 +31,6 @@ module Fog end response end - end end end diff --git a/lib/fog/ibm/requests/compute/get_image.rb b/lib/fog/ibm/requests/compute/get_image.rb index 58e380d78..ada13a5fe 100644 --- a/lib/fog/ibm/requests/compute/get_image.rb +++ b/lib/fog/ibm/requests/compute/get_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns details of image specified by id # # ==== Parameters @@ -39,11 +38,9 @@ module Fog :path => "/offerings/image/#{image_id}" ) end - end class Mock - def get_image(image_id) response = Excon::Response.new if image_exists? image_id @@ -60,7 +57,6 @@ module Fog def image_exists?(image_id) self.data[:images].key? image_id end - end end end diff --git a/lib/fog/ibm/requests/compute/get_image_agreement.rb b/lib/fog/ibm/requests/compute/get_image_agreement.rb index a7571f291..8825335f4 100644 --- a/lib/fog/ibm/requests/compute/get_image_agreement.rb +++ b/lib/fog/ibm/requests/compute/get_image_agreement.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns license agreement of image specified by id # # ==== Parameters @@ -24,11 +23,9 @@ module Fog :path => "/offerings/image/#{image_id}/agreement" ) end - end class Mock - # TODO: Fix this so they work. def get_image_agreement(image_id) response = Excon::Response.new @@ -59,7 +56,6 @@ module Fog "type"=>2}]} response end - end end end diff --git a/lib/fog/ibm/requests/compute/get_image_manifest.rb b/lib/fog/ibm/requests/compute/get_image_manifest.rb index fa034f607..20462545e 100644 --- a/lib/fog/ibm/requests/compute/get_image_manifest.rb +++ b/lib/fog/ibm/requests/compute/get_image_manifest.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns manifest of image specified by id # # ==== Parameters @@ -19,11 +18,9 @@ module Fog :path => "/offerings/image/#{image_id}/manifest" ) end - end class Mock - # TODO: Create a data store for this. def get_image_manifest(image_id) response = Excon::Response.new @@ -32,7 +29,6 @@ module Fog "\n\t\n\t\t\n\t\t\t0.0.0.0/0\n\t\t\t1\n\t\t\t65535\n\t\t\n\t\n"} response end - end end end diff --git a/lib/fog/ibm/requests/compute/get_instance.rb b/lib/fog/ibm/requests/compute/get_instance.rb index b8b2e4bd7..f9483574e 100644 --- a/lib/fog/ibm/requests/compute/get_instance.rb +++ b/lib/fog/ibm/requests/compute/get_instance.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns the Instance that the authenticated user manages with the specified :instance_id # # ==== Parameters @@ -38,11 +37,9 @@ module Fog :path => "/instances/#{instance_id}" ) end - end class Mock - def get_instance(instance_id) response = Excon::Response.new if instance_exists? instance_id @@ -69,7 +66,6 @@ module Fog def instance_active?(instance_id) self.data[:instances][instance_id]["status"] == 5 end - end end end diff --git a/lib/fog/ibm/requests/compute/get_instance_logs.rb b/lib/fog/ibm/requests/compute/get_instance_logs.rb index d805517f9..08fff8d74 100644 --- a/lib/fog/ibm/requests/compute/get_instance_logs.rb +++ b/lib/fog/ibm/requests/compute/get_instance_logs.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Get an instance's logs # # ==== Returns @@ -18,7 +17,6 @@ module Fog (start_index ? "?startIndex=#{start_index}" : '') ) end - end end end diff --git a/lib/fog/ibm/requests/compute/get_key.rb b/lib/fog/ibm/requests/compute/get_key.rb index 589ad4c61..cda64ac86 100644 --- a/lib/fog/ibm/requests/compute/get_key.rb +++ b/lib/fog/ibm/requests/compute/get_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns details of key by name specified # # ==== Parameters @@ -23,11 +22,9 @@ module Fog :path => "/keys/#{key_name}" ) end - end class Mock - def get_key(key_name) response = Excon::Response.new if key_exists? key_name @@ -42,7 +39,6 @@ module Fog def key_exists?(name) self.data[:keys].key? name end - end end end diff --git a/lib/fog/ibm/requests/compute/get_location.rb b/lib/fog/ibm/requests/compute/get_location.rb index baa81e0aa..c5364ab0b 100644 --- a/lib/fog/ibm/requests/compute/get_location.rb +++ b/lib/fog/ibm/requests/compute/get_location.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Get a location # # ==== Parameters @@ -29,11 +28,9 @@ module Fog :path => "/locations/#{location_id}" ) end - end class Mock - def get_location(location_id) response = Excon::Response.new if location_exists? location_id @@ -48,7 +45,6 @@ module Fog def location_exists?(location_id) self.data[:locations].key? location_id end - end end end diff --git a/lib/fog/ibm/requests/compute/get_request.rb b/lib/fog/ibm/requests/compute/get_request.rb index a569aa2bf..dab0a1b96 100644 --- a/lib/fog/ibm/requests/compute/get_request.rb +++ b/lib/fog/ibm/requests/compute/get_request.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns list of instances created with request specified by request_id # # ==== Parameters @@ -39,11 +38,9 @@ module Fog :path => "computecloud/enterprise/api/rest/20100331/requests/#{request_id}" ) end - end class Mock - def get_request(request_id) response = Excon::Response.new response.status = 200 @@ -71,7 +68,6 @@ module Fog "owner"=>"user@example.com"}]} response end - end end end diff --git a/lib/fog/ibm/requests/compute/list_address_offerings.rb b/lib/fog/ibm/requests/compute/list_address_offerings.rb index f3a27c873..76f4c4efa 100644 --- a/lib/fog/ibm/requests/compute/list_address_offerings.rb +++ b/lib/fog/ibm/requests/compute/list_address_offerings.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns the offerings of static address types/pricing for the authenticated user # # ==== Parameters @@ -30,11 +29,9 @@ module Fog :path => '/offerings/address' ) end - end class Mock - def list_address_offerings response = Excon::Response.new response.status = 200 @@ -51,7 +48,6 @@ module Fog "id"=>"20001223"}]} response end - end end end diff --git a/lib/fog/ibm/requests/compute/list_addresses.rb b/lib/fog/ibm/requests/compute/list_addresses.rb index 0ba2bff4f..eee3b2f8d 100644 --- a/lib/fog/ibm/requests/compute/list_addresses.rb +++ b/lib/fog/ibm/requests/compute/list_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns the list of static IP addresses for current user # # ==== Parameters @@ -27,11 +26,9 @@ module Fog :path => '/addresses' ) end - end class Mock - def list_addresses # Loop through addresses and update states and values if they aren't set self.data[:addresses].values.each do |address| @@ -46,7 +43,6 @@ module Fog response.body = { 'addresses' => self.data[:addresses].values } response end - end end end diff --git a/lib/fog/ibm/requests/compute/list_images.rb b/lib/fog/ibm/requests/compute/list_images.rb index 7f66eff85..ea735d855 100644 --- a/lib/fog/ibm/requests/compute/list_images.rb +++ b/lib/fog/ibm/requests/compute/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns the list of Images available to be provisioned on the IBM DeveloperCloud. # # ==== Parameters @@ -40,18 +39,15 @@ module Fog :path => '/offerings/image' ) end - end class Mock - def list_images response = Excon::Response.new response.status = 200 response.body = {'images' => self.data[:images].values} response end - end end end diff --git a/lib/fog/ibm/requests/compute/list_instances.rb b/lib/fog/ibm/requests/compute/list_instances.rb index 4f8defa46..55a608741 100644 --- a/lib/fog/ibm/requests/compute/list_instances.rb +++ b/lib/fog/ibm/requests/compute/list_instances.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns list of instances that the authenticated user manages. # # ==== Parameters @@ -39,18 +38,15 @@ module Fog :path => '/instances' ) end - end class Mock - def list_instances response = Excon::Response.new response.status = 200 response.body = { 'instances' => self.data[:instances].values } response end - end end end diff --git a/lib/fog/ibm/requests/compute/list_keys.rb b/lib/fog/ibm/requests/compute/list_keys.rb index 273492649..1ff2ed491 100644 --- a/lib/fog/ibm/requests/compute/list_keys.rb +++ b/lib/fog/ibm/requests/compute/list_keys.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns list of instances that the authenticated user manages. # # ==== Parameters @@ -39,18 +38,15 @@ module Fog :path => '/keys' ) end - end class Mock - def list_keys response = Excon::Response.new response.status = 200 response.body = {'keys' => self.data[:keys].values} response end - end end end diff --git a/lib/fog/ibm/requests/compute/list_locations.rb b/lib/fog/ibm/requests/compute/list_locations.rb index a802ee2e0..5215734d3 100644 --- a/lib/fog/ibm/requests/compute/list_locations.rb +++ b/lib/fog/ibm/requests/compute/list_locations.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns the list of Images available to be provisioned on the IBM DeveloperCloud. # # ==== Parameters @@ -19,18 +18,15 @@ module Fog :path => "/locations" ) end - end class Mock - def list_locations response = Excon::Response.new response.status = 200 response.body = { "locations" => self.data[:locations].values } response end - end end end diff --git a/lib/fog/ibm/requests/compute/list_vlans.rb b/lib/fog/ibm/requests/compute/list_vlans.rb index bb4a0876a..3fdb58a74 100644 --- a/lib/fog/ibm/requests/compute/list_vlans.rb +++ b/lib/fog/ibm/requests/compute/list_vlans.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Returns the vlan offerings for user # # ==== Parameters @@ -27,10 +26,8 @@ module Fog :path => '/offerings/vlan' ) end - end class Mock - def list_vlans response = Excon::Response.new response.status = 200 @@ -40,7 +37,6 @@ module Fog "name"=>"FOG-VLAN1"}]} response end - end end end diff --git a/lib/fog/ibm/requests/compute/modify_instance.rb b/lib/fog/ibm/requests/compute/modify_instance.rb index 1210999b8..bb73e9f30 100644 --- a/lib/fog/ibm/requests/compute/modify_instance.rb +++ b/lib/fog/ibm/requests/compute/modify_instance.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Modify an instance # # ==== Parameters @@ -35,7 +34,6 @@ module Fog end class Mock - def modify_instance(instance_id, params={}) response = Excon::Response.new if instance_exists? instance_id @@ -64,7 +62,6 @@ module Fog end response end - end end end diff --git a/lib/fog/ibm/requests/compute/modify_key.rb b/lib/fog/ibm/requests/compute/modify_key.rb index f95287eb6..42c06f545 100644 --- a/lib/fog/ibm/requests/compute/modify_key.rb +++ b/lib/fog/ibm/requests/compute/modify_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class IBM class Real - # Modify a key # # ==== Parameters @@ -21,10 +20,8 @@ module Fog :body => params ) end - end class Mock - def modify_key(key_name, params={}) response = Excon::Response.new if key_exists? key_name @@ -45,7 +42,6 @@ module Fog end response end - end end end diff --git a/lib/fog/ibm/requests/storage/create_volume.rb b/lib/fog/ibm/requests/storage/create_volume.rb index 2ebeec8f4..dd3462675 100644 --- a/lib/fog/ibm/requests/storage/create_volume.rb +++ b/lib/fog/ibm/requests/storage/create_volume.rb @@ -2,7 +2,6 @@ module Fog module Storage class IBM class Real - # Requests a new Storage Volume be created. # # ==== Parameters @@ -43,7 +42,6 @@ module Fog end class Mock - def create_volume(name, offering_id, format, location_id, size) volume = Fog::IBM::Mock.create_volume(name, offering_id, format, location_id, size) self.data[:volumes][volume['id']] = volume @@ -59,7 +57,6 @@ module Fog ready_volume(volume_id) unless volume_attached? volume_id self.data[:volumes][volume_id].reject { |k,v| k == 'ioPrice' } end - end end end diff --git a/lib/fog/ibm/requests/storage/delete_volume.rb b/lib/fog/ibm/requests/storage/delete_volume.rb index 700833153..d44db6630 100644 --- a/lib/fog/ibm/requests/storage/delete_volume.rb +++ b/lib/fog/ibm/requests/storage/delete_volume.rb @@ -2,7 +2,6 @@ module Fog module Storage class IBM class Real - # Deletes the storage that the authenticated user manages with the specified :storage_id # # ==== Parameters @@ -19,11 +18,9 @@ module Fog :path => "/storage/#{volume_id}" ) end - end class Mock - def delete_volume(volume_id) response = Excon::Response.new if volume_exists? volume_id @@ -35,7 +32,6 @@ module Fog end response end - end end end diff --git a/lib/fog/ibm/requests/storage/get_volume.rb b/lib/fog/ibm/requests/storage/get_volume.rb index 531bb30f0..6d7d2cbd4 100644 --- a/lib/fog/ibm/requests/storage/get_volume.rb +++ b/lib/fog/ibm/requests/storage/get_volume.rb @@ -2,7 +2,6 @@ module Fog module Storage class IBM class Real - # Used to retrieve the specified storage volume for specified volume_id # # ==== Parameters @@ -18,11 +17,9 @@ module Fog :path => "/storage/#{volume_id}" ) end - end class Mock - # For whatever reason, get_volume returns different data than an entry in list_volumes def get_volume(volume_id) response = Excon::Response.new @@ -65,7 +62,6 @@ module Fog # If not ready, make ready self.data[:volumes][volume_id]['state'] = 4 end - end end end diff --git a/lib/fog/ibm/requests/storage/list_offerings.rb b/lib/fog/ibm/requests/storage/list_offerings.rb index 5143e8cb2..22383675d 100644 --- a/lib/fog/ibm/requests/storage/list_offerings.rb +++ b/lib/fog/ibm/requests/storage/list_offerings.rb @@ -2,7 +2,6 @@ module Fog module Storage class IBM class Real - # Returns the offerings of storage for the authenticated user # # ==== Parameters @@ -32,11 +31,9 @@ module Fog :path => '/offerings/storage' ) end - end class Mock - def list_offerings response = Excon::Response.new response.status = 200 @@ -69,7 +66,6 @@ module Fog "capacity"=>256}]}, response end - end end end diff --git a/lib/fog/ibm/requests/storage/list_volumes.rb b/lib/fog/ibm/requests/storage/list_volumes.rb index 4e229d7fe..099ded3ae 100644 --- a/lib/fog/ibm/requests/storage/list_volumes.rb +++ b/lib/fog/ibm/requests/storage/list_volumes.rb @@ -2,7 +2,6 @@ module Fog module Storage class IBM class Real - # Returns the list of storage volumes # # ==== Parameters @@ -29,18 +28,15 @@ module Fog :path => '/storage' ) end - end class Mock - def list_volumes response = Excon::Response.new response.status = 200 response.body = { 'volumes' => format_list_volumes_response } response end - end end end diff --git a/lib/fog/ibm/storage.rb b/lib/fog/ibm/storage.rb index 27851c305..430b542c4 100644 --- a/lib/fog/ibm/storage.rb +++ b/lib/fog/ibm/storage.rb @@ -3,7 +3,6 @@ require 'fog/ibm/core' module Fog module Storage class IBM < Fog::Service - requires :ibm_username, :ibm_password recognizes :location @@ -42,11 +41,9 @@ module Fog end end end - end class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -73,9 +70,7 @@ module Fog @ibm_password = options[:ibm_password] @data = self.class.data[@ibm_username] end - end - end end end diff --git a/lib/fog/internet_archive/core.rb b/lib/fog/internet_archive/core.rb index ec7f3421b..c9853c280 100644 --- a/lib/fog/internet_archive/core.rb +++ b/lib/fog/internet_archive/core.rb @@ -4,7 +4,6 @@ require 'fog/internet_archive/signaturev4' module Fog module InternetArchive - COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\-(?![\.])){1,61}[a-z0-9]$/ DOMAIN_NAME = 'archive.org' @@ -104,7 +103,6 @@ module Fog end class Mock - def self.arn(vendor, account_id, path, region = nil) "arn:aws:#{vendor}:#{region}:#{account_id}:#{path}" end diff --git a/lib/fog/internet_archive/models/storage/directories.rb b/lib/fog/internet_archive/models/storage/directories.rb index c1a0790f0..34c40806f 100644 --- a/lib/fog/internet_archive/models/storage/directories.rb +++ b/lib/fog/internet_archive/models/storage/directories.rb @@ -4,9 +4,7 @@ require 'fog/internet_archive/models/storage/directory' module Fog module Storage class InternetArchive - class Directories < Fog::Collection - model Fog::Storage::InternetArchive::Directory def all @@ -35,9 +33,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/internet_archive/models/storage/directory.rb b/lib/fog/internet_archive/models/storage/directory.rb index 167d7304c..2e5d1faa9 100644 --- a/lib/fog/internet_archive/models/storage/directory.rb +++ b/lib/fog/internet_archive/models/storage/directory.rb @@ -5,9 +5,7 @@ require 'fog/internet_archive/models/storage/ia_attributes.rb' module Fog module Storage class InternetArchive - class Directory < Fog::Model - extend Fog::Storage::IAAttributes::ClassMethods include Fog::Storage::IAAttributes::InstanceMethods @@ -101,9 +99,7 @@ module Fog data = service.get_bucket_location(key) data.body['LocationConstraint'] end - end - end end end diff --git a/lib/fog/internet_archive/models/storage/file.rb b/lib/fog/internet_archive/models/storage/file.rb index c83a4a1ee..41d99b54d 100644 --- a/lib/fog/internet_archive/models/storage/file.rb +++ b/lib/fog/internet_archive/models/storage/file.rb @@ -4,9 +4,7 @@ require 'fog/internet_archive/models/storage/ia_attributes.rb' module Fog module Storage class InternetArchive - class File < Fog::Model - extend Fog::Storage::IAAttributes::ClassMethods include Fog::Storage::IAAttributes::InstanceMethods @@ -18,7 +16,6 @@ module Fog attr_writer :body - identity :key, :aliases => 'Key' attribute :cache_control, :aliases => 'Cache-Control' @@ -66,7 +63,6 @@ module Fog end end - # Set body attribute. # # @param [File] new_body @@ -76,7 +72,6 @@ module Fog attributes[:body] = new_body end - # Get the file instance's directory. # # @return [Fog::InternetArchive::Storage::Directory] @@ -85,7 +80,6 @@ module Fog @directory end - # Copy object from one bucket to other bucket. # # required attributes: directory, key @@ -102,7 +96,6 @@ module Fog target_directory.files.head(target_file_key) end - # Destroy file via http DELETE. # # required attributes: directory, key @@ -127,7 +120,6 @@ module Fog merge_attributes(new_metadata) end - remove_method :owner= def owner=(new_owner) if new_owner @@ -138,7 +130,6 @@ module Fog end end - # Set Access-Control-List permissions. # # valid new_publics: public_read, private @@ -150,7 +141,6 @@ module Fog 'public-read' end - # Get publicly acessible url via http GET. # # required attributes: directory, key @@ -212,7 +202,6 @@ module Fog true end - # Get a url for file. # # required attributes: key @@ -259,9 +248,7 @@ module Fog # Complete the upload service.complete_multipart_upload(directory.key, key, upload_id, part_tags) end - end - end end end diff --git a/lib/fog/internet_archive/models/storage/files.rb b/lib/fog/internet_archive/models/storage/files.rb index 267db71c8..2e70e4826 100644 --- a/lib/fog/internet_archive/models/storage/files.rb +++ b/lib/fog/internet_archive/models/storage/files.rb @@ -4,7 +4,6 @@ require 'fog/internet_archive/models/storage/file' module Fog module Storage class InternetArchive - class Files < Fog::Collection extend Fog::Deprecation deprecate :get_url, :get_https_url @@ -114,9 +113,7 @@ module Fog data.headers['Last-Modified'] = Time.parse(data.get_header('Last-Modified')) data.headers['ETag'] = data.get_header('ETag').gsub('"','') end - end - end end end diff --git a/lib/fog/internet_archive/models/storage/ia_attributes.rb b/lib/fog/internet_archive/models/storage/ia_attributes.rb index fe565544d..88d58dbce 100644 --- a/lib/fog/internet_archive/models/storage/ia_attributes.rb +++ b/lib/fog/internet_archive/models/storage/ia_attributes.rb @@ -1,7 +1,6 @@ module Fog module Storage module IAAttributes - # you can add other x-archive-metadata-* values, but these are standard IA_STANDARD_METADATA_FIELDS = %q[hidden, title, collection, creator, mediatype, description, date, subject, licenseurl, pick, noindex, notes, rights, contributor, language, coverage, credits] @@ -30,10 +29,8 @@ module Fog options["x-archive-meta#{format("%02d", i+1)}-#{array_attribute.to_s[0..-2]}"] = value end end - end end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/access_control_list.rb b/lib/fog/internet_archive/parsers/storage/access_control_list.rb index 900757c66..c3b96fd0e 100644 --- a/lib/fog/internet_archive/parsers/storage/access_control_list.rb +++ b/lib/fog/internet_archive/parsers/storage/access_control_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class AccessControlList < Fog::Parsers::Base - def reset @in_access_control_list = false @grant = { 'Grantee' => {} } @@ -37,9 +35,7 @@ module Fog @grant['Grantee'][name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/complete_multipart_upload.rb b/lib/fog/internet_archive/parsers/storage/complete_multipart_upload.rb index 432870f2d..a9dbf0e5e 100644 --- a/lib/fog/internet_archive/parsers/storage/complete_multipart_upload.rb +++ b/lib/fog/internet_archive/parsers/storage/complete_multipart_upload.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class CompleteMultipartUpload < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/copy_object.rb b/lib/fog/internet_archive/parsers/storage/copy_object.rb index 5cc58a107..cd02e3265 100644 --- a/lib/fog/internet_archive/parsers/storage/copy_object.rb +++ b/lib/fog/internet_archive/parsers/storage/copy_object.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class CopyObject < Fog::Parsers::Base - def end_element(name) case name when 'ETag' @@ -13,9 +11,7 @@ module Fog @response[name] = Time.parse(value) end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/cors_configuration.rb b/lib/fog/internet_archive/parsers/storage/cors_configuration.rb index 8d0b615e0..9cd3b0db9 100644 --- a/lib/fog/internet_archive/parsers/storage/cors_configuration.rb +++ b/lib/fog/internet_archive/parsers/storage/cors_configuration.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Storage module InternetArchive - class CorsConfiguration < Fog::Parsers::Base def reset @in_cors_configuration_list = false @@ -32,9 +31,7 @@ module Fog (@cors_rule[name] ||= []) << value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/delete_multiple_objects.rb b/lib/fog/internet_archive/parsers/storage/delete_multiple_objects.rb index 0ff7de32d..1bd6fcd0a 100644 --- a/lib/fog/internet_archive/parsers/storage/delete_multiple_objects.rb +++ b/lib/fog/internet_archive/parsers/storage/delete_multiple_objects.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class DeleteMultipleObjects < Fog::Parsers::Base - def reset @deleted = { 'Deleted' => {} } @error = { 'Error' => {} } @@ -40,9 +38,7 @@ module Fog @error['Error'][name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/get_bucket.rb b/lib/fog/internet_archive/parsers/storage/get_bucket.rb index 886677289..d82012e7e 100644 --- a/lib/fog/internet_archive/parsers/storage/get_bucket.rb +++ b/lib/fog/internet_archive/parsers/storage/get_bucket.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class GetBucket < Fog::Parsers::Base - def reset @object = { 'Owner' => {} } @response = { 'Contents' => [], 'CommonPrefixes' => [] } @@ -53,9 +51,7 @@ module Fog @object[name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/get_bucket_lifecycle.rb b/lib/fog/internet_archive/parsers/storage/get_bucket_lifecycle.rb index 6ae5dac6b..4b2e8bc19 100644 --- a/lib/fog/internet_archive/parsers/storage/get_bucket_lifecycle.rb +++ b/lib/fog/internet_archive/parsers/storage/get_bucket_lifecycle.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class GetBucketLifecycle < Fog::Parsers::Base - def reset @expiration = {} @transition = {} diff --git a/lib/fog/internet_archive/parsers/storage/get_bucket_location.rb b/lib/fog/internet_archive/parsers/storage/get_bucket_location.rb index 393cf6cb0..580387346 100644 --- a/lib/fog/internet_archive/parsers/storage/get_bucket_location.rb +++ b/lib/fog/internet_archive/parsers/storage/get_bucket_location.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Storage module InternetArchive - class GetBucketLocation < Fog::Parsers::Base - def end_element(name) case name when 'LocationConstraint' @response[name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/get_bucket_logging.rb b/lib/fog/internet_archive/parsers/storage/get_bucket_logging.rb index d4952288a..0978cde88 100644 --- a/lib/fog/internet_archive/parsers/storage/get_bucket_logging.rb +++ b/lib/fog/internet_archive/parsers/storage/get_bucket_logging.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class GetBucketLogging < Fog::Parsers::Base - def reset @grant = { 'Grantee' => {} } @response = { 'BucketLoggingStatus' => {} } @@ -31,9 +29,7 @@ module Fog @grant['Grantee'][name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/get_bucket_website.rb b/lib/fog/internet_archive/parsers/storage/get_bucket_website.rb index 7d5008972..d1def4698 100644 --- a/lib/fog/internet_archive/parsers/storage/get_bucket_website.rb +++ b/lib/fog/internet_archive/parsers/storage/get_bucket_website.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class GetBucketWebsite < Fog::Parsers::Base - def reset @response = { 'ErrorDocument' => {}, 'IndexDocument' => {} } end @@ -17,9 +15,7 @@ module Fog @response['IndexDocument'][name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/get_request_payment.rb b/lib/fog/internet_archive/parsers/storage/get_request_payment.rb index 20855d4e3..b2f680c84 100644 --- a/lib/fog/internet_archive/parsers/storage/get_request_payment.rb +++ b/lib/fog/internet_archive/parsers/storage/get_request_payment.rb @@ -2,18 +2,14 @@ module Fog module Parsers module Storage module InternetArchive - class GetRequestPayment < Fog::Parsers::Base - def end_element(name) case name when 'Payer' @response[name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/get_service.rb b/lib/fog/internet_archive/parsers/storage/get_service.rb index 401b2db5a..ccd0aee96 100644 --- a/lib/fog/internet_archive/parsers/storage/get_service.rb +++ b/lib/fog/internet_archive/parsers/storage/get_service.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class GetService < Fog::Parsers::Base - def reset @bucket = {} @response = { 'Owner' => {}, 'Buckets' => [] } @@ -23,9 +21,7 @@ module Fog @bucket[name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/initiate_multipart_upload.rb b/lib/fog/internet_archive/parsers/storage/initiate_multipart_upload.rb index f5e439d8b..584b7ecd4 100644 --- a/lib/fog/internet_archive/parsers/storage/initiate_multipart_upload.rb +++ b/lib/fog/internet_archive/parsers/storage/initiate_multipart_upload.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class InitiateMultipartUpload < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/list_multipart_uploads.rb b/lib/fog/internet_archive/parsers/storage/list_multipart_uploads.rb index 82fbd2749..679279699 100644 --- a/lib/fog/internet_archive/parsers/storage/list_multipart_uploads.rb +++ b/lib/fog/internet_archive/parsers/storage/list_multipart_uploads.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class ListMultipartUploads < Fog::Parsers::Base - def reset @upload = { 'Initiator' => {}, 'Owner' => {} } @response = { 'Upload' => [] } @@ -47,9 +45,7 @@ module Fog @upload = { 'Initiator' => {}, 'Owner' => {} } end end - end - end end end diff --git a/lib/fog/internet_archive/parsers/storage/list_parts.rb b/lib/fog/internet_archive/parsers/storage/list_parts.rb index 229ee7c4e..d779fc8df 100644 --- a/lib/fog/internet_archive/parsers/storage/list_parts.rb +++ b/lib/fog/internet_archive/parsers/storage/list_parts.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Storage module InternetArchive - class ListParts < Fog::Parsers::Base - def reset @part = {} @response = { 'Initiator' => {}, 'Part' => [] } @@ -31,9 +29,7 @@ module Fog @part[name] = value.to_i end end - end - end end end diff --git a/lib/fog/internet_archive/requests/storage/abort_multipart_upload.rb b/lib/fog/internet_archive/requests/storage/abort_multipart_upload.rb index 6a1e3458c..f57c398ab 100644 --- a/lib/fog/internet_archive/requests/storage/abort_multipart_upload.rb +++ b/lib/fog/internet_archive/requests/storage/abort_multipart_upload.rb @@ -21,7 +21,6 @@ module Fog :query => {'uploadId' => upload_id} }) end - end # Real end # Storage end # InternetArchive diff --git a/lib/fog/internet_archive/requests/storage/acl_utils.rb b/lib/fog/internet_archive/requests/storage/acl_utils.rb index 1523a3393..fe12f3caf 100644 --- a/lib/fog/internet_archive/requests/storage/acl_utils.rb +++ b/lib/fog/internet_archive/requests/storage/acl_utils.rb @@ -1,7 +1,6 @@ module Fog module Storage class InternetArchive - require 'fog/internet_archive/parsers/storage/access_control_list' private @@ -56,7 +55,6 @@ module Fog Nokogiri::XML::SAX::Parser.new(parser).parse(acl_xml) parser.response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/complete_multipart_upload.rb b/lib/fog/internet_archive/requests/storage/complete_multipart_upload.rb index f6e2c6385..99daec061 100644 --- a/lib/fog/internet_archive/requests/storage/complete_multipart_upload.rb +++ b/lib/fog/internet_archive/requests/storage/complete_multipart_upload.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/complete_multipart_upload' # Complete a multipart upload @@ -41,7 +40,6 @@ module Fog :query => {'uploadId' => upload_id} }) end - end # Real end # Storage end # InternetArchive diff --git a/lib/fog/internet_archive/requests/storage/copy_object.rb b/lib/fog/internet_archive/requests/storage/copy_object.rb index ee5a95d4a..5b86e31b2 100644 --- a/lib/fog/internet_archive/requests/storage/copy_object.rb +++ b/lib/fog/internet_archive/requests/storage/copy_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/copy_object' # Copy an object from one S3 bucket to another @@ -39,11 +38,9 @@ module Fog :path => CGI.escape(target_object_name) }) end - end class Mock # :nodoc:all - def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {}) response = Excon::Response.new source_bucket = self.data[:buckets][source_bucket_name] @@ -74,7 +71,6 @@ module Fog response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/cors_utils.rb b/lib/fog/internet_archive/requests/storage/cors_utils.rb index b2b8001d4..d56d25da6 100644 --- a/lib/fog/internet_archive/requests/storage/cors_utils.rb +++ b/lib/fog/internet_archive/requests/storage/cors_utils.rb @@ -1,7 +1,6 @@ module Fog module Storage class InternetArchive - require 'fog/internet_archive/parsers/storage/cors_configuration' private @@ -35,7 +34,6 @@ module Fog Nokogiri::XML::SAX::Parser.new(parser).parse(cors_xml) parser.response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/delete_bucket.rb b/lib/fog/internet_archive/requests/storage/delete_bucket.rb index 91f604956..b6166c642 100644 --- a/lib/fog/internet_archive/requests/storage/delete_bucket.rb +++ b/lib/fog/internet_archive/requests/storage/delete_bucket.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Delete an S3 bucket # # @param bucket_name [String] name of bucket to delete @@ -20,11 +19,9 @@ module Fog :method => 'DELETE' }) end - end class Mock # :nodoc:all - def delete_bucket(bucket_name) response = Excon::Response.new if self.data[:buckets][bucket_name].nil? @@ -39,9 +36,7 @@ module Fog end response end - end - end end end diff --git a/lib/fog/internet_archive/requests/storage/delete_bucket_cors.rb b/lib/fog/internet_archive/requests/storage/delete_bucket_cors.rb index 6ec212160..b880beb69 100644 --- a/lib/fog/internet_archive/requests/storage/delete_bucket_cors.rb +++ b/lib/fog/internet_archive/requests/storage/delete_bucket_cors.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Deletes the cors configuration information set for the bucket. # # @param bucket_name [String] name of bucket to delete cors rules from @@ -21,9 +20,7 @@ module Fog :query => {'cors' => nil} }) end - end - end end end diff --git a/lib/fog/internet_archive/requests/storage/delete_bucket_lifecycle.rb b/lib/fog/internet_archive/requests/storage/delete_bucket_lifecycle.rb index 3a6b1e234..e07af562c 100644 --- a/lib/fog/internet_archive/requests/storage/delete_bucket_lifecycle.rb +++ b/lib/fog/internet_archive/requests/storage/delete_bucket_lifecycle.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Delete lifecycle configuration for a bucket # # @param bucket_name [String] name of bucket to delete lifecycle configuration from diff --git a/lib/fog/internet_archive/requests/storage/delete_bucket_policy.rb b/lib/fog/internet_archive/requests/storage/delete_bucket_policy.rb index 9cf6d20ec..d528434d7 100644 --- a/lib/fog/internet_archive/requests/storage/delete_bucket_policy.rb +++ b/lib/fog/internet_archive/requests/storage/delete_bucket_policy.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Delete policy for a bucket # # @param bucket_name [String] name of bucket to delete policy from @@ -21,9 +20,7 @@ module Fog :query => {'policy' => nil} }) end - end - end end end diff --git a/lib/fog/internet_archive/requests/storage/delete_bucket_website.rb b/lib/fog/internet_archive/requests/storage/delete_bucket_website.rb index 7c90bb690..748f4444c 100644 --- a/lib/fog/internet_archive/requests/storage/delete_bucket_website.rb +++ b/lib/fog/internet_archive/requests/storage/delete_bucket_website.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Delete website configuration for a bucket # # @param bucket_name [String] name of bucket to delete website configuration from @@ -21,9 +20,7 @@ module Fog :query => {'website' => nil} }) end - end - end end end diff --git a/lib/fog/internet_archive/requests/storage/delete_multiple_objects.rb b/lib/fog/internet_archive/requests/storage/delete_multiple_objects.rb index f076892e3..8613609cf 100644 --- a/lib/fog/internet_archive/requests/storage/delete_multiple_objects.rb +++ b/lib/fog/internet_archive/requests/storage/delete_multiple_objects.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/delete_multiple_objects' # Delete multiple objects from S3 @@ -56,11 +55,9 @@ module Fog :query => {'delete' => nil} }) end - end class Mock # :nodoc:all - def delete_multiple_objects(bucket_name, object_names, options = {}) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -85,7 +82,6 @@ module Fog response['Deleted'] = { 'Key' => object_name } response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/delete_object.rb b/lib/fog/internet_archive/requests/storage/delete_object.rb index a5a6eb46f..856bc51bb 100644 --- a/lib/fog/internet_archive/requests/storage/delete_object.rb +++ b/lib/fog/internet_archive/requests/storage/delete_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Delete an object from S3 # # @param bucket_name [String] Name of bucket containing object to delete @@ -26,11 +25,9 @@ module Fog :path => path }) end - end class Mock # :nodoc:all - def delete_object(bucket_name, object_name, options = {}) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -43,7 +40,6 @@ module Fog end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_bucket.rb b/lib/fog/internet_archive/requests/storage/get_bucket.rb index 8078d4dca..c70fddb4c 100644 --- a/lib/fog/internet_archive/requests/storage/get_bucket.rb +++ b/lib/fog/internet_archive/requests/storage/get_bucket.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/get_bucket' # List information about objects in an S3 bucket @@ -51,11 +50,9 @@ module Fog :query => options }) end - end class Mock # :nodoc:all - def get_bucket(bucket_name, options = {}) prefix, marker, delimiter, max_keys = \ options['prefix'], options['marker'], options['delimiter'], options['max-keys'] @@ -105,7 +102,6 @@ module Fog end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_bucket_acl.rb b/lib/fog/internet_archive/requests/storage/get_bucket_acl.rb index 709a684d5..aae0875bd 100644 --- a/lib/fog/internet_archive/requests/storage/get_bucket_acl.rb +++ b/lib/fog/internet_archive/requests/storage/get_bucket_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/access_control_list' # Get access control list for an S3 bucket @@ -40,11 +39,9 @@ module Fog :query => {'acl' => nil} }) end - end class Mock # :nodoc:all - require 'fog/internet_archive/requests/storage/acl_utils' def get_bucket_acl(bucket_name) @@ -62,7 +59,6 @@ module Fog end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_bucket_cors.rb b/lib/fog/internet_archive/requests/storage/get_bucket_cors.rb index 4cd1e2213..86e4ecde3 100644 --- a/lib/fog/internet_archive/requests/storage/get_bucket_cors.rb +++ b/lib/fog/internet_archive/requests/storage/get_bucket_cors.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/cors_configuration' # Gets the CORS configuration for an S3 bucket @@ -36,11 +35,9 @@ module Fog :query => {'cors' => nil} }) end - end class Mock # :nodoc:all - require 'fog/internet_archive/requests/storage/cors_utils' def get_bucket_cors(bucket_name) @@ -58,7 +55,6 @@ module Fog end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_bucket_lifecycle.rb b/lib/fog/internet_archive/requests/storage/get_bucket_lifecycle.rb index 67176f04c..06bc1f2ad 100644 --- a/lib/fog/internet_archive/requests/storage/get_bucket_lifecycle.rb +++ b/lib/fog/internet_archive/requests/storage/get_bucket_lifecycle.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/get_bucket_lifecycle' # Get bucket lifecycle configuration @@ -30,7 +29,6 @@ module Fog :query => {'lifecycle' => nil} }) end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_bucket_location.rb b/lib/fog/internet_archive/requests/storage/get_bucket_location.rb index fffbe5eca..2e1ef0b32 100644 --- a/lib/fog/internet_archive/requests/storage/get_bucket_location.rb +++ b/lib/fog/internet_archive/requests/storage/get_bucket_location.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/get_bucket_location' # Get location constraint for an S3 bucket @@ -26,11 +25,9 @@ module Fog :query => {'location' => nil} }) end - end class Mock # :nodoc:all - def get_bucket_location(bucket_name) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -51,7 +48,6 @@ module Fog end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_bucket_logging.rb b/lib/fog/internet_archive/requests/storage/get_bucket_logging.rb index 18bfbed38..1ebd808cf 100644 --- a/lib/fog/internet_archive/requests/storage/get_bucket_logging.rb +++ b/lib/fog/internet_archive/requests/storage/get_bucket_logging.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/get_bucket_logging' # Get logging status for an S3 bucket @@ -40,7 +39,6 @@ module Fog :query => {'logging' => nil} }) end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_bucket_policy.rb b/lib/fog/internet_archive/requests/storage/get_bucket_policy.rb index d021e8a88..10f9699ef 100644 --- a/lib/fog/internet_archive/requests/storage/get_bucket_policy.rb +++ b/lib/fog/internet_archive/requests/storage/get_bucket_policy.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Get bucket policy for an S3 bucket # # @param bucket_name [String] name of bucket to get policy for @@ -26,9 +25,7 @@ module Fog }) response.body = Fog::JSON.decode(response.body) unless response.body.nil? end - end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_bucket_website.rb b/lib/fog/internet_archive/requests/storage/get_bucket_website.rb index f35973065..1ed3d64f0 100644 --- a/lib/fog/internet_archive/requests/storage/get_bucket_website.rb +++ b/lib/fog/internet_archive/requests/storage/get_bucket_website.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/get_bucket_website' # Get website configuration for an S3 bucket @@ -33,7 +32,6 @@ module Fog :query => {'website' => nil} }) end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_object.rb b/lib/fog/internet_archive/requests/storage/get_object.rb index 1cbeed717..45ee53d8c 100644 --- a/lib/fog/internet_archive/requests/storage/get_object.rb +++ b/lib/fog/internet_archive/requests/storage/get_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Get an object from S3 # # @param bucket_name [String] Name of bucket to read from @@ -53,13 +52,10 @@ module Fog :path => CGI.escape(object_name), })) end - end class Mock # :nodoc:all - def get_object(bucket_name, object_name, options = {}, &block) - unless bucket_name raise ArgumentError.new('bucket_name is required') end diff --git a/lib/fog/internet_archive/requests/storage/get_object_acl.rb b/lib/fog/internet_archive/requests/storage/get_object_acl.rb index 485002779..c09c9dcc3 100644 --- a/lib/fog/internet_archive/requests/storage/get_object_acl.rb +++ b/lib/fog/internet_archive/requests/storage/get_object_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/access_control_list' # Get access control list for an S3 object @@ -47,11 +46,9 @@ module Fog :query => query }) end - end class Mock # :nodoc:all - require 'fog/internet_archive/requests/storage/acl_utils' def get_object_acl(bucket_name, object_name, options = {}) @@ -69,7 +66,6 @@ module Fog end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_object_http_url.rb b/lib/fog/internet_archive/requests/storage/get_object_http_url.rb index c43e5617a..4268eac05 100644 --- a/lib/fog/internet_archive/requests/storage/get_object_http_url.rb +++ b/lib/fog/internet_archive/requests/storage/get_object_http_url.rb @@ -1,9 +1,7 @@ module Fog module Storage class InternetArchive - module GetObjectHttpUrl - def get_object_http_url(bucket_name, object_name, expires, options = {}) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -25,11 +23,9 @@ module Fog :query => options[:query] }, expires) end - end class Real - # Get an expiring object http url from S3 # # @param bucket_name [String] Name of bucket containing object @@ -42,13 +38,10 @@ module Fog # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include GetObjectHttpUrl - end class Mock # :nodoc:all - include GetObjectHttpUrl - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_object_https_url.rb b/lib/fog/internet_archive/requests/storage/get_object_https_url.rb index 94c24ed53..0b3937913 100644 --- a/lib/fog/internet_archive/requests/storage/get_object_https_url.rb +++ b/lib/fog/internet_archive/requests/storage/get_object_https_url.rb @@ -1,17 +1,13 @@ module Fog module Storage class InternetArchive - module GetObjectHttpsUrl - def get_object_https_url(bucket_name, object_name, expires, options = {}) get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'https')) end - end class Real - # Get an expiring object https url from S3 # # @param bucket_name [String] Name of bucket containing object @@ -24,13 +20,10 @@ module Fog # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include GetObjectHttpsUrl - end class Mock # :nodoc:all - include GetObjectHttpsUrl - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_object_torrent.rb b/lib/fog/internet_archive/requests/storage/get_object_torrent.rb index 1231d87a2..6115d0c28 100644 --- a/lib/fog/internet_archive/requests/storage/get_object_torrent.rb +++ b/lib/fog/internet_archive/requests/storage/get_object_torrent.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Get torrent for an S3 object # # @param bucket_name [String] name of bucket containing object @@ -40,7 +39,6 @@ module Fog :query => {'torrent' => nil} }) end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_object_url.rb b/lib/fog/internet_archive/requests/storage/get_object_url.rb index 1deb2f30b..3bf95925c 100644 --- a/lib/fog/internet_archive/requests/storage/get_object_url.rb +++ b/lib/fog/internet_archive/requests/storage/get_object_url.rb @@ -1,9 +1,7 @@ module Fog module Storage class InternetArchive - module GetObjectUrl - def get_object_url(bucket_name, object_name, expires, options = {}) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -29,7 +27,6 @@ module Fog end class Real - # Get an expiring object url from S3 # # @param bucket_name [String] Name of bucket containing object @@ -42,13 +39,10 @@ module Fog # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include GetObjectUrl - end class Mock # :nodoc:all - include GetObjectUrl - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_request_payment.rb b/lib/fog/internet_archive/requests/storage/get_request_payment.rb index 5babd5a48..6a90ff5b4 100644 --- a/lib/fog/internet_archive/requests/storage/get_request_payment.rb +++ b/lib/fog/internet_archive/requests/storage/get_request_payment.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/get_request_payment' # Get configured payer for an S3 bucket @@ -26,11 +25,9 @@ module Fog :query => {'requestPayment' => nil} }) end - end class Mock # :nodoc:all - def get_request_payment(bucket_name) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -42,7 +39,6 @@ module Fog end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/get_service.rb b/lib/fog/internet_archive/requests/storage/get_service.rb index 6525dc259..469a2be2b 100644 --- a/lib/fog/internet_archive/requests/storage/get_service.rb +++ b/lib/fog/internet_archive/requests/storage/get_service.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/get_service' # List information about S3 buckets for authorized user @@ -28,11 +27,9 @@ module Fog :parser => Fog::Parsers::Storage::InternetArchive::GetService.new }) end - end class Mock # :nodoc:all - def get_service response = Excon::Response.new response.headers['Status'] = 200 @@ -47,7 +44,6 @@ module Fog } response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/head_object.rb b/lib/fog/internet_archive/requests/storage/head_object.rb index 628d4e2b6..036ce545e 100644 --- a/lib/fog/internet_archive/requests/storage/head_object.rb +++ b/lib/fog/internet_archive/requests/storage/head_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Get headers for an object from S3 # # @param bucket_name [String] Name of bucket to read from @@ -44,17 +43,14 @@ module Fog :path => CGI.escape(object_name) }) end - end class Mock # :nodoc:all - def head_object(bucket_name, object_name, options = {}) response = get_object(bucket_name, object_name, options) response.body = nil response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/initiate_multipart_upload.rb b/lib/fog/internet_archive/requests/storage/initiate_multipart_upload.rb index b84d7d0ec..599100872 100644 --- a/lib/fog/internet_archive/requests/storage/initiate_multipart_upload.rb +++ b/lib/fog/internet_archive/requests/storage/initiate_multipart_upload.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/initiate_multipart_upload' # Initiate a multipart upload to an S3 bucket @@ -37,7 +36,6 @@ module Fog :query => {'uploads' => nil} }) end - end # Real end # Storage end # InternetArchive diff --git a/lib/fog/internet_archive/requests/storage/list_multipart_uploads.rb b/lib/fog/internet_archive/requests/storage/list_multipart_uploads.rb index 65dab3c13..2f6cea937 100644 --- a/lib/fog/internet_archive/requests/storage/list_multipart_uploads.rb +++ b/lib/fog/internet_archive/requests/storage/list_multipart_uploads.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/list_multipart_uploads' # List multipart uploads for a bucket @@ -47,7 +46,6 @@ module Fog :query => options.merge!({'uploads' => nil}) }) end - end end end diff --git a/lib/fog/internet_archive/requests/storage/list_parts.rb b/lib/fog/internet_archive/requests/storage/list_parts.rb index b3c448535..b63658538 100644 --- a/lib/fog/internet_archive/requests/storage/list_parts.rb +++ b/lib/fog/internet_archive/requests/storage/list_parts.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/parsers/storage/list_parts' # List parts for a multipart upload @@ -48,7 +47,6 @@ module Fog :query => options.merge!({'uploadId' => upload_id}) }) end - end end end diff --git a/lib/fog/internet_archive/requests/storage/post_object_hidden_fields.rb b/lib/fog/internet_archive/requests/storage/post_object_hidden_fields.rb index 9d1b66a3a..054c01ee7 100644 --- a/lib/fog/internet_archive/requests/storage/post_object_hidden_fields.rb +++ b/lib/fog/internet_archive/requests/storage/post_object_hidden_fields.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value} # Form should look like: # These hidden fields should then appear, followed by a field named 'file' which is either a textarea or file input. @@ -31,7 +30,6 @@ module Fog end options end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_bucket.rb b/lib/fog/internet_archive/requests/storage/put_bucket.rb index a447d5c3c..bcdce7379 100644 --- a/lib/fog/internet_archive/requests/storage/put_bucket.rb +++ b/lib/fog/internet_archive/requests/storage/put_bucket.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Create an S3 bucket # # @param bucket_name [String] name of bucket to create @@ -35,11 +34,9 @@ DATA :method => 'PUT' }) end - end class Mock # :nodoc:all - def put_bucket(bucket_name, options = {}) acl = options['x-amz-acl'] || 'private' if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) @@ -67,7 +64,6 @@ DATA end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_bucket_acl.rb b/lib/fog/internet_archive/requests/storage/put_bucket_acl.rb index 08ab7fe44..77c7496f0 100644 --- a/lib/fog/internet_archive/requests/storage/put_bucket_acl.rb +++ b/lib/fog/internet_archive/requests/storage/put_bucket_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/requests/storage/acl_utils' # Change access control list for an S3 bucket @@ -65,7 +64,6 @@ module Fog end end end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_bucket_cors.rb b/lib/fog/internet_archive/requests/storage/put_bucket_cors.rb index 66448062b..80732ccd6 100644 --- a/lib/fog/internet_archive/requests/storage/put_bucket_cors.rb +++ b/lib/fog/internet_archive/requests/storage/put_bucket_cors.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/requests/storage/cors_utils' # Sets the cors configuration for your bucket. If the configuration exists, Amazon S3 replaces it. @@ -43,7 +42,6 @@ module Fog self.data[:cors][:bucket][bucket_name] = Fog::Storage::InternetArchive.hash_to_cors(cors) end end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_bucket_lifecycle.rb b/lib/fog/internet_archive/requests/storage/put_bucket_lifecycle.rb index 7f5e28df9..f38a7c827 100644 --- a/lib/fog/internet_archive/requests/storage/put_bucket_lifecycle.rb +++ b/lib/fog/internet_archive/requests/storage/put_bucket_lifecycle.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Change lifecycle configuration for an S3 bucket # # @param bucket_name [String] name of bucket to set lifecycle configuration for diff --git a/lib/fog/internet_archive/requests/storage/put_bucket_logging.rb b/lib/fog/internet_archive/requests/storage/put_bucket_logging.rb index 21cad530a..4cb23782e 100644 --- a/lib/fog/internet_archive/requests/storage/put_bucket_logging.rb +++ b/lib/fog/internet_archive/requests/storage/put_bucket_logging.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Change logging status for an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -74,7 +73,6 @@ DATA :query => {'logging' => nil} }) end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_bucket_policy.rb b/lib/fog/internet_archive/requests/storage/put_bucket_policy.rb index 83f583420..a684580a0 100644 --- a/lib/fog/internet_archive/requests/storage/put_bucket_policy.rb +++ b/lib/fog/internet_archive/requests/storage/put_bucket_policy.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Change bucket policy for an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -20,7 +19,6 @@ module Fog :query => {'policy' => nil} }) end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_bucket_website.rb b/lib/fog/internet_archive/requests/storage/put_bucket_website.rb index 97cda549f..3634d700f 100644 --- a/lib/fog/internet_archive/requests/storage/put_bucket_website.rb +++ b/lib/fog/internet_archive/requests/storage/put_bucket_website.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Change website configuration for an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -40,11 +39,9 @@ DATA :query => {'website' => nil} }) end - end class Mock # :nodoc:all - def put_bucket_website(bucket_name, suffix, options = {}) response = Excon::Response.new if self.data[:buckets][bucket_name] @@ -56,9 +53,7 @@ DATA response end - end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_object.rb b/lib/fog/internet_archive/requests/storage/put_object.rb index 06c2e9957..9089daba5 100644 --- a/lib/fog/internet_archive/requests/storage/put_object.rb +++ b/lib/fog/internet_archive/requests/storage/put_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Create an object in an S3 bucket # # @param bucket_name [String] Name of bucket to create object in @@ -39,11 +38,9 @@ module Fog :path => CGI.escape(object_name) }) end - end class Mock # :nodoc:all - def put_object(bucket_name, object_name, data, options = {}) acl = options['x-amz-acl'] || 'private' if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) @@ -91,7 +88,6 @@ module Fog end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_object_acl.rb b/lib/fog/internet_archive/requests/storage/put_object_acl.rb index c6c6093db..8e25de789 100644 --- a/lib/fog/internet_archive/requests/storage/put_object_acl.rb +++ b/lib/fog/internet_archive/requests/storage/put_object_acl.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - require 'fog/internet_archive/requests/storage/acl_utils' # Change access control list for an S3 object @@ -69,7 +68,6 @@ module Fog end end end - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_object_url.rb b/lib/fog/internet_archive/requests/storage/put_object_url.rb index d5ca461d6..1a76c0662 100644 --- a/lib/fog/internet_archive/requests/storage/put_object_url.rb +++ b/lib/fog/internet_archive/requests/storage/put_object_url.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive module PutObjectUrl - def put_object_url(bucket_name, object_name, expires, headers = {}, options = {}) unless bucket_name raise ArgumentError.new('bucket_name is required') @@ -22,7 +21,6 @@ module Fog end class Real - # Get an expiring object url from S3 for putting an object # # @param bucket_name [String] Name of bucket containing object @@ -35,13 +33,10 @@ module Fog # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html include PutObjectUrl - end class Mock # :nodoc:all - include PutObjectUrl - end end end diff --git a/lib/fog/internet_archive/requests/storage/put_request_payment.rb b/lib/fog/internet_archive/requests/storage/put_request_payment.rb index 4f2752e60..06c7b31e9 100644 --- a/lib/fog/internet_archive/requests/storage/put_request_payment.rb +++ b/lib/fog/internet_archive/requests/storage/put_request_payment.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Change who pays for requests to an S3 bucket # # @param bucket_name [String] name of bucket to modify @@ -26,11 +25,9 @@ DATA :query => {'requestPayment' => nil} }) end - end class Mock # :nodoc:all - def put_request_payment(bucket_name, payer) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] @@ -42,7 +39,6 @@ DATA end response end - end end end diff --git a/lib/fog/internet_archive/requests/storage/sync_clock.rb b/lib/fog/internet_archive/requests/storage/sync_clock.rb index 7137b0e95..9ed4dcf73 100644 --- a/lib/fog/internet_archive/requests/storage/sync_clock.rb +++ b/lib/fog/internet_archive/requests/storage/sync_clock.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Sync clock against S3 to avoid skew errors # def sync_clock @@ -13,15 +12,12 @@ module Fog end Fog::Time.now = Time.parse(response.headers['Date']) end - end # Real class Mock # :nodoc:all - def sync_clock true end - end # Mock end # Storage end # InternetArchive diff --git a/lib/fog/internet_archive/requests/storage/upload_part.rb b/lib/fog/internet_archive/requests/storage/upload_part.rb index b77f69cd3..10fd7592b 100644 --- a/lib/fog/internet_archive/requests/storage/upload_part.rb +++ b/lib/fog/internet_archive/requests/storage/upload_part.rb @@ -2,7 +2,6 @@ module Fog module Storage class InternetArchive class Real - # Upload a part for a multipart upload # # @param bucket_name [String] Name of bucket to add part to @@ -34,7 +33,6 @@ module Fog :query => {'uploadId' => upload_id, 'partNumber' => part_number} }) end - end # Real end # Storage end # InternetArchive diff --git a/lib/fog/internet_archive/signaturev4.rb b/lib/fog/internet_archive/signaturev4.rb index 16c8f43b3..ab5ea6126 100644 --- a/lib/fog/internet_archive/signaturev4.rb +++ b/lib/fog/internet_archive/signaturev4.rb @@ -66,8 +66,6 @@ DATA kSigning = Fog::HMAC.new('sha256', kService).sign('aws4_request') Fog::HMAC.new('sha256', kSigning) end - - end end end diff --git a/lib/fog/internet_archive/storage.rb b/lib/fog/internet_archive/storage.rb index f0b8ffa78..dffd8d54f 100644 --- a/lib/fog/internet_archive/storage.rb +++ b/lib/fog/internet_archive/storage.rb @@ -3,7 +3,6 @@ require 'fog/internet_archive/core' module Fog module Storage class InternetArchive < Fog::Service - requires :ia_access_key_id, :ia_secret_access_key recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :ia_session_token, :ia_credentials_expire_at @@ -62,7 +61,6 @@ module Fog request :upload_part module Utils - attr_accessor :region def http_url(params, expires) @@ -78,7 +76,6 @@ module Fog http_url(params, expires) end - private def scheme_host_path_query(params, expires) @@ -106,7 +103,6 @@ module Fog port_part = params[:port] && ":#{params[:port]}" "#{params[:scheme]}://#{params[:host]}#{port_part}/#{params[:path]}?#{query.join('&')}" end - end class Mock @@ -220,7 +216,6 @@ module Fog @ia_session_token = options[:ia_session_token] @ia_credentials_expire_at = options[:ia_credentials_expire_at] end - end class Real diff --git a/lib/fog/joyent.rb b/lib/fog/joyent.rb index 88be77f68..660c3f477 100644 --- a/lib/fog/joyent.rb +++ b/lib/fog/joyent.rb @@ -8,6 +8,5 @@ module Fog service(:analytics, 'Analytics') service(:compute, 'Compute') - end end diff --git a/lib/fog/joyent/analytics.rb b/lib/fog/joyent/analytics.rb index 49c9dfbd0..4a9f0ec7a 100644 --- a/lib/fog/joyent/analytics.rb +++ b/lib/fog/joyent/analytics.rb @@ -46,7 +46,6 @@ module Fog model :value - class Mock def self.data @data ||= Hash.new do |hash, key| @@ -206,7 +205,6 @@ module Fog opts[:body] = Fog::JSON.encode(opts[:body]) end - response = @connection.request(opts) if response.headers["Content-Type"] == "application/json" response.body = json_decode(response.body) @@ -306,7 +304,6 @@ module Fog raise Fog::Compute::Joyent::Errors::ServiceUnavailable.new('Either there\'s no capacity in this datacenter, or we\'re in a maintenance window', request, response) end end - end # Real end end diff --git a/lib/fog/joyent/compute.rb b/lib/fog/joyent/compute.rb index 3d46993b4..538bbe49c 100644 --- a/lib/fog/joyent/compute.rb +++ b/lib/fog/joyent/compute.rb @@ -5,7 +5,6 @@ require 'net/ssh' module Fog module Compute class Joyent < Fog::Service - requires :joyent_username recognizes :joyent_password @@ -115,7 +114,6 @@ module Fog attr_accessor :joyent_url def initialize(options = {}) - @connection_options = options[:connection_options] || {} @persistent = options[:persistent] || false @@ -176,7 +174,6 @@ module Fog opts[:body] = Fog::JSON.encode(opts[:body]) end - response = @connection.request(opts) if response.headers["Content-Type"] == "application/json" response.body = json_decode(response.body) @@ -274,7 +271,6 @@ module Fog raise Joyent::Errors::ServiceUnavailable.new('Either there\'s no capacity in this datacenter, or we\'re in a maintenance window', request, response) end end - end # Real end end diff --git a/lib/fog/joyent/core.rb b/lib/fog/joyent/core.rb index debd99f96..ffdec81da 100644 --- a/lib/fog/joyent/core.rb +++ b/lib/fog/joyent/core.rb @@ -6,6 +6,5 @@ module Fog extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/lib/fog/joyent/errors.rb b/lib/fog/joyent/errors.rb index 8e7541b81..13c8dd9e5 100644 --- a/lib/fog/joyent/errors.rb +++ b/lib/fog/joyent/errors.rb @@ -3,7 +3,6 @@ require 'fog/joyent/core' module Fog module Compute class Joyent < Fog::Service - class Errors module MessageParserMixin def message diff --git a/lib/fog/joyent/models/analytics/field.rb b/lib/fog/joyent/models/analytics/field.rb index 02815b0eb..d4c51aa70 100644 --- a/lib/fog/joyent/models/analytics/field.rb +++ b/lib/fog/joyent/models/analytics/field.rb @@ -7,7 +7,6 @@ module Fog attribute :name attribute :label attribute :type - end end end diff --git a/lib/fog/joyent/models/analytics/fields.rb b/lib/fog/joyent/models/analytics/fields.rb index 5b3ae3e5e..a2eac312b 100644 --- a/lib/fog/joyent/models/analytics/fields.rb +++ b/lib/fog/joyent/models/analytics/fields.rb @@ -4,7 +4,6 @@ module Fog module Joyent class Analytics class Fields < Fog::Collection - model Fog::Joyent::Analytics::Field def all @@ -19,7 +18,6 @@ module Fog name, other_attributes = attributes super(other_attributes.merge('name' => name)) end - end end end diff --git a/lib/fog/joyent/models/analytics/instrumentation.rb b/lib/fog/joyent/models/analytics/instrumentation.rb index a932e587e..e2fea88f2 100644 --- a/lib/fog/joyent/models/analytics/instrumentation.rb +++ b/lib/fog/joyent/models/analytics/instrumentation.rb @@ -76,7 +76,6 @@ module Fog Fog::Joyent::Analytics::Value.new(datum) end end - end end end diff --git a/lib/fog/joyent/models/analytics/instrumentations.rb b/lib/fog/joyent/models/analytics/instrumentations.rb index 5a54ac8dc..6795e3f79 100644 --- a/lib/fog/joyent/models/analytics/instrumentations.rb +++ b/lib/fog/joyent/models/analytics/instrumentations.rb @@ -4,7 +4,6 @@ module Fog module Joyent class Analytics class Instrumentations < Fog::Collection - model Fog::Joyent::Analytics::Instrumentation def all @@ -18,8 +17,6 @@ module Fog rescue Fog::Compute::Joyent::Errors::NotFound nil end - - end end end diff --git a/lib/fog/joyent/models/analytics/joyent_module.rb b/lib/fog/joyent/models/analytics/joyent_module.rb index 4eab489f0..417e13262 100644 --- a/lib/fog/joyent/models/analytics/joyent_module.rb +++ b/lib/fog/joyent/models/analytics/joyent_module.rb @@ -1,6 +1,5 @@ require 'fog/core/model' - # named 'JoyentModule' to avoid name conflicts with ruby's 'Module' module Fog module Joyent @@ -8,7 +7,6 @@ module Fog class JoyentModule < Fog::Model attribute :name attribute :label - end end end diff --git a/lib/fog/joyent/models/analytics/joyent_modules.rb b/lib/fog/joyent/models/analytics/joyent_modules.rb index e2e9c4b3e..6972c7e32 100644 --- a/lib/fog/joyent/models/analytics/joyent_modules.rb +++ b/lib/fog/joyent/models/analytics/joyent_modules.rb @@ -4,7 +4,6 @@ module Fog module Joyent class Analytics class JoyentModules < Fog::Collection - model Fog::Joyent::Analytics::JoyentModule def all @@ -19,7 +18,6 @@ module Fog name, other_attributes = attributes super(other_attributes.merge('name' => name)) end - end end end diff --git a/lib/fog/joyent/models/analytics/metric.rb b/lib/fog/joyent/models/analytics/metric.rb index 396cb61f0..f497322cc 100644 --- a/lib/fog/joyent/models/analytics/metric.rb +++ b/lib/fog/joyent/models/analytics/metric.rb @@ -11,7 +11,6 @@ module Fog attribute :fields attribute :unit attribute :type - end end end diff --git a/lib/fog/joyent/models/analytics/metrics.rb b/lib/fog/joyent/models/analytics/metrics.rb index 833707a02..ad2f000aa 100644 --- a/lib/fog/joyent/models/analytics/metrics.rb +++ b/lib/fog/joyent/models/analytics/metrics.rb @@ -4,14 +4,12 @@ module Fog module Joyent class Analytics class Metrics < Fog::Collection - model Fog::Joyent::Analytics::Metric def all data = service.describe_analytics.body['metrics'] load(data) end - end end end diff --git a/lib/fog/joyent/models/analytics/transformations.rb b/lib/fog/joyent/models/analytics/transformations.rb index 39dc90830..78cb76908 100644 --- a/lib/fog/joyent/models/analytics/transformations.rb +++ b/lib/fog/joyent/models/analytics/transformations.rb @@ -4,7 +4,6 @@ module Fog module Joyent class Analytics class Transformations < Fog::Collection - model Fog::Joyent::Analytics::Transformation def all @@ -19,7 +18,6 @@ module Fog name, other_attributes = attributes super(other_attributes.merge('name' => name)) end - end end end diff --git a/lib/fog/joyent/models/analytics/types.rb b/lib/fog/joyent/models/analytics/types.rb index bd2a146ff..8e026c328 100644 --- a/lib/fog/joyent/models/analytics/types.rb +++ b/lib/fog/joyent/models/analytics/types.rb @@ -4,7 +4,6 @@ module Fog module Joyent class Analytics class Types < Fog::Collection - model Fog::Joyent::Analytics::Type def all @@ -19,7 +18,6 @@ module Fog name, other_attributes = attributes super(other_attributes.merge('name' => name)) end - end end end diff --git a/lib/fog/joyent/models/compute/datacenter.rb b/lib/fog/joyent/models/compute/datacenter.rb index 14cc42aee..25734b55d 100644 --- a/lib/fog/joyent/models/compute/datacenter.rb +++ b/lib/fog/joyent/models/compute/datacenter.rb @@ -2,7 +2,6 @@ module Fog module Compute class Joyent class Datacenter < Fog::Model - identity :name attribute :url diff --git a/lib/fog/joyent/models/compute/datacenters.rb b/lib/fog/joyent/models/compute/datacenters.rb index d66d78a83..370c82c5a 100644 --- a/lib/fog/joyent/models/compute/datacenters.rb +++ b/lib/fog/joyent/models/compute/datacenters.rb @@ -3,10 +3,8 @@ require 'fog/joyent/models/compute/datacenter' module Fog module Compute - class Joyent class Datacenters < Fog::Collection - model Fog::Compute::Joyent::Datacenter def all @@ -17,9 +15,7 @@ module Fog def get(id) all[id] end - end end # Joyent - end # Compute end # Fog diff --git a/lib/fog/joyent/models/compute/flavor.rb b/lib/fog/joyent/models/compute/flavor.rb index 090ae0600..f3d6ad9ef 100644 --- a/lib/fog/joyent/models/compute/flavor.rb +++ b/lib/fog/joyent/models/compute/flavor.rb @@ -2,7 +2,6 @@ module Fog module Compute class Joyent class Flavor < Fog::Model - identity :id attribute :name @@ -14,7 +13,6 @@ module Fog attribute :description attribute :version attribute :group - end end end diff --git a/lib/fog/joyent/models/compute/flavors.rb b/lib/fog/joyent/models/compute/flavors.rb index 782a3513b..e842b81bb 100644 --- a/lib/fog/joyent/models/compute/flavors.rb +++ b/lib/fog/joyent/models/compute/flavors.rb @@ -3,10 +3,8 @@ require 'fog/joyent/models/compute/flavor' module Fog module Compute - class Joyent class Flavors < Fog::Collection - model Fog::Compute::Joyent::Flavor def all @@ -17,9 +15,7 @@ module Fog data = service.get_package(id).body new(data) end - end end # Joyent - end # Compute end # Fog diff --git a/lib/fog/joyent/models/compute/image.rb b/lib/fog/joyent/models/compute/image.rb index e4ff4b3c9..75c587dc6 100644 --- a/lib/fog/joyent/models/compute/image.rb +++ b/lib/fog/joyent/models/compute/image.rb @@ -2,7 +2,6 @@ module Fog module Compute class Joyent class Image < Fog::Model - identity :id attribute :name @@ -21,7 +20,6 @@ module Fog attribute :acl attribute :created, :type => :time attribute :default, :type => :boolean - end end end diff --git a/lib/fog/joyent/models/compute/images.rb b/lib/fog/joyent/models/compute/images.rb index 579742e29..164a8aab1 100644 --- a/lib/fog/joyent/models/compute/images.rb +++ b/lib/fog/joyent/models/compute/images.rb @@ -3,10 +3,8 @@ require 'fog/joyent/models/compute/image' module Fog module Compute - class Joyent class Images < Fog::Collection - model Fog::Compute::Joyent::Image def all @@ -26,9 +24,7 @@ module Fog end new(data) end - end # Images end # Joyent - end # Compute end # Fog diff --git a/lib/fog/joyent/models/compute/keys.rb b/lib/fog/joyent/models/compute/keys.rb index c9a0ed10d..7bbdba772 100644 --- a/lib/fog/joyent/models/compute/keys.rb +++ b/lib/fog/joyent/models/compute/keys.rb @@ -4,7 +4,6 @@ module Fog module Compute class Joyent class Keys < Fog::Collection - model Fog::Compute::Joyent::Key def all @@ -27,7 +26,6 @@ module Fog service.create_key(params) end - end end end diff --git a/lib/fog/joyent/models/compute/network.rb b/lib/fog/joyent/models/compute/network.rb index 4696ebedc..4e870336f 100644 --- a/lib/fog/joyent/models/compute/network.rb +++ b/lib/fog/joyent/models/compute/network.rb @@ -6,7 +6,6 @@ module Fog attribute :name attribute :public - end end end diff --git a/lib/fog/joyent/models/compute/networks.rb b/lib/fog/joyent/models/compute/networks.rb index 521bcc386..d5bf1cc97 100644 --- a/lib/fog/joyent/models/compute/networks.rb +++ b/lib/fog/joyent/models/compute/networks.rb @@ -3,7 +3,6 @@ module Fog module Compute class Joyent class Networks < Fog::Collection - model Fog::Compute::Joyent::Network def all diff --git a/lib/fog/joyent/models/compute/server.rb b/lib/fog/joyent/models/compute/server.rb index a0d3b0ff2..2196dc7ec 100644 --- a/lib/fog/joyent/models/compute/server.rb +++ b/lib/fog/joyent/models/compute/server.rb @@ -2,7 +2,6 @@ require 'fog/compute/models/server' module Fog module Compute class Joyent - class Server < Fog::Compute::Server identity :id @@ -119,7 +118,6 @@ module Fog service.delete_all_machine_tags(self.id) true end - end end end diff --git a/lib/fog/joyent/models/compute/servers.rb b/lib/fog/joyent/models/compute/servers.rb index 1e99f05b7..fe942c9ac 100644 --- a/lib/fog/joyent/models/compute/servers.rb +++ b/lib/fog/joyent/models/compute/servers.rb @@ -3,7 +3,6 @@ require 'fog/joyent/models/compute/server' module Fog module Compute - class Joyent class Servers < Fog::Collection model Fog::Compute::Joyent::Server @@ -30,9 +29,7 @@ module Fog server.tags = server.list_tags if server.tags.nil? server end - end end # Joyent - end # Compute end # Fog diff --git a/lib/fog/joyent/models/compute/snapshot.rb b/lib/fog/joyent/models/compute/snapshot.rb index be2717d96..c28575cfe 100644 --- a/lib/fog/joyent/models/compute/snapshot.rb +++ b/lib/fog/joyent/models/compute/snapshot.rb @@ -38,7 +38,6 @@ module Fog service.servers.get(self.machine_id) end - end end end diff --git a/lib/fog/joyent/models/compute/snapshots.rb b/lib/fog/joyent/models/compute/snapshots.rb index 946ce0b57..7e39c78fb 100644 --- a/lib/fog/joyent/models/compute/snapshots.rb +++ b/lib/fog/joyent/models/compute/snapshots.rb @@ -4,7 +4,6 @@ module Fog module Compute class Joyent class Snapshots < Fog::Collection - model Fog::Compute::Joyent::Snapshot def create(machine_id, snapshot_name) @@ -30,7 +29,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/joyent/requests/compute/add_machine_tags.rb b/lib/fog/joyent/requests/compute/add_machine_tags.rb index 28eafd1cb..cc5fad5cb 100644 --- a/lib/fog/joyent/requests/compute/add_machine_tags.rb +++ b/lib/fog/joyent/requests/compute/add_machine_tags.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Real # https://us-west-1.api.joyentcloud.com/docs#AddMachineTags def add_machine_tags(machine_id, tags={}) diff --git a/lib/fog/joyent/requests/compute/create_key.rb b/lib/fog/joyent/requests/compute/create_key.rb index 4975f36a4..5bde09b43 100644 --- a/lib/fog/joyent/requests/compute/create_key.rb +++ b/lib/fog/joyent/requests/compute/create_key.rb @@ -26,7 +26,6 @@ module Fog end # Mock class Real - # Creates a new SSH Key # ==== Parameters # * name<~String> - Name to assign to this key @@ -49,7 +48,6 @@ module Fog :expects => 201 ) end - end end end diff --git a/lib/fog/joyent/requests/compute/create_machine_snapshot.rb b/lib/fog/joyent/requests/compute/create_machine_snapshot.rb index dee83bbe9..daf9f95ee 100644 --- a/lib/fog/joyent/requests/compute/create_machine_snapshot.rb +++ b/lib/fog/joyent/requests/compute/create_machine_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Compute class Joyent class Real - def create_machine_snapshot(machine_id, snapshot_name) request( :method => "POST", @@ -11,7 +10,6 @@ module Fog :expects => [201] ) end - end end end diff --git a/lib/fog/joyent/requests/compute/delete_key.rb b/lib/fog/joyent/requests/compute/delete_key.rb index 3c5a6fbd4..f841a4e91 100644 --- a/lib/fog/joyent/requests/compute/delete_key.rb +++ b/lib/fog/joyent/requests/compute/delete_key.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def delete_key(keyname) if self.data[:keys].delete(keyname) @@ -23,7 +22,6 @@ module Fog ) end end # Real - end end end diff --git a/lib/fog/joyent/requests/compute/delete_machine_metadata.rb b/lib/fog/joyent/requests/compute/delete_machine_metadata.rb index bf13f6111..b158da435 100644 --- a/lib/fog/joyent/requests/compute/delete_machine_metadata.rb +++ b/lib/fog/joyent/requests/compute/delete_machine_metadata.rb @@ -1,9 +1,7 @@ module Fog module Compute - class Joyent class Real - # https://us-west-1.api.joyentcloud.com/docs#DeleteAllMachineMetadata def delete_machine_metadata(machine_id, key) request( diff --git a/lib/fog/joyent/requests/compute/delete_machine_snapshot.rb b/lib/fog/joyent/requests/compute/delete_machine_snapshot.rb index be5aecd2c..0ff5487af 100644 --- a/lib/fog/joyent/requests/compute/delete_machine_snapshot.rb +++ b/lib/fog/joyent/requests/compute/delete_machine_snapshot.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Real def delete_machine_snapshot(machine_id, snapshot) request( @@ -13,9 +12,7 @@ module Fog end class Mock - end - end end end diff --git a/lib/fog/joyent/requests/compute/get_dataset.rb b/lib/fog/joyent/requests/compute/get_dataset.rb index fb0b7ae62..3656a021d 100644 --- a/lib/fog/joyent/requests/compute/get_dataset.rb +++ b/lib/fog/joyent/requests/compute/get_dataset.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def get_dataset(id) if ds = self.data[:datasets][id] @@ -23,7 +22,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/joyent/requests/compute/get_image.rb b/lib/fog/joyent/requests/compute/get_image.rb index e53c178ae..0d54fefa2 100644 --- a/lib/fog/joyent/requests/compute/get_image.rb +++ b/lib/fog/joyent/requests/compute/get_image.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def get_image(id) if ds = self.data[:datasets][id] @@ -24,7 +23,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/joyent/requests/compute/get_key.rb b/lib/fog/joyent/requests/compute/get_key.rb index 79f551b15..f48cd232d 100644 --- a/lib/fog/joyent/requests/compute/get_key.rb +++ b/lib/fog/joyent/requests/compute/get_key.rb @@ -2,7 +2,6 @@ module Fog module Compute class Joyent class Mock - def get_key(keyid) if key = self.data[:keys][keyid] response = Excon::Response.new diff --git a/lib/fog/joyent/requests/compute/get_machine.rb b/lib/fog/joyent/requests/compute/get_machine.rb index c1dccfc0f..12ae0e091 100644 --- a/lib/fog/joyent/requests/compute/get_machine.rb +++ b/lib/fog/joyent/requests/compute/get_machine.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def get_machine(uuid) if machine = self.data[:machines][uuid] diff --git a/lib/fog/joyent/requests/compute/get_machine_metadata.rb b/lib/fog/joyent/requests/compute/get_machine_metadata.rb index 8e3c485c2..3730fe2f0 100644 --- a/lib/fog/joyent/requests/compute/get_machine_metadata.rb +++ b/lib/fog/joyent/requests/compute/get_machine_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class Joyent class Real - def get_machine_metadata(machine_id, options = {}) query = {} if options[:credentials] @@ -19,7 +18,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/joyent/requests/compute/get_machine_tag.rb b/lib/fog/joyent/requests/compute/get_machine_tag.rb index e2d254291..7d91c8e6a 100644 --- a/lib/fog/joyent/requests/compute/get_machine_tag.rb +++ b/lib/fog/joyent/requests/compute/get_machine_tag.rb @@ -2,7 +2,6 @@ module Fog module Compute class Joyent class Real - # https://us-west-1.api.joyentcloud.com/docs#GetMachineTag def get_machine_tag(machine_id, tagname) request( @@ -13,7 +12,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/joyent/requests/compute/get_package.rb b/lib/fog/joyent/requests/compute/get_package.rb index b09c5f02f..a1085daf9 100644 --- a/lib/fog/joyent/requests/compute/get_package.rb +++ b/lib/fog/joyent/requests/compute/get_package.rb @@ -4,7 +4,6 @@ module Fog module Compute class Joyent class Mock - def get_package(name) if pkg = self.data[:packages][name] response = Excon::Response.new @@ -27,7 +26,6 @@ module Fog :idempotent => true ) end - end end end diff --git a/lib/fog/joyent/requests/compute/list_datacenters.rb b/lib/fog/joyent/requests/compute/list_datacenters.rb index 608fa9275..3bfaf77a9 100644 --- a/lib/fog/joyent/requests/compute/list_datacenters.rb +++ b/lib/fog/joyent/requests/compute/list_datacenters.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Real def list_datacenters request( @@ -12,7 +11,6 @@ module Fog ) end end # Real - end end end diff --git a/lib/fog/joyent/requests/compute/list_datasets.rb b/lib/fog/joyent/requests/compute/list_datasets.rb index dea3ceb66..450b80c3f 100644 --- a/lib/fog/joyent/requests/compute/list_datasets.rb +++ b/lib/fog/joyent/requests/compute/list_datasets.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def list_datasets res = Excon::Response.new diff --git a/lib/fog/joyent/requests/compute/list_images.rb b/lib/fog/joyent/requests/compute/list_images.rb index c1ad4284f..c449313ad 100644 --- a/lib/fog/joyent/requests/compute/list_images.rb +++ b/lib/fog/joyent/requests/compute/list_images.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def list_images res = Excon::Response.new diff --git a/lib/fog/joyent/requests/compute/list_keys.rb b/lib/fog/joyent/requests/compute/list_keys.rb index d93e3294b..0e7f89088 100644 --- a/lib/fog/joyent/requests/compute/list_keys.rb +++ b/lib/fog/joyent/requests/compute/list_keys.rb @@ -20,7 +20,6 @@ module Fog ) end end # Real - end end end diff --git a/lib/fog/joyent/requests/compute/list_machine_tags.rb b/lib/fog/joyent/requests/compute/list_machine_tags.rb index fca539ece..159e1c759 100644 --- a/lib/fog/joyent/requests/compute/list_machine_tags.rb +++ b/lib/fog/joyent/requests/compute/list_machine_tags.rb @@ -14,7 +14,6 @@ module Fog end class Mock - end end end diff --git a/lib/fog/joyent/requests/compute/list_machines.rb b/lib/fog/joyent/requests/compute/list_machines.rb index b5436a78c..89e877759 100644 --- a/lib/fog/joyent/requests/compute/list_machines.rb +++ b/lib/fog/joyent/requests/compute/list_machines.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def list_machines(options={}) res = Excon::Response.new diff --git a/lib/fog/joyent/requests/compute/list_networks.rb b/lib/fog/joyent/requests/compute/list_networks.rb index d17371da8..2d86f5ee3 100644 --- a/lib/fog/joyent/requests/compute/list_networks.rb +++ b/lib/fog/joyent/requests/compute/list_networks.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def list_networks(options={}) res = Excon::Response.new diff --git a/lib/fog/joyent/requests/compute/list_packages.rb b/lib/fog/joyent/requests/compute/list_packages.rb index bc6a879e9..9603697d4 100644 --- a/lib/fog/joyent/requests/compute/list_packages.rb +++ b/lib/fog/joyent/requests/compute/list_packages.rb @@ -1,7 +1,6 @@ module Fog module Compute class Joyent - class Mock def list_packages response = Excon::Response.new() @@ -30,8 +29,6 @@ module Fog ) end end # Real - end - end end diff --git a/lib/fog/libvirt/compute.rb b/lib/fog/libvirt/compute.rb index 1987ece75..2d1a8a03f 100644 --- a/lib/fog/libvirt/compute.rb +++ b/lib/fog/libvirt/compute.rb @@ -5,7 +5,6 @@ require 'fog/libvirt/models/compute/util/uri' module Fog module Compute class Libvirt < Fog::Service - requires :libvirt_uri recognizes :libvirt_username, :libvirt_password recognizes :libvirt_ip_command @@ -76,7 +75,6 @@ module Fog attr_reader :uri attr_reader :ip_command - def initialize(options={}) @uri = ::Fog::Compute::LibvirtUtil::URI.new(enhance_uri(options[:libvirt_uri])) @ip_command = options[:libvirt_ip_command] @@ -106,7 +104,6 @@ module Fog rescue ::Libvirt::ConnectionError raise Fog::Errors::Error.new("Error making a connection to libvirt URI #{uri.uri}:\n#{$!}") end - end def terminate @@ -134,7 +131,6 @@ module Fog end uri+append end - end end end diff --git a/lib/fog/libvirt/core.rb b/lib/fog/libvirt/core.rb index d7ec9aba3..73fce104b 100644 --- a/lib/fog/libvirt/core.rb +++ b/lib/fog/libvirt/core.rb @@ -4,10 +4,8 @@ require 'fog/json' module Fog module Libvirt - extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/lib/fog/libvirt/models/compute/interface.rb b/lib/fog/libvirt/models/compute/interface.rb index cc01fedba..a7ebde622 100644 --- a/lib/fog/libvirt/models/compute/interface.rb +++ b/lib/fog/libvirt/models/compute/interface.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Libvirt - class Interface < Fog::Model - identity :name attribute :mac attribute :active @@ -22,7 +20,6 @@ module Fog active end end - end end end diff --git a/lib/fog/libvirt/models/compute/interfaces.rb b/lib/fog/libvirt/models/compute/interfaces.rb index d01d22cfd..48f696d97 100644 --- a/lib/fog/libvirt/models/compute/interfaces.rb +++ b/lib/fog/libvirt/models/compute/interfaces.rb @@ -4,9 +4,7 @@ require 'fog/libvirt/models/compute/interface' module Fog module Compute class Libvirt - class Interfaces < Fog::Collection - model Fog::Compute::Libvirt::Interface def all(filter={}) @@ -16,9 +14,7 @@ module Fog def get(name) self.all(:name => name).first end - end - end end end diff --git a/lib/fog/libvirt/models/compute/network.rb b/lib/fog/libvirt/models/compute/network.rb index 122181c6f..6a8024716 100644 --- a/lib/fog/libvirt/models/compute/network.rb +++ b/lib/fog/libvirt/models/compute/network.rb @@ -4,9 +4,7 @@ require 'fog/libvirt/models/compute/util/util' module Fog module Compute class Libvirt - class Network < Fog::Model - include Fog::Compute::LibvirtUtil identity :uuid @@ -25,10 +23,7 @@ module Fog def shutdown service.destroy_network(uuid) end - end - end end - end diff --git a/lib/fog/libvirt/models/compute/networks.rb b/lib/fog/libvirt/models/compute/networks.rb index 233e433e4..760ccf27e 100644 --- a/lib/fog/libvirt/models/compute/networks.rb +++ b/lib/fog/libvirt/models/compute/networks.rb @@ -4,9 +4,7 @@ require 'fog/libvirt/models/compute/network' module Fog module Compute class Libvirt - class Networks < Fog::Collection - model Fog::Compute::Libvirt::Network def all(filter={}) @@ -16,9 +14,7 @@ module Fog def get(uuid) self.all(:uuid => uuid).first end - end - end end end diff --git a/lib/fog/libvirt/models/compute/nic.rb b/lib/fog/libvirt/models/compute/nic.rb index 225f914ff..485b4171b 100644 --- a/lib/fog/libvirt/models/compute/nic.rb +++ b/lib/fog/libvirt/models/compute/nic.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Libvirt - class Nic < Fog::Model - identity :mac attribute :id attribute :type @@ -46,10 +44,7 @@ module Fog :model => "virtio" } end - end - end end - end diff --git a/lib/fog/libvirt/models/compute/nics.rb b/lib/fog/libvirt/models/compute/nics.rb index 7686bef62..7a326f305 100644 --- a/lib/fog/libvirt/models/compute/nics.rb +++ b/lib/fog/libvirt/models/compute/nics.rb @@ -4,13 +4,9 @@ require 'fog/libvirt/models/compute/nic' module Fog module Compute class Libvirt - class Nics < Fog::Collection - model Fog::Compute::Libvirt::Nic - end - end end end diff --git a/lib/fog/libvirt/models/compute/node.rb b/lib/fog/libvirt/models/compute/node.rb index 43d37210b..02d3fc793 100644 --- a/lib/fog/libvirt/models/compute/node.rb +++ b/lib/fog/libvirt/models/compute/node.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Libvirt - class Node < Fog::Model - identity :uuid attribute :model @@ -25,10 +23,7 @@ module Fog attribute :product attribute :serial attribute :hostname - end - end end - end diff --git a/lib/fog/libvirt/models/compute/nodes.rb b/lib/fog/libvirt/models/compute/nodes.rb index f1386c7f9..72d6d7b2f 100644 --- a/lib/fog/libvirt/models/compute/nodes.rb +++ b/lib/fog/libvirt/models/compute/nodes.rb @@ -4,9 +4,7 @@ require 'fog/libvirt/models/compute/node' module Fog module Compute class Libvirt - class Nodes < Fog::Collection - model Fog::Compute::Libvirt::Node def all(filter={ }) @@ -16,7 +14,6 @@ module Fog def get all.first end - end end end diff --git a/lib/fog/libvirt/models/compute/pool.rb b/lib/fog/libvirt/models/compute/pool.rb index 1d9b568df..d186b86fc 100644 --- a/lib/fog/libvirt/models/compute/pool.rb +++ b/lib/fog/libvirt/models/compute/pool.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class Libvirt - class Pool < Fog::Model attr_reader :xml @@ -79,10 +78,7 @@ module Fog def volumes service.list_pool_volumes uuid end - end - end end - end diff --git a/lib/fog/libvirt/models/compute/pools.rb b/lib/fog/libvirt/models/compute/pools.rb index 78e16720d..2f3f73f3f 100644 --- a/lib/fog/libvirt/models/compute/pools.rb +++ b/lib/fog/libvirt/models/compute/pools.rb @@ -4,9 +4,7 @@ require 'fog/libvirt/models/compute/pool' module Fog module Compute class Libvirt - class Pools < Fog::Collection - model Fog::Compute::Libvirt::Pool def all(filter = {}) @@ -16,9 +14,7 @@ module Fog def get(uuid) self.all(:uuid => uuid).first end - end - end end end diff --git a/lib/fog/libvirt/models/compute/server.rb b/lib/fog/libvirt/models/compute/server.rb index 598bd8d8c..324f4e17a 100644 --- a/lib/fog/libvirt/models/compute/server.rb +++ b/lib/fog/libvirt/models/compute/server.rb @@ -5,9 +5,7 @@ require 'net/ssh/proxy/command' module Fog module Compute class Libvirt - class Server < Fog::Compute::Server - include Fog::Compute::LibvirtUtil attr_reader :xml @@ -241,7 +239,6 @@ module Fog ssh_options[:port]=port unless keyfile.nil? ssh_options[:paranoid]=true if service.uri.no_verify? - begin result=Fog::SSH.new(host, user, ssh_options).run(ip_command) rescue Errno::ECONNREFUSED @@ -250,7 +247,6 @@ module Fog raise Fog::Errors::Error.new("Error authenticating over ssh to host #{host} and user #{user}") end - # Check for a clean exit code if result.first.status == 0 ip_address=result.first.stdout.strip @@ -283,7 +279,6 @@ module Fog ip_address=ip_address.chomp end - # The Ip-address command has been run either local or remote now if ip_address=="" @@ -390,10 +385,7 @@ module Fog def default_display {:port => '-1', :listen => '127.0.0.1', :type => 'vnc', :password => '' } end - end - end end - end diff --git a/lib/fog/libvirt/models/compute/servers.rb b/lib/fog/libvirt/models/compute/servers.rb index e2fc2798c..a28db2f5f 100644 --- a/lib/fog/libvirt/models/compute/servers.rb +++ b/lib/fog/libvirt/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/libvirt/models/compute/server' module Fog module Compute class Libvirt - class Servers < Fog::Collection - model Fog::Compute::Libvirt::Server def all(filter={}) @@ -17,7 +15,6 @@ module Fog data = service.list_domains(:uuid => uuid) new data.first if data end - end end end diff --git a/lib/fog/libvirt/models/compute/util/uri.rb b/lib/fog/libvirt/models/compute/util/uri.rb index d84949e7d..1407930e7 100644 --- a/lib/fog/libvirt/models/compute/util/uri.rb +++ b/lib/fog/libvirt/models/compute/util/uri.rb @@ -4,9 +4,7 @@ require 'cgi' module Fog module Compute module LibvirtUtil - class URI - attr_reader :uri def initialize(uri) @@ -109,7 +107,6 @@ module Fog else return true end - end def tty? @@ -120,7 +117,6 @@ module Fog value("pkipath") end - # A libvirt URI allows you to specify extra params # http://libvirt.org/remote.html private @@ -136,8 +132,6 @@ module Fog return nil end end - - end end end diff --git a/lib/fog/libvirt/models/compute/util/util.rb b/lib/fog/libvirt/models/compute/util/util.rb index d668e46b3..28aadf7a6 100644 --- a/lib/fog/libvirt/models/compute/util/util.rb +++ b/lib/fog/libvirt/models/compute/util/util.rb @@ -6,7 +6,6 @@ require 'securerandom' module Fog module Compute module LibvirtUtil - def xml_element(xml, path, attribute=nil) xml = Nokogiri::XML(xml) attribute.nil? ? (xml/path).first.text : (xml/path).first[attribute.to_sym] diff --git a/lib/fog/libvirt/models/compute/volume.rb b/lib/fog/libvirt/models/compute/volume.rb index 7bb0ccc8a..5bf275939 100644 --- a/lib/fog/libvirt/models/compute/volume.rb +++ b/lib/fog/libvirt/models/compute/volume.rb @@ -4,9 +4,7 @@ require 'fog/libvirt/models/compute/util/util' module Fog module Compute class Libvirt - class Volume < Fog::Model - attr_reader :xml include Fog::Compute::LibvirtUtil @@ -119,8 +117,6 @@ module Fog [size, unit] end end - end end - end diff --git a/lib/fog/libvirt/models/compute/volumes.rb b/lib/fog/libvirt/models/compute/volumes.rb index 512f498d2..a29a0b482 100644 --- a/lib/fog/libvirt/models/compute/volumes.rb +++ b/lib/fog/libvirt/models/compute/volumes.rb @@ -4,9 +4,7 @@ require 'fog/libvirt/models/compute/volume' module Fog module Compute class Libvirt - class Volumes < Fog::Collection - model Fog::Compute::Libvirt::Volume def all(filter = {}) @@ -16,9 +14,7 @@ module Fog def get(key) self.all(:key => key).first end - end - end end end diff --git a/lib/fog/libvirt/requests/compute/create_volume.rb b/lib/fog/libvirt/requests/compute/create_volume.rb index 0623ec369..f1f90d88b 100644 --- a/lib/fog/libvirt/requests/compute/create_volume.rb +++ b/lib/fog/libvirt/requests/compute/create_volume.rb @@ -9,7 +9,6 @@ module Fog class Mock def create_volume(pool_name, xml) - end end end diff --git a/lib/fog/libvirt/requests/compute/define_pool.rb b/lib/fog/libvirt/requests/compute/define_pool.rb index 24b532888..8874bf4e4 100644 --- a/lib/fog/libvirt/requests/compute/define_pool.rb +++ b/lib/fog/libvirt/requests/compute/define_pool.rb @@ -9,7 +9,6 @@ module Fog class Mock def define_pool(xml) - end end end diff --git a/lib/fog/libvirt/requests/compute/get_node_info.rb b/lib/fog/libvirt/requests/compute/get_node_info.rb index 9903d7673..9d5aa673b 100644 --- a/lib/fog/libvirt/requests/compute/get_node_info.rb +++ b/lib/fog/libvirt/requests/compute/get_node_info.rb @@ -26,12 +26,10 @@ module Fog def node_attr attr, xml xml_element(xml, "sysinfo/system/entry[@name='#{attr}']").strip end - end class Mock def get_node_info - end end end diff --git a/lib/fog/libvirt/requests/compute/list_domains.rb b/lib/fog/libvirt/requests/compute/list_domains.rb index 0516040d4..9a37e1dd6 100644 --- a/lib/fog/libvirt/requests/compute/list_domains.rb +++ b/lib/fog/libvirt/requests/compute/list_domains.rb @@ -69,7 +69,6 @@ module Fog :state => states[dom.info.state] } end - end class Mock diff --git a/lib/fog/libvirt/requests/compute/list_interfaces.rb b/lib/fog/libvirt/requests/compute/list_interfaces.rb index 2af2ff6b4..d93843775 100644 --- a/lib/fog/libvirt/requests/compute/list_interfaces.rb +++ b/lib/fog/libvirt/requests/compute/list_interfaces.rb @@ -25,7 +25,6 @@ module Fog when :name client.lookup_interface_by_name(filter[:name]) end - end def interface_to_attributes(net) @@ -36,7 +35,6 @@ module Fog :active => net.active? } end - end class Mock diff --git a/lib/fog/libvirt/requests/compute/list_networks.rb b/lib/fog/libvirt/requests/compute/list_networks.rb index 508fd9937..5f55c2ac1 100644 --- a/lib/fog/libvirt/requests/compute/list_networks.rb +++ b/lib/fog/libvirt/requests/compute/list_networks.rb @@ -3,7 +3,6 @@ module Fog class Libvirt class Real def list_networks(filter = { }) - data=[] if filter.keys.empty? (client.list_networks + client.list_defined_networks).each do |network_name| @@ -24,7 +23,6 @@ module Fog when :name client.lookup_network_by_name(filter[:name]) end - end def network_to_attributes(net) @@ -35,7 +33,6 @@ module Fog :bridge_name => net.bridge_name } end - end class Mock diff --git a/lib/fog/libvirt/requests/compute/list_pool_volumes.rb b/lib/fog/libvirt/requests/compute/list_pool_volumes.rb index d3b15da55..6faba30a7 100644 --- a/lib/fog/libvirt/requests/compute/list_pool_volumes.rb +++ b/lib/fog/libvirt/requests/compute/list_pool_volumes.rb @@ -8,12 +8,10 @@ module Fog volume_to_attributes(pool.lookup_volume_by_name(volume_name)) end end - end class Mock def list_pool_volumes(uuid) - end end end diff --git a/lib/fog/libvirt/requests/compute/list_pools.rb b/lib/fog/libvirt/requests/compute/list_pools.rb index e4b2220a7..e41e829b7 100644 --- a/lib/fog/libvirt/requests/compute/list_pools.rb +++ b/lib/fog/libvirt/requests/compute/list_pools.rb @@ -43,7 +43,6 @@ module Fog rescue ::Libvirt::RetrieveError nil end - end class Mock diff --git a/lib/fog/libvirt/requests/compute/list_volumes.rb b/lib/fog/libvirt/requests/compute/list_volumes.rb index af8723e06..8c7ac6af4 100644 --- a/lib/fog/libvirt/requests/compute/list_volumes.rb +++ b/lib/fog/libvirt/requests/compute/list_volumes.rb @@ -19,7 +19,6 @@ module Fog private def volume_to_attributes(vol) - format_type = xml_element(vol.xml_desc, "/volume/target/format", "type") rescue nil # not all volumes have types, e.g. LVM return nil if format_type == "dir" diff --git a/lib/fog/linode/compute.rb b/lib/fog/linode/compute.rb index 5b823acd2..c36ed670d 100644 --- a/lib/fog/linode/compute.rb +++ b/lib/fog/linode/compute.rb @@ -3,7 +3,6 @@ require 'fog/linode/core' module Fog module Compute class Linode < Fog::Service - requires :linode_api_key recognizes :port, :scheme, :persistent @@ -51,7 +50,6 @@ module Fog # request :linode_resize class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = {} @@ -73,11 +71,9 @@ module Fog def reset_data self.class.data.delete(@linode_api_key) end - end class Real - def initialize(options={}) @linode_api_key = options[:linode_api_key] @host = options[:host] || "api.linode.com" @@ -110,7 +106,6 @@ module Fog end response end - end end end diff --git a/lib/fog/linode/dns.rb b/lib/fog/linode/dns.rb index 144ec7fc2..d49edd39b 100644 --- a/lib/fog/linode/dns.rb +++ b/lib/fog/linode/dns.rb @@ -3,7 +3,6 @@ require 'fog/linode/core' module Fog module DNS class Linode < Fog::Service - requires :linode_api_key recognizes :port, :scheme, :persistent @@ -24,7 +23,6 @@ module Fog request :domain_resource_update class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = {} @@ -46,11 +44,9 @@ module Fog def reset_data self.class.data.delete(@linode_api_key) end - end class Real - def initialize(options={}) @connection_options = options[:connection_options] || {} @host = options[:host] || "api.linode.com" @@ -85,7 +81,6 @@ module Fog end response end - end end end diff --git a/lib/fog/linode/models/dns/record.rb b/lib/fog/linode/models/dns/record.rb index f2019a4a4..48ebbdf1c 100644 --- a/lib/fog/linode/models/dns/record.rb +++ b/lib/fog/linode/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class Linode - class Record < Fog::Model extend Fog::Deprecation deprecate :ip, :value @@ -63,9 +62,7 @@ module Fog def zone=(new_zone) @zone = new_zone end - end - end end end diff --git a/lib/fog/linode/models/dns/records.rb b/lib/fog/linode/models/dns/records.rb index 33b41e83f..340dc3a83 100644 --- a/lib/fog/linode/models/dns/records.rb +++ b/lib/fog/linode/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/linode/models/dns/record' module Fog module DNS class Linode - class Records < Fog::Collection - attribute :zone model Fog::DNS::Linode::Record @@ -29,9 +27,7 @@ module Fog requires :zone super({ :zone => zone }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/linode/models/dns/zone.rb b/lib/fog/linode/models/dns/zone.rb index bd9d5fbff..80f923219 100644 --- a/lib/fog/linode/models/dns/zone.rb +++ b/lib/fog/linode/models/dns/zone.rb @@ -4,9 +4,7 @@ require 'fog/linode/models/dns/records' module Fog module DNS class Linode - class Zone < Fog::Model - identity :id, :aliases => ['DomainID', 'DOMAINID', 'ResourceID'] attribute :description, :aliases => 'DESCRIPTION' @@ -75,9 +73,7 @@ module Fog merge_attributes(response.body['DATA']) true end - end - end end end diff --git a/lib/fog/linode/models/dns/zones.rb b/lib/fog/linode/models/dns/zones.rb index fd2e08549..cbd467c83 100644 --- a/lib/fog/linode/models/dns/zones.rb +++ b/lib/fog/linode/models/dns/zones.rb @@ -4,9 +4,7 @@ require 'fog/linode/models/dns/zone' module Fog module DNS class Linode - class Zones < Fog::Collection - model Fog::DNS::Linode::Zone def all @@ -21,9 +19,7 @@ module Fog nil end end - end - end end end diff --git a/lib/fog/linode/requests/compute/avail_datacenters.rb b/lib/fog/linode/requests/compute/avail_datacenters.rb index 26bf5f917..c048c3be3 100644 --- a/lib/fog/linode/requests/compute/avail_datacenters.rb +++ b/lib/fog/linode/requests/compute/avail_datacenters.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # Get available data centers # # ==== Returns @@ -16,7 +15,6 @@ module Fog :query => { :api_action => 'avail.datacenters' } ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/avail_distributions.rb b/lib/fog/linode/requests/compute/avail_distributions.rb index 940dd637c..8308d00fa 100644 --- a/lib/fog/linode/requests/compute/avail_distributions.rb +++ b/lib/fog/linode/requests/compute/avail_distributions.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # Get available distributions # # ==== Parameters @@ -23,7 +22,6 @@ module Fog :query => { :api_action => 'avail.distributions' }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/avail_kernels.rb b/lib/fog/linode/requests/compute/avail_kernels.rb index 3d695ef61..6c0c125fc 100644 --- a/lib/fog/linode/requests/compute/avail_kernels.rb +++ b/lib/fog/linode/requests/compute/avail_kernels.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # Get available kernels # # ==== Parameters @@ -23,7 +22,6 @@ module Fog :query => { :api_action => 'avail.kernels' }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/avail_linodeplans.rb b/lib/fog/linode/requests/compute/avail_linodeplans.rb index 111d3a742..25c171434 100644 --- a/lib/fog/linode/requests/compute/avail_linodeplans.rb +++ b/lib/fog/linode/requests/compute/avail_linodeplans.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # Get available plans # # ==== Parameters @@ -27,7 +26,6 @@ module Fog result.body["DATA"] = result.body["DATA"].select { |item| item['PLANID'] == linodeplan_id } if linodeplan_id result end - end class Mock diff --git a/lib/fog/linode/requests/compute/avail_stackscripts.rb b/lib/fog/linode/requests/compute/avail_stackscripts.rb index 0b0d8df4b..88df62068 100644 --- a/lib/fog/linode/requests/compute/avail_stackscripts.rb +++ b/lib/fog/linode/requests/compute/avail_stackscripts.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def avail_stackscripts(options={}) result = request( :expects => 200, @@ -12,7 +11,6 @@ module Fog result.body['DATA'].each { |r| r['DISTRIBUTIONIDLIST'] = r['DISTRIBUTIONIDLIST'].to_s } result end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_boot.rb b/lib/fog/linode/requests/compute/linode_boot.rb index 48db21c44..8b8f269ef 100644 --- a/lib/fog/linode/requests/compute/linode_boot.rb +++ b/lib/fog/linode/requests/compute/linode_boot.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_boot(linode_id, config_id) request( :expects => 200, @@ -10,7 +9,6 @@ module Fog :query => { :api_action => 'linode.boot', :linodeId => linode_id, :configId => config_id } ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_config_create.rb b/lib/fog/linode/requests/compute/linode_config_create.rb index e603d43fe..19431c0ba 100644 --- a/lib/fog/linode/requests/compute/linode_config_create.rb +++ b/lib/fog/linode/requests/compute/linode_config_create.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_config_create(linode_id, kernel_id, name, disk_list) request( :expects => 200, @@ -16,7 +15,6 @@ module Fog } ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_config_list.rb b/lib/fog/linode/requests/compute/linode_config_list.rb index 3b66526d2..d73c8e11a 100644 --- a/lib/fog/linode/requests/compute/linode_config_list.rb +++ b/lib/fog/linode/requests/compute/linode_config_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_config_list(linode_id, config_id=nil, options={}) if config_id options.merge!(:configid => config_id) @@ -13,7 +12,6 @@ module Fog :query => { :api_action => 'linode.config.list', :linodeId => linode_id }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_create.rb b/lib/fog/linode/requests/compute/linode_create.rb index 836112714..9860d0f0e 100644 --- a/lib/fog/linode/requests/compute/linode_create.rb +++ b/lib/fog/linode/requests/compute/linode_create.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # Creates a linode and assigns you full privileges # # ==== Parameters @@ -26,7 +25,6 @@ module Fog } ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_delete.rb b/lib/fog/linode/requests/compute/linode_delete.rb index b915a6599..414c8ac7a 100644 --- a/lib/fog/linode/requests/compute/linode_delete.rb +++ b/lib/fog/linode/requests/compute/linode_delete.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # List all linodes user has access or delete to # # ==== Parameters @@ -21,7 +20,6 @@ module Fog :query => { :api_action => 'linode.delete', :linodeId => linode_id }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_disk_create.rb b/lib/fog/linode/requests/compute/linode_disk_create.rb index 2e8a2dca6..c87718532 100644 --- a/lib/fog/linode/requests/compute/linode_disk_create.rb +++ b/lib/fog/linode/requests/compute/linode_disk_create.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_disk_create(linode_id, name, type, size) request( :expects => 200, @@ -16,7 +15,6 @@ module Fog } ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_disk_createfromdistribution.rb b/lib/fog/linode/requests/compute/linode_disk_createfromdistribution.rb index 0b4b2ce36..d3dfc1926 100644 --- a/lib/fog/linode/requests/compute/linode_disk_createfromdistribution.rb +++ b/lib/fog/linode/requests/compute/linode_disk_createfromdistribution.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_disk_createfromdistribution(linode_id, distro_id, name, size, password) request( :expects => 200, @@ -17,7 +16,6 @@ module Fog } ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_disk_createfromstackscript.rb b/lib/fog/linode/requests/compute/linode_disk_createfromstackscript.rb index 7d0d9644e..26f03b83d 100644 --- a/lib/fog/linode/requests/compute/linode_disk_createfromstackscript.rb +++ b/lib/fog/linode/requests/compute/linode_disk_createfromstackscript.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_disk_createfromstackscript(linode_id, script_id, distro_id, name, size, password, options={}) request( :expects => 200, @@ -19,7 +18,6 @@ module Fog } ) end - end end end diff --git a/lib/fog/linode/requests/compute/linode_disk_delete.rb b/lib/fog/linode/requests/compute/linode_disk_delete.rb index e4d7929e5..182e0f893 100644 --- a/lib/fog/linode/requests/compute/linode_disk_delete.rb +++ b/lib/fog/linode/requests/compute/linode_disk_delete.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_disk_delete(linode_id, disk_id) request( :expects => 200, @@ -14,7 +13,6 @@ module Fog } ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_disk_list.rb b/lib/fog/linode/requests/compute/linode_disk_list.rb index 6cf383a28..6ecd9cfb5 100644 --- a/lib/fog/linode/requests/compute/linode_disk_list.rb +++ b/lib/fog/linode/requests/compute/linode_disk_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_disk_list(linode_id, disk_id=nil) options = {} if disk_id @@ -14,7 +13,6 @@ module Fog :query => { :api_action => 'linode.disk.list', :linodeId => linode_id }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_ip_addprivate.rb b/lib/fog/linode/requests/compute/linode_ip_addprivate.rb index a627ba0ef..8cc1169b8 100644 --- a/lib/fog/linode/requests/compute/linode_ip_addprivate.rb +++ b/lib/fog/linode/requests/compute/linode_ip_addprivate.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_ip_addprivate(linode_id) request( :expects => 200, @@ -10,7 +9,6 @@ module Fog :query => { :api_action => 'linode.ip.addprivate', :linodeId => linode_id } ) end - end end end diff --git a/lib/fog/linode/requests/compute/linode_ip_list.rb b/lib/fog/linode/requests/compute/linode_ip_list.rb index ba2998d67..fd909cd7b 100644 --- a/lib/fog/linode/requests/compute/linode_ip_list.rb +++ b/lib/fog/linode/requests/compute/linode_ip_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_ip_list(linode_id, ip_id=nil) options = {} if ip_id @@ -14,7 +13,6 @@ module Fog :query => { :api_action => 'linode.ip.list', :linodeId => linode_id }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_list.rb b/lib/fog/linode/requests/compute/linode_list.rb index 0f1beda22..1ef883502 100644 --- a/lib/fog/linode/requests/compute/linode_list.rb +++ b/lib/fog/linode/requests/compute/linode_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # List all linodes user has access or delete to # # ==== Parameters @@ -23,7 +22,6 @@ module Fog :query => { :api_action => 'linode.list' }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_reboot.rb b/lib/fog/linode/requests/compute/linode_reboot.rb index f9657e529..f7572c6d5 100644 --- a/lib/fog/linode/requests/compute/linode_reboot.rb +++ b/lib/fog/linode/requests/compute/linode_reboot.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # Issues a shutdown, and then a boot job for a given linode # # ==== Parameters @@ -21,7 +20,6 @@ module Fog :query => { :api_action => 'linode.reboot', :linodeId => linode_id }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_shutdown.rb b/lib/fog/linode/requests/compute/linode_shutdown.rb index 736d1d471..4efa4c542 100644 --- a/lib/fog/linode/requests/compute/linode_shutdown.rb +++ b/lib/fog/linode/requests/compute/linode_shutdown.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_shutdown(linode_id) request( :expects => 200, @@ -10,7 +9,6 @@ module Fog :query => { :api_action => 'linode.shutdown', :linodeId => linode_id } ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/linode_update.rb b/lib/fog/linode/requests/compute/linode_update.rb index 50ce94a19..b0804492f 100644 --- a/lib/fog/linode/requests/compute/linode_update.rb +++ b/lib/fog/linode/requests/compute/linode_update.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - def linode_update(linode_id, options={}) request( :expects => 200, @@ -10,7 +9,6 @@ module Fog :query => { :api_action => 'linode.update', :linodeId => linode_id }.merge!(options) ) end - end class Mock diff --git a/lib/fog/linode/requests/compute/stackscript_list.rb b/lib/fog/linode/requests/compute/stackscript_list.rb index b98119d60..a5e135c9b 100644 --- a/lib/fog/linode/requests/compute/stackscript_list.rb +++ b/lib/fog/linode/requests/compute/stackscript_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class Linode class Real - # Get available stack scripts # # ==== Parameters @@ -25,7 +24,6 @@ module Fog result.body['DATA'].each { |r| r['DISTRIBUTIONIDLIST'] = r['DISTRIBUTIONIDLIST'].to_s } result end - end end end diff --git a/lib/fog/linode/requests/dns/domain_create.rb b/lib/fog/linode/requests/dns/domain_create.rb index 0164600b7..79e93faf5 100644 --- a/lib/fog/linode/requests/dns/domain_create.rb +++ b/lib/fog/linode/requests/dns/domain_create.rb @@ -2,7 +2,6 @@ module Fog module DNS class Linode class Real - # Creates a domain record # # ==== Parameters @@ -36,7 +35,6 @@ module Fog }.merge!( options) ) end - end end end diff --git a/lib/fog/linode/requests/dns/domain_delete.rb b/lib/fog/linode/requests/dns/domain_delete.rb index 47ec126c1..f554c2506 100644 --- a/lib/fog/linode/requests/dns/domain_delete.rb +++ b/lib/fog/linode/requests/dns/domain_delete.rb @@ -2,7 +2,6 @@ module Fog module DNS class Linode class Real - # Delete the given domain from the list Linode hosts # # ==== Parameters @@ -20,7 +19,6 @@ module Fog :query => { :api_action => 'domain.delete', :domainId => domain_id } ) end - end end end diff --git a/lib/fog/linode/requests/dns/domain_list.rb b/lib/fog/linode/requests/dns/domain_list.rb index e7f99aed1..435514ad4 100644 --- a/lib/fog/linode/requests/dns/domain_list.rb +++ b/lib/fog/linode/requests/dns/domain_list.rb @@ -2,7 +2,6 @@ module Fog module DNS class Linode class Real - # List of domains (you have access to) # # ==== Parameters @@ -35,7 +34,6 @@ module Fog :query => { :api_action => 'domain.list' }.merge!(options) ) end - end end end diff --git a/lib/fog/linode/requests/dns/domain_resource_create.rb b/lib/fog/linode/requests/dns/domain_resource_create.rb index 52df56413..0291e22e9 100644 --- a/lib/fog/linode/requests/dns/domain_resource_create.rb +++ b/lib/fog/linode/requests/dns/domain_resource_create.rb @@ -2,7 +2,6 @@ module Fog module DNS class Linode class Real - # Creates a resource record in a domain # # ==== Parameters @@ -37,7 +36,6 @@ module Fog }.merge!( options) ) end - end end end diff --git a/lib/fog/linode/requests/dns/domain_resource_delete.rb b/lib/fog/linode/requests/dns/domain_resource_delete.rb index 40de20465..7917cf1bf 100644 --- a/lib/fog/linode/requests/dns/domain_resource_delete.rb +++ b/lib/fog/linode/requests/dns/domain_resource_delete.rb @@ -2,7 +2,6 @@ module Fog module DNS class Linode class Real - # Delete the given resource from a domain # # ==== Parameters @@ -21,7 +20,6 @@ module Fog :query => { :api_action => 'domain.resource.delete', :domainId => domain_id, :resourceID => resource_id } ) end - end end end diff --git a/lib/fog/linode/requests/dns/domain_resource_list.rb b/lib/fog/linode/requests/dns/domain_resource_list.rb index 4a8fb1b32..8b5d3b9dc 100644 --- a/lib/fog/linode/requests/dns/domain_resource_list.rb +++ b/lib/fog/linode/requests/dns/domain_resource_list.rb @@ -2,7 +2,6 @@ module Fog module DNS class Linode class Real - # List of resource records for a domain # # ==== Parameters @@ -36,7 +35,6 @@ module Fog :query => query ) end - end end end diff --git a/lib/fog/linode/requests/dns/domain_resource_update.rb b/lib/fog/linode/requests/dns/domain_resource_update.rb index 236b6582a..44bc585ae 100644 --- a/lib/fog/linode/requests/dns/domain_resource_update.rb +++ b/lib/fog/linode/requests/dns/domain_resource_update.rb @@ -2,7 +2,6 @@ module Fog module DNS class Linode class Real - # Updates a resource record in a domain # # ==== Parameters @@ -27,7 +26,6 @@ module Fog # * DATA<~Hash>: # * 'ResourceID'<~Integer>: ID of the resource record updated def domain_resource_update(domain_id, resource_id, options = {}) - query= {} request( :expects => 200, @@ -39,7 +37,6 @@ module Fog }.merge!( options) ) end - end end end diff --git a/lib/fog/linode/requests/dns/domain_update.rb b/lib/fog/linode/requests/dns/domain_update.rb index c5d0a037a..e6ea53495 100644 --- a/lib/fog/linode/requests/dns/domain_update.rb +++ b/lib/fog/linode/requests/dns/domain_update.rb @@ -2,7 +2,6 @@ module Fog module DNS class Linode class Real - # Update a domain record # # ==== Parameters @@ -25,15 +24,12 @@ module Fog # * DATA<~Hash>: # * 'DomainID'<~Integer>: domain ID def domain_update(domain_id, options = {}) - request( :expects => 200, :method => 'GET', :query => { :api_action => 'domain.update', :domainId => domain_id }.merge!(options) ) - end - end end end diff --git a/lib/fog/local/core.rb b/lib/fog/local/core.rb index 89567c18b..7212b1837 100644 --- a/lib/fog/local/core.rb +++ b/lib/fog/local/core.rb @@ -2,10 +2,8 @@ require 'fog/core' module Fog module Local - extend Fog::Provider service(:storage, 'Storage') - end end diff --git a/lib/fog/local/models/storage/directories.rb b/lib/fog/local/models/storage/directories.rb index 97b37e6bf..d974263ee 100644 --- a/lib/fog/local/models/storage/directories.rb +++ b/lib/fog/local/models/storage/directories.rb @@ -4,9 +4,7 @@ require 'fog/local/models/storage/directory' module Fog module Storage class Local - class Directories < Fog::Collection - model Fog::Storage::Local::Directory def all @@ -29,9 +27,7 @@ module Fog nil end end - end - end end end diff --git a/lib/fog/local/models/storage/directory.rb b/lib/fog/local/models/storage/directory.rb index 4ce8e3fd0..8ed9d13ba 100644 --- a/lib/fog/local/models/storage/directory.rb +++ b/lib/fog/local/models/storage/directory.rb @@ -4,9 +4,7 @@ require 'fog/local/models/storage/files' module Fog module Storage class Local - class Directory < Fog::Model - identity :key def destroy @@ -49,9 +47,7 @@ module Fog def path service.path_to(key) end - end - end end end diff --git a/lib/fog/local/models/storage/file.rb b/lib/fog/local/models/storage/file.rb index 82bfa529d..d8a871c50 100644 --- a/lib/fog/local/models/storage/file.rb +++ b/lib/fog/local/models/storage/file.rb @@ -4,9 +4,7 @@ require 'fog/core/model' module Fog module Storage class Local - class File < Fog::Model - identity :key, :aliases => 'Key' attribute :content_length, :aliases => 'Content-Length', :type => :integer @@ -126,9 +124,7 @@ module Fog def path service.path_to(::File.join(directory.key, key)) end - end - end end end diff --git a/lib/fog/local/models/storage/files.rb b/lib/fog/local/models/storage/files.rb index 498190cb8..379dd49e1 100644 --- a/lib/fog/local/models/storage/files.rb +++ b/lib/fog/local/models/storage/files.rb @@ -4,9 +4,7 @@ require 'fog/local/models/storage/file' module Fog module Storage class Local - class Files < Fog::Collection - attribute :directory model Fog::Storage::Local::File @@ -80,7 +78,6 @@ module Fog def file_path(key) service.path_to(::File.join(directory.key, key)) end - end end end diff --git a/lib/fog/local/storage.rb b/lib/fog/local/storage.rb index 713a85655..55aaacfd4 100644 --- a/lib/fog/local/storage.rb +++ b/lib/fog/local/storage.rb @@ -3,7 +3,6 @@ require 'fog/local/core' module Fog module Storage class Local < Fog::Service - requires :local_root recognizes :endpoint, :scheme, :host, :port, :path @@ -16,7 +15,6 @@ module Fog require 'uri' class Mock - attr_reader :endpoint def self.data @@ -62,7 +60,6 @@ module Fog end class Real - attr_reader :endpoint def initialize(options={}) @@ -94,7 +91,6 @@ module Fog URI::Generic.build(options).to_s end end - end end end diff --git a/lib/fog/ninefold/compute.rb b/lib/fog/ninefold/compute.rb index 0ee652262..34c9bc0ec 100644 --- a/lib/fog/ninefold/compute.rb +++ b/lib/fog/ninefold/compute.rb @@ -3,7 +3,6 @@ require 'fog/ninefold/core' module Fog module Compute class Ninefold < Fog::Service - API_URL = "http://api.ninefold.com/compute/v1.0/" requires :ninefold_compute_key, :ninefold_compute_secret @@ -69,7 +68,6 @@ module Fog request :update_load_balancer_rule class Mock - def initialize(options) @api_url = options[:ninefold_api_url] || API_URL @ninefold_compute_key = options[:ninefold_compute_key] @@ -82,7 +80,6 @@ module Fog end class Real - def initialize(options) @api_url = options[:ninefold_api_url] || API_URL @ninefold_compute_key = options[:ninefold_compute_key] diff --git a/lib/fog/ninefold/core.rb b/lib/fog/ninefold/core.rb index 42cf0a1c9..261e1951c 100644 --- a/lib/fog/ninefold/core.rb +++ b/lib/fog/ninefold/core.rb @@ -3,11 +3,9 @@ require 'fog/json' module Fog module Ninefold - extend Fog::Provider service(:compute, 'Compute') service(:storage, 'Storage') - end end diff --git a/lib/fog/ninefold/models/compute/address.rb b/lib/fog/ninefold/models/compute/address.rb index 8dd50e1b8..02a058815 100644 --- a/lib/fog/ninefold/models/compute/address.rb +++ b/lib/fog/ninefold/models/compute/address.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Ninefold - class Address < Fog::Model - identity :id attribute :account @@ -96,7 +94,6 @@ module Fog def to_boolean(val) val && (val.to_s.match(/(true|t|yes|y|1)$/i) != nil) end - end end end diff --git a/lib/fog/ninefold/models/compute/addresses.rb b/lib/fog/ninefold/models/compute/addresses.rb index 15f7e7880..6e2b85265 100644 --- a/lib/fog/ninefold/models/compute/addresses.rb +++ b/lib/fog/ninefold/models/compute/addresses.rb @@ -4,9 +4,7 @@ require 'fog/ninefold/models/compute/address' module Fog module Compute class Ninefold - class Addresses < Fog::Collection - model Fog::Compute::Ninefold::Address def all @@ -23,9 +21,7 @@ module Fog new(data[0]) end end - end - end end end diff --git a/lib/fog/ninefold/models/compute/flavor.rb b/lib/fog/ninefold/models/compute/flavor.rb index 9294b95d8..89d0376a6 100644 --- a/lib/fog/ninefold/models/compute/flavor.rb +++ b/lib/fog/ninefold/models/compute/flavor.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Ninefold - class Flavor < Fog::Model - identity :id attribute :cpunumber @@ -20,10 +18,7 @@ module Fog attribute :offerha attribute :storagetype attribute :tags - - end - end end end diff --git a/lib/fog/ninefold/models/compute/flavors.rb b/lib/fog/ninefold/models/compute/flavors.rb index 4212ab350..c624a06e9 100644 --- a/lib/fog/ninefold/models/compute/flavors.rb +++ b/lib/fog/ninefold/models/compute/flavors.rb @@ -4,9 +4,7 @@ require 'fog/ninefold/models/compute/flavor' module Fog module Compute class Ninefold - class Flavors < Fog::Collection - model Fog::Compute::Ninefold::Flavor def all @@ -22,9 +20,7 @@ module Fog new(data[0]) end end - end - end end end diff --git a/lib/fog/ninefold/models/compute/image.rb b/lib/fog/ninefold/models/compute/image.rb index ceb7ed84e..ddaad1d70 100644 --- a/lib/fog/ninefold/models/compute/image.rb +++ b/lib/fog/ninefold/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Ninefold - class Image < Fog::Model - identity :id attribute :account @@ -34,9 +32,7 @@ module Fog attribute :templatetype attribute :zoneid attribute :zonename - end - end end end diff --git a/lib/fog/ninefold/models/compute/images.rb b/lib/fog/ninefold/models/compute/images.rb index 41ea91343..650a40ced 100644 --- a/lib/fog/ninefold/models/compute/images.rb +++ b/lib/fog/ninefold/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/ninefold/models/compute/image' module Fog module Compute class Ninefold - class Images < Fog::Collection - model Fog::Compute::Ninefold::Image def all(offering = 'executable') @@ -22,9 +20,7 @@ module Fog new(data[0]) end end - end - end end end diff --git a/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb b/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb index 3853c4237..b01d84400 100644 --- a/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb +++ b/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Ninefold - class IpForwardingRule < Fog::Model - identity :id attribute :protocol @@ -72,7 +70,6 @@ module Fog job['jobid'] || job['id'] end end - end end end diff --git a/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb b/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb index ae0826cdc..36078ff24 100644 --- a/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb +++ b/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb @@ -4,9 +4,7 @@ require 'fog/ninefold/models/compute/ip_forwarding_rule' module Fog module Compute class Ninefold - class IpForwardingRules < Fog::Collection - model Fog::Compute::Ninefold::IpForwardingRule def all @@ -23,9 +21,7 @@ module Fog new(data[0]) end end - end - end end end diff --git a/lib/fog/ninefold/models/compute/server.rb b/lib/fog/ninefold/models/compute/server.rb index 42d709b36..76ece1af0 100644 --- a/lib/fog/ninefold/models/compute/server.rb +++ b/lib/fog/ninefold/models/compute/server.rb @@ -3,7 +3,6 @@ require 'fog/compute/models/server' module Fog module Compute class Ninefold - class Server < Fog::Compute::Server extend Fog::Deprecation deprecate :serviceofferingid, :flavor_id @@ -66,7 +65,6 @@ module Fog #attribute :flavor_id, :aliases => "server_type", :squash => "id" #attribute :zone_id, :aliases => "zone", :squash => "id" - def initialize(attributes={}) merge_attributes({ :flavor_id => 105, # '1CPU, 384MB, 80GB HDD' @@ -178,7 +176,6 @@ module Fog job['jobid'] || job['id'] end end - end end end diff --git a/lib/fog/ninefold/models/compute/servers.rb b/lib/fog/ninefold/models/compute/servers.rb index 6293bbde2..e0e26d650 100644 --- a/lib/fog/ninefold/models/compute/servers.rb +++ b/lib/fog/ninefold/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/ninefold/models/compute/server' module Fog module Compute class Ninefold - class Servers < Fog::Collection - model Fog::Compute::Ninefold::Server def all @@ -23,9 +21,7 @@ module Fog new(data[0]) end end - end - end end end diff --git a/lib/fog/ninefold/requests/compute/associate_ip_address.rb b/lib/fog/ninefold/requests/compute/associate_ip_address.rb index 1d5113aa3..dea4d95dc 100644 --- a/lib/fog/ninefold/requests/compute/associate_ip_address.rb +++ b/lib/fog/ninefold/requests/compute/associate_ip_address.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def associate_ip_address(options = {}) request('associateIpAddress', options, :expects => [200], :response_prefix => 'associateipaddressresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/change_service_for_virtual_machine.rb b/lib/fog/ninefold/requests/compute/change_service_for_virtual_machine.rb index c59bb7399..184245460 100644 --- a/lib/fog/ninefold/requests/compute/change_service_for_virtual_machine.rb +++ b/lib/fog/ninefold/requests/compute/change_service_for_virtual_machine.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def change_service_for_virtual_machine(options = {}) request('changeServiceForVirtualMachine', options, :expects => [200], :response_prefix => 'changeserviceforvirtualmachineresponse/virtualmachine', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/create_ip_forwarding_rule.rb b/lib/fog/ninefold/requests/compute/create_ip_forwarding_rule.rb index d1ddcf11b..8d207bc90 100644 --- a/lib/fog/ninefold/requests/compute/create_ip_forwarding_rule.rb +++ b/lib/fog/ninefold/requests/compute/create_ip_forwarding_rule.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def create_ip_forwarding_rule(options = {}) request('createIpForwardingRule', options, :expects => [200], :response_prefix => 'createipforwardingruleresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/delete_ip_forwarding_rule.rb b/lib/fog/ninefold/requests/compute/delete_ip_forwarding_rule.rb index bd97345c2..5121bade1 100644 --- a/lib/fog/ninefold/requests/compute/delete_ip_forwarding_rule.rb +++ b/lib/fog/ninefold/requests/compute/delete_ip_forwarding_rule.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def delete_ip_forwarding_rule(options = {}) request('deleteIpForwardingRule', options, :expects => [200], :response_prefix => 'deleteipforwardingruleresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/deploy_virtual_machine.rb b/lib/fog/ninefold/requests/compute/deploy_virtual_machine.rb index 084c142b7..9517d9751 100644 --- a/lib/fog/ninefold/requests/compute/deploy_virtual_machine.rb +++ b/lib/fog/ninefold/requests/compute/deploy_virtual_machine.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def deploy_virtual_machine(options = {}) request('deployVirtualMachine', options, :expects => [200], :response_prefix => 'deployvirtualmachineresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/destroy_virtual_machine.rb b/lib/fog/ninefold/requests/compute/destroy_virtual_machine.rb index a4bd5149a..4666f9c84 100644 --- a/lib/fog/ninefold/requests/compute/destroy_virtual_machine.rb +++ b/lib/fog/ninefold/requests/compute/destroy_virtual_machine.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def destroy_virtual_machine(options = {}) request('destroyVirtualMachine', options, :expects => [200], :response_prefix => 'destroyvirtualmachineresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/disable_static_nat.rb b/lib/fog/ninefold/requests/compute/disable_static_nat.rb index b982dfcfc..a1905d4be 100644 --- a/lib/fog/ninefold/requests/compute/disable_static_nat.rb +++ b/lib/fog/ninefold/requests/compute/disable_static_nat.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def disable_static_nat(options = {}) request('disableStaticNat', options, :expects => [200], :response_prefix => 'disablestaticnatresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/disassociate_ip_address.rb b/lib/fog/ninefold/requests/compute/disassociate_ip_address.rb index d31f162ad..bd8e89924 100644 --- a/lib/fog/ninefold/requests/compute/disassociate_ip_address.rb +++ b/lib/fog/ninefold/requests/compute/disassociate_ip_address.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def disassociate_ip_address(options = {}) request('disassociateIpAddress', options, :expects => [200], :response_prefix => 'disassociateipaddressresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/enable_static_nat.rb b/lib/fog/ninefold/requests/compute/enable_static_nat.rb index eddd6b45a..c883d8156 100644 --- a/lib/fog/ninefold/requests/compute/enable_static_nat.rb +++ b/lib/fog/ninefold/requests/compute/enable_static_nat.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def enable_static_nat(options = {}) request('enableStaticNat', options, :expects => [200], :response_prefix => 'enablestaticnatresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_accounts.rb b/lib/fog/ninefold/requests/compute/list_accounts.rb index 866fdb2a8..337af0758 100644 --- a/lib/fog/ninefold/requests/compute/list_accounts.rb +++ b/lib/fog/ninefold/requests/compute/list_accounts.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_accounts(options = {}) request('listAccounts', options, :expects => [200], :response_prefix => 'listaccountsresponse/account', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_async_jobs.rb b/lib/fog/ninefold/requests/compute/list_async_jobs.rb index c96b5706a..e8ecde511 100644 --- a/lib/fog/ninefold/requests/compute/list_async_jobs.rb +++ b/lib/fog/ninefold/requests/compute/list_async_jobs.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_async_jobs(options = {}) request('listAsyncJobs', options, :expects => [200], :response_prefix => 'listasyncjobsresponse/asyncjobs', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_capabilities.rb b/lib/fog/ninefold/requests/compute/list_capabilities.rb index 7a50069bd..748e44ffb 100644 --- a/lib/fog/ninefold/requests/compute/list_capabilities.rb +++ b/lib/fog/ninefold/requests/compute/list_capabilities.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_capabilities(options = {}) request('listCapabilities', options, :expects => [200], :response_prefix => 'listcapabilitiesresponse/capability', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_disk_offerings.rb b/lib/fog/ninefold/requests/compute/list_disk_offerings.rb index fa64094c6..dcd08bc45 100644 --- a/lib/fog/ninefold/requests/compute/list_disk_offerings.rb +++ b/lib/fog/ninefold/requests/compute/list_disk_offerings.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_disk_offerings(options = {}) request('listDiskOfferings', options, :expects => [200], :response_prefix => 'listdiskofferingsresponse/diskoffering', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_events.rb b/lib/fog/ninefold/requests/compute/list_events.rb index fe775b463..3c697a1d6 100644 --- a/lib/fog/ninefold/requests/compute/list_events.rb +++ b/lib/fog/ninefold/requests/compute/list_events.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_events(options = {}) request('listEvents', options, :expects => [200], :response_prefix => 'listeventsresponse/event', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_hypervisors.rb b/lib/fog/ninefold/requests/compute/list_hypervisors.rb index 5f8dd6730..a3541b7ed 100644 --- a/lib/fog/ninefold/requests/compute/list_hypervisors.rb +++ b/lib/fog/ninefold/requests/compute/list_hypervisors.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_hypervisors(options = {}) request('listHypervisors', options, :expects => [200], :response_prefix => 'listhypervisorsresponse/hypervisor', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_ip_forwarding_rules.rb b/lib/fog/ninefold/requests/compute/list_ip_forwarding_rules.rb index 70a774d67..72b4ae213 100644 --- a/lib/fog/ninefold/requests/compute/list_ip_forwarding_rules.rb +++ b/lib/fog/ninefold/requests/compute/list_ip_forwarding_rules.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_ip_forwarding_rules(options = {}) request('listIpForwardingRules', options, :expects => [200], :response_prefix => 'listipforwardingrulesresponse/ipforwardingrule', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_network_offerings.rb b/lib/fog/ninefold/requests/compute/list_network_offerings.rb index 30e900c62..7abd3d4a0 100644 --- a/lib/fog/ninefold/requests/compute/list_network_offerings.rb +++ b/lib/fog/ninefold/requests/compute/list_network_offerings.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_network_offerings(options = {}) request('listNetworkOfferings', options, :expects => [200], :response_prefix => 'listnetworkofferingsresponse/networkoffering', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_networks.rb b/lib/fog/ninefold/requests/compute/list_networks.rb index bc7fb8bc7..5a7813b03 100644 --- a/lib/fog/ninefold/requests/compute/list_networks.rb +++ b/lib/fog/ninefold/requests/compute/list_networks.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_networks(options = {}) request('listNetworks', options, :expects => [200], :response_prefix => 'listnetworksresponse/network', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_public_ip_addresses.rb b/lib/fog/ninefold/requests/compute/list_public_ip_addresses.rb index f060b6b6b..3902dbbde 100644 --- a/lib/fog/ninefold/requests/compute/list_public_ip_addresses.rb +++ b/lib/fog/ninefold/requests/compute/list_public_ip_addresses.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_public_ip_addresses(options = {}) request('listPublicIpAddresses', options, :expects => [200], :response_prefix => 'listpublicipaddressesresponse/publicipaddress', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_resource_limits.rb b/lib/fog/ninefold/requests/compute/list_resource_limits.rb index 757443fd6..e38aaca46 100644 --- a/lib/fog/ninefold/requests/compute/list_resource_limits.rb +++ b/lib/fog/ninefold/requests/compute/list_resource_limits.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_resource_limits(options = {}) request('listResourceLimits', options, :expects => [200], :response_prefix => 'listresourcelimitsresponse/resourcelimit', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_service_offerings.rb b/lib/fog/ninefold/requests/compute/list_service_offerings.rb index 4f57fe057..93c4615df 100644 --- a/lib/fog/ninefold/requests/compute/list_service_offerings.rb +++ b/lib/fog/ninefold/requests/compute/list_service_offerings.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_service_offerings(options = {}) request('listServiceOfferings', options, :expects => [200], :response_prefix => 'listserviceofferingsresponse/serviceoffering', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_templates.rb b/lib/fog/ninefold/requests/compute/list_templates.rb index 2d2eab62f..86b34dacc 100644 --- a/lib/fog/ninefold/requests/compute/list_templates.rb +++ b/lib/fog/ninefold/requests/compute/list_templates.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_templates(options = {}) request('listTemplates', options, :expects => [200], :response_prefix => 'listtemplatesresponse/template', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_virtual_machines.rb b/lib/fog/ninefold/requests/compute/list_virtual_machines.rb index b9e1f1b76..99544d633 100644 --- a/lib/fog/ninefold/requests/compute/list_virtual_machines.rb +++ b/lib/fog/ninefold/requests/compute/list_virtual_machines.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_virtual_machines(options = {}) request('listVirtualMachines', options, :expects => [200], :response_prefix => 'listvirtualmachinesresponse/virtualmachine', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/list_zones.rb b/lib/fog/ninefold/requests/compute/list_zones.rb index e8c623a0c..b37a417fc 100644 --- a/lib/fog/ninefold/requests/compute/list_zones.rb +++ b/lib/fog/ninefold/requests/compute/list_zones.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def list_zones(options = {}) request('listZones', options, :expects => [200], :response_prefix => 'listzonesresponse/zone', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/query_async_job_result.rb b/lib/fog/ninefold/requests/compute/query_async_job_result.rb index ab916ad8c..a091f9400 100644 --- a/lib/fog/ninefold/requests/compute/query_async_job_result.rb +++ b/lib/fog/ninefold/requests/compute/query_async_job_result.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def query_async_job_result(options = {}) request('queryAsyncJobResult', options, :expects => [200], :response_prefix => 'queryasyncjobresultresponse', :response_type => Array) end - end end end diff --git a/lib/fog/ninefold/requests/compute/reboot_virtual_machine.rb b/lib/fog/ninefold/requests/compute/reboot_virtual_machine.rb index 85963cce5..64d2c4843 100644 --- a/lib/fog/ninefold/requests/compute/reboot_virtual_machine.rb +++ b/lib/fog/ninefold/requests/compute/reboot_virtual_machine.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def reboot_virtual_machine(options = {}) request('rebootVirtualMachine', options, :expects => [200], :response_prefix => 'rebootvirtualmachineresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/reset_password_for_virtual_machine.rb b/lib/fog/ninefold/requests/compute/reset_password_for_virtual_machine.rb index 7fe674787..1d30c2411 100644 --- a/lib/fog/ninefold/requests/compute/reset_password_for_virtual_machine.rb +++ b/lib/fog/ninefold/requests/compute/reset_password_for_virtual_machine.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def reset_password_for_virtual_machine(options = {}) request('resetPasswordForVirtualMachine', options, :expects => [200], :response_prefix => 'resetpasswordforvirtualmachineresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/start_virtual_machine.rb b/lib/fog/ninefold/requests/compute/start_virtual_machine.rb index fd86d9e4d..a38c397e1 100644 --- a/lib/fog/ninefold/requests/compute/start_virtual_machine.rb +++ b/lib/fog/ninefold/requests/compute/start_virtual_machine.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def start_virtual_machine(options = {}) request('startVirtualMachine', options, :expects => [200], :response_prefix => 'startvirtualmachineresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/stop_virtual_machine.rb b/lib/fog/ninefold/requests/compute/stop_virtual_machine.rb index 542eec52c..44823b29f 100644 --- a/lib/fog/ninefold/requests/compute/stop_virtual_machine.rb +++ b/lib/fog/ninefold/requests/compute/stop_virtual_machine.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def stop_virtual_machine(options = {}) request('stopVirtualMachine', options, :expects => [200], :response_prefix => 'stopvirtualmachineresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/requests/compute/update_virtual_machine.rb b/lib/fog/ninefold/requests/compute/update_virtual_machine.rb index 6254e9dfe..eaebea8fc 100644 --- a/lib/fog/ninefold/requests/compute/update_virtual_machine.rb +++ b/lib/fog/ninefold/requests/compute/update_virtual_machine.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ninefold class Real - def update_virtual_machine(options = {}) request('updateVirtualMachine', options, :expects => [200], :response_prefix => 'updatevirtualmachineresponse', :response_type => Hash) end - end end end diff --git a/lib/fog/ninefold/storage.rb b/lib/fog/ninefold/storage.rb index 7c955f6ff..70a28ee1c 100644 --- a/lib/fog/ninefold/storage.rb +++ b/lib/fog/ninefold/storage.rb @@ -32,7 +32,6 @@ module Fog def request(options) raise "Ninefold Storage mocks not implemented" end - end class Real < Fog::Storage::Atmos::Real diff --git a/lib/fog/openstack/compute.rb b/lib/fog/openstack/compute.rb index 382cc2486..42ca83796 100644 --- a/lib/fog/openstack/compute.rb +++ b/lib/fog/openstack/compute.rb @@ -3,7 +3,6 @@ require 'fog/openstack/core' module Fog module Compute class OpenStack < Fog::Service - requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -170,7 +169,6 @@ module Fog request :list_hosts request :get_host_details - class Mock attr_reader :auth_token attr_reader :auth_token_expiration @@ -429,7 +427,6 @@ module Fog true end - end end end diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 8b4757942..00f35be3d 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -94,7 +94,6 @@ module Fog endpoint_type = (options[:openstack_endpoint_type] || 'publicURL').to_s openstack_region = options[:openstack_region] - body = retrieve_tokens_v2(options, connection_options) service = get_service(body, service_type, service_name) @@ -166,7 +165,6 @@ module Fog :current_user_id => body['access']['user']['id'], :unscoped_token => options[:unscoped_token] } - end def self.get_service(body, service_type=[], service_name=nil) @@ -245,6 +243,5 @@ module Fog '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase end end - end end diff --git a/lib/fog/openstack/examples/compute/basics.rb b/lib/fog/openstack/examples/compute/basics.rb index 7891d13bb..61cdf6f18 100644 --- a/lib/fog/openstack/examples/compute/basics.rb +++ b/lib/fog/openstack/examples/compute/basics.rb @@ -56,7 +56,6 @@ end # Images available at tenant image_names = compute_client.images.map { |image| image['name'] } - # Floating IP address pools available at tenant compute_client.addresses.get_address_pools # response.body #=> { 'name' => 'pool1' }, { 'name' => 'pool2' } diff --git a/lib/fog/openstack/examples/identity/basics.rb b/lib/fog/openstack/examples/identity/basics.rb index a0579e7d8..20d0659d2 100644 --- a/lib/fog/openstack/examples/identity/basics.rb +++ b/lib/fog/openstack/examples/identity/basics.rb @@ -57,7 +57,6 @@ user = keystone.users.create :name => 'rubiojr@example.net', :password => 'rubiojr@example.net', :email => 'rubiojr@example.net' - # Find the recently created tenant tenant = keystone.tenants.find { |t| t.name == 'rubiojr@example.net' } # Destroy the tenant diff --git a/lib/fog/openstack/examples/network/network_subnets_routers.rb b/lib/fog/openstack/examples/network/network_subnets_routers.rb index d9ba0263f..746db7523 100644 --- a/lib/fog/openstack/examples/network/network_subnets_routers.rb +++ b/lib/fog/openstack/examples/network/network_subnets_routers.rb @@ -57,7 +57,6 @@ public_subnet = network.subnets.create :name => 'floating_ips_net', :cidr => '1.2.3.0/24', :enable_dhcp => false - # Create tenant networks create_tenant_network 'admin@example.net', public_net create_tenant_network 'demo@example.net', public_net diff --git a/lib/fog/openstack/identity.rb b/lib/fog/openstack/identity.rb index 758caf9ad..09b769c67 100644 --- a/lib/fog/openstack/identity.rb +++ b/lib/fog/openstack/identity.rb @@ -3,7 +3,6 @@ require 'fog/openstack/core' module Fog module Identity class OpenStack < Fog::Service - requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, :openstack_tenant, @@ -287,7 +286,6 @@ module Fog @scheme = uri.scheme true end - end end end diff --git a/lib/fog/openstack/image.rb b/lib/fog/openstack/image.rb index 3bf8e8603..98f7ddb29 100644 --- a/lib/fog/openstack/image.rb +++ b/lib/fog/openstack/image.rb @@ -212,7 +212,6 @@ module Fog @scheme = uri.scheme true end - end end end diff --git a/lib/fog/openstack/metering.rb b/lib/fog/openstack/metering.rb index bb97a4b35..226b4d174 100644 --- a/lib/fog/openstack/metering.rb +++ b/lib/fog/openstack/metering.rb @@ -3,7 +3,6 @@ require 'fog/openstack/core' module Fog module Metering class OpenStack < Fog::Service - requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, :openstack_tenant, @@ -16,7 +15,6 @@ module Fog model :resource collection :resources - request_path 'fog/openstack/requests/metering' # Metering @@ -26,7 +24,6 @@ module Fog request :list_meters request :list_resources - class Mock def self.data @data ||= Hash.new do |hash, key| @@ -202,7 +199,6 @@ module Fog @scheme = uri.scheme true end - end end end diff --git a/lib/fog/openstack/models/compute/address.rb b/lib/fog/openstack/models/compute/address.rb index c6a47b7b4..245b10823 100644 --- a/lib/fog/openstack/models/compute/address.rb +++ b/lib/fog/openstack/models/compute/address.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class OpenStack - class Address < Fog::Model - identity :id attribute :ip @@ -63,9 +61,7 @@ module Fog end self.instance_id = nil end - end - end end end diff --git a/lib/fog/openstack/models/compute/addresses.rb b/lib/fog/openstack/models/compute/addresses.rb index 90525bb5f..33cf267a9 100644 --- a/lib/fog/openstack/models/compute/addresses.rb +++ b/lib/fog/openstack/models/compute/addresses.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/address' module Fog module Compute class OpenStack - class Addresses < Fog::Collection - model Fog::Compute::OpenStack::Address def all @@ -24,9 +22,7 @@ module Fog def get_address_pools service.list_address_pools.body['floating_ip_pools'] end - end - end end end diff --git a/lib/fog/openstack/models/compute/flavors.rb b/lib/fog/openstack/models/compute/flavors.rb index 671cfb032..1fab112af 100644 --- a/lib/fog/openstack/models/compute/flavors.rb +++ b/lib/fog/openstack/models/compute/flavors.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/flavor' module Fog module Compute class OpenStack - class Flavors < Fog::Collection - model Fog::Compute::OpenStack::Flavor def all(options = {}) @@ -20,9 +18,7 @@ module Fog rescue Fog::Compute::OpenStack::NotFound nil end - end - end end end diff --git a/lib/fog/openstack/models/compute/host.rb b/lib/fog/openstack/models/compute/host.rb index 3675f725a..fb8466ffa 100644 --- a/lib/fog/openstack/models/compute/host.rb +++ b/lib/fog/openstack/models/compute/host.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/metadata' module Fog module Compute class OpenStack - class Host < Fog::Model - attribute :host_name attribute :service_name attribute :details @@ -24,10 +22,7 @@ module Fog rescue Fog::Compute::OpenStack::NotFound nil end - end - end end - end diff --git a/lib/fog/openstack/models/compute/hosts.rb b/lib/fog/openstack/models/compute/hosts.rb index ee1409c91..e13363dcc 100644 --- a/lib/fog/openstack/models/compute/hosts.rb +++ b/lib/fog/openstack/models/compute/hosts.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/host' module Fog module Compute class OpenStack - class Hosts < Fog::Collection - model Fog::Compute::OpenStack::Host def all @@ -24,9 +22,7 @@ module Fog rescue Fog::Compute::OpenStack::NotFound nil end - end - end end end diff --git a/lib/fog/openstack/models/compute/image.rb b/lib/fog/openstack/models/compute/image.rb index 0a9ff3ad1..e3f880b72 100644 --- a/lib/fog/openstack/models/compute/image.rb +++ b/lib/fog/openstack/models/compute/image.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/metadata' module Fog module Compute class OpenStack - class Image < Fog::Model - identity :id attribute :name @@ -50,9 +48,7 @@ module Fog def ready? status == 'ACTIVE' end - end - end end end diff --git a/lib/fog/openstack/models/compute/images.rb b/lib/fog/openstack/models/compute/images.rb index 5425c8fe3..1ffc3ab0f 100644 --- a/lib/fog/openstack/models/compute/images.rb +++ b/lib/fog/openstack/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/image' module Fog module Compute class OpenStack - class Images < Fog::Collection - attribute :filters model Fog::Compute::OpenStack::Image @@ -34,9 +32,7 @@ module Fog rescue Fog::Compute::OpenStack::NotFound nil end - end - end end end diff --git a/lib/fog/openstack/models/compute/key_pair.rb b/lib/fog/openstack/models/compute/key_pair.rb index 466d5450a..d74bdaaea 100644 --- a/lib/fog/openstack/models/compute/key_pair.rb +++ b/lib/fog/openstack/models/compute/key_pair.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class OpenStack - class KeyPair < Fog::Model - identity :name attribute :fingerprint @@ -37,7 +35,6 @@ module Fog end def write(path="#{ENV['HOME']}/.ssh/fog_#{Fog.credential.to_s}_#{name}.pem") - if writable? split_private_key = private_key.split(/\n/) File.open(path, "w") do |f| @@ -53,7 +50,6 @@ module Fog def writable? !!(private_key && ENV.has_key?('HOME')) end - end end end diff --git a/lib/fog/openstack/models/compute/key_pairs.rb b/lib/fog/openstack/models/compute/key_pairs.rb index be92e7be2..bb747125b 100644 --- a/lib/fog/openstack/models/compute/key_pairs.rb +++ b/lib/fog/openstack/models/compute/key_pairs.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/key_pair' module Fog module Compute class OpenStack - class KeyPairs < Fog::Collection - model Fog::Compute::OpenStack::KeyPair def all @@ -24,7 +22,6 @@ module Fog rescue Fog::Compute::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/compute/metadata.rb b/lib/fog/openstack/models/compute/metadata.rb index 833307971..aa66759b8 100644 --- a/lib/fog/openstack/models/compute/metadata.rb +++ b/lib/fog/openstack/models/compute/metadata.rb @@ -7,9 +7,7 @@ require 'fog/openstack/models/compute/server' module Fog module Compute class OpenStack - class Metadata < Fog::Collection - model Fog::Compute::OpenStack::Metadatum include Fog::Compute::OpenStack::MetaParent @@ -60,9 +58,7 @@ module Fog end data end - end - end end end diff --git a/lib/fog/openstack/models/compute/metadatum.rb b/lib/fog/openstack/models/compute/metadatum.rb index 8a4e62515..a338d6a12 100644 --- a/lib/fog/openstack/models/compute/metadatum.rb +++ b/lib/fog/openstack/models/compute/metadatum.rb @@ -5,7 +5,6 @@ module Fog module Compute class OpenStack class Metadatum < Fog::Model - include Fog::Compute::OpenStack::MetaParent identity :key @@ -22,7 +21,6 @@ module Fog service.update_meta(collection_name, @parent.id, key, value) true end - end end end diff --git a/lib/fog/openstack/models/compute/security_group.rb b/lib/fog/openstack/models/compute/security_group.rb index 3b4369286..eb7542c85 100644 --- a/lib/fog/openstack/models/compute/security_group.rb +++ b/lib/fog/openstack/models/compute/security_group.rb @@ -4,7 +4,6 @@ module Fog module Compute class OpenStack class SecurityGroup < Fog::Model - identity :id attribute :name diff --git a/lib/fog/openstack/models/compute/security_group_rules.rb b/lib/fog/openstack/models/compute/security_group_rules.rb index a1fedf523..b5f7156a8 100644 --- a/lib/fog/openstack/models/compute/security_group_rules.rb +++ b/lib/fog/openstack/models/compute/security_group_rules.rb @@ -5,7 +5,6 @@ module Fog module Compute class OpenStack class SecurityGroupRules < Fog::Collection - model Fog::Compute::OpenStack::SecurityGroupRule def get(security_group_rule_id) diff --git a/lib/fog/openstack/models/compute/security_groups.rb b/lib/fog/openstack/models/compute/security_groups.rb index a55ff2232..4613f3aaa 100644 --- a/lib/fog/openstack/models/compute/security_groups.rb +++ b/lib/fog/openstack/models/compute/security_groups.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/security_group' module Fog module Compute class OpenStack - class SecurityGroups < Fog::Collection - model Fog::Compute::OpenStack::SecurityGroup def all @@ -20,7 +18,6 @@ module Fog rescue Fog::Compute::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/compute/server.rb b/lib/fog/openstack/models/compute/server.rb index 36fb98581..968809a46 100644 --- a/lib/fog/openstack/models/compute/server.rb +++ b/lib/fog/openstack/models/compute/server.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/metadata' module Fog module Compute class OpenStack - class Server < Fog::Compute::Server - identity :id attribute :instance_name, :aliases => 'OS-EXT-SRV-ATTR:instance_name' @@ -54,7 +52,6 @@ module Fog attr_writer :image_ref, :flavor_ref, :nics, :os_scheduler_hints attr_accessor :block_device_mapping - def initialize(attributes={}) # Old 'connection' is renamed as service and should be used instead prepare_service_value(attributes) @@ -134,7 +131,6 @@ module Fog 1 else 0 end } - end alias_method :public_ip_addresses, :floating_ip_addresses @@ -343,10 +339,7 @@ module Fog def adminPass=(new_admin_pass) @password = new_admin_pass end - end - end end - end diff --git a/lib/fog/openstack/models/compute/servers.rb b/lib/fog/openstack/models/compute/servers.rb index e2946bf87..7e111e98f 100644 --- a/lib/fog/openstack/models/compute/servers.rb +++ b/lib/fog/openstack/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/server' module Fog module Compute class OpenStack - class Servers < Fog::Collection - attribute :filters model Fog::Compute::OpenStack::Server @@ -49,9 +47,7 @@ module Fog rescue Fog::Compute::OpenStack::NotFound nil end - end - end end end diff --git a/lib/fog/openstack/models/compute/snapshot.rb b/lib/fog/openstack/models/compute/snapshot.rb index 52c301631..270c26f34 100644 --- a/lib/fog/openstack/models/compute/snapshot.rb +++ b/lib/fog/openstack/models/compute/snapshot.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/metadata' module Fog module Compute class OpenStack - class Snapshot < Fog::Model - identity :id attribute :name, :aliases => 'displayName' @@ -16,7 +14,6 @@ module Fog attribute :size attribute :created_at, :aliases => 'createdAt' - def initialize(attributes) # Old 'connection' is renamed as service and should be used instead prepare_service_value(attributes) @@ -35,10 +32,7 @@ module Fog service.delete_snapshot(id) true end - end - end end - end diff --git a/lib/fog/openstack/models/compute/snapshots.rb b/lib/fog/openstack/models/compute/snapshots.rb index 468712ea7..779bb94e9 100644 --- a/lib/fog/openstack/models/compute/snapshots.rb +++ b/lib/fog/openstack/models/compute/snapshots.rb @@ -4,7 +4,6 @@ require 'fog/openstack/models/compute/snapshot' module Fog module Compute class OpenStack - class Snapshots < Fog::Collection model Fog::Compute::OpenStack::Snapshot @@ -20,7 +19,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/openstack/models/compute/volume.rb b/lib/fog/openstack/models/compute/volume.rb index c23f762f7..dda750799 100644 --- a/lib/fog/openstack/models/compute/volume.rb +++ b/lib/fog/openstack/models/compute/volume.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/compute/metadata' module Fog module Compute class OpenStack - class Volume < Fog::Model - identity :id attribute :name, :aliases => 'displayName' @@ -19,7 +17,6 @@ module Fog attribute :created_at, :aliases => 'createdAt' attribute :attachments - def initialize(attributes) # Old 'connection' is renamed as service and should be used instead prepare_service_value(attributes) @@ -55,10 +52,7 @@ module Fog def ready? self.status == "available" end - end - end end - end diff --git a/lib/fog/openstack/models/compute/volumes.rb b/lib/fog/openstack/models/compute/volumes.rb index 9a83b1a3c..4da82d5dc 100644 --- a/lib/fog/openstack/models/compute/volumes.rb +++ b/lib/fog/openstack/models/compute/volumes.rb @@ -4,7 +4,6 @@ require 'fog/openstack/models/compute/volume' module Fog module Compute class OpenStack - class Volumes < Fog::Collection model Fog::Compute::OpenStack::Volume @@ -20,7 +19,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/openstack/models/identity/roles.rb b/lib/fog/openstack/models/identity/roles.rb index 25a44f6c6..ccba660f3 100644 --- a/lib/fog/openstack/models/identity/roles.rb +++ b/lib/fog/openstack/models/identity/roles.rb @@ -14,7 +14,6 @@ module Fog def get(id) service.get_role(id) end - end end # class OpenStack end # module Compute diff --git a/lib/fog/openstack/models/image/image.rb b/lib/fog/openstack/models/image/image.rb index a6636203e..6ce9f25e4 100644 --- a/lib/fog/openstack/models/image/image.rb +++ b/lib/fog/openstack/models/image/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Image class OpenStack - class Image < Fog::Model - identity :id attribute :name @@ -30,7 +28,6 @@ module Fog attribute :location attribute :copy_from - def initialize(attributes) # Old 'connection' is renamed as service and should be used instead prepare_service_value(attributes) @@ -84,7 +81,6 @@ module Fog requires :id service.get_image(self.id).headers end - end end end diff --git a/lib/fog/openstack/models/meta_parent.rb b/lib/fog/openstack/models/meta_parent.rb index 12f591e86..b90b6e5b1 100644 --- a/lib/fog/openstack/models/meta_parent.rb +++ b/lib/fog/openstack/models/meta_parent.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack module MetaParent - def parent @parent end @@ -26,7 +25,6 @@ module Fog metas.each { |meta| hash.store(meta.key, meta.value) } hash end - end end end diff --git a/lib/fog/openstack/models/metering/resource.rb b/lib/fog/openstack/models/metering/resource.rb index 9857cfe23..b0fc47d16 100644 --- a/lib/fog/openstack/models/metering/resource.rb +++ b/lib/fog/openstack/models/metering/resource.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Metering class OpenStack - class Resource < Fog::Model - identity :resource_id attribute :project_id @@ -16,7 +14,6 @@ module Fog prepare_service_value(attributes) super end - end end end diff --git a/lib/fog/openstack/models/metering/resources.rb b/lib/fog/openstack/models/metering/resources.rb index 6108b7bb9..5209b3d58 100644 --- a/lib/fog/openstack/models/metering/resources.rb +++ b/lib/fog/openstack/models/metering/resources.rb @@ -4,7 +4,6 @@ require 'fog/openstack/models/metering/resource' module Fog module Metering class OpenStack - class Resources < Fog::Collection model Fog::Metering::OpenStack::Resource @@ -19,7 +18,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/openstack/models/network/floating_ip.rb b/lib/fog/openstack/models/network/floating_ip.rb index 6ddf4eca4..5c1d3af2b 100644 --- a/lib/fog/openstack/models/network/floating_ip.rb +++ b/lib/fog/openstack/models/network/floating_ip.rb @@ -12,11 +12,6 @@ module Fog attribute :fixed_ip_address attribute :floating_ip_address - - - - - def initialize(attributes) @connection = attributes[:connection] super @@ -31,7 +26,6 @@ module Fog requires :floating_network_id merge_attributes(service.create_floating_ip(self.floating_network_id, - self.attributes).body['floatingip']) self end @@ -45,7 +39,6 @@ module Fog service.delete_floating_ip(self.id) true end - end end end diff --git a/lib/fog/openstack/models/network/floating_ips.rb b/lib/fog/openstack/models/network/floating_ips.rb index 9a827f015..e27e322ea 100644 --- a/lib/fog/openstack/models/network/floating_ips.rb +++ b/lib/fog/openstack/models/network/floating_ips.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class FloatingIps < Fog::Collection - attribute :filters model Fog::Network::OpenStack::FloatingIp @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/lb_health_monitor.rb b/lib/fog/openstack/models/network/lb_health_monitor.rb index 34dea547e..24b40fc65 100644 --- a/lib/fog/openstack/models/network/lb_health_monitor.rb +++ b/lib/fog/openstack/models/network/lb_health_monitor.rb @@ -61,7 +61,6 @@ module Fog service.disassociate_lb_health_monitor(pool_id, self.id) true end - end end end diff --git a/lib/fog/openstack/models/network/lb_health_monitors.rb b/lib/fog/openstack/models/network/lb_health_monitors.rb index f18374cd7..d30faa814 100644 --- a/lib/fog/openstack/models/network/lb_health_monitors.rb +++ b/lib/fog/openstack/models/network/lb_health_monitors.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class LbHealthMonitors < Fog::Collection - attribute :filters model Fog::Network::OpenStack::LbHealthMonitor @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/lb_member.rb b/lib/fog/openstack/models/network/lb_member.rb index 10e115887..d119b0469 100644 --- a/lib/fog/openstack/models/network/lb_member.rb +++ b/lib/fog/openstack/models/network/lb_member.rb @@ -46,7 +46,6 @@ module Fog service.delete_lb_member(self.id) true end - end end end diff --git a/lib/fog/openstack/models/network/lb_members.rb b/lib/fog/openstack/models/network/lb_members.rb index 15014b667..76e9a42ae 100644 --- a/lib/fog/openstack/models/network/lb_members.rb +++ b/lib/fog/openstack/models/network/lb_members.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class LbMembers < Fog::Collection - attribute :filters model Fog::Network::OpenStack::LbMember @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/lb_pool.rb b/lib/fog/openstack/models/network/lb_pool.rb index 5c6ee3ce9..952ac6a49 100644 --- a/lib/fog/openstack/models/network/lb_pool.rb +++ b/lib/fog/openstack/models/network/lb_pool.rb @@ -71,7 +71,6 @@ module Fog service.disassociate_lb_health_monitor(self.id, health_monitor_id) true end - end end end diff --git a/lib/fog/openstack/models/network/lb_pools.rb b/lib/fog/openstack/models/network/lb_pools.rb index ea57ec269..1c5b5552f 100644 --- a/lib/fog/openstack/models/network/lb_pools.rb +++ b/lib/fog/openstack/models/network/lb_pools.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class LbPools < Fog::Collection - attribute :filters model Fog::Network::OpenStack::LbPool @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/lb_vip.rb b/lib/fog/openstack/models/network/lb_vip.rb index c5ce78ada..aac3ce1e3 100644 --- a/lib/fog/openstack/models/network/lb_vip.rb +++ b/lib/fog/openstack/models/network/lb_vip.rb @@ -52,7 +52,6 @@ module Fog service.delete_lb_vip(self.id) true end - end end end diff --git a/lib/fog/openstack/models/network/lb_vips.rb b/lib/fog/openstack/models/network/lb_vips.rb index 72d72a409..984408d5a 100644 --- a/lib/fog/openstack/models/network/lb_vips.rb +++ b/lib/fog/openstack/models/network/lb_vips.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class LbVips < Fog::Collection - attribute :filters model Fog::Network::OpenStack::LbVip @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/networks.rb b/lib/fog/openstack/models/network/networks.rb index f6d0bc75d..a3045aacf 100644 --- a/lib/fog/openstack/models/network/networks.rb +++ b/lib/fog/openstack/models/network/networks.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class Networks < Fog::Collection - attribute :filters model Fog::Network::OpenStack::Network @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/port.rb b/lib/fog/openstack/models/network/port.rb index 62b95dd9c..4f87c4ca7 100644 --- a/lib/fog/openstack/models/network/port.rb +++ b/lib/fog/openstack/models/network/port.rb @@ -46,7 +46,6 @@ module Fog service.delete_port(self.id) true end - end end end diff --git a/lib/fog/openstack/models/network/ports.rb b/lib/fog/openstack/models/network/ports.rb index efac0ae19..03e10285a 100644 --- a/lib/fog/openstack/models/network/ports.rb +++ b/lib/fog/openstack/models/network/ports.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class Ports < Fog::Collection - attribute :filters model Fog::Network::OpenStack::Port @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/router.rb b/lib/fog/openstack/models/network/router.rb index 8ce6c37fb..855387ed1 100644 --- a/lib/fog/openstack/models/network/router.rb +++ b/lib/fog/openstack/models/network/router.rb @@ -66,7 +66,6 @@ module Fog end options end - end end end diff --git a/lib/fog/openstack/models/network/routers.rb b/lib/fog/openstack/models/network/routers.rb index 79892a00c..0933529a2 100644 --- a/lib/fog/openstack/models/network/routers.rb +++ b/lib/fog/openstack/models/network/routers.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class Routers < Fog::Collection - attribute :filters model Fog::Network::OpenStack::Router @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/security_group_rules.rb b/lib/fog/openstack/models/network/security_group_rules.rb index 55336363f..b9bb55778 100644 --- a/lib/fog/openstack/models/network/security_group_rules.rb +++ b/lib/fog/openstack/models/network/security_group_rules.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class SecurityGroupRules < Fog::Collection - attribute :filters model Fog::Network::OpenStack::SecurityGroupRule diff --git a/lib/fog/openstack/models/network/security_groups.rb b/lib/fog/openstack/models/network/security_groups.rb index 7a96ff599..52fbcbd4d 100644 --- a/lib/fog/openstack/models/network/security_groups.rb +++ b/lib/fog/openstack/models/network/security_groups.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class SecurityGroups < Fog::Collection - attribute :filters model Fog::Network::OpenStack::SecurityGroup @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/network/subnet.rb b/lib/fog/openstack/models/network/subnet.rb index 1557383fe..4dd9aa079 100644 --- a/lib/fog/openstack/models/network/subnet.rb +++ b/lib/fog/openstack/models/network/subnet.rb @@ -49,7 +49,6 @@ module Fog service.delete_subnet(self.id) true end - end end end diff --git a/lib/fog/openstack/models/network/subnets.rb b/lib/fog/openstack/models/network/subnets.rb index 9000f5d40..2d36b07a3 100644 --- a/lib/fog/openstack/models/network/subnets.rb +++ b/lib/fog/openstack/models/network/subnets.rb @@ -5,7 +5,6 @@ module Fog module Network class OpenStack class Subnets < Fog::Collection - attribute :filters model Fog::Network::OpenStack::Subnet @@ -27,7 +26,6 @@ module Fog rescue Fog::Network::OpenStack::NotFound nil end - end end end diff --git a/lib/fog/openstack/models/storage/directories.rb b/lib/fog/openstack/models/storage/directories.rb index e27cc734c..ead226438 100644 --- a/lib/fog/openstack/models/storage/directories.rb +++ b/lib/fog/openstack/models/storage/directories.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/storage/directory' module Fog module Storage class OpenStack - class Directories < Fog::Collection - model Fog::Storage::OpenStack::Directory def all @@ -32,9 +30,7 @@ module Fog rescue Fog::Storage::OpenStack::NotFound nil end - end - end end end diff --git a/lib/fog/openstack/models/storage/directory.rb b/lib/fog/openstack/models/storage/directory.rb index b04730a70..4cb6e682b 100644 --- a/lib/fog/openstack/models/storage/directory.rb +++ b/lib/fog/openstack/models/storage/directory.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/storage/files' module Fog module Storage class OpenStack - class Directory < Fog::Model - identity :key, :aliases => 'name' attribute :bytes, :aliases => 'X-Container-Bytes-Used' @@ -42,9 +40,7 @@ module Fog service.put_container(key) true end - end - end end end diff --git a/lib/fog/openstack/models/storage/file.rb b/lib/fog/openstack/models/storage/file.rb index ec075ae30..9abd31e6f 100644 --- a/lib/fog/openstack/models/storage/file.rb +++ b/lib/fog/openstack/models/storage/file.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Storage class OpenStack - class File < Fog::Model - identity :key, :aliases => 'name' attribute :content_length, :aliases => ['bytes', 'Content-Length'], :type => :integer @@ -83,7 +81,6 @@ module Fog self.collection.get_url(self.key) end - def save(options = {}) requires :body, :directory, :key options['Content-Type'] = content_type if content_type @@ -160,7 +157,6 @@ module Fog merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)}) end end - end end end diff --git a/lib/fog/openstack/models/storage/files.rb b/lib/fog/openstack/models/storage/files.rb index 1e6545996..f1570d6e3 100644 --- a/lib/fog/openstack/models/storage/files.rb +++ b/lib/fog/openstack/models/storage/files.rb @@ -4,9 +4,7 @@ require 'fog/openstack/models/storage/file' module Fog module Storage class OpenStack - class Files < Fog::Collection - attribute :directory attribute :limit attribute :marker @@ -96,9 +94,7 @@ module Fog requires :directory super({ :directory => directory }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/openstack/models/volume/volume.rb b/lib/fog/openstack/models/volume/volume.rb index bdbd938d1..fa1e4e42e 100644 --- a/lib/fog/openstack/models/volume/volume.rb +++ b/lib/fog/openstack/models/volume/volume.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Volume class OpenStack - class Volume < Fog::Model - identity :id attribute :display_name, :aliases => 'displayName' @@ -20,7 +18,6 @@ module Fog attribute :attachments attribute :source_volid - def initialize(attributes) # Old 'connection' is renamed as service and should be used instead prepare_service_value(attributes) @@ -43,11 +40,8 @@ module Fog def ready? status == 'available' end - end - end end - end diff --git a/lib/fog/openstack/models/volume/volumes.rb b/lib/fog/openstack/models/volume/volumes.rb index 53770b69e..1932b72a7 100644 --- a/lib/fog/openstack/models/volume/volumes.rb +++ b/lib/fog/openstack/models/volume/volumes.rb @@ -4,7 +4,6 @@ require 'fog/openstack/models/volume/volume' module Fog module Volume class OpenStack - class Volumes < Fog::Collection model Fog::Volume::OpenStack::Volume @@ -24,7 +23,6 @@ module Fog end alias_method :find_by_id, :get end - end end end diff --git a/lib/fog/openstack/network.rb b/lib/fog/openstack/network.rb index 87161fd22..f1eeb3b7e 100644 --- a/lib/fog/openstack/network.rb +++ b/lib/fog/openstack/network.rb @@ -348,7 +348,6 @@ module Fog @scheme = uri.scheme true end - end end end diff --git a/lib/fog/openstack/orchestration.rb b/lib/fog/openstack/orchestration.rb index 2fc1f0ae6..87c4ef683 100644 --- a/lib/fog/openstack/orchestration.rb +++ b/lib/fog/openstack/orchestration.rb @@ -221,7 +221,6 @@ module Fog true end - end end end diff --git a/lib/fog/openstack/requests/compute/add_security_group.rb b/lib/fog/openstack/requests/compute/add_security_group.rb index 6d76ec203..97ed91f30 100644 --- a/lib/fog/openstack/requests/compute/add_security_group.rb +++ b/lib/fog/openstack/requests/compute/add_security_group.rb @@ -2,22 +2,18 @@ module Fog module Compute class OpenStack class Real - def add_security_group(server_id, group_name) body = {'addSecurityGroup' => { "name" => group_name } } server_action(server_id, body) end - end class Mock - def add_security_group(server_id, group_name) response = Excon::Response.new response.status = 200 response end - end end end diff --git a/lib/fog/openstack/requests/compute/allocate_address.rb b/lib/fog/openstack/requests/compute/allocate_address.rb index 5d1cb4085..b29447d23 100644 --- a/lib/fog/openstack/requests/compute/allocate_address.rb +++ b/lib/fog/openstack/requests/compute/allocate_address.rb @@ -2,9 +2,7 @@ module Fog module Compute class OpenStack class Real - def allocate_address(pool = nil) - request( :body => Fog::JSON.encode({'pool' => pool}), :expects => [200, 202], @@ -12,7 +10,6 @@ module Fog :path => 'os-floating-ips.json' ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/associate_address.rb b/lib/fog/openstack/requests/compute/associate_address.rb index 7184a91b3..6e1e36603 100644 --- a/lib/fog/openstack/requests/compute/associate_address.rb +++ b/lib/fog/openstack/requests/compute/associate_address.rb @@ -2,17 +2,14 @@ module Fog module Compute class OpenStack class Real - def associate_address(server_id, ip_address) body = { "addFloatingIp" => {"address" => ip_address}} server_action(server_id, body) end - end class Mock def associate_address(server_id, ip_address) - server = data[:servers][server_id] server["addresses"]['mocknet'] ||= [] ip_hash = {"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:85:47:40", "version"=>4, "addr"=>ip_address, "OS-EXT-IPS:type"=>"floating"} diff --git a/lib/fog/openstack/requests/compute/attach_volume.rb b/lib/fog/openstack/requests/compute/attach_volume.rb index 3a45abaa3..97d274326 100644 --- a/lib/fog/openstack/requests/compute/attach_volume.rb +++ b/lib/fog/openstack/requests/compute/attach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def attach_volume(volume_id, server_id, device) data = { 'volumeAttachment' => { @@ -17,11 +16,9 @@ module Fog :path => "servers/%s/os-volume_attachments" % [server_id] ) end - end class Mock - def attach_volume(volume_id, server_id, device) response = Excon::Response.new response.status = 200 @@ -35,9 +32,7 @@ module Fog response.body = { 'volumeAttachment' => data } response end - end - end end end diff --git a/lib/fog/openstack/requests/compute/change_server_password.rb b/lib/fog/openstack/requests/compute/change_server_password.rb index f94e50dba..41e30e30c 100644 --- a/lib/fog/openstack/requests/compute/change_server_password.rb +++ b/lib/fog/openstack/requests/compute/change_server_password.rb @@ -2,22 +2,18 @@ module Fog module Compute class OpenStack class Real - def change_server_password(server_id, admin_password) body = { 'changePassword' => { 'adminPass' => admin_password }} server_action(server_id, body) end - end class Mock - def change_server_password(server_id, admin_password) response = Excon::Response.new response.status = 202 response end - end end end diff --git a/lib/fog/openstack/requests/compute/confirm_resize_server.rb b/lib/fog/openstack/requests/compute/confirm_resize_server.rb index be8853dd3..f88e3aaef 100644 --- a/lib/fog/openstack/requests/compute/confirm_resize_server.rb +++ b/lib/fog/openstack/requests/compute/confirm_resize_server.rb @@ -2,22 +2,18 @@ module Fog module Compute class OpenStack class Real - def confirm_resize_server(server_id) body = { 'confirmResize' => nil } server_action(server_id, body, 204) end - end class Mock - def confirm_resize_server(server_id) response = Excon::Response.new response.status = 204 response end - end end end diff --git a/lib/fog/openstack/requests/compute/create_image.rb b/lib/fog/openstack/requests/compute/create_image.rb index 79299f396..dfbd7bbd4 100644 --- a/lib/fog/openstack/requests/compute/create_image.rb +++ b/lib/fog/openstack/requests/compute/create_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def create_image(server_id, name, metadata={}) body = { 'createImage' => { 'name' => name, @@ -12,11 +11,9 @@ module Fog image_id = data.headers["Location"].scan(/.*\/(.*)/).flatten[0] get_image_details(image_id) end - end class Mock - def create_image(server_id, name, metadata={}) response = Excon::Response.new response.status = 202 @@ -40,9 +37,7 @@ module Fog self.data[:images][data['id']] = data response.body = { 'image' => data } response - end - end end end diff --git a/lib/fog/openstack/requests/compute/create_key_pair.rb b/lib/fog/openstack/requests/compute/create_key_pair.rb index e53efb9cf..9733881f2 100644 --- a/lib/fog/openstack/requests/compute/create_key_pair.rb +++ b/lib/fog/openstack/requests/compute/create_key_pair.rb @@ -2,9 +2,7 @@ module Fog module Compute class OpenStack class Real - def create_key_pair(key_name, public_key = nil) - data = { 'keypair' => { 'name' => key_name @@ -20,7 +18,6 @@ module Fog :path => 'os-keypairs.json' ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/create_security_group.rb b/lib/fog/openstack/requests/compute/create_security_group.rb index a744e0e4f..fd8060c23 100644 --- a/lib/fog/openstack/requests/compute/create_security_group.rb +++ b/lib/fog/openstack/requests/compute/create_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def create_security_group(name, description) data = { 'security_group' => { @@ -18,7 +17,6 @@ module Fog :path => 'os-security-groups.json' ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/create_security_group_rule.rb b/lib/fog/openstack/requests/compute/create_security_group_rule.rb index 37fdfd9b2..92d745fcc 100644 --- a/lib/fog/openstack/requests/compute/create_security_group_rule.rb +++ b/lib/fog/openstack/requests/compute/create_security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id=nil) data = { 'security_group_rule' => { @@ -22,7 +21,6 @@ module Fog :path => 'os-security-group-rules.json' ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/create_server.rb b/lib/fog/openstack/requests/compute/create_server.rb index f77fa1040..ee5ce2a06 100644 --- a/lib/fog/openstack/requests/compute/create_server.rb +++ b/lib/fog/openstack/requests/compute/create_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def create_server(name, image_ref, flavor_ref, options = {}) data = { 'server' => { @@ -83,11 +82,9 @@ module Fog :path => path ) end - end class Mock - def create_server(name, image_ref, flavor_ref, options = {}) response = Excon::Response.new response.status = 202 diff --git a/lib/fog/openstack/requests/compute/create_volume.rb b/lib/fog/openstack/requests/compute/create_volume.rb index 82906c0d1..47750d1cd 100644 --- a/lib/fog/openstack/requests/compute/create_volume.rb +++ b/lib/fog/openstack/requests/compute/create_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def create_volume(name, description, size, options={}) data = { 'volume' => { @@ -23,11 +22,9 @@ module Fog :path => "os-volumes" ) end - end class Mock - def create_volume(name, description, size, options={}) response = Excon::Response.new response.status = 202 @@ -48,9 +45,7 @@ module Fog response.body = { 'volume' => data } response end - end - end end end diff --git a/lib/fog/openstack/requests/compute/create_volume_snapshot.rb b/lib/fog/openstack/requests/compute/create_volume_snapshot.rb index f2e1ced98..128522353 100644 --- a/lib/fog/openstack/requests/compute/create_volume_snapshot.rb +++ b/lib/fog/openstack/requests/compute/create_volume_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def create_volume_snapshot(volume_id, name, description, force=false) data = { 'snapshot' => { @@ -20,7 +19,6 @@ module Fog :path => "os-snapshots" ) end - end class Mock @@ -41,7 +39,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/compute/delete_image.rb b/lib/fog/openstack/requests/compute/delete_image.rb index bbae7f219..274fc6d94 100644 --- a/lib/fog/openstack/requests/compute/delete_image.rb +++ b/lib/fog/openstack/requests/compute/delete_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def delete_image(image_id) request( :expects => 204, @@ -10,11 +9,9 @@ module Fog :path => "images/#{image_id}" ) end - end class Mock - def delete_image(image_id) response = Excon::Response.new if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id} @@ -31,9 +28,7 @@ module Fog response.status = 400 raise(Excon::Errors.status_error({:expects => 202}, response)) end - end - end end end diff --git a/lib/fog/openstack/requests/compute/delete_key_pair.rb b/lib/fog/openstack/requests/compute/delete_key_pair.rb index 8b7bd4af4..3df01054d 100644 --- a/lib/fog/openstack/requests/compute/delete_key_pair.rb +++ b/lib/fog/openstack/requests/compute/delete_key_pair.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def delete_key_pair(key_name) request( :expects => 202, @@ -10,7 +9,6 @@ module Fog :path => "os-keypairs/#{key_name}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/delete_meta.rb b/lib/fog/openstack/requests/compute/delete_meta.rb index 0697441f2..274433931 100644 --- a/lib/fog/openstack/requests/compute/delete_meta.rb +++ b/lib/fog/openstack/requests/compute/delete_meta.rb @@ -1,9 +1,7 @@ module Fog module Compute class OpenStack - class Real - def delete_meta(collection_name, parent_id, key) request( :expects => 204, @@ -11,13 +9,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def delete_meta(collection_name, parent_id, key) - if collection_name == "images" then if not list_images_detail.body['images'].detect {|_| _['id'] == parent_id} raise Fog::Compute::OpenStack::NotFound @@ -33,11 +28,8 @@ module Fog response = Excon::Response.new response.status = 204 response - end - end - end end end diff --git a/lib/fog/openstack/requests/compute/delete_metadata.rb b/lib/fog/openstack/requests/compute/delete_metadata.rb index 088943cb8..f5470f466 100644 --- a/lib/fog/openstack/requests/compute/delete_metadata.rb +++ b/lib/fog/openstack/requests/compute/delete_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def delete_metadata(collection_name, parent_id, key) request( :expects => 204, @@ -10,19 +9,15 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def delete_metadata(collection_name, parent_id, key) response = Excon::Response.new response.status = 204 response end - end - end end end diff --git a/lib/fog/openstack/requests/compute/delete_security_group.rb b/lib/fog/openstack/requests/compute/delete_security_group.rb index f1cc1b78c..ea643c89b 100644 --- a/lib/fog/openstack/requests/compute/delete_security_group.rb +++ b/lib/fog/openstack/requests/compute/delete_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def delete_security_group(security_group_id) request( :expects => 202, @@ -10,7 +9,6 @@ module Fog :path => "os-security-groups/#{security_group_id}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/delete_security_group_rule.rb b/lib/fog/openstack/requests/compute/delete_security_group_rule.rb index 024d2bbbc..41dd0c4e8 100644 --- a/lib/fog/openstack/requests/compute/delete_security_group_rule.rb +++ b/lib/fog/openstack/requests/compute/delete_security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def delete_security_group_rule(security_group_rule_id) request( :expects => 202, @@ -10,7 +9,6 @@ module Fog :path => "os-security-group-rules/#{security_group_rule_id}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/delete_server.rb b/lib/fog/openstack/requests/compute/delete_server.rb index b6424749a..fbaf7207f 100644 --- a/lib/fog/openstack/requests/compute/delete_server.rb +++ b/lib/fog/openstack/requests/compute/delete_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def delete_server(server_id) request( :expects => 204, @@ -10,11 +9,9 @@ module Fog :path => "servers/#{server_id}" ) end - end class Mock - def delete_server(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -31,7 +28,6 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/compute/delete_snapshot.rb b/lib/fog/openstack/requests/compute/delete_snapshot.rb index b7da489da..1e017eeeb 100644 --- a/lib/fog/openstack/requests/compute/delete_snapshot.rb +++ b/lib/fog/openstack/requests/compute/delete_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def delete_snapshot(snapshot_id) request( :expects => 202, @@ -10,7 +9,6 @@ module Fog :path => "os-snapshots/#{snapshot_id}" ) end - end class Mock @@ -20,7 +18,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/compute/delete_volume.rb b/lib/fog/openstack/requests/compute/delete_volume.rb index ed245d976..03866de03 100644 --- a/lib/fog/openstack/requests/compute/delete_volume.rb +++ b/lib/fog/openstack/requests/compute/delete_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def delete_volume(volume_id) request( :expects => 202, @@ -10,11 +9,9 @@ module Fog :path => "os-volumes/#{volume_id}" ) end - end class Mock - def delete_volume(volume_id) response = Excon::Response.new if list_volumes.body['volumes'].map { |v| v['id'] }.include? volume_id @@ -25,9 +22,7 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end - end end end diff --git a/lib/fog/openstack/requests/compute/detach_volume.rb b/lib/fog/openstack/requests/compute/detach_volume.rb index 1bcf1ebcb..37298e631 100644 --- a/lib/fog/openstack/requests/compute/detach_volume.rb +++ b/lib/fog/openstack/requests/compute/detach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def detach_volume(server_id, attachment_id) request( :expects => 202, @@ -10,11 +9,9 @@ module Fog :path => "servers/%s/os-volume_attachments/%s" % [server_id, attachment_id] ) end - end class Mock - def detach_volume(server_id, attachment_id) response = Excon::Response.new if self.data[:volumes][attachment_id] && @@ -26,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/compute/disassociate_address.rb b/lib/fog/openstack/requests/compute/disassociate_address.rb index 8f380a2f0..6eb7307b4 100644 --- a/lib/fog/openstack/requests/compute/disassociate_address.rb +++ b/lib/fog/openstack/requests/compute/disassociate_address.rb @@ -2,12 +2,10 @@ module Fog module Compute class OpenStack class Real - def disassociate_address(server_id, ip_address) body = { "removeFloatingIp" => {"address" => ip_address}} server_action(server_id, body) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/get_address.rb b/lib/fog/openstack/requests/compute/get_address.rb index 9fb64bfd4..1e0f75710 100644 --- a/lib/fog/openstack/requests/compute/get_address.rb +++ b/lib/fog/openstack/requests/compute/get_address.rb @@ -2,16 +2,13 @@ module Fog module Compute class OpenStack class Real - def get_address(address_id) - request( :expects => [200], :method => 'GET', :path => "os-floating-ips/#{address_id}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/get_console_output.rb b/lib/fog/openstack/requests/compute/get_console_output.rb index c6f72da25..d59e859b9 100644 --- a/lib/fog/openstack/requests/compute/get_console_output.rb +++ b/lib/fog/openstack/requests/compute/get_console_output.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_console_output(server_id, log_length) body = { 'os-getConsoleOutput' => { @@ -11,17 +10,14 @@ module Fog } server_action(server_id, body) end - end class Mock - def get_console_output(server_id, log_length) response = Excon::Response.new response.status = 200 response end - end end end diff --git a/lib/fog/openstack/requests/compute/get_flavor_details.rb b/lib/fog/openstack/requests/compute/get_flavor_details.rb index aae6984d5..b3c64b927 100644 --- a/lib/fog/openstack/requests/compute/get_flavor_details.rb +++ b/lib/fog/openstack/requests/compute/get_flavor_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_flavor_details(flavor_ref) request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => "flavors/#{flavor_ref}.json" ) end - end class Mock - def get_flavor_details(flavor_ref) response = Excon::Response.new flavor = { @@ -36,7 +33,6 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/compute/get_host_details.rb b/lib/fog/openstack/requests/compute/get_host_details.rb index ba1be1315..410d381a9 100644 --- a/lib/fog/openstack/requests/compute/get_host_details.rb +++ b/lib/fog/openstack/requests/compute/get_host_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_host_details(host) request( :expects => [200, 203], @@ -10,13 +9,10 @@ module Fog :path => "os-hosts/#{host}.json" ) end - end class Mock - def get_host_details(host) - response = Excon::Response.new response.status = 200 response.body = { "host" => [ @@ -63,11 +59,7 @@ module Fog ] } response - - end - - end # mock end # openstack end # compute diff --git a/lib/fog/openstack/requests/compute/get_image_details.rb b/lib/fog/openstack/requests/compute/get_image_details.rb index 630a070d7..806370f02 100644 --- a/lib/fog/openstack/requests/compute/get_image_details.rb +++ b/lib/fog/openstack/requests/compute/get_image_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_image_details(image_id) request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => "images/#{image_id}.json" ) end - end class Mock - def get_image_details(image_id) response = Excon::Response.new if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id} @@ -25,9 +22,7 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end - end end end diff --git a/lib/fog/openstack/requests/compute/get_limits.rb b/lib/fog/openstack/requests/compute/get_limits.rb index fd19db6c0..2a3f783ff 100644 --- a/lib/fog/openstack/requests/compute/get_limits.rb +++ b/lib/fog/openstack/requests/compute/get_limits.rb @@ -1,7 +1,6 @@ module Fog module Compute class OpenStack - # http://docs.openstack.org/api/openstack-compute/2/content/ProgramaticLimits.html # class Real @@ -14,7 +13,6 @@ module Fog end end - class Mock def get_limits rate_limits = [ @@ -76,7 +74,6 @@ module Fog 'totalFloatingIpsUsed' => 0 } - Excon::Response.new( :status => 200, :body => { @@ -87,7 +84,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/compute/get_metadata.rb b/lib/fog/openstack/requests/compute/get_metadata.rb index b85db3a02..24a05b66d 100644 --- a/lib/fog/openstack/requests/compute/get_metadata.rb +++ b/lib/fog/openstack/requests/compute/get_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_metadata(collection_name, parent_id, key) request( :expects => [200, 203], @@ -10,20 +9,16 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def get_metadata(collection_name, parent_id, key) response = Excon::Response.new response.status = 200 response.body = { 'meta' => {} } response end - end - end end end diff --git a/lib/fog/openstack/requests/compute/get_quota.rb b/lib/fog/openstack/requests/compute/get_quota.rb index feca55ab6..058f33a16 100644 --- a/lib/fog/openstack/requests/compute/get_quota.rb +++ b/lib/fog/openstack/requests/compute/get_quota.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_quota(tenant_id) request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => "/os-quota-sets/#{tenant_id}" ) end - end class Mock - def get_quota(tenant_id) response = Excon::Response.new response.status = 200 @@ -23,9 +20,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/openstack/requests/compute/get_quota_defaults.rb b/lib/fog/openstack/requests/compute/get_quota_defaults.rb index 25944c170..6148fc2e8 100644 --- a/lib/fog/openstack/requests/compute/get_quota_defaults.rb +++ b/lib/fog/openstack/requests/compute/get_quota_defaults.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_quota_defaults(tenant_id) request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => "/os-quota-sets/#{tenant_id}/defaults" ) end - end class Mock - def get_quota_defaults(tenant_id) response = Excon::Response.new response.status = 200 @@ -23,9 +20,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/openstack/requests/compute/get_security_group.rb b/lib/fog/openstack/requests/compute/get_security_group.rb index 2b8add658..20b2df6cf 100644 --- a/lib/fog/openstack/requests/compute/get_security_group.rb +++ b/lib/fog/openstack/requests/compute/get_security_group.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_security_group(security_group_id) request( :expects => [200], @@ -10,7 +9,6 @@ module Fog :path => "os-security-groups/#{security_group_id}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/get_server_details.rb b/lib/fog/openstack/requests/compute/get_server_details.rb index 13bd03652..97aa7c2b7 100644 --- a/lib/fog/openstack/requests/compute/get_server_details.rb +++ b/lib/fog/openstack/requests/compute/get_server_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_server_details(server_id) request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => "servers/#{server_id}.json" ) end - end class Mock - def get_server_details(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -25,7 +22,6 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/compute/get_server_volumes.rb b/lib/fog/openstack/requests/compute/get_server_volumes.rb index 5a60d1dd0..4658ddcb5 100644 --- a/lib/fog/openstack/requests/compute/get_server_volumes.rb +++ b/lib/fog/openstack/requests/compute/get_server_volumes.rb @@ -2,20 +2,16 @@ module Fog module Compute class OpenStack class Real - def get_server_volumes(server_id) - request( :expects => 200, :method => 'GET', :path => "/servers/#{server_id}/os-volume_attachments" ) end - end class Mock - def get_server_volumes(server_id) response = Excon::Response.new response.status = 200 @@ -25,9 +21,7 @@ module Fog response.body = { 'volumeAttachments' => data.collect! { |vol| vol['attachments'] }.flatten(1) } response end - end - end end end diff --git a/lib/fog/openstack/requests/compute/get_snapshot_details.rb b/lib/fog/openstack/requests/compute/get_snapshot_details.rb index 45e854274..724592e34 100644 --- a/lib/fog/openstack/requests/compute/get_snapshot_details.rb +++ b/lib/fog/openstack/requests/compute/get_snapshot_details.rb @@ -2,20 +2,16 @@ module Fog module Compute class OpenStack class Real - def get_snapshot_details(snapshot_id) - request( :expects => 200, :method => 'GET', :path => "os-snapshots/#{snapshot_id}" ) end - end class Mock - def get_snapshot_details(snapshot_id) response = Excon::Response.new response.status = 200 @@ -33,7 +29,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/compute/get_usage.rb b/lib/fog/openstack/requests/compute/get_usage.rb index 55cfd9d9f..06c6f67d4 100644 --- a/lib/fog/openstack/requests/compute/get_usage.rb +++ b/lib/fog/openstack/requests/compute/get_usage.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def get_usage(tenant_id, date_start, date_end) params = Hash.new params[:start] = date_start.utc.iso8601.chop! @@ -14,7 +13,6 @@ module Fog :query => params ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/get_volume_details.rb b/lib/fog/openstack/requests/compute/get_volume_details.rb index 8fb2ccd51..00d2ee1e7 100644 --- a/lib/fog/openstack/requests/compute/get_volume_details.rb +++ b/lib/fog/openstack/requests/compute/get_volume_details.rb @@ -2,20 +2,16 @@ module Fog module Compute class OpenStack class Real - def get_volume_details(volume_id) - request( :expects => 200, :method => 'GET', :path => "os-volumes/#{volume_id}" ) end - end class Mock - def get_volume_details(volume_id) response = Excon::Response.new if data = self.data[:volumes][volume_id] @@ -27,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/compute/list_address_pools.rb b/lib/fog/openstack/requests/compute/list_address_pools.rb index bd24b990f..9f4dc716e 100644 --- a/lib/fog/openstack/requests/compute/list_address_pools.rb +++ b/lib/fog/openstack/requests/compute/list_address_pools.rb @@ -2,20 +2,16 @@ module Fog module Compute class OpenStack class Real - def list_address_pools request( :expects => [200, 203], :method => 'GET', :path => "os-floating-ip-pools" ) - end - end class Mock - def list_address_pools response = Excon::Response.new response.status = 200 @@ -26,7 +22,6 @@ module Fog } response end - end end end diff --git a/lib/fog/openstack/requests/compute/list_addresses.rb b/lib/fog/openstack/requests/compute/list_addresses.rb index 7fe046c94..d501b5eea 100644 --- a/lib/fog/openstack/requests/compute/list_addresses.rb +++ b/lib/fog/openstack/requests/compute/list_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_addresses(server_id) request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => "servers/#{server_id}/ips.json" ) end - end class Mock - def list_addresses(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -25,7 +22,6 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/compute/list_all_addresses.rb b/lib/fog/openstack/requests/compute/list_all_addresses.rb index b16eb1dd5..5e241b750 100644 --- a/lib/fog/openstack/requests/compute/list_all_addresses.rb +++ b/lib/fog/openstack/requests/compute/list_all_addresses.rb @@ -2,16 +2,13 @@ module Fog module Compute class OpenStack class Real - def list_all_addresses request( :expects => [200, 203], :method => 'GET', :path => "os-floating-ips.json" ) - end - end class Mock diff --git a/lib/fog/openstack/requests/compute/list_flavors.rb b/lib/fog/openstack/requests/compute/list_flavors.rb index ec2c754cb..ae54b3101 100644 --- a/lib/fog/openstack/requests/compute/list_flavors.rb +++ b/lib/fog/openstack/requests/compute/list_flavors.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_flavors request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => 'flavors.json' ) end - end class Mock - def list_flavors response = Excon::Response.new response.status = 200 @@ -31,7 +28,6 @@ module Fog } response end - end end end diff --git a/lib/fog/openstack/requests/compute/list_flavors_detail.rb b/lib/fog/openstack/requests/compute/list_flavors_detail.rb index 1416de290..c9133ac7f 100644 --- a/lib/fog/openstack/requests/compute/list_flavors_detail.rb +++ b/lib/fog/openstack/requests/compute/list_flavors_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_flavors_detail(options = {}) request( :expects => [200, 203], @@ -11,11 +10,9 @@ module Fog :query => options ) end - end class Mock - def list_flavors_detail(options = {}) response = Excon::Response.new response.status = 200 @@ -32,7 +29,6 @@ module Fog } response end - end end end diff --git a/lib/fog/openstack/requests/compute/list_hosts.rb b/lib/fog/openstack/requests/compute/list_hosts.rb index e8dd929d8..08cdd0110 100644 --- a/lib/fog/openstack/requests/compute/list_hosts.rb +++ b/lib/fog/openstack/requests/compute/list_hosts.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_hosts request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => 'os-hosts.json' ) end - end class Mock - def list_hosts response = Excon::Response.new response.status = 200 @@ -24,8 +21,6 @@ module Fog } response end - - end # mock end # openstack end # compute diff --git a/lib/fog/openstack/requests/compute/list_images.rb b/lib/fog/openstack/requests/compute/list_images.rb index 8ad0405c9..0d88e2462 100644 --- a/lib/fog/openstack/requests/compute/list_images.rb +++ b/lib/fog/openstack/requests/compute/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_images request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => 'images.json' ) end - end class Mock - def list_images response = Excon::Response.new data = list_images_detail.body['images'] @@ -26,7 +23,6 @@ module Fog response.body = { 'images' => images } response end - end end end diff --git a/lib/fog/openstack/requests/compute/list_images_detail.rb b/lib/fog/openstack/requests/compute/list_images_detail.rb index f340e0e2a..676a1d4ab 100644 --- a/lib/fog/openstack/requests/compute/list_images_detail.rb +++ b/lib/fog/openstack/requests/compute/list_images_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_images_detail(filters = {}) request( :expects => [200, 203], @@ -11,11 +10,9 @@ module Fog :query => filters ) end - end class Mock - def list_images_detail(filters = {}) response = Excon::Response.new @@ -33,7 +30,6 @@ module Fog response.body = { 'images' => images.map {|image| image.reject {|key, value| !['id', 'name', 'links', 'minRam', 'minDisk', 'metadata', 'status', 'updated'].include?(key)}} } response end - end end end diff --git a/lib/fog/openstack/requests/compute/list_key_pairs.rb b/lib/fog/openstack/requests/compute/list_key_pairs.rb index 043ea106b..b5bdad4ad 100644 --- a/lib/fog/openstack/requests/compute/list_key_pairs.rb +++ b/lib/fog/openstack/requests/compute/list_key_pairs.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_key_pairs request( :expects => [200, 203], @@ -10,7 +9,6 @@ module Fog :path => 'os-keypairs.json' ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/list_metadata.rb b/lib/fog/openstack/requests/compute/list_metadata.rb index 7ba1346f7..e5b5f3cba 100644 --- a/lib/fog/openstack/requests/compute/list_metadata.rb +++ b/lib/fog/openstack/requests/compute/list_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_metadata(collection_name, parent_id) request( :expects => [200, 203], @@ -10,18 +9,15 @@ module Fog :path => "/#{collection_name}/#{parent_id}/metadata.json" ) end - end class Mock - def list_metadata(collection_name, parent_id) response = Excon::Response.new response.status = 200 response.body = {} response end - end end end diff --git a/lib/fog/openstack/requests/compute/list_private_addresses.rb b/lib/fog/openstack/requests/compute/list_private_addresses.rb index 96c2636f7..83caff933 100644 --- a/lib/fog/openstack/requests/compute/list_private_addresses.rb +++ b/lib/fog/openstack/requests/compute/list_private_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_private_addresses(server_id) request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => "servers/#{server_id}/ips/private.json" ) end - end class Mock - def list_private_addresses(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -25,7 +22,6 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/compute/list_public_addresses.rb b/lib/fog/openstack/requests/compute/list_public_addresses.rb index 9eaf49ad8..c8988979c 100644 --- a/lib/fog/openstack/requests/compute/list_public_addresses.rb +++ b/lib/fog/openstack/requests/compute/list_public_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_public_addresses(server_id) request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => "servers/#{server_id}/ips/public.json" ) end - end class Mock - def list_public_addresses(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -25,7 +22,6 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/compute/list_security_groups.rb b/lib/fog/openstack/requests/compute/list_security_groups.rb index a6da05d39..5d683e5d9 100644 --- a/lib/fog/openstack/requests/compute/list_security_groups.rb +++ b/lib/fog/openstack/requests/compute/list_security_groups.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_security_groups(server_id = nil) path = "os-security-groups.json" if server_id @@ -14,7 +13,6 @@ module Fog :path => path ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/list_servers.rb b/lib/fog/openstack/requests/compute/list_servers.rb index 9d19dc61b..cb45d0e59 100644 --- a/lib/fog/openstack/requests/compute/list_servers.rb +++ b/lib/fog/openstack/requests/compute/list_servers.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_servers(options = {}) params = Hash.new params['all_tenants'] = 'True' if options[:all_tenants] @@ -14,11 +13,9 @@ module Fog :query => params ) end - end class Mock - def list_servers(options = {}) response = Excon::Response.new data = list_servers_detail.body['servers'] @@ -30,7 +27,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/openstack/requests/compute/list_servers_detail.rb b/lib/fog/openstack/requests/compute/list_servers_detail.rb index bd28e89ed..5b4df1b73 100644 --- a/lib/fog/openstack/requests/compute/list_servers_detail.rb +++ b/lib/fog/openstack/requests/compute/list_servers_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - # Available filters: name, status, image, flavor, changes_since, reservation_id def list_servers_detail(filters = {}) params = Hash.new @@ -15,11 +14,9 @@ module Fog :query => params ) end - end class Mock - def list_servers_detail(filters = {}) response = Excon::Response.new @@ -37,7 +34,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/openstack/requests/compute/list_snapshots.rb b/lib/fog/openstack/requests/compute/list_snapshots.rb index c81ae509c..95a02e62c 100644 --- a/lib/fog/openstack/requests/compute/list_snapshots.rb +++ b/lib/fog/openstack/requests/compute/list_snapshots.rb @@ -2,9 +2,7 @@ module Fog module Compute class OpenStack class Real - def list_snapshots(detailed=true) - path = detailed ? 'os-snapshots/detail' : 'os-snapshots' request( :expects => 200, @@ -12,11 +10,9 @@ module Fog :path => path ) end - end class Mock - def list_snapshots(detailed=true) response = Excon::Response.new response.status = 200 @@ -26,7 +22,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/compute/list_usages.rb b/lib/fog/openstack/requests/compute/list_usages.rb index 249c3cbbd..bf47411ab 100644 --- a/lib/fog/openstack/requests/compute/list_usages.rb +++ b/lib/fog/openstack/requests/compute/list_usages.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_usages(date_start = nil, date_end = nil, detailed=false) params = Hash.new params[:start] = date_start.iso8601.gsub(/\+.*/, '') if date_start @@ -16,7 +15,6 @@ module Fog :query => params ) end - end class Mock diff --git a/lib/fog/openstack/requests/compute/list_volumes.rb b/lib/fog/openstack/requests/compute/list_volumes.rb index b8f811ee5..3891568e1 100644 --- a/lib/fog/openstack/requests/compute/list_volumes.rb +++ b/lib/fog/openstack/requests/compute/list_volumes.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def list_volumes(detailed=true) path = detailed ? 'os-volumes/detail' : 'os-volumes' request( @@ -11,11 +10,9 @@ module Fog :path => path ) end - end class Mock - def list_volumes(detailed=true) Excon::Response.new( :body => { 'volumes' => self.data[:volumes].values }, @@ -23,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/compute/live_migrate_server.rb b/lib/fog/openstack/requests/compute/live_migrate_server.rb index 9fe5e31c7..ea40e578c 100644 --- a/lib/fog/openstack/requests/compute/live_migrate_server.rb +++ b/lib/fog/openstack/requests/compute/live_migrate_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def live_migrate_server(server_id, host, block_migration, disk_over_commit) body = { 'os-migrateLive' => { @@ -12,19 +11,15 @@ module Fog } } server_action(server_id, body) - end - end class Mock - def live_migrate_server(server_id, host, block_migration, disk_over_commit) response = Excon::Response.new response.status = 202 response end - end end end diff --git a/lib/fog/openstack/requests/compute/migrate_server.rb b/lib/fog/openstack/requests/compute/migrate_server.rb index f132b7c43..2cb2bc6c6 100644 --- a/lib/fog/openstack/requests/compute/migrate_server.rb +++ b/lib/fog/openstack/requests/compute/migrate_server.rb @@ -2,22 +2,18 @@ module Fog module Compute class OpenStack class Real - def migrate_server(server_id) body = { 'migrate' => nil } server_action(server_id, body) end - end class Mock - def migrate_server(server_id) response = Excon::Response.new response.status = 202 response end - end end end diff --git a/lib/fog/openstack/requests/compute/reboot_server.rb b/lib/fog/openstack/requests/compute/reboot_server.rb index 0cfd72d80..23eedd312 100644 --- a/lib/fog/openstack/requests/compute/reboot_server.rb +++ b/lib/fog/openstack/requests/compute/reboot_server.rb @@ -2,22 +2,18 @@ module Fog module Compute class OpenStack class Real - def reboot_server(server_id, type = 'SOFT') body = { 'reboot' => { 'type' => type }} server_action(server_id, body) end - end class Mock - def reboot_server(server_id, type = 'SOFT') response = Excon::Response.new response.status = 202 response end - end end end diff --git a/lib/fog/openstack/requests/compute/rebuild_server.rb b/lib/fog/openstack/requests/compute/rebuild_server.rb index 77f744659..f801831f7 100644 --- a/lib/fog/openstack/requests/compute/rebuild_server.rb +++ b/lib/fog/openstack/requests/compute/rebuild_server.rb @@ -2,9 +2,7 @@ module Fog module Compute class OpenStack class Real - def rebuild_server(server_id, image_ref, name, admin_pass=nil, metadata=nil, personality=nil) - body = { 'rebuild' => { 'imageRef' => image_ref, 'name' => name @@ -22,17 +20,14 @@ module Fog end server_action(server_id, body, 202) end - end class Mock - def rebuild_server(server_id, image_ref, name, admin_pass=nil, metadata=nil, personality=nil) response = get_server_details(server_id) response.body['server']['status'] = "REBUILD" response end - end end end diff --git a/lib/fog/openstack/requests/compute/release_address.rb b/lib/fog/openstack/requests/compute/release_address.rb index f205729ac..f4c9bf38b 100644 --- a/lib/fog/openstack/requests/compute/release_address.rb +++ b/lib/fog/openstack/requests/compute/release_address.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def release_address(address_id) request( :expects => [200, 202], @@ -10,11 +9,9 @@ module Fog :path => "os-floating-ips/#{address_id}" ) end - end class Mock - def release_address(address_id) response = Excon::Response.new response.status = 202 @@ -26,9 +23,7 @@ module Fog response.body = {} response end - end # mock - end end end diff --git a/lib/fog/openstack/requests/compute/remove_security_group.rb b/lib/fog/openstack/requests/compute/remove_security_group.rb index 58ace3f2e..fee63f223 100644 --- a/lib/fog/openstack/requests/compute/remove_security_group.rb +++ b/lib/fog/openstack/requests/compute/remove_security_group.rb @@ -2,22 +2,18 @@ module Fog module Compute class OpenStack class Real - def remove_security_group(server_id, group_name) body = {'removeSecurityGroup' => { "name" => group_name } } server_action(server_id, body) end - end class Mock - def remove_security_group(server_id, group_name) response = Excon::Response.new response.status = 200 response end - end end end diff --git a/lib/fog/openstack/requests/compute/reset_server_state.rb b/lib/fog/openstack/requests/compute/reset_server_state.rb index 66f308713..d32c19948 100644 --- a/lib/fog/openstack/requests/compute/reset_server_state.rb +++ b/lib/fog/openstack/requests/compute/reset_server_state.rb @@ -2,22 +2,18 @@ module Fog module Compute class OpenStack class Real - def reset_server_state(server_id, status) body = { 'os-resetState' => { 'state' => status } } server_action(server_id, body, 202) end - end class Mock - def reset_server_state(server_id, status) response = get_server_details(server_id) response.body['server']['status'] = status.upcase response end - end end end diff --git a/lib/fog/openstack/requests/compute/resize_server.rb b/lib/fog/openstack/requests/compute/resize_server.rb index bb14b6dab..489563eec 100644 --- a/lib/fog/openstack/requests/compute/resize_server.rb +++ b/lib/fog/openstack/requests/compute/resize_server.rb @@ -2,22 +2,18 @@ module Fog module Compute class OpenStack class Real - def resize_server(server_id, flavor_ref) body = { 'resize' => { 'flavorRef' => flavor_ref }} server_action(server_id, body) end - end class Mock - def resize_server(server_id, flavor_ref) response = Excon::Response.new response.status = 202 response end - end end end diff --git a/lib/fog/openstack/requests/compute/revert_resize_server.rb b/lib/fog/openstack/requests/compute/revert_resize_server.rb index 74e4d5928..cf0080933 100644 --- a/lib/fog/openstack/requests/compute/revert_resize_server.rb +++ b/lib/fog/openstack/requests/compute/revert_resize_server.rb @@ -2,16 +2,13 @@ module Fog module Compute class OpenStack class Real - def revert_resize_server(server_id) body = { 'revertResize' => nil } server_action(server_id, body) end - end class Mock - def revert_resize_server(server_id) response = Excon::Response.new response.status = 202 @@ -23,7 +20,6 @@ module Fog response end - end end end diff --git a/lib/fog/openstack/requests/compute/server_action.rb b/lib/fog/openstack/requests/compute/server_action.rb index b55d7a030..11c329b3f 100644 --- a/lib/fog/openstack/requests/compute/server_action.rb +++ b/lib/fog/openstack/requests/compute/server_action.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def server_action(server_id, body, expects=[200,202]) request( :body => Fog::JSON.encode(body), @@ -11,7 +10,6 @@ module Fog :path => "servers/#{server_id}/action.json" ) end - end end end diff --git a/lib/fog/openstack/requests/compute/set_metadata.rb b/lib/fog/openstack/requests/compute/set_metadata.rb index 48b5de76e..d63336727 100644 --- a/lib/fog/openstack/requests/compute/set_metadata.rb +++ b/lib/fog/openstack/requests/compute/set_metadata.rb @@ -1,9 +1,7 @@ module Fog module Compute class OpenStack - class Real - def set_metadata(collection_name, parent_id, metadata = {}) request( :body => Fog::JSON.encode({ 'metadata' => metadata }), @@ -12,13 +10,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata" ) end - end class Mock - def set_metadata(collection_name, parent_id, metadata = {}) - if collection_name == "images" then if not list_images_detail.body['images'].detect {|_| _['id'] == parent_id} raise Fog::Compute::OpenStack::NotFound @@ -35,11 +30,8 @@ module Fog response.body = { "metadata" => metadata } response.status = 200 response - end - end - end end end diff --git a/lib/fog/openstack/requests/compute/set_tenant.rb b/lib/fog/openstack/requests/compute/set_tenant.rb index cde9a8520..05f47463c 100644 --- a/lib/fog/openstack/requests/compute/set_tenant.rb +++ b/lib/fog/openstack/requests/compute/set_tenant.rb @@ -1,7 +1,6 @@ module Fog module Compute class OpenStack - class Real def set_tenant(tenant) @openstack_must_reauthenticate = true @@ -15,7 +14,6 @@ module Fog true end end - end # class OpenStack end # module Compute end # module Fog diff --git a/lib/fog/openstack/requests/compute/update_meta.rb b/lib/fog/openstack/requests/compute/update_meta.rb index 68c751da4..cfbd15e39 100644 --- a/lib/fog/openstack/requests/compute/update_meta.rb +++ b/lib/fog/openstack/requests/compute/update_meta.rb @@ -1,9 +1,7 @@ module Fog module Compute class OpenStack - class Real - def update_meta(collection_name, parent_id, key, value) request( :body => Fog::JSON.encode({ 'meta' => {key => value}}), @@ -12,13 +10,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata/#{key}" ) end - end class Mock - def update_meta(collection_name, parent_id, key, value) - if collection_name == "images" then if not list_images_detail.body['images'].detect {|_| _['id'] == parent_id} raise Fog::Compute::OpenStack::NotFound @@ -36,11 +31,8 @@ module Fog response.body = { "metadata" => {key => value} } response.status = 200 response - end - end - end end end diff --git a/lib/fog/openstack/requests/compute/update_metadata.rb b/lib/fog/openstack/requests/compute/update_metadata.rb index 93d260eea..dcd2b7c68 100644 --- a/lib/fog/openstack/requests/compute/update_metadata.rb +++ b/lib/fog/openstack/requests/compute/update_metadata.rb @@ -1,9 +1,7 @@ module Fog module Compute class OpenStack - class Real - def update_metadata(collection_name, parent_id, metadata = {}) request( :body => Fog::JSON.encode({ 'metadata' => metadata }), @@ -12,13 +10,10 @@ module Fog :path => "#{collection_name}/#{parent_id}/metadata.json" ) end - end class Mock - def update_metadata(collection_name, parent_id, metadata = {}) - if collection_name == "images" then if not list_images_detail.body['images'].detect {|_| _['id'] == parent_id} raise Fog::Compute::OpenStack::NotFound @@ -36,11 +31,8 @@ module Fog response.body = { "metadata" => metadata } response.status = 200 response - end - end - end end end diff --git a/lib/fog/openstack/requests/compute/update_quota.rb b/lib/fog/openstack/requests/compute/update_quota.rb index 51f59b296..bccf22f49 100644 --- a/lib/fog/openstack/requests/compute/update_quota.rb +++ b/lib/fog/openstack/requests/compute/update_quota.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def update_quota(tenant_id, options = {}) options['tenant_id'] = tenant_id request( @@ -12,11 +11,9 @@ module Fog :path => "/os-quota-sets/#{tenant_id}" ) end - end class Mock - def update_quota(tenant_id, options = {}) self.data[:quota_updated] = self.data[:quota].merge options @@ -25,7 +22,6 @@ module Fog response.body = { 'quota_set' => self.data[:quota_updated] } response end - end end end diff --git a/lib/fog/openstack/requests/compute/update_server.rb b/lib/fog/openstack/requests/compute/update_server.rb index dbf0b9bc9..1eefbe54f 100644 --- a/lib/fog/openstack/requests/compute/update_server.rb +++ b/lib/fog/openstack/requests/compute/update_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class OpenStack class Real - def update_server(server_id, options = {}) request( :body => Fog::JSON.encode({ 'server' => options }), @@ -11,11 +10,9 @@ module Fog :path => "servers/#{server_id}.json" ) end - end class Mock - def update_server(server_id, options = {}) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -28,7 +25,6 @@ module Fog raise Fog::Compute::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/identity/check_token.rb b/lib/fog/openstack/requests/identity/check_token.rb index f208c5848..8a0301d4e 100644 --- a/lib/fog/openstack/requests/identity/check_token.rb +++ b/lib/fog/openstack/requests/identity/check_token.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def check_token(token_id, tenant_id) request( :expects => [200, 203], @@ -10,13 +9,9 @@ module Fog :path => "tokens/#{token_id}?belongsTo=#{tenant_id}" ) end - end class Mock - - - end end end diff --git a/lib/fog/openstack/requests/identity/create_ec2_credential.rb b/lib/fog/openstack/requests/identity/create_ec2_credential.rb index dc20e9896..0714074da 100644 --- a/lib/fog/openstack/requests/identity/create_ec2_credential.rb +++ b/lib/fog/openstack/requests/identity/create_ec2_credential.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - ## # Create an EC2 credential for a user in a tenant. Requires # administrator credentials. diff --git a/lib/fog/openstack/requests/identity/create_role.rb b/lib/fog/openstack/requests/identity/create_role.rb index 79c25a66c..9f71b3240 100644 --- a/lib/fog/openstack/requests/identity/create_role.rb +++ b/lib/fog/openstack/requests/identity/create_role.rb @@ -30,7 +30,6 @@ module Fog :status => 202 ) end - end end end diff --git a/lib/fog/openstack/requests/identity/create_user.rb b/lib/fog/openstack/requests/identity/create_user.rb index c4996af8b..b8d436725 100644 --- a/lib/fog/openstack/requests/identity/create_user.rb +++ b/lib/fog/openstack/requests/identity/create_user.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def create_user(name, password, email, tenantId=nil, enabled=true) data = { 'user' => { @@ -21,11 +20,9 @@ module Fog :path => '/users' ) end - end class Mock - def create_user(name, password, email, tenantId=nil, enabled=true) response = Excon::Response.new response.status = 200 @@ -40,7 +37,6 @@ module Fog response.body = { 'user' => data } response end - end end end diff --git a/lib/fog/openstack/requests/identity/create_user_role.rb b/lib/fog/openstack/requests/identity/create_user_role.rb index 0becdb437..7e7d7ae19 100644 --- a/lib/fog/openstack/requests/identity/create_user_role.rb +++ b/lib/fog/openstack/requests/identity/create_user_role.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def create_user_role(tenant_id, user_id, role_id) request( :expects => 200, @@ -10,7 +9,6 @@ module Fog :path => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/identity/delete_ec2_credential.rb b/lib/fog/openstack/requests/identity/delete_ec2_credential.rb index 95fe7a138..ac58b1f78 100644 --- a/lib/fog/openstack/requests/identity/delete_ec2_credential.rb +++ b/lib/fog/openstack/requests/identity/delete_ec2_credential.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - ## # Destroy an EC2 credential for a user. Requires administrator # credentials. diff --git a/lib/fog/openstack/requests/identity/delete_role.rb b/lib/fog/openstack/requests/identity/delete_role.rb index 2600af8b2..a0f78563f 100644 --- a/lib/fog/openstack/requests/identity/delete_role.rb +++ b/lib/fog/openstack/requests/identity/delete_role.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def delete_role(role_id) request( :expects => [200, 204], @@ -10,11 +9,9 @@ module Fog :path => "/OS-KSADM/roles/#{role_id}" ) end - end class Mock - def delete_role(role_id) response = Excon::Response.new if self.data[:roles][role_id] @@ -25,7 +22,6 @@ module Fog raise Fog::Identity::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/identity/delete_user.rb b/lib/fog/openstack/requests/identity/delete_user.rb index d42b778d8..33096510c 100644 --- a/lib/fog/openstack/requests/identity/delete_user.rb +++ b/lib/fog/openstack/requests/identity/delete_user.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def delete_user(user_id) request( :expects => [200, 204], @@ -10,11 +9,9 @@ module Fog :path => "users/#{user_id}" ) end - end class Mock - def delete_user(user_id) self.data[:users].delete( list_users.body['users'].find {|x| x['id'] == user_id }['id']) @@ -25,7 +22,6 @@ module Fog rescue raise Fog::Identity::OpenStack::NotFound end - end end end diff --git a/lib/fog/openstack/requests/identity/delete_user_role.rb b/lib/fog/openstack/requests/identity/delete_user_role.rb index 8bd5cd9b0..88fe9d62a 100644 --- a/lib/fog/openstack/requests/identity/delete_user_role.rb +++ b/lib/fog/openstack/requests/identity/delete_user_role.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def delete_user_role(tenant_id, user_id, role_id) request( :expects => 204, @@ -10,7 +9,6 @@ module Fog :path => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/identity/get_ec2_credential.rb b/lib/fog/openstack/requests/identity/get_ec2_credential.rb index 323c5fe41..31b32c291 100644 --- a/lib/fog/openstack/requests/identity/get_ec2_credential.rb +++ b/lib/fog/openstack/requests/identity/get_ec2_credential.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - ## # Retrieves an EC2 credential for a user. Requires administrator # credentials. diff --git a/lib/fog/openstack/requests/identity/get_tenants_by_id.rb b/lib/fog/openstack/requests/identity/get_tenants_by_id.rb index 01489e8d1..ad69c02bc 100644 --- a/lib/fog/openstack/requests/identity/get_tenants_by_id.rb +++ b/lib/fog/openstack/requests/identity/get_tenants_by_id.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def get_tenants_by_id(tenant_id) request( :expects => [200], @@ -10,13 +9,9 @@ module Fog :path => "tenants/#{tenant_id}" ) end - end class Mock - - - end end end diff --git a/lib/fog/openstack/requests/identity/get_tenants_by_name.rb b/lib/fog/openstack/requests/identity/get_tenants_by_name.rb index 42fd01943..b468f86b9 100644 --- a/lib/fog/openstack/requests/identity/get_tenants_by_name.rb +++ b/lib/fog/openstack/requests/identity/get_tenants_by_name.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def get_tenants_by_name(name) request( :expects => [200], @@ -10,13 +9,9 @@ module Fog :path => "tenants?name=#{name}" ) end - end class Mock - - - end end end diff --git a/lib/fog/openstack/requests/identity/get_user_by_id.rb b/lib/fog/openstack/requests/identity/get_user_by_id.rb index e00f3086d..af3049ef0 100644 --- a/lib/fog/openstack/requests/identity/get_user_by_id.rb +++ b/lib/fog/openstack/requests/identity/get_user_by_id.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def get_user_by_id(user_id) request( :expects => [200, 203], @@ -10,7 +9,6 @@ module Fog :path => "users/#{user_id}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/identity/get_user_by_name.rb b/lib/fog/openstack/requests/identity/get_user_by_name.rb index 79085be6f..2b2e0c710 100644 --- a/lib/fog/openstack/requests/identity/get_user_by_name.rb +++ b/lib/fog/openstack/requests/identity/get_user_by_name.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def get_user_by_name(name) request( :expects => [200, 203], @@ -10,11 +9,9 @@ module Fog :path => "users?name=#{name}" ) end - end class Mock - def get_user_by_name(name) response = Excon::Response.new response.status = 200 @@ -24,7 +21,6 @@ module Fog } response end - end end end diff --git a/lib/fog/openstack/requests/identity/list_ec2_credentials.rb b/lib/fog/openstack/requests/identity/list_ec2_credentials.rb index 8cd548c44..c4c955174 100644 --- a/lib/fog/openstack/requests/identity/list_ec2_credentials.rb +++ b/lib/fog/openstack/requests/identity/list_ec2_credentials.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - ## # List EC2 credentials for a user. Requires administrator # credentials. diff --git a/lib/fog/openstack/requests/identity/list_endpoints_for_token.rb b/lib/fog/openstack/requests/identity/list_endpoints_for_token.rb index 916ef1007..4a89c2e16 100644 --- a/lib/fog/openstack/requests/identity/list_endpoints_for_token.rb +++ b/lib/fog/openstack/requests/identity/list_endpoints_for_token.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def list_endpoints_for_token(token_id) request( :expects => [200, 203], @@ -10,13 +9,9 @@ module Fog :path => "tokens/#{token_id}/endpoints" ) end - end class Mock - - - end end end diff --git a/lib/fog/openstack/requests/identity/list_roles.rb b/lib/fog/openstack/requests/identity/list_roles.rb index a6595cd52..07e9077cf 100644 --- a/lib/fog/openstack/requests/identity/list_roles.rb +++ b/lib/fog/openstack/requests/identity/list_roles.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def list_roles request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => '/OS-KSADM/roles' ) end - end class Mock - def list_roles if self.data[:roles].empty? ['admin', 'Member'].each do |name| @@ -28,7 +25,6 @@ module Fog :status => 200 ) end - end end end diff --git a/lib/fog/openstack/requests/identity/list_user_global_roles.rb b/lib/fog/openstack/requests/identity/list_user_global_roles.rb index 8c089227e..07dc5232e 100644 --- a/lib/fog/openstack/requests/identity/list_user_global_roles.rb +++ b/lib/fog/openstack/requests/identity/list_user_global_roles.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def list_user_global_roles(user_id) request( :expects => [200], @@ -13,9 +12,6 @@ module Fog end class Mock - - - end end end diff --git a/lib/fog/openstack/requests/identity/list_users.rb b/lib/fog/openstack/requests/identity/list_users.rb index ba27a97ca..28bb2345b 100644 --- a/lib/fog/openstack/requests/identity/list_users.rb +++ b/lib/fog/openstack/requests/identity/list_users.rb @@ -22,7 +22,6 @@ module Fog } end - Excon::Response.new( :body => { 'users' => users }, :status => 200 diff --git a/lib/fog/openstack/requests/identity/set_tenant.rb b/lib/fog/openstack/requests/identity/set_tenant.rb index a5aa904d2..896107fae 100644 --- a/lib/fog/openstack/requests/identity/set_tenant.rb +++ b/lib/fog/openstack/requests/identity/set_tenant.rb @@ -1,7 +1,6 @@ module Fog module Identity class OpenStack - class Real def set_tenant(tenant) @openstack_must_reauthenticate = true @@ -15,7 +14,6 @@ module Fog true end end - end # class OpenStack end # module Identity end # module Fog diff --git a/lib/fog/openstack/requests/identity/update_user.rb b/lib/fog/openstack/requests/identity/update_user.rb index a1f8fbab1..8f72e7749 100644 --- a/lib/fog/openstack/requests/identity/update_user.rb +++ b/lib/fog/openstack/requests/identity/update_user.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def update_user(user_id, options = {}) url = options.delete('url') || "/users/#{user_id}" request( @@ -12,11 +11,9 @@ module Fog :path => url ) end - end class Mock - def update_user(user_id, options) response = Excon::Response.new if user = self.data[:users][user_id] @@ -29,7 +26,6 @@ module Fog raise Fog::Identity::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/identity/validate_token.rb b/lib/fog/openstack/requests/identity/validate_token.rb index 4e676c2a8..3f06a2000 100644 --- a/lib/fog/openstack/requests/identity/validate_token.rb +++ b/lib/fog/openstack/requests/identity/validate_token.rb @@ -2,7 +2,6 @@ module Fog module Identity class OpenStack class Real - def validate_token(token_id, tenant_id) request( :expects => [200, 203], @@ -10,13 +9,9 @@ module Fog :path => "tokens/#{token_id}?belongsTo=#{tenant_id}" ) end - end class Mock - - - end end end diff --git a/lib/fog/openstack/requests/image/create_image.rb b/lib/fog/openstack/requests/image/create_image.rb index 8431cf238..6d3678552 100644 --- a/lib/fog/openstack/requests/image/create_image.rb +++ b/lib/fog/openstack/requests/image/create_image.rb @@ -2,7 +2,6 @@ module Fog module Image class OpenStack class Real - def create_image(attributes) data = { 'Content-Type' =>'application/octet-stream', @@ -41,11 +40,9 @@ module Fog ensure body.close if body.respond_to?(:close) end - end class Mock - def create_image(attributes) response = Excon::Response.new response.status = 201 diff --git a/lib/fog/openstack/requests/image/delete_image.rb b/lib/fog/openstack/requests/image/delete_image.rb index eab8c4707..8f50bd775 100644 --- a/lib/fog/openstack/requests/image/delete_image.rb +++ b/lib/fog/openstack/requests/image/delete_image.rb @@ -2,7 +2,6 @@ module Fog module Image class OpenStack class Real - def delete_image(image_id) request( :expects => 200, @@ -10,7 +9,6 @@ module Fog :path => "images/#{image_id}" ) end - end class Mock diff --git a/lib/fog/openstack/requests/image/list_public_images_detailed.rb b/lib/fog/openstack/requests/image/list_public_images_detailed.rb index e165df387..5e60b10f7 100644 --- a/lib/fog/openstack/requests/image/list_public_images_detailed.rb +++ b/lib/fog/openstack/requests/image/list_public_images_detailed.rb @@ -3,7 +3,6 @@ module Fog class OpenStack class Real def list_public_images_detailed(attribute=nil, query=nil) - if attribute path = "images/detail?#{attribute}=#{URI::encode(query)}" else diff --git a/lib/fog/openstack/requests/image/set_tenant.rb b/lib/fog/openstack/requests/image/set_tenant.rb index 81d037340..b3f85bf8d 100644 --- a/lib/fog/openstack/requests/image/set_tenant.rb +++ b/lib/fog/openstack/requests/image/set_tenant.rb @@ -1,7 +1,6 @@ module Fog module Image class OpenStack - class Real def set_tenant(tenant) @openstack_must_reauthenticate = true @@ -15,7 +14,6 @@ module Fog true end end - end # class OpenStack end # module Compute end # module Fog diff --git a/lib/fog/openstack/requests/image/update_image.rb b/lib/fog/openstack/requests/image/update_image.rb index f7d0c8d24..9e8250e4b 100644 --- a/lib/fog/openstack/requests/image/update_image.rb +++ b/lib/fog/openstack/requests/image/update_image.rb @@ -2,7 +2,6 @@ module Fog module Image class OpenStack class Real - def update_image(attributes) data = { 'x-image-meta-name' => attributes[:name], @@ -29,11 +28,9 @@ module Fog :path => "images/#{attributes[:id]}" ) end - end class Mock - def update_image(attributes) response = Excon::Response.new response.status = 200 @@ -61,7 +58,6 @@ module Fog } response end - end end end diff --git a/lib/fog/openstack/requests/metering/get_resource.rb b/lib/fog/openstack/requests/metering/get_resource.rb index f398fea14..52114feec 100644 --- a/lib/fog/openstack/requests/metering/get_resource.rb +++ b/lib/fog/openstack/requests/metering/get_resource.rb @@ -2,7 +2,6 @@ module Fog module Metering class OpenStack class Real - def get_resource(resource_id) request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => "resources/#{resource_id}" ) end - end class Mock - def get_resource(resource_id) response = Excon::Response.new response.status = 200 @@ -26,7 +23,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/metering/get_samples.rb b/lib/fog/openstack/requests/metering/get_samples.rb index f6cc9d8ae..6b5ad073c 100644 --- a/lib/fog/openstack/requests/metering/get_samples.rb +++ b/lib/fog/openstack/requests/metering/get_samples.rb @@ -2,9 +2,7 @@ module Fog module Metering class OpenStack class Real - def get_samples(meter_id, options=[]) - data = { 'q' => Array.new } @@ -26,11 +24,9 @@ module Fog :path => "meters/#{meter_id}" ) end - end class Mock - def get_samples(meter_id) response = Excon::Response.new response.status = 200 @@ -49,7 +45,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/metering/get_statistics.rb b/lib/fog/openstack/requests/metering/get_statistics.rb index c5e5650e4..b3593b5c4 100644 --- a/lib/fog/openstack/requests/metering/get_statistics.rb +++ b/lib/fog/openstack/requests/metering/get_statistics.rb @@ -2,9 +2,7 @@ module Fog module Metering class OpenStack class Real - def get_statistics(meter_id, options={}) - data = { 'period' => options['period'], 'q' => Array.new @@ -27,11 +25,9 @@ module Fog :path => "meters/#{meter_id}/statistics" ) end - end class Mock - def get_statistics(meter_id, options={}) response = Excon::Response.new response.status = 200 @@ -50,7 +46,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/metering/list_meters.rb b/lib/fog/openstack/requests/metering/list_meters.rb index 59ad0ffd8..2183b61f7 100644 --- a/lib/fog/openstack/requests/metering/list_meters.rb +++ b/lib/fog/openstack/requests/metering/list_meters.rb @@ -2,9 +2,7 @@ module Fog module Metering class OpenStack class Real - def list_meters(options=[]) - data = { 'q' => Array.new } @@ -26,11 +24,9 @@ module Fog :path => 'meters' ) end - end class Mock - def list_meters(options={}) response = Excon::Response.new response.status = 200 @@ -44,7 +40,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/metering/list_resources.rb b/lib/fog/openstack/requests/metering/list_resources.rb index 8fdd0d8cb..0688add6e 100644 --- a/lib/fog/openstack/requests/metering/list_resources.rb +++ b/lib/fog/openstack/requests/metering/list_resources.rb @@ -2,7 +2,6 @@ module Fog module Metering class OpenStack class Real - def list_resources(options = {}) request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => 'resources' ) end - end class Mock - def list_resources(options = {}) response = Excon::Response.new response.status = 200 @@ -26,7 +23,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/add_router_interface.rb b/lib/fog/openstack/requests/network/add_router_interface.rb index afa4ca6ae..8dfb899d2 100644 --- a/lib/fog/openstack/requests/network/add_router_interface.rb +++ b/lib/fog/openstack/requests/network/add_router_interface.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def add_router_interface(router_id, subnet_id, options = {}) data = { @@ -42,7 +41,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/associate_floating_ip.rb b/lib/fog/openstack/requests/network/associate_floating_ip.rb index 8bd845b50..e252fac0e 100644 --- a/lib/fog/openstack/requests/network/associate_floating_ip.rb +++ b/lib/fog/openstack/requests/network/associate_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def associate_floating_ip(floating_ip_id, port_id, options = {}) data = { @@ -43,7 +42,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/associate_lb_health_monitor.rb b/lib/fog/openstack/requests/network/associate_lb_health_monitor.rb index b5aaad22b..174ef4456 100644 --- a/lib/fog/openstack/requests/network/associate_lb_health_monitor.rb +++ b/lib/fog/openstack/requests/network/associate_lb_health_monitor.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def associate_lb_health_monitor(pool_id, health_monitor_id) data = { @@ -33,7 +32,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/create_floating_ip.rb b/lib/fog/openstack/requests/network/create_floating_ip.rb index ea9df1f08..923cc0cb7 100644 --- a/lib/fog/openstack/requests/network/create_floating_ip.rb +++ b/lib/fog/openstack/requests/network/create_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_floating_ip(floating_network_id, options = {}) data = { @@ -41,7 +40,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/create_lb_health_monitor.rb b/lib/fog/openstack/requests/network/create_lb_health_monitor.rb index a76a8deeb..9b08bdd20 100644 --- a/lib/fog/openstack/requests/network/create_lb_health_monitor.rb +++ b/lib/fog/openstack/requests/network/create_lb_health_monitor.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_lb_health_monitor(type, delay, timeout, max_retries, options = {}) data = { @@ -50,7 +49,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/create_lb_member.rb b/lib/fog/openstack/requests/network/create_lb_member.rb index 1f24d39b0..85ef83cca 100644 --- a/lib/fog/openstack/requests/network/create_lb_member.rb +++ b/lib/fog/openstack/requests/network/create_lb_member.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_lb_member(pool_id, address, protocol_port, weight, options = {}) data = { @@ -47,7 +46,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/create_lb_pool.rb b/lib/fog/openstack/requests/network/create_lb_pool.rb index f62fbf537..31d699967 100644 --- a/lib/fog/openstack/requests/network/create_lb_pool.rb +++ b/lib/fog/openstack/requests/network/create_lb_pool.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_lb_pool(subnet_id, protocol, lb_method, options = {}) data = { @@ -54,7 +53,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/create_lb_vip.rb b/lib/fog/openstack/requests/network/create_lb_vip.rb index 700c06caf..297946d46 100644 --- a/lib/fog/openstack/requests/network/create_lb_vip.rb +++ b/lib/fog/openstack/requests/network/create_lb_vip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {}) data = { @@ -54,7 +53,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/create_network.rb b/lib/fog/openstack/requests/network/create_network.rb index bbbbfb270..3b2604747 100644 --- a/lib/fog/openstack/requests/network/create_network.rb +++ b/lib/fog/openstack/requests/network/create_network.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_network(options = {}) data = { 'network' => {} } @@ -93,7 +92,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/create_port.rb b/lib/fog/openstack/requests/network/create_port.rb index 9741f9c5a..e8006dfd8 100644 --- a/lib/fog/openstack/requests/network/create_port.rb +++ b/lib/fog/openstack/requests/network/create_port.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_port(network_id, options = {}) data = { @@ -46,7 +45,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/create_router.rb b/lib/fog/openstack/requests/network/create_router.rb index 273212e90..a5de38a0a 100644 --- a/lib/fog/openstack/requests/network/create_router.rb +++ b/lib/fog/openstack/requests/network/create_router.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_router(name, options = {}) data = { @@ -72,7 +71,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/create_subnet.rb b/lib/fog/openstack/requests/network/create_subnet.rb index ed05ae3e2..10187d955 100644 --- a/lib/fog/openstack/requests/network/create_subnet.rb +++ b/lib/fog/openstack/requests/network/create_subnet.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def create_subnet(network_id, cidr, ip_version, options = {}) data = { @@ -50,7 +49,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_floating_ip.rb b/lib/fog/openstack/requests/network/delete_floating_ip.rb index 42c1a4113..b3442fe9b 100644 --- a/lib/fog/openstack/requests/network/delete_floating_ip.rb +++ b/lib/fog/openstack/requests/network/delete_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_floating_ip(floating_ip_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_lb_health_monitor.rb b/lib/fog/openstack/requests/network/delete_lb_health_monitor.rb index 26031c1de..aeeddcc16 100644 --- a/lib/fog/openstack/requests/network/delete_lb_health_monitor.rb +++ b/lib/fog/openstack/requests/network/delete_lb_health_monitor.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_lb_health_monitor(health_monitor_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_lb_member.rb b/lib/fog/openstack/requests/network/delete_lb_member.rb index 15daea0d3..5de460d61 100644 --- a/lib/fog/openstack/requests/network/delete_lb_member.rb +++ b/lib/fog/openstack/requests/network/delete_lb_member.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_lb_member(member_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_lb_pool.rb b/lib/fog/openstack/requests/network/delete_lb_pool.rb index 0db85dae2..835b91073 100644 --- a/lib/fog/openstack/requests/network/delete_lb_pool.rb +++ b/lib/fog/openstack/requests/network/delete_lb_pool.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_lb_pool(pool_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_lb_vip.rb b/lib/fog/openstack/requests/network/delete_lb_vip.rb index 42ec3e8b9..9ba1b15ac 100644 --- a/lib/fog/openstack/requests/network/delete_lb_vip.rb +++ b/lib/fog/openstack/requests/network/delete_lb_vip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_lb_vip(vip_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_network.rb b/lib/fog/openstack/requests/network/delete_network.rb index 65edd1eb4..0580cd363 100644 --- a/lib/fog/openstack/requests/network/delete_network.rb +++ b/lib/fog/openstack/requests/network/delete_network.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_network(network_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_port.rb b/lib/fog/openstack/requests/network/delete_port.rb index f89a925c3..387c70627 100644 --- a/lib/fog/openstack/requests/network/delete_port.rb +++ b/lib/fog/openstack/requests/network/delete_port.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_port(port_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_quota.rb b/lib/fog/openstack/requests/network/delete_quota.rb index 42fe7cfcf..90a670ad6 100644 --- a/lib/fog/openstack/requests/network/delete_quota.rb +++ b/lib/fog/openstack/requests/network/delete_quota.rb @@ -2,7 +2,6 @@ module Fog module Network class OpenStack class Real - def delete_quota(tenant_id) request( :expects => 204, @@ -10,7 +9,6 @@ module Fog :path => "/quotas/#{tenant_id}" ) end - end class Mock @@ -20,7 +18,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_router.rb b/lib/fog/openstack/requests/network/delete_router.rb index 5d8eabf15..130bdb95b 100644 --- a/lib/fog/openstack/requests/network/delete_router.rb +++ b/lib/fog/openstack/requests/network/delete_router.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_router(router_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_security_group_rule.rb b/lib/fog/openstack/requests/network/delete_security_group_rule.rb index 2b0b02403..388ae1bfc 100644 --- a/lib/fog/openstack/requests/network/delete_security_group_rule.rb +++ b/lib/fog/openstack/requests/network/delete_security_group_rule.rb @@ -2,7 +2,6 @@ module Fog module Network class OpenStack class Real - # Delete a security group rule # # ==== Parameters @@ -14,11 +13,9 @@ module Fog :path => "security-group-rules/#{security_group_rule_id}" ) end - end class Mock - def delete_security_group_rule(security_group_rule_id) response = Excon::Response.new if self.data[:security_group_rules][security_group_rule_id] @@ -29,7 +26,6 @@ module Fog raise Fog::Network::OpenStack::NotFound end end - end end end diff --git a/lib/fog/openstack/requests/network/delete_subnet.rb b/lib/fog/openstack/requests/network/delete_subnet.rb index ba52aab08..100c768f0 100644 --- a/lib/fog/openstack/requests/network/delete_subnet.rb +++ b/lib/fog/openstack/requests/network/delete_subnet.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def delete_subnet(subnet_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/disassociate_floating_ip.rb b/lib/fog/openstack/requests/network/disassociate_floating_ip.rb index a27576e17..27ecfbc87 100644 --- a/lib/fog/openstack/requests/network/disassociate_floating_ip.rb +++ b/lib/fog/openstack/requests/network/disassociate_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def disassociate_floating_ip(floating_ip_id, options = {}) data = { @@ -43,7 +42,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/disassociate_lb_health_monitor.rb b/lib/fog/openstack/requests/network/disassociate_lb_health_monitor.rb index 8167a806b..4f6c4345d 100644 --- a/lib/fog/openstack/requests/network/disassociate_lb_health_monitor.rb +++ b/lib/fog/openstack/requests/network/disassociate_lb_health_monitor.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def disassociate_lb_health_monitor(pool_id, health_monitor_id) request( @@ -25,7 +24,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_floating_ip.rb b/lib/fog/openstack/requests/network/get_floating_ip.rb index 2bcb7ecd5..2ec92555e 100644 --- a/lib/fog/openstack/requests/network/get_floating_ip.rb +++ b/lib/fog/openstack/requests/network/get_floating_ip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_floating_ip(floating_ip_id) request( @@ -35,8 +34,6 @@ module Fog end end end - - end end end diff --git a/lib/fog/openstack/requests/network/get_lb_health_monitor.rb b/lib/fog/openstack/requests/network/get_lb_health_monitor.rb index 6dee9bfdb..18d2a3a65 100644 --- a/lib/fog/openstack/requests/network/get_lb_health_monitor.rb +++ b/lib/fog/openstack/requests/network/get_lb_health_monitor.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_lb_health_monitor(health_monitor_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_lb_member.rb b/lib/fog/openstack/requests/network/get_lb_member.rb index 4e686aa7c..ab2351cce 100644 --- a/lib/fog/openstack/requests/network/get_lb_member.rb +++ b/lib/fog/openstack/requests/network/get_lb_member.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_lb_member(member_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_lb_pool.rb b/lib/fog/openstack/requests/network/get_lb_pool.rb index 45e5c9beb..051a80719 100644 --- a/lib/fog/openstack/requests/network/get_lb_pool.rb +++ b/lib/fog/openstack/requests/network/get_lb_pool.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_lb_pool(pool_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_lb_pool_stats.rb b/lib/fog/openstack/requests/network/get_lb_pool_stats.rb index f360b48fc..35fdf4f7d 100644 --- a/lib/fog/openstack/requests/network/get_lb_pool_stats.rb +++ b/lib/fog/openstack/requests/network/get_lb_pool_stats.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_lb_pool_stats(pool_id) request( @@ -29,7 +28,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_lb_vip.rb b/lib/fog/openstack/requests/network/get_lb_vip.rb index 0d68ad16e..63c145c8f 100644 --- a/lib/fog/openstack/requests/network/get_lb_vip.rb +++ b/lib/fog/openstack/requests/network/get_lb_vip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_lb_vip(vip_id) request( @@ -24,7 +23,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_network.rb b/lib/fog/openstack/requests/network/get_network.rb index eebbc2a1c..23d3fc6ca 100644 --- a/lib/fog/openstack/requests/network/get_network.rb +++ b/lib/fog/openstack/requests/network/get_network.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_network(network_id) request( @@ -36,7 +35,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_port.rb b/lib/fog/openstack/requests/network/get_port.rb index 0a06defa6..b01c337d4 100644 --- a/lib/fog/openstack/requests/network/get_port.rb +++ b/lib/fog/openstack/requests/network/get_port.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_port(port_id) request( @@ -42,7 +41,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_quota.rb b/lib/fog/openstack/requests/network/get_quota.rb index 3b0c789e4..ce0bf690f 100644 --- a/lib/fog/openstack/requests/network/get_quota.rb +++ b/lib/fog/openstack/requests/network/get_quota.rb @@ -2,7 +2,6 @@ module Fog module Network class OpenStack class Real - def get_quota(tenant_id) request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => "/quotas/#{tenant_id}" ) end - end class Mock - def get_quota(tenant_id) response = Excon::Response.new response.status = 200 @@ -23,9 +20,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/openstack/requests/network/get_quotas.rb b/lib/fog/openstack/requests/network/get_quotas.rb index 93783c65a..563cb5b64 100644 --- a/lib/fog/openstack/requests/network/get_quotas.rb +++ b/lib/fog/openstack/requests/network/get_quotas.rb @@ -2,7 +2,6 @@ module Fog module Network class OpenStack class Real - def get_quotas request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => "/quotas" ) end - end class Mock - def get_quotas response = Excon::Response.new response.status = 200 @@ -23,9 +20,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/openstack/requests/network/get_router.rb b/lib/fog/openstack/requests/network/get_router.rb index b512606f6..bac1bb316 100644 --- a/lib/fog/openstack/requests/network/get_router.rb +++ b/lib/fog/openstack/requests/network/get_router.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_router(router_id) request( @@ -26,7 +25,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/get_subnet.rb b/lib/fog/openstack/requests/network/get_subnet.rb index f1ba33049..9feac3c52 100644 --- a/lib/fog/openstack/requests/network/get_subnet.rb +++ b/lib/fog/openstack/requests/network/get_subnet.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def get_subnet(subnet_id) request( @@ -43,7 +42,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/list_floating_ips.rb b/lib/fog/openstack/requests/network/list_floating_ips.rb index b14844199..725bde7f9 100644 --- a/lib/fog/openstack/requests/network/list_floating_ips.rb +++ b/lib/fog/openstack/requests/network/list_floating_ips.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def list_floating_ips(filters = {}) request( @@ -21,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/list_lb_health_monitors.rb b/lib/fog/openstack/requests/network/list_lb_health_monitors.rb index 6dabfcf7d..d5dedaefd 100644 --- a/lib/fog/openstack/requests/network/list_lb_health_monitors.rb +++ b/lib/fog/openstack/requests/network/list_lb_health_monitors.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def list_lb_health_monitors(filters = {}) request( @@ -21,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/list_lb_members.rb b/lib/fog/openstack/requests/network/list_lb_members.rb index a1d33999d..11736bb3e 100644 --- a/lib/fog/openstack/requests/network/list_lb_members.rb +++ b/lib/fog/openstack/requests/network/list_lb_members.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def list_lb_members(filters = {}) request( @@ -21,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/list_lb_pools.rb b/lib/fog/openstack/requests/network/list_lb_pools.rb index 4aabc5b7d..6b4297c8c 100644 --- a/lib/fog/openstack/requests/network/list_lb_pools.rb +++ b/lib/fog/openstack/requests/network/list_lb_pools.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def list_lb_pools(filters = {}) request( @@ -21,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/list_lb_vips.rb b/lib/fog/openstack/requests/network/list_lb_vips.rb index d9ae0debe..684e9feb0 100644 --- a/lib/fog/openstack/requests/network/list_lb_vips.rb +++ b/lib/fog/openstack/requests/network/list_lb_vips.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def list_lb_vips(filters = {}) request( @@ -21,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/list_networks.rb b/lib/fog/openstack/requests/network/list_networks.rb index d90be2712..36cc9c1ed 100644 --- a/lib/fog/openstack/requests/network/list_networks.rb +++ b/lib/fog/openstack/requests/network/list_networks.rb @@ -20,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/list_ports.rb b/lib/fog/openstack/requests/network/list_ports.rb index e137f7cea..e97aee22c 100644 --- a/lib/fog/openstack/requests/network/list_ports.rb +++ b/lib/fog/openstack/requests/network/list_ports.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def list_ports(filters = {}) request( @@ -21,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/list_routers.rb b/lib/fog/openstack/requests/network/list_routers.rb index 3f692c369..83703e5b4 100644 --- a/lib/fog/openstack/requests/network/list_routers.rb +++ b/lib/fog/openstack/requests/network/list_routers.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def list_routers(filters = {}) request( @@ -21,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/list_security_group_rules.rb b/lib/fog/openstack/requests/network/list_security_group_rules.rb index 4af07fdb6..14af5469f 100644 --- a/lib/fog/openstack/requests/network/list_security_group_rules.rb +++ b/lib/fog/openstack/requests/network/list_security_group_rules.rb @@ -2,7 +2,6 @@ module Fog module Network class OpenStack class Real - # List all security group rules # # ==== Parameters @@ -30,11 +29,9 @@ module Fog :query => options ) end - end class Mock - def list_security_group_rules(options = {}) response = Excon::Response.new @@ -45,7 +42,6 @@ module Fog response.body = { 'security_group_rules' => sec_group_rules } response end - end end end diff --git a/lib/fog/openstack/requests/network/list_security_groups.rb b/lib/fog/openstack/requests/network/list_security_groups.rb index b0bbd2c4b..0b481fdba 100644 --- a/lib/fog/openstack/requests/network/list_security_groups.rb +++ b/lib/fog/openstack/requests/network/list_security_groups.rb @@ -2,7 +2,6 @@ module Fog module Network class OpenStack class Real - # List all security groups # # ==== Parameters @@ -35,11 +34,9 @@ module Fog :query => options ) end - end class Mock - def list_security_groups(options = {}) response = Excon::Response.new @@ -50,7 +47,6 @@ module Fog response.body = { 'security_groups' => sec_groups } response end - end end end diff --git a/lib/fog/openstack/requests/network/list_subnets.rb b/lib/fog/openstack/requests/network/list_subnets.rb index 111a693a3..c1841b0b9 100644 --- a/lib/fog/openstack/requests/network/list_subnets.rb +++ b/lib/fog/openstack/requests/network/list_subnets.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def list_subnets(filters = {}) request( @@ -21,7 +20,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/openstack/requests/network/remove_router_interface.rb b/lib/fog/openstack/requests/network/remove_router_interface.rb index c822ab1c4..07dd235d5 100644 --- a/lib/fog/openstack/requests/network/remove_router_interface.rb +++ b/lib/fog/openstack/requests/network/remove_router_interface.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def remove_router_interface(router_id, subnet_id, options = {}) data = { @@ -30,7 +29,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/set_tenant.rb b/lib/fog/openstack/requests/network/set_tenant.rb index 022535ec4..28269544e 100644 --- a/lib/fog/openstack/requests/network/set_tenant.rb +++ b/lib/fog/openstack/requests/network/set_tenant.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def set_tenant(tenant) @openstack_must_reauthenticate = true @@ -15,7 +14,6 @@ module Fog true end end - end end end diff --git a/lib/fog/openstack/requests/network/update_lb_health_monitor.rb b/lib/fog/openstack/requests/network/update_lb_health_monitor.rb index fdea25735..8bc048435 100644 --- a/lib/fog/openstack/requests/network/update_lb_health_monitor.rb +++ b/lib/fog/openstack/requests/network/update_lb_health_monitor.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def update_lb_health_monitor(health_monitor_id, options = {}) data = { 'health_monitor' => {} } @@ -39,7 +38,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/update_lb_member.rb b/lib/fog/openstack/requests/network/update_lb_member.rb index 24d1d856f..6138de3e5 100644 --- a/lib/fog/openstack/requests/network/update_lb_member.rb +++ b/lib/fog/openstack/requests/network/update_lb_member.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def update_lb_member(member_id, options = {}) data = { 'member' => {} } @@ -35,7 +34,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/update_lb_pool.rb b/lib/fog/openstack/requests/network/update_lb_pool.rb index 86298acb0..1f52e87a8 100644 --- a/lib/fog/openstack/requests/network/update_lb_pool.rb +++ b/lib/fog/openstack/requests/network/update_lb_pool.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def update_lb_pool(pool_id, options = {}) data = { 'pool' => {} } @@ -36,7 +35,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/update_lb_vip.rb b/lib/fog/openstack/requests/network/update_lb_vip.rb index 1eb02a7d5..14c2f8edb 100644 --- a/lib/fog/openstack/requests/network/update_lb_vip.rb +++ b/lib/fog/openstack/requests/network/update_lb_vip.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def update_lb_vip(vip_id, options = {}) data = { 'vip' => {} } @@ -38,7 +37,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/update_network.rb b/lib/fog/openstack/requests/network/update_network.rb index 959348e2c..7ec3f2a89 100644 --- a/lib/fog/openstack/requests/network/update_network.rb +++ b/lib/fog/openstack/requests/network/update_network.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def update_network(network_id, options = {}) data = { 'network' => {} } @@ -35,7 +34,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/update_port.rb b/lib/fog/openstack/requests/network/update_port.rb index a8de157a6..c3186e1a9 100644 --- a/lib/fog/openstack/requests/network/update_port.rb +++ b/lib/fog/openstack/requests/network/update_port.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def update_port(port_id, options = {}) data = { 'port' => {} } @@ -38,7 +37,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/network/update_quota.rb b/lib/fog/openstack/requests/network/update_quota.rb index f43d8c3b5..1ac3e2e7d 100644 --- a/lib/fog/openstack/requests/network/update_quota.rb +++ b/lib/fog/openstack/requests/network/update_quota.rb @@ -2,7 +2,6 @@ module Fog module Network class OpenStack class Real - def update_quota(tenant_id, options = {}) request( :body => Fog::JSON.encode({ 'quota' => options} ), @@ -11,11 +10,9 @@ module Fog :path => "/quotas/#{tenant_id}" ) end - end class Mock - def update_quota(tenant_id, options = {}) self.data[:quota_updated] = self.data[:quota].merge options @@ -24,9 +21,7 @@ module Fog response.body = { 'quota' => self.data[:quota_updated] } response end - end - end end end diff --git a/lib/fog/openstack/requests/network/update_router.rb b/lib/fog/openstack/requests/network/update_router.rb index b1e320e64..61ad014e9 100644 --- a/lib/fog/openstack/requests/network/update_router.rb +++ b/lib/fog/openstack/requests/network/update_router.rb @@ -1,9 +1,7 @@ module Fog module Network class OpenStack - class Real - # Update Router # # Beyond the name and the administrative state, the only @@ -66,7 +64,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/network/update_subnet.rb b/lib/fog/openstack/requests/network/update_subnet.rb index 6e3597bf9..588abf567 100644 --- a/lib/fog/openstack/requests/network/update_subnet.rb +++ b/lib/fog/openstack/requests/network/update_subnet.rb @@ -1,7 +1,6 @@ module Fog module Network class OpenStack - class Real def update_subnet(subnet_id, options = {}) data = { 'subnet' => {} } @@ -38,7 +37,6 @@ module Fog end end end - end end end diff --git a/lib/fog/openstack/requests/orchestration/create_stack.rb b/lib/fog/openstack/requests/orchestration/create_stack.rb index ade690582..40ac5d5f5 100644 --- a/lib/fog/openstack/requests/orchestration/create_stack.rb +++ b/lib/fog/openstack/requests/orchestration/create_stack.rb @@ -2,7 +2,6 @@ module Fog module Orchestration class OpenStack class Real - # Create a stack. # # * stack_name [String] Name of the stack to create. @@ -28,7 +27,6 @@ module Fog :body => Fog::JSON.encode(params) ) end - end class Mock diff --git a/lib/fog/openstack/requests/orchestration/delete_stack.rb b/lib/fog/openstack/requests/orchestration/delete_stack.rb index 6b14cb45b..bc35213a1 100644 --- a/lib/fog/openstack/requests/orchestration/delete_stack.rb +++ b/lib/fog/openstack/requests/orchestration/delete_stack.rb @@ -2,7 +2,6 @@ module Fog module Orchestration class OpenStack class Real - # Delete a stack. # # @param stack_name [String] Name of the stack to delete. @@ -19,7 +18,6 @@ module Fog :method => 'DELETE' ) end - end class Mock diff --git a/lib/fog/openstack/requests/orchestration/list_stacks.rb b/lib/fog/openstack/requests/orchestration/list_stacks.rb index eee9056e4..cc0c64cd8 100644 --- a/lib/fog/openstack/requests/orchestration/list_stacks.rb +++ b/lib/fog/openstack/requests/orchestration/list_stacks.rb @@ -2,7 +2,6 @@ module Fog module Orchestration class OpenStack class Real - # List stacks. # # @param options [Hash] @@ -31,7 +30,6 @@ module Fog :query => options ) end - end class Mock diff --git a/lib/fog/openstack/requests/orchestration/update_stack.rb b/lib/fog/openstack/requests/orchestration/update_stack.rb index f54892b6e..c75fa0f23 100644 --- a/lib/fog/openstack/requests/orchestration/update_stack.rb +++ b/lib/fog/openstack/requests/orchestration/update_stack.rb @@ -2,7 +2,6 @@ module Fog module Orchestration class OpenStack class Real - # Update a stack. # # @param [String] stack_id ID of the stack to update. @@ -25,7 +24,6 @@ module Fog :body => Fog::JSON.encode(params) ) end - end class Mock diff --git a/lib/fog/openstack/requests/storage/copy_object.rb b/lib/fog/openstack/requests/storage/copy_object.rb index 1a9de8959..d9d378327 100644 --- a/lib/fog/openstack/requests/storage/copy_object.rb +++ b/lib/fog/openstack/requests/storage/copy_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Copy object # # ==== Parameters @@ -20,7 +19,6 @@ module Fog :path => "#{Fog::OpenStack.escape(target_container_name)}/#{Fog::OpenStack.escape(target_object_name)}" }) end - end end end diff --git a/lib/fog/openstack/requests/storage/delete_container.rb b/lib/fog/openstack/requests/storage/delete_container.rb index 9cc083191..54b53e08c 100644 --- a/lib/fog/openstack/requests/storage/delete_container.rb +++ b/lib/fog/openstack/requests/storage/delete_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Delete an existing container # # ==== Parameters @@ -15,7 +14,6 @@ module Fog :path => Fog::OpenStack.escape(name) ) end - end end end diff --git a/lib/fog/openstack/requests/storage/delete_multiple_objects.rb b/lib/fog/openstack/requests/storage/delete_multiple_objects.rb index c623419ce..04b73a571 100644 --- a/lib/fog/openstack/requests/storage/delete_multiple_objects.rb +++ b/lib/fog/openstack/requests/storage/delete_multiple_objects.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Deletes multiple objects or containers with a single request. # # To delete objects from a single container, +container+ may be provided @@ -60,7 +59,6 @@ module Fog response.body = Fog::JSON.decode(response.body) response end - end end end diff --git a/lib/fog/openstack/requests/storage/delete_object.rb b/lib/fog/openstack/requests/storage/delete_object.rb index 27a24fd4d..1f1a63f22 100644 --- a/lib/fog/openstack/requests/storage/delete_object.rb +++ b/lib/fog/openstack/requests/storage/delete_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Delete an existing object # # ==== Parameters @@ -16,7 +15,6 @@ module Fog :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" ) end - end end end diff --git a/lib/fog/openstack/requests/storage/delete_static_large_object.rb b/lib/fog/openstack/requests/storage/delete_static_large_object.rb index 82600f09d..feb15d4d6 100644 --- a/lib/fog/openstack/requests/storage/delete_static_large_object.rb +++ b/lib/fog/openstack/requests/storage/delete_static_large_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Delete a static large object. # # Deletes the SLO manifest +object+ and all segments that it references. @@ -36,7 +35,6 @@ module Fog response.body = Fog::JSON.decode(response.body) response end - end end end diff --git a/lib/fog/openstack/requests/storage/get_container.rb b/lib/fog/openstack/requests/storage/get_container.rb index 0b1a42bb4..9ee764e4c 100644 --- a/lib/fog/openstack/requests/storage/get_container.rb +++ b/lib/fog/openstack/requests/storage/get_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Get details for container and total bytes stored # # ==== Parameters @@ -37,7 +36,6 @@ module Fog :query => {'format' => 'json'}.merge!(options) ) end - end end end diff --git a/lib/fog/openstack/requests/storage/get_containers.rb b/lib/fog/openstack/requests/storage/get_containers.rb index f2a7ce252..b030b36d4 100644 --- a/lib/fog/openstack/requests/storage/get_containers.rb +++ b/lib/fog/openstack/requests/storage/get_containers.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # List existing storage containers # # ==== Parameters @@ -26,7 +25,6 @@ module Fog :query => {'format' => 'json'}.merge!(options) ) end - end end end diff --git a/lib/fog/openstack/requests/storage/get_object.rb b/lib/fog/openstack/requests/storage/get_object.rb index 451510330..85281c5bc 100644 --- a/lib/fog/openstack/requests/storage/get_object.rb +++ b/lib/fog/openstack/requests/storage/get_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Get details for object # # ==== Parameters @@ -22,7 +21,6 @@ module Fog request(params, false) end - end end end diff --git a/lib/fog/openstack/requests/storage/get_object_https_url.rb b/lib/fog/openstack/requests/storage/get_object_https_url.rb index ca439ec0a..999b2ae6d 100644 --- a/lib/fog/openstack/requests/storage/get_object_https_url.rb +++ b/lib/fog/openstack/requests/storage/get_object_https_url.rb @@ -1,9 +1,7 @@ module Fog module Storage class OpenStack - class Real - # Get an expiring object https url from Cloud Files # # ==== Parameters @@ -46,7 +44,6 @@ module Fog raise ArgumentError.new("Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(', ')}") end - expires = expires.to_i object_path_escaped = "#{@path}/#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object,"/")}" object_path_unescaped = "#{@path}/#{Fog::OpenStack.escape(container)}/#{object}" @@ -77,9 +74,7 @@ module Fog h.size == 1 ? "0#{h}" : h }.join end - end - end end end diff --git a/lib/fog/openstack/requests/storage/head_container.rb b/lib/fog/openstack/requests/storage/head_container.rb index 83e4bdcf8..f7cdd0a0e 100644 --- a/lib/fog/openstack/requests/storage/head_container.rb +++ b/lib/fog/openstack/requests/storage/head_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # List number of objects and total bytes stored # # ==== Parameters @@ -21,7 +20,6 @@ module Fog :query => {'format' => 'json'} ) end - end end end diff --git a/lib/fog/openstack/requests/storage/head_containers.rb b/lib/fog/openstack/requests/storage/head_containers.rb index 74cc4eaf8..49d986ba9 100644 --- a/lib/fog/openstack/requests/storage/head_containers.rb +++ b/lib/fog/openstack/requests/storage/head_containers.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # List number of containers and total bytes stored # # ==== Returns @@ -18,7 +17,6 @@ module Fog :query => {'format' => 'json'} ) end - end end end diff --git a/lib/fog/openstack/requests/storage/head_object.rb b/lib/fog/openstack/requests/storage/head_object.rb index 35396b16b..72b84b6a0 100644 --- a/lib/fog/openstack/requests/storage/head_object.rb +++ b/lib/fog/openstack/requests/storage/head_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Get headers for object # # ==== Parameters @@ -16,7 +15,6 @@ module Fog :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" }, false) end - end end end diff --git a/lib/fog/openstack/requests/storage/post_set_meta_temp_url_key.rb b/lib/fog/openstack/requests/storage/post_set_meta_temp_url_key.rb index c68475f78..efc0bd9ab 100644 --- a/lib/fog/openstack/requests/storage/post_set_meta_temp_url_key.rb +++ b/lib/fog/openstack/requests/storage/post_set_meta_temp_url_key.rb @@ -1,9 +1,7 @@ module Fog module Storage class OpenStack - class Real - # Set the account wide Temp URL Key. This is a secret key that's # used to generate signed expiring URLs. # @@ -29,9 +27,7 @@ module Fog :headers => {'X-Account-Meta-Temp-Url-Key' => key} ) end - end - end end end diff --git a/lib/fog/openstack/requests/storage/put_container.rb b/lib/fog/openstack/requests/storage/put_container.rb index 5a003879f..5ca9df71f 100644 --- a/lib/fog/openstack/requests/storage/put_container.rb +++ b/lib/fog/openstack/requests/storage/put_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Create a new container # # ==== Parameters @@ -15,7 +14,6 @@ module Fog :path => Fog::OpenStack.escape(name) ) end - end end end diff --git a/lib/fog/openstack/requests/storage/put_dynamic_obj_manifest.rb b/lib/fog/openstack/requests/storage/put_dynamic_obj_manifest.rb index d185d5489..7c4da8578 100644 --- a/lib/fog/openstack/requests/storage/put_dynamic_obj_manifest.rb +++ b/lib/fog/openstack/requests/storage/put_dynamic_obj_manifest.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Create a new dynamic large object manifest # # Creates an object with a +X-Object-Manifest+ header that specifies the common prefix ("/") @@ -36,7 +35,6 @@ module Fog :path => path ) end - end end end diff --git a/lib/fog/openstack/requests/storage/put_object.rb b/lib/fog/openstack/requests/storage/put_object.rb index c8a9005e3..f6c0e98e3 100644 --- a/lib/fog/openstack/requests/storage/put_object.rb +++ b/lib/fog/openstack/requests/storage/put_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Create a new object # # When passed a block, it will make a chunked request, calling diff --git a/lib/fog/openstack/requests/storage/put_object_manifest.rb b/lib/fog/openstack/requests/storage/put_object_manifest.rb index 0037e9903..1fe01c6d8 100644 --- a/lib/fog/openstack/requests/storage/put_object_manifest.rb +++ b/lib/fog/openstack/requests/storage/put_object_manifest.rb @@ -2,14 +2,12 @@ module Fog module Storage class OpenStack class Real - # Create a new dynamic large object manifest # # This is an alias for {#put_dynamic_obj_manifest} for backward compatibility. def put_object_manifest(container, object, options = {}) put_dynamic_obj_manifest(container, object, options) end - end end end diff --git a/lib/fog/openstack/requests/storage/put_static_obj_manifest.rb b/lib/fog/openstack/requests/storage/put_static_obj_manifest.rb index a1c0b1f0a..729f241a0 100644 --- a/lib/fog/openstack/requests/storage/put_static_obj_manifest.rb +++ b/lib/fog/openstack/requests/storage/put_static_obj_manifest.rb @@ -2,7 +2,6 @@ module Fog module Storage class OpenStack class Real - # Create a new static large object manifest. # # A static large object is similar to a dynamic large object. Whereas a GET for a dynamic large object manifest @@ -50,7 +49,6 @@ module Fog :query => { 'multipart-manifest' => 'put' } ) end - end end end diff --git a/lib/fog/openstack/requests/volume/create_volume.rb b/lib/fog/openstack/requests/volume/create_volume.rb index 3ccf4fd61..21c653b9e 100644 --- a/lib/fog/openstack/requests/volume/create_volume.rb +++ b/lib/fog/openstack/requests/volume/create_volume.rb @@ -2,7 +2,6 @@ module Fog module Volume class OpenStack class Real - def create_volume(name, description, size, options={}) data = { 'volume' => { @@ -24,11 +23,9 @@ module Fog :path => "volumes" ) end - end class Mock - def create_volume(name, description, size, options={}) response = Excon::Response.new response.status = 202 @@ -50,7 +47,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/volume/create_volume_snapshot.rb b/lib/fog/openstack/requests/volume/create_volume_snapshot.rb index ada07c8e9..a42e9a51b 100644 --- a/lib/fog/openstack/requests/volume/create_volume_snapshot.rb +++ b/lib/fog/openstack/requests/volume/create_volume_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Volume class OpenStack class Real - def create_volume_snapshot(volume_id, name, description, force=false) data = { 'snapshot' => { @@ -20,7 +19,6 @@ module Fog :path => "snapshots" ) end - end class Mock @@ -41,7 +39,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/volume/delete_snapshot.rb b/lib/fog/openstack/requests/volume/delete_snapshot.rb index b973a1643..5fc804a9c 100644 --- a/lib/fog/openstack/requests/volume/delete_snapshot.rb +++ b/lib/fog/openstack/requests/volume/delete_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Volume class OpenStack class Real - def delete_snapshot(snapshot_id) request( :expects => 202, @@ -10,7 +9,6 @@ module Fog :path => "snapshots/#{snapshot_id}" ) end - end class Mock @@ -20,7 +18,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/volume/delete_volume.rb b/lib/fog/openstack/requests/volume/delete_volume.rb index c0c06ff18..bf7d6a4b3 100644 --- a/lib/fog/openstack/requests/volume/delete_volume.rb +++ b/lib/fog/openstack/requests/volume/delete_volume.rb @@ -2,7 +2,6 @@ module Fog module Volume class OpenStack class Real - def delete_volume(volume_id) request( :expects => 202, @@ -10,7 +9,6 @@ module Fog :path => "volumes/#{volume_id}" ) end - end class Mock @@ -20,7 +18,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/volume/get_quota.rb b/lib/fog/openstack/requests/volume/get_quota.rb index f505c64cd..a9bc4d508 100644 --- a/lib/fog/openstack/requests/volume/get_quota.rb +++ b/lib/fog/openstack/requests/volume/get_quota.rb @@ -2,7 +2,6 @@ module Fog module Volume class OpenStack class Real - def get_quota(tenant_id) request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => "/os-quota-sets/#{tenant_id}" ) end - end class Mock - def get_quota(tenant_id) response = Excon::Response.new response.status = 200 @@ -23,9 +20,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/openstack/requests/volume/get_quota_defaults.rb b/lib/fog/openstack/requests/volume/get_quota_defaults.rb index 6474a75c3..c2202d0a9 100644 --- a/lib/fog/openstack/requests/volume/get_quota_defaults.rb +++ b/lib/fog/openstack/requests/volume/get_quota_defaults.rb @@ -2,7 +2,6 @@ module Fog module Volume class OpenStack class Real - def get_quota_defaults(tenant_id) request( :expects => 200, @@ -10,11 +9,9 @@ module Fog :path => "/os-quota-sets/#{tenant_id}/defaults" ) end - end class Mock - def get_quota_defaults(tenant_id) response = Excon::Response.new response.status = 200 @@ -23,9 +20,7 @@ module Fog } response end - end - end end end diff --git a/lib/fog/openstack/requests/volume/get_snapshot_details.rb b/lib/fog/openstack/requests/volume/get_snapshot_details.rb index b86dbe61b..ca8201fb5 100644 --- a/lib/fog/openstack/requests/volume/get_snapshot_details.rb +++ b/lib/fog/openstack/requests/volume/get_snapshot_details.rb @@ -2,20 +2,16 @@ module Fog module Volume class OpenStack class Real - def get_snapshot_details(snapshot_id) - request( :expects => 200, :method => 'GET', :path => "snapshots/#{snapshot_id}" ) end - end class Mock - def get_snapshot_details(detailed=true) response = Excon::Response.new response.status = 200 @@ -33,7 +29,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/volume/get_volume_details.rb b/lib/fog/openstack/requests/volume/get_volume_details.rb index 9f2426e60..0e4555d85 100644 --- a/lib/fog/openstack/requests/volume/get_volume_details.rb +++ b/lib/fog/openstack/requests/volume/get_volume_details.rb @@ -2,20 +2,16 @@ module Fog module Volume class OpenStack class Real - def get_volume_details(volume_id) - request( :expects => 200, :method => 'GET', :path => "volumes/#{volume_id}" ) end - end class Mock - def get_volume_details(detailed=true) response = Excon::Response.new response.status = 200 @@ -36,7 +32,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/volume/list_snapshots.rb b/lib/fog/openstack/requests/volume/list_snapshots.rb index 457d82583..52feddfed 100644 --- a/lib/fog/openstack/requests/volume/list_snapshots.rb +++ b/lib/fog/openstack/requests/volume/list_snapshots.rb @@ -2,9 +2,7 @@ module Fog module Volume class OpenStack class Real - def list_snapshots(detailed=true) - path = detailed ? 'snapshots/detail' : 'snapshots' request( :expects => 200, @@ -12,11 +10,9 @@ module Fog :path => path ) end - end class Mock - def list_snapshots(detailed=true) response = Excon::Response.new response.status = 200 @@ -26,7 +22,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/volume/list_volumes.rb b/lib/fog/openstack/requests/volume/list_volumes.rb index e1f0ce4d9..2e18345b8 100644 --- a/lib/fog/openstack/requests/volume/list_volumes.rb +++ b/lib/fog/openstack/requests/volume/list_volumes.rb @@ -2,7 +2,6 @@ module Fog module Volume class OpenStack class Real - def list_volumes(detailed=true, options={}) path = detailed ? 'volumes/detail' : 'volumes' request( @@ -12,11 +11,9 @@ module Fog :query => options ) end - end class Mock - def list_volumes(detailed=true, options={}) response = Excon::Response.new response.status = 200 @@ -48,7 +45,6 @@ module Fog response end end - end end end diff --git a/lib/fog/openstack/requests/volume/set_tenant.rb b/lib/fog/openstack/requests/volume/set_tenant.rb index 0e78819c0..02e499ef3 100644 --- a/lib/fog/openstack/requests/volume/set_tenant.rb +++ b/lib/fog/openstack/requests/volume/set_tenant.rb @@ -1,7 +1,6 @@ module Fog module Volume class OpenStack - class Real def set_tenant(tenant) @openstack_must_reauthenticate = true @@ -15,7 +14,6 @@ module Fog true end end - end # class OpenStack end # module Volume end # module Fog diff --git a/lib/fog/openstack/requests/volume/update_quota.rb b/lib/fog/openstack/requests/volume/update_quota.rb index c0a628e99..2ca685498 100644 --- a/lib/fog/openstack/requests/volume/update_quota.rb +++ b/lib/fog/openstack/requests/volume/update_quota.rb @@ -2,7 +2,6 @@ module Fog module Volume class OpenStack class Real - def update_quota(tenant_id, options = {}) options['tenant_id'] = tenant_id request( @@ -12,11 +11,9 @@ module Fog :path => "/os-quota-sets/#{tenant_id}" ) end - end class Mock - def update_quota(tenant_id, options = {}) self.data[:quota_updated] = self.data[:quota].merge options @@ -25,7 +22,6 @@ module Fog response.body = { 'quota_set' => self.data[:quota_updated] } response end - end end end diff --git a/lib/fog/openstack/storage.rb b/lib/fog/openstack/storage.rb index 4d2cfb223..57d235ad9 100644 --- a/lib/fog/openstack/storage.rb +++ b/lib/fog/openstack/storage.rb @@ -3,7 +3,6 @@ require 'fog/openstack/core' module Fog module Storage class OpenStack < Fog::Service - requires :openstack_auth_url, :openstack_username, :openstack_api_key recognizes :persistent, :openstack_service_name, @@ -38,7 +37,6 @@ module Fog request :post_set_meta_temp_url_key class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = {} @@ -72,11 +70,9 @@ module Fog def reset_account_name @path = @original_path end - end class Real - def initialize(options={}) @openstack_api_key = options[:openstack_api_key] @openstack_username = options[:openstack_username] @@ -213,7 +209,6 @@ module Fog @scheme = uri.scheme true end - end end end diff --git a/lib/fog/openstack/volume.rb b/lib/fog/openstack/volume.rb index 0bc06bd28..04a5d331a 100644 --- a/lib/fog/openstack/volume.rb +++ b/lib/fog/openstack/volume.rb @@ -3,7 +3,6 @@ require 'fog/openstack/core' module Fog module Volume class OpenStack < Fog::Service - requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, :openstack_tenant, @@ -221,7 +220,6 @@ module Fog @scheme = uri.scheme true end - end end end diff --git a/lib/fog/openvz/compute.rb b/lib/fog/openvz/compute.rb index dd6c9d802..d8322cfd9 100644 --- a/lib/fog/openvz/compute.rb +++ b/lib/fog/openvz/compute.rb @@ -3,7 +3,6 @@ require 'fog/openvz/core' module Fog module Compute class Openvz < Fog::Service - recognizes :openvz_connect_command model_path 'fog/openvz/models/compute' @@ -41,7 +40,6 @@ module Fog request :set_server class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -65,11 +63,9 @@ module Fog def reset_data self.class.data.delete(@openvz_connect_command) end - end class Real - def initialize(options={}) @openvz_connect_command = options[:openvz_connect_command] end @@ -139,7 +135,6 @@ module Fog end def vzlist(params,args = []) - commands = [ 'vzlist', '-a', '-j' , params['ctid'], params[:ctid] ] prefixed_command = expand_commands(commands, params, args) @@ -166,9 +161,7 @@ module Fog else return Fog::JSON.decode(result) end - end - end end end diff --git a/lib/fog/openvz/models/compute/server.rb b/lib/fog/openvz/models/compute/server.rb index f38d5acca..7297f9a68 100644 --- a/lib/fog/openvz/models/compute/server.rb +++ b/lib/fog/openvz/models/compute/server.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class Openvz - class Server < Fog::Compute::Server - identity :ctid attribute :ostemplate attribute :config @@ -178,7 +176,6 @@ module Fog data = service.resume_server(ctid, options) end - def set(options) data = service.set_server(ctid,options) end @@ -186,9 +183,7 @@ module Fog def ready? status == 'running' end - end - end end end diff --git a/lib/fog/openvz/models/compute/servers.rb b/lib/fog/openvz/models/compute/servers.rb index f35f0fdb9..f7a510c02 100644 --- a/lib/fog/openvz/models/compute/servers.rb +++ b/lib/fog/openvz/models/compute/servers.rb @@ -4,7 +4,6 @@ require 'fog/openvz/models/compute/server' module Fog module Compute class Openvz - class Servers < Fog::Collection model Fog::Compute::Openvz::Server @@ -19,9 +18,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/openvz/requests/compute/compact_server.rb b/lib/fog/openvz/requests/compute/compact_server.rb index 583220c2d..b874e70a3 100644 --- a/lib/fog/openvz/requests/compute/compact_server.rb +++ b/lib/fog/openvz/requests/compute/compact_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def compact_server(id,options = {}) vzctl("compact",{:ctid => id}.merge(options)) end - end class Mock - def compact_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/convert_server.rb b/lib/fog/openvz/requests/compute/convert_server.rb index ea141c341..8a97007b3 100644 --- a/lib/fog/openvz/requests/compute/convert_server.rb +++ b/lib/fog/openvz/requests/compute/convert_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def convert_server(id,options = {}) vzctl("convert",{:ctid => id}.merge(options)) end - end class Mock - def convert_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/create_server.rb b/lib/fog/openvz/requests/compute/create_server.rb index 1c86c62dc..1f0dbe2ff 100644 --- a/lib/fog/openvz/requests/compute/create_server.rb +++ b/lib/fog/openvz/requests/compute/create_server.rb @@ -2,21 +2,17 @@ module Fog module Compute class Openvz class Real - def create_server(options = {}) vzctl("create",options) end - end class Mock - def create_server(options = {}) # When a new fake server is created we set the status to stopped options['status'] = 'stopped' self.data[:servers] << options end - end end end diff --git a/lib/fog/openvz/requests/compute/destroy_server.rb b/lib/fog/openvz/requests/compute/destroy_server.rb index e414924cb..60d057af9 100644 --- a/lib/fog/openvz/requests/compute/destroy_server.rb +++ b/lib/fog/openvz/requests/compute/destroy_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def destroy_server(id, options = {}) vzctl("destroy",{:ctid => id}.merge(options)) end - end class Mock - def destroy_server(id , options = {}) self.data[:servers].reject! { |s| s['ctid'].to_s == id.to_s } end - end end end diff --git a/lib/fog/openvz/requests/compute/exec2_server.rb b/lib/fog/openvz/requests/compute/exec2_server.rb index e6d0ba690..29e3d81e3 100644 --- a/lib/fog/openvz/requests/compute/exec2_server.rb +++ b/lib/fog/openvz/requests/compute/exec2_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def exec2_server(id,args) vzctl("exec2",{:ctid => id},args) end - end class Mock - def exec2_server(id, args) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/exec_server.rb b/lib/fog/openvz/requests/compute/exec_server.rb index 26286b135..86a2e5287 100644 --- a/lib/fog/openvz/requests/compute/exec_server.rb +++ b/lib/fog/openvz/requests/compute/exec_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def exec_server(id,args = []) vzctl("exec",{:ctid => id},args) end - end class Mock - def exec_server(id, args = []) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/get_server_details.rb b/lib/fog/openvz/requests/compute/get_server_details.rb index 0064e16ef..876e617b7 100644 --- a/lib/fog/openvz/requests/compute/get_server_details.rb +++ b/lib/fog/openvz/requests/compute/get_server_details.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def get_server_details(id) vzlist({:ctid => id}).first end - end class Mock - def get_server_details(id) return self.data[:servers].find { |s| s['ctid'].to_s == id.to_s } end - end end end diff --git a/lib/fog/openvz/requests/compute/list_servers.rb b/lib/fog/openvz/requests/compute/list_servers.rb index a4578f950..2bf6ba963 100644 --- a/lib/fog/openvz/requests/compute/list_servers.rb +++ b/lib/fog/openvz/requests/compute/list_servers.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def list_servers(options = {}) vzlist({}) end - end class Mock - def list_servers self.data[:servers] end - end end end diff --git a/lib/fog/openvz/requests/compute/mount_server.rb b/lib/fog/openvz/requests/compute/mount_server.rb index 7e146ae70..15609825b 100644 --- a/lib/fog/openvz/requests/compute/mount_server.rb +++ b/lib/fog/openvz/requests/compute/mount_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def mount_server(id, options = {}) vzctl("mount",{:ctid => id}.merge(options)) end - end class Mock - def mount_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/quotainit_server.rb b/lib/fog/openvz/requests/compute/quotainit_server.rb index 35c99aafd..e5eca4ab2 100644 --- a/lib/fog/openvz/requests/compute/quotainit_server.rb +++ b/lib/fog/openvz/requests/compute/quotainit_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def quotainit_server(id, options = {}) vzctl("quotainit",{:ctid => id}.merge(options)) end - end class Mock - def quotainit_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/quotaoff_server.rb b/lib/fog/openvz/requests/compute/quotaoff_server.rb index aedec008f..d67c5d1b7 100644 --- a/lib/fog/openvz/requests/compute/quotaoff_server.rb +++ b/lib/fog/openvz/requests/compute/quotaoff_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def quotaooff_server(id, options = {}) vzctl("quotaoff",{:ctid => id}.merge(options)) end - end class Mock - def quotaooff_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/quotaon_server.rb b/lib/fog/openvz/requests/compute/quotaon_server.rb index 98f4936f2..e6278b434 100644 --- a/lib/fog/openvz/requests/compute/quotaon_server.rb +++ b/lib/fog/openvz/requests/compute/quotaon_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def quotaon_server(id, options = {}) vzctl("quotaon",{:ctid => id}.merge(options)) end - end class Mock - def quotaon_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/restart_server.rb b/lib/fog/openvz/requests/compute/restart_server.rb index 5f9c7c049..ba7667022 100644 --- a/lib/fog/openvz/requests/compute/restart_server.rb +++ b/lib/fog/openvz/requests/compute/restart_server.rb @@ -2,22 +2,18 @@ module Fog module Compute class Openvz class Real - def restart_server(id, options = {}) vzctl("restart",{:ctid => id}.merge(options)) end - end class Mock - def restart_server(id, options = {}) server = self.data[:servers].find { |s| s['ctid'] == id.to_s } unless server.nil? server['status'] = 'running' end end - end end end diff --git a/lib/fog/openvz/requests/compute/resume_server.rb b/lib/fog/openvz/requests/compute/resume_server.rb index 89bedf94c..ad655ca0d 100644 --- a/lib/fog/openvz/requests/compute/resume_server.rb +++ b/lib/fog/openvz/requests/compute/resume_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def resume_server(id, options = {}) vzctl("resume",{:ctid => id}.merge(options)) end - end class Mock - def resume_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/runscript_server.rb b/lib/fog/openvz/requests/compute/runscript_server.rb index a0c0f1ae0..2a3ec9570 100644 --- a/lib/fog/openvz/requests/compute/runscript_server.rb +++ b/lib/fog/openvz/requests/compute/runscript_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def runscript_server(id,args = []) vzctl("runscript",{:ctid => id},args) end - end class Mock - def runscript_server(id,args = []) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/set_server.rb b/lib/fog/openvz/requests/compute/set_server.rb index ec47e8001..3addf42ac 100644 --- a/lib/fog/openvz/requests/compute/set_server.rb +++ b/lib/fog/openvz/requests/compute/set_server.rb @@ -2,15 +2,12 @@ module Fog module Compute class Openvz class Real - def set_server(id,options = {}) vzctl("set",{:ctid => id}.merge(options)) end - end class Mock - def set_server(id, options = {}) server = self.data[:servers].find { |s| s['ctid'].to_s == id.to_s } unless server.nil? @@ -18,9 +15,7 @@ module Fog server[k] = v end end - end - end end end diff --git a/lib/fog/openvz/requests/compute/snapshot_delete_server.rb b/lib/fog/openvz/requests/compute/snapshot_delete_server.rb index 1bc37d5c3..f3bf4d96b 100644 --- a/lib/fog/openvz/requests/compute/snapshot_delete_server.rb +++ b/lib/fog/openvz/requests/compute/snapshot_delete_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def snapshot_delete_server(id,options = {}) vzctl("snapshot-delete",{:ctid => id}.merge(options)) end - end class Mock - def snapshot_delete_server(id,options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/snapshot_list_server.rb b/lib/fog/openvz/requests/compute/snapshot_list_server.rb index b1aad0ff2..59e63d98d 100644 --- a/lib/fog/openvz/requests/compute/snapshot_list_server.rb +++ b/lib/fog/openvz/requests/compute/snapshot_list_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def snapshot_list_server(id,options = {}) vzctl("snapshot-list",{:ctid => id}.merge(options)) end - end class Mock - def snapshot_list_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/snapshot_mount_server.rb b/lib/fog/openvz/requests/compute/snapshot_mount_server.rb index 439e0da76..ec9fe3e05 100644 --- a/lib/fog/openvz/requests/compute/snapshot_mount_server.rb +++ b/lib/fog/openvz/requests/compute/snapshot_mount_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def snapshot_mount_server(id,options = {}) vzctl("snapshot-mount",{:ctid => id}.merge(options)) end - end class Mock - def snapshot_mount_server(id,options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/snapshot_server.rb b/lib/fog/openvz/requests/compute/snapshot_server.rb index 00bcc9519..c63d98af3 100644 --- a/lib/fog/openvz/requests/compute/snapshot_server.rb +++ b/lib/fog/openvz/requests/compute/snapshot_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def snapshot_server(id,options = {}) vzctl("snapshot",{:ctid => id}.merge(options)) end - end class Mock - def snapshot_server(id,options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/snapshot_switch_server.rb b/lib/fog/openvz/requests/compute/snapshot_switch_server.rb index 4b84b03bf..37c78c108 100644 --- a/lib/fog/openvz/requests/compute/snapshot_switch_server.rb +++ b/lib/fog/openvz/requests/compute/snapshot_switch_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def snapshot_switch_server(id,options = {}) vzctl("snapshot-switch",{:ctid => id}.merge(options)) end - end class Mock - def snapshot_switch_server(id,options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/snapshot_umount_server.rb b/lib/fog/openvz/requests/compute/snapshot_umount_server.rb index 27c2de374..74e6867ed 100644 --- a/lib/fog/openvz/requests/compute/snapshot_umount_server.rb +++ b/lib/fog/openvz/requests/compute/snapshot_umount_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def snapshot_umount_server(id,options = {}) vzctl("snapshot-umount",{:ctid => id}.merge(options)) end - end class Mock - def snapshot_umount_server(id,options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/start_server.rb b/lib/fog/openvz/requests/compute/start_server.rb index 9f99b4d86..aab9f6267 100644 --- a/lib/fog/openvz/requests/compute/start_server.rb +++ b/lib/fog/openvz/requests/compute/start_server.rb @@ -2,22 +2,18 @@ module Fog module Compute class Openvz class Real - def start_server(id,options={}) vzctl("start",{:ctid => id}.merge(options)) end - end class Mock - def start_server(id,options={}) server = self.data[:servers].find { |s| s['ctid'].to_s == id.to_s } unless server.nil? server['status'] = 'running' end end - end end end diff --git a/lib/fog/openvz/requests/compute/status_server.rb b/lib/fog/openvz/requests/compute/status_server.rb index 754d5cad8..e208fd849 100644 --- a/lib/fog/openvz/requests/compute/status_server.rb +++ b/lib/fog/openvz/requests/compute/status_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def status_server(id, options = {}) vzctl("status",{:ctid => id}.merge(options)) end - end class Mock - def status_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/stop_server.rb b/lib/fog/openvz/requests/compute/stop_server.rb index 9572624bc..eb59671d4 100644 --- a/lib/fog/openvz/requests/compute/stop_server.rb +++ b/lib/fog/openvz/requests/compute/stop_server.rb @@ -2,22 +2,18 @@ module Fog module Compute class Openvz class Real - def stop_server(id, options = {}) vzctl("stop",{:ctid => id}.merge(options)) end - end class Mock - def stop_server(id, options = {}) server = self.data[:servers].find { |s| s['ctid'].to_s == id.to_s } unless server.nil? server['status'] = 'stopped' end end - end end end diff --git a/lib/fog/openvz/requests/compute/suspend_server.rb b/lib/fog/openvz/requests/compute/suspend_server.rb index 1c2cd3bb5..fe44022bd 100644 --- a/lib/fog/openvz/requests/compute/suspend_server.rb +++ b/lib/fog/openvz/requests/compute/suspend_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def suspend_server(id, options = {}) vzctl("suspend",{:ctid => id}.merge(options)) end - end class Mock - def suspend_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/openvz/requests/compute/umount_server.rb b/lib/fog/openvz/requests/compute/umount_server.rb index 248cd19ba..1ad02e399 100644 --- a/lib/fog/openvz/requests/compute/umount_server.rb +++ b/lib/fog/openvz/requests/compute/umount_server.rb @@ -2,19 +2,15 @@ module Fog module Compute class Openvz class Real - def umount_server(id, options = {}) vzctl("umount",{:ctid => id}.merge(options)) end - end class Mock - def umount_server(id, options = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/ovirt/compute.rb b/lib/fog/ovirt/compute.rb index 9b2e47acb..9e043651a 100644 --- a/lib/fog/ovirt/compute.rb +++ b/lib/fog/ovirt/compute.rb @@ -3,7 +3,6 @@ require 'fog/ovirt/core' module Fog module Compute class Ovirt < Fog::Service - requires :ovirt_username, :ovirt_password recognizes :ovirt_url, :ovirt_server, :ovirt_port, :ovirt_api_path, :ovirt_datacenter, :ovirt_ca_cert_store, :ovirt_ca_cert_file @@ -99,7 +98,6 @@ module Fog class Real include Shared - def initialize(options={}) require 'rbovirt' username = options[:ovirt_username] diff --git a/lib/fog/ovirt/core.rb b/lib/fog/ovirt/core.rb index 5d85afe87..b228fc72b 100644 --- a/lib/fog/ovirt/core.rb +++ b/lib/fog/ovirt/core.rb @@ -3,7 +3,6 @@ require 'fog/xml' module Fog module Ovirt - extend Fog::Provider module Errors @@ -13,6 +12,5 @@ module Fog end service(:compute, 'Compute') - end end diff --git a/lib/fog/ovirt/models/compute/cluster.rb b/lib/fog/ovirt/models/compute/cluster.rb index e5ce654e6..6d948ceef 100644 --- a/lib/fog/ovirt/models/compute/cluster.rb +++ b/lib/fog/ovirt/models/compute/cluster.rb @@ -1,9 +1,7 @@ module Fog module Compute class Ovirt - class Cluster < Fog::Model - identity :id attribute :name @@ -16,9 +14,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/ovirt/models/compute/clusters.rb b/lib/fog/ovirt/models/compute/clusters.rb index c6d6b9f94..b58507a6e 100644 --- a/lib/fog/ovirt/models/compute/clusters.rb +++ b/lib/fog/ovirt/models/compute/clusters.rb @@ -4,9 +4,7 @@ require 'fog/ovirt/models/compute/cluster' module Fog module Compute class Ovirt - class Clusters < Fog::Collection - model Fog::Compute::Ovirt::Cluster def all(filters = {}) @@ -16,7 +14,6 @@ module Fog def get(id) new service.get_cluster(id) end - end end end diff --git a/lib/fog/ovirt/models/compute/interface.rb b/lib/fog/ovirt/models/compute/interface.rb index 955193b69..cebccd625 100644 --- a/lib/fog/ovirt/models/compute/interface.rb +++ b/lib/fog/ovirt/models/compute/interface.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ovirt - class Interface < Fog::Model attr_accessor :raw identity :id @@ -14,9 +13,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/ovirt/models/compute/interfaces.rb b/lib/fog/ovirt/models/compute/interfaces.rb index 982328273..1a9b0307e 100644 --- a/lib/fog/ovirt/models/compute/interfaces.rb +++ b/lib/fog/ovirt/models/compute/interfaces.rb @@ -4,9 +4,7 @@ require 'fog/ovirt/models/compute/interface' module Fog module Compute class Ovirt - class Interfaces < Fog::Collection - model Fog::Compute::Ovirt::Interface attr_accessor :vm @@ -25,7 +23,6 @@ module Fog def get(id) new service.get_interface(id) end - end end end diff --git a/lib/fog/ovirt/models/compute/quota.rb b/lib/fog/ovirt/models/compute/quota.rb index e7bb4f359..86d665550 100644 --- a/lib/fog/ovirt/models/compute/quota.rb +++ b/lib/fog/ovirt/models/compute/quota.rb @@ -1,9 +1,7 @@ module Fog module Compute class Ovirt - class Quota < Fog::Model - identity :id attribute :name @@ -12,9 +10,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/ovirt/models/compute/quotas.rb b/lib/fog/ovirt/models/compute/quotas.rb index 27805cde6..f12e5b22d 100644 --- a/lib/fog/ovirt/models/compute/quotas.rb +++ b/lib/fog/ovirt/models/compute/quotas.rb @@ -4,9 +4,7 @@ require 'fog/ovirt/models/compute/quota' module Fog module Compute class Ovirt - class Quotas < Fog::Collection - model Fog::Compute::Ovirt::Quota def all(filters = {}) @@ -16,7 +14,6 @@ module Fog def get(id) new service.get_quota(id) end - end end end diff --git a/lib/fog/ovirt/models/compute/server.rb b/lib/fog/ovirt/models/compute/server.rb index c90af2cb5..47aafb1a8 100644 --- a/lib/fog/ovirt/models/compute/server.rb +++ b/lib/fog/ovirt/models/compute/server.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class Ovirt - class Server < Fog::Compute::Server - # This will be the instance uuid which is globally unique across # a oVirt deployment. identity :id @@ -129,9 +127,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/ovirt/models/compute/servers.rb b/lib/fog/ovirt/models/compute/servers.rb index 2f5e09537..945a88a9a 100644 --- a/lib/fog/ovirt/models/compute/servers.rb +++ b/lib/fog/ovirt/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/ovirt/models/compute/server' module Fog module Compute class Ovirt - class Servers < Fog::Collection - model Fog::Compute::Ovirt::Server def all(filters = {}) @@ -23,7 +21,6 @@ module Fog server.start server end - end end end diff --git a/lib/fog/ovirt/models/compute/template.rb b/lib/fog/ovirt/models/compute/template.rb index cfe56f9ed..20419bada 100644 --- a/lib/fog/ovirt/models/compute/template.rb +++ b/lib/fog/ovirt/models/compute/template.rb @@ -1,9 +1,7 @@ module Fog module Compute class Ovirt - class Template < Fog::Model - identity :id attr_accessor :raw @@ -52,9 +50,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/ovirt/models/compute/templates.rb b/lib/fog/ovirt/models/compute/templates.rb index 389159e56..5193a2763 100644 --- a/lib/fog/ovirt/models/compute/templates.rb +++ b/lib/fog/ovirt/models/compute/templates.rb @@ -4,9 +4,7 @@ require 'fog/ovirt/models/compute/template' module Fog module Compute class Ovirt - class Templates < Fog::Collection - model Fog::Compute::Ovirt::Template def all(filters = {}) @@ -16,7 +14,6 @@ module Fog def get(id) new service.get_template(id) end - end end end diff --git a/lib/fog/ovirt/models/compute/volume.rb b/lib/fog/ovirt/models/compute/volume.rb index c595e704b..932ccfa04 100644 --- a/lib/fog/ovirt/models/compute/volume.rb +++ b/lib/fog/ovirt/models/compute/volume.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ovirt - class Volume < Fog::Model attr_accessor :raw DISK_SIZE_TO_GB = 1073741824 @@ -29,9 +28,7 @@ module Fog def to_s id end - end - end end end diff --git a/lib/fog/ovirt/models/compute/volumes.rb b/lib/fog/ovirt/models/compute/volumes.rb index 1d1d9b14f..9f50e1049 100644 --- a/lib/fog/ovirt/models/compute/volumes.rb +++ b/lib/fog/ovirt/models/compute/volumes.rb @@ -4,9 +4,7 @@ require 'fog/ovirt/models/compute/volume' module Fog module Compute class Ovirt - class Volumes < Fog::Collection - model Fog::Compute::Ovirt::Volume attr_accessor :vm @@ -25,7 +23,6 @@ module Fog def get(id) new service.get_volume(id) end - end end end diff --git a/lib/fog/ovirt/requests/compute/add_interface.rb b/lib/fog/ovirt/requests/compute/add_interface.rb index 675311db4..8b1113a77 100644 --- a/lib/fog/ovirt/requests/compute/add_interface.rb +++ b/lib/fog/ovirt/requests/compute/add_interface.rb @@ -2,13 +2,11 @@ module Fog module Compute class Ovirt class Real - def add_interface(id, options = {}) raise ArgumentError, "instance id is a required parameter" unless id client.add_interface(id, options) end - end class Mock @@ -16,7 +14,6 @@ module Fog raise ArgumentError, "instance id is a required parameter" unless id true end - end end end diff --git a/lib/fog/ovirt/requests/compute/add_volume.rb b/lib/fog/ovirt/requests/compute/add_volume.rb index 264a07c48..9ffb4b9d8 100644 --- a/lib/fog/ovirt/requests/compute/add_volume.rb +++ b/lib/fog/ovirt/requests/compute/add_volume.rb @@ -8,7 +8,6 @@ module Fog options[:size]=options[:size_gb].to_i*DISK_SIZE_TO_GB if options[:size_gb] client.add_volume(id, options) end - end class Mock @@ -16,7 +15,6 @@ module Fog raise ArgumentError, "instance id is a required parameter" unless id true end - end end end diff --git a/lib/fog/ovirt/requests/compute/create_vm.rb b/lib/fog/ovirt/requests/compute/create_vm.rb index b72505786..a6d265253 100644 --- a/lib/fog/ovirt/requests/compute/create_vm.rb +++ b/lib/fog/ovirt/requests/compute/create_vm.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ovirt - class Real def create_vm(attrs) client.create_vm(attrs) @@ -13,7 +12,6 @@ module Fog xml = read_xml('vm.xml') OVIRT::VM::new(self, Nokogiri::XML(xml).root) end - end end end diff --git a/lib/fog/ovirt/requests/compute/datacenters.rb b/lib/fog/ovirt/requests/compute/datacenters.rb index 4c94ba4d6..72438bdb6 100644 --- a/lib/fog/ovirt/requests/compute/datacenters.rb +++ b/lib/fog/ovirt/requests/compute/datacenters.rb @@ -2,11 +2,9 @@ module Fog module Compute class Ovirt class Real - def datacenters filter={} client.datacenters(filter).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock diff --git a/lib/fog/ovirt/requests/compute/destroy_interface.rb b/lib/fog/ovirt/requests/compute/destroy_interface.rb index 00610c24e..9fbd118dd 100644 --- a/lib/fog/ovirt/requests/compute/destroy_interface.rb +++ b/lib/fog/ovirt/requests/compute/destroy_interface.rb @@ -2,14 +2,12 @@ module Fog module Compute class Ovirt class Real - def destroy_interface(id, options) raise ArgumentError, "instance id is a required parameter" unless id raise ArgumentError, "interface id is a required parameter for destroy-interface" unless options.has_key? :id client.destroy_interface(id, options[:id]) end - end class Mock @@ -18,7 +16,6 @@ module Fog raise ArgumentError, "interface id is a required parameter for destroy-interface" unless options.has_key? :id true end - end end end diff --git a/lib/fog/ovirt/requests/compute/destroy_vm.rb b/lib/fog/ovirt/requests/compute/destroy_vm.rb index 8bc221104..e8743b7c2 100644 --- a/lib/fog/ovirt/requests/compute/destroy_vm.rb +++ b/lib/fog/ovirt/requests/compute/destroy_vm.rb @@ -2,12 +2,10 @@ module Fog module Compute class Ovirt class Real - def destroy_vm(options = {}) raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id client.destroy_vm(options[:id]) end - end class Mock @@ -15,7 +13,6 @@ module Fog raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id true end - end end end diff --git a/lib/fog/ovirt/requests/compute/destroy_volume.rb b/lib/fog/ovirt/requests/compute/destroy_volume.rb index 3b12b8999..3a812a520 100644 --- a/lib/fog/ovirt/requests/compute/destroy_volume.rb +++ b/lib/fog/ovirt/requests/compute/destroy_volume.rb @@ -2,14 +2,12 @@ module Fog module Compute class Ovirt class Real - def destroy_volume(id, options) raise ArgumentError, "instance id is a required parameter" unless id raise ArgumentError, "volume id is a required parameter for destroy-volume" unless options.has_key? :id client.destroy_volume(id, options[:id]) end - end class Mock @@ -18,7 +16,6 @@ module Fog raise ArgumentError, "volume id is a required parameter for destroy-volume" unless options.has_key? :id true end - end end end diff --git a/lib/fog/ovirt/requests/compute/get_cluster.rb b/lib/fog/ovirt/requests/compute/get_cluster.rb index 61d628d33..33daddbe8 100644 --- a/lib/fog/ovirt/requests/compute/get_cluster.rb +++ b/lib/fog/ovirt/requests/compute/get_cluster.rb @@ -5,7 +5,6 @@ module Fog def get_cluster(id) ovirt_attrs client.cluster(id) end - end class Mock def get_cluster(id) diff --git a/lib/fog/ovirt/requests/compute/get_quota.rb b/lib/fog/ovirt/requests/compute/get_quota.rb index 4a5abc686..cefcb4a4d 100644 --- a/lib/fog/ovirt/requests/compute/get_quota.rb +++ b/lib/fog/ovirt/requests/compute/get_quota.rb @@ -5,7 +5,6 @@ module Fog def get_quota(id) ovirt_attrs client.quota(id) end - end class Mock def get_quota(id) diff --git a/lib/fog/ovirt/requests/compute/get_template.rb b/lib/fog/ovirt/requests/compute/get_template.rb index 73622dc15..337aa7b06 100644 --- a/lib/fog/ovirt/requests/compute/get_template.rb +++ b/lib/fog/ovirt/requests/compute/get_template.rb @@ -5,7 +5,6 @@ module Fog def get_template(id) ovirt_attrs client.template(id) end - end class Mock def get_template(id) diff --git a/lib/fog/ovirt/requests/compute/get_virtual_machine.rb b/lib/fog/ovirt/requests/compute/get_virtual_machine.rb index 8896a5c13..5d8531103 100644 --- a/lib/fog/ovirt/requests/compute/get_virtual_machine.rb +++ b/lib/fog/ovirt/requests/compute/get_virtual_machine.rb @@ -5,7 +5,6 @@ module Fog def get_virtual_machine(id) ovirt_attrs client.vm(id) end - end class Mock def get_virtual_machine(id) diff --git a/lib/fog/ovirt/requests/compute/list_clusters.rb b/lib/fog/ovirt/requests/compute/list_clusters.rb index 4fdf0b93f..10f64666e 100644 --- a/lib/fog/ovirt/requests/compute/list_clusters.rb +++ b/lib/fog/ovirt/requests/compute/list_clusters.rb @@ -5,7 +5,6 @@ module Fog def list_clusters(filters = {}) client.clusters(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock def list_clusters(filters = {}) diff --git a/lib/fog/ovirt/requests/compute/list_networks.rb b/lib/fog/ovirt/requests/compute/list_networks.rb index f4af0d7ea..f789d93bb 100644 --- a/lib/fog/ovirt/requests/compute/list_networks.rb +++ b/lib/fog/ovirt/requests/compute/list_networks.rb @@ -5,7 +5,6 @@ module Fog def list_networks(cluster_id) client.networks(:cluster_id => cluster_id) end - end class Mock def list_networks(cluster_id) diff --git a/lib/fog/ovirt/requests/compute/list_quotas.rb b/lib/fog/ovirt/requests/compute/list_quotas.rb index 9b56cd29e..e1c80765d 100644 --- a/lib/fog/ovirt/requests/compute/list_quotas.rb +++ b/lib/fog/ovirt/requests/compute/list_quotas.rb @@ -5,7 +5,6 @@ module Fog def list_quotas(filters = {}) client.quotas(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock def list_quotas(filters = {}) diff --git a/lib/fog/ovirt/requests/compute/list_template_interfaces.rb b/lib/fog/ovirt/requests/compute/list_template_interfaces.rb index 7467dbcd5..a2f9e436e 100644 --- a/lib/fog/ovirt/requests/compute/list_template_interfaces.rb +++ b/lib/fog/ovirt/requests/compute/list_template_interfaces.rb @@ -5,7 +5,6 @@ module Fog def list_template_interfaces(vm_id) client.template_interfaces(vm_id).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock def list_template_interfaces(vm_id) diff --git a/lib/fog/ovirt/requests/compute/list_template_volumes.rb b/lib/fog/ovirt/requests/compute/list_template_volumes.rb index 7c4fe86ba..205e06a34 100644 --- a/lib/fog/ovirt/requests/compute/list_template_volumes.rb +++ b/lib/fog/ovirt/requests/compute/list_template_volumes.rb @@ -5,7 +5,6 @@ module Fog def list_template_volumes(template_id) client.template_volumes(template_id).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock def list_template_volumes(template_id) diff --git a/lib/fog/ovirt/requests/compute/list_templates.rb b/lib/fog/ovirt/requests/compute/list_templates.rb index eb74d981c..2382fa1ce 100644 --- a/lib/fog/ovirt/requests/compute/list_templates.rb +++ b/lib/fog/ovirt/requests/compute/list_templates.rb @@ -5,7 +5,6 @@ module Fog def list_templates(filters = {}) client.templates(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock def list_templates(filters = {}) diff --git a/lib/fog/ovirt/requests/compute/list_virtual_machines.rb b/lib/fog/ovirt/requests/compute/list_virtual_machines.rb index a2d6251b5..1dc8a73e6 100644 --- a/lib/fog/ovirt/requests/compute/list_virtual_machines.rb +++ b/lib/fog/ovirt/requests/compute/list_virtual_machines.rb @@ -5,7 +5,6 @@ module Fog def list_virtual_machines(filters = {}) client.vms(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock def list_virtual_machines(filters = {}) diff --git a/lib/fog/ovirt/requests/compute/list_vm_interfaces.rb b/lib/fog/ovirt/requests/compute/list_vm_interfaces.rb index 9f744b52b..6d35d01f1 100644 --- a/lib/fog/ovirt/requests/compute/list_vm_interfaces.rb +++ b/lib/fog/ovirt/requests/compute/list_vm_interfaces.rb @@ -5,7 +5,6 @@ module Fog def list_vm_interfaces(vm_id) client.vm_interfaces(vm_id).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock def list_vm_interfaces(vm_id) diff --git a/lib/fog/ovirt/requests/compute/list_vm_volumes.rb b/lib/fog/ovirt/requests/compute/list_vm_volumes.rb index bfd7b5a0e..62d2d5a68 100644 --- a/lib/fog/ovirt/requests/compute/list_vm_volumes.rb +++ b/lib/fog/ovirt/requests/compute/list_vm_volumes.rb @@ -5,7 +5,6 @@ module Fog def list_vm_volumes(vm_id) client.vm_volumes(vm_id).map {|ovirt_obj| ovirt_attrs ovirt_obj} end - end class Mock def list_vm_volumes(vm_id) diff --git a/lib/fog/ovirt/requests/compute/storage_domains.rb b/lib/fog/ovirt/requests/compute/storage_domains.rb index 557af7d44..703642c63 100644 --- a/lib/fog/ovirt/requests/compute/storage_domains.rb +++ b/lib/fog/ovirt/requests/compute/storage_domains.rb @@ -2,11 +2,9 @@ module Fog module Compute class Ovirt class Real - def storage_domains filter={} client.storagedomains(filter) end - end class Mock diff --git a/lib/fog/ovirt/requests/compute/update_interface.rb b/lib/fog/ovirt/requests/compute/update_interface.rb index 39c13e8ca..0477cee02 100644 --- a/lib/fog/ovirt/requests/compute/update_interface.rb +++ b/lib/fog/ovirt/requests/compute/update_interface.rb @@ -2,14 +2,12 @@ module Fog module Compute class Ovirt class Real - def update_interface(id, options) raise ArgumentError, "instance id is a required parameter" unless id raise ArgumentError, "interface id is a required parameter for update-interface" unless options.has_key? :id client.update_interface(id, options) end - end class Mock @@ -18,7 +16,6 @@ module Fog raise ArgumentError, "interface id is a required parameter for update-interface" unless options.has_key? :id true end - end end end diff --git a/lib/fog/ovirt/requests/compute/update_vm.rb b/lib/fog/ovirt/requests/compute/update_vm.rb index 48ef49bf0..af7dd0e1f 100644 --- a/lib/fog/ovirt/requests/compute/update_vm.rb +++ b/lib/fog/ovirt/requests/compute/update_vm.rb @@ -1,7 +1,6 @@ module Fog module Compute class Ovirt - class Real def update_vm(attrs) client.update_vm(attrs) @@ -13,7 +12,6 @@ module Fog xml = read_xml('vm.xml') OVIRT::VM::new(self, Nokogiri::XML(xml).root) end - end end end diff --git a/lib/fog/ovirt/requests/compute/vm_action.rb b/lib/fog/ovirt/requests/compute/vm_action.rb index d71be381c..f2390c95f 100644 --- a/lib/fog/ovirt/requests/compute/vm_action.rb +++ b/lib/fog/ovirt/requests/compute/vm_action.rb @@ -2,24 +2,20 @@ module Fog module Compute class Ovirt class Real - def vm_action(options = {}) raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id raise ArgumentError, "action is a required parameter" unless options.has_key? :action client.vm_action options[:id], options[:action] end - end class Mock - def vm_action(options = {}) raise ArgumentError, "id is a required parameter" unless options.has_key? :id raise ArgumentError, "action is a required parameter" unless options.has_key? :action true end - end end end diff --git a/lib/fog/ovirt/requests/compute/vm_ticket.rb b/lib/fog/ovirt/requests/compute/vm_ticket.rb index 86da6aa53..140b440e0 100644 --- a/lib/fog/ovirt/requests/compute/vm_ticket.rb +++ b/lib/fog/ovirt/requests/compute/vm_ticket.rb @@ -2,19 +2,15 @@ module Fog module Compute class Ovirt class Real - def vm_ticket(id, options = {}) client.set_ticket(id, options) end - end class Mock - def vm_ticket(id, options = {}) "Secret" end - end end end diff --git a/lib/fog/rackspace/auto_scale.rb b/lib/fog/rackspace/auto_scale.rb index bdcbf467a..a5f1e466a 100644 --- a/lib/fog/rackspace/auto_scale.rb +++ b/lib/fog/rackspace/auto_scale.rb @@ -86,9 +86,7 @@ module Fog end end - class Real < Fog::Rackspace::Service - def initialize(options = {}) @options = options @options[:connection_options] ||= {} diff --git a/lib/fog/rackspace/block_storage.rb b/lib/fog/rackspace/block_storage.rb index 0f5762e95..1018ec04e 100644 --- a/lib/fog/rackspace/block_storage.rb +++ b/lib/fog/rackspace/block_storage.rb @@ -173,7 +173,6 @@ module Fog append_tenant_v1 credentials @auth_token = credentials['X-Auth-Token'] end - end end end diff --git a/lib/fog/rackspace/cdn.rb b/lib/fog/rackspace/cdn.rb index 8b65817cc..9559017f7 100644 --- a/lib/fog/rackspace/cdn.rb +++ b/lib/fog/rackspace/cdn.rb @@ -13,7 +13,6 @@ module Fog request :put_container request :delete_object - module Base URI_HEADERS = { "X-Cdn-Ios-Uri" => :ios_uri, @@ -130,7 +129,6 @@ module Fog def reset_data self.class.data.delete(@rackspace_username) end - end class Real < Fog::Rackspace::Service diff --git a/lib/fog/rackspace/compute.rb b/lib/fog/rackspace/compute.rb index dfd688f50..47557cfed 100644 --- a/lib/fog/rackspace/compute.rb +++ b/lib/fog/rackspace/compute.rb @@ -46,7 +46,6 @@ module Fog request :update_server class Mock < Fog::Rackspace::Service - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -181,11 +180,9 @@ module Fog def reset_data self.class.data.delete(@rackspace_username) end - end class Real < Fog::Rackspace::Service - def initialize(options={}) @rackspace_api_key = options[:rackspace_api_key] @rackspace_username = options[:rackspace_username] @@ -253,7 +250,6 @@ module Fog endpoint_uri credentials['X-Server-Management-Url'] @auth_token = credentials['X-Auth-Token'] end - end end end diff --git a/lib/fog/rackspace/compute_v2.rb b/lib/fog/rackspace/compute_v2.rb index fb24ec2f5..3578d8586 100644 --- a/lib/fog/rackspace/compute_v2.rb +++ b/lib/fog/rackspace/compute_v2.rb @@ -10,7 +10,6 @@ module Fog class BadRequest < Fog::Rackspace::Errors::BadRequest; end class InvalidStateException < ::RuntimeError - attr_reader :desired_state attr_reader :current_state @@ -144,7 +143,6 @@ module Fog end class Real < Fog::Rackspace::Service - def initialize(options = {}) @rackspace_api_key = options[:rackspace_api_key] @rackspace_username = options[:rackspace_username] diff --git a/lib/fog/rackspace/core.rb b/lib/fog/rackspace/core.rb index 3fa6a2481..7e22a9b68 100644 --- a/lib/fog/rackspace/core.rb +++ b/lib/fog/rackspace/core.rb @@ -4,7 +4,6 @@ require 'fog/rackspace/mock_data' require 'fog/rackspace/service' require 'fog/rackspace/errors' - module Fog module Rackspace extend Fog::Provider diff --git a/lib/fog/rackspace/databases.rb b/lib/fog/rackspace/databases.rb index 569c1529f..c2be0f9c9 100644 --- a/lib/fog/rackspace/databases.rb +++ b/lib/fog/rackspace/databases.rb @@ -20,7 +20,6 @@ module Fog recognizes :rackspace_region recognizes :rackspace_database_url - model_path 'fog/rackspace/models/databases' model :flavor collection :flavors @@ -60,7 +59,6 @@ module Fog end class Real < Fog::Rackspace::Service - def service_name :cloudDatabases end diff --git a/lib/fog/rackspace/dns.rb b/lib/fog/rackspace/dns.rb index f3f8ba516..d33bf6678 100644 --- a/lib/fog/rackspace/dns.rb +++ b/lib/fog/rackspace/dns.rb @@ -50,7 +50,6 @@ module Fog request :add_records class Mock < Fog::Rackspace::Service - def initialize(options={}) @rackspace_api_key = options[:rackspace_api_key] @rackspace_username = options[:rackspace_username] @@ -74,11 +73,9 @@ module Fog def reset_data self.class.reset end - end class Real < Fog::Rackspace::Service - def service_name :cloudDNS end diff --git a/lib/fog/rackspace/errors.rb b/lib/fog/rackspace/errors.rb index 5e140be2f..73e0c1314 100644 --- a/lib/fog/rackspace/errors.rb +++ b/lib/fog/rackspace/errors.rb @@ -1,7 +1,6 @@ module Fog module Rackspace module Errors - def self.included(mod) mod.class_eval <<-'EOS', __FILE__, __LINE__ class NotFound < Fog::Service::NotFound diff --git a/lib/fog/rackspace/examples/auto_scale/add_policy.rb b/lib/fog/rackspace/examples/auto_scale/add_policy.rb index c67680a92..ff0fbc3e7 100644 --- a/lib/fog/rackspace/examples/auto_scale/add_policy.rb +++ b/lib/fog/rackspace/examples/auto_scale/add_policy.rb @@ -39,7 +39,6 @@ def select_group(groups) groups[select_str.to_i] end - # create auto scaling service auto_scale_service = Fog::Rackspace::AutoScale.new({ :rackspace_username => rackspace_username, @@ -47,7 +46,6 @@ auto_scale_service = Fog::Rackspace::AutoScale.new({ :rackspace_region => :ord # Use Chicago Region }) - # retrieve list of scaling groups groups = auto_scale_service.groups diff --git a/lib/fog/rackspace/examples/auto_scale/create_scaling_group.rb b/lib/fog/rackspace/examples/auto_scale/create_scaling_group.rb index 9069cccd4..a3c1ee664 100644 --- a/lib/fog/rackspace/examples/auto_scale/create_scaling_group.rb +++ b/lib/fog/rackspace/examples/auto_scale/create_scaling_group.rb @@ -33,7 +33,6 @@ def rackspace_api_key Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key") end - def select_image(images) puts "\nSelect Image For Server:\n\n" images.each_with_index do |image, i| @@ -44,7 +43,6 @@ def select_image(images) images[select_str.to_i] end - # create auto scaling service auto_scale_service = Fog::Rackspace::AutoScale.new({ :rackspace_username => rackspace_username, @@ -52,7 +50,6 @@ auto_scale_service = Fog::Rackspace::AutoScale.new({ :rackspace_region => :ord # Use Chicago Region }) - # create Next Generation Cloud Server service to get list of flavors compute_service = Fog::Compute.new({ :provider => 'rackspace', @@ -62,7 +59,6 @@ compute_service = Fog::Compute.new({ :rackspace_region => :ord # Use Chicago Region }) - # prompt for scaling group name scaling_group_name = get_user_input "Enter name of scaling group" diff --git a/lib/fog/rackspace/examples/auto_scale/delete_scaling_group.rb b/lib/fog/rackspace/examples/auto_scale/delete_scaling_group.rb index ae6ef683d..c6c76296d 100644 --- a/lib/fog/rackspace/examples/auto_scale/delete_scaling_group.rb +++ b/lib/fog/rackspace/examples/auto_scale/delete_scaling_group.rb @@ -34,7 +34,6 @@ def select_group(groups) groups[select_str.to_i] end - # create auto scaling service auto_scale_service = Fog::Rackspace::AutoScale.new({ :rackspace_username => rackspace_username, @@ -42,7 +41,6 @@ auto_scale_service = Fog::Rackspace::AutoScale.new({ :rackspace_region => :ord # Use Chicago Region }) - # retrieve list of scaling groups groups = auto_scale_service.groups diff --git a/lib/fog/rackspace/examples/auto_scale/delete_webhook.rb b/lib/fog/rackspace/examples/auto_scale/delete_webhook.rb index afba4bf67..d03b63882 100644 --- a/lib/fog/rackspace/examples/auto_scale/delete_webhook.rb +++ b/lib/fog/rackspace/examples/auto_scale/delete_webhook.rb @@ -9,7 +9,6 @@ def get_user_input(prompt) gets.chomp end - # Use username defined in ~/.fog file, if absent prompt for username. # For more details on ~/.fog refer to http://fog.io/about/getting_started.html def rackspace_username @@ -59,7 +58,6 @@ def select_webhook(webhooks) webhooks[select_str.to_i] end - # create auto scaling service auto_scale_service = Fog::Rackspace::AutoScale.new({ :rackspace_username => rackspace_username, diff --git a/lib/fog/rackspace/examples/block_storage/create_snapshot.rb b/lib/fog/rackspace/examples/block_storage/create_snapshot.rb index f435de5f0..796e2f6dd 100644 --- a/lib/fog/rackspace/examples/block_storage/create_snapshot.rb +++ b/lib/fog/rackspace/examples/block_storage/create_snapshot.rb @@ -83,7 +83,6 @@ puts "* Volume must be unmounted from operating system before detaching. *" puts "* This script assumes volume has been unmounted. *" puts "********************************************************************\n\n" - volume = cbs_service.volumes.get attachment.volume_id # The snapshot process requires all writes to be flushed to disk. This requires unmounting the file systems or detaching the volume. diff --git a/lib/fog/rackspace/examples/queues/delete_message.rb b/lib/fog/rackspace/examples/queues/delete_message.rb index aa84c8879..6fb7afdce 100644 --- a/lib/fog/rackspace/examples/queues/delete_message.rb +++ b/lib/fog/rackspace/examples/queues/delete_message.rb @@ -34,7 +34,6 @@ def select_message(messages) messages[delete_str.to_i] end - # Use username defined in ~/.fog file, if absent prompt for username. # For more details on ~/.fog refer to http://fog.io/about/getting_started.html def rackspace_username diff --git a/lib/fog/rackspace/examples/storage/create_private_directory.rb b/lib/fog/rackspace/examples/storage/create_private_directory.rb index 439f59751..36a9ebdc9 100644 --- a/lib/fog/rackspace/examples/storage/create_private_directory.rb +++ b/lib/fog/rackspace/examples/storage/create_private_directory.rb @@ -30,7 +30,6 @@ service = Fog::Storage.new({ :rackspace_region => :ord #Use Chicago Region }) - # prompt for directory name directory_name = get_user_input "\nEnter name of directory to create" diff --git a/lib/fog/rackspace/examples/storage/storage_metadata.rb b/lib/fog/rackspace/examples/storage/storage_metadata.rb index 698867b5b..507c150a3 100644 --- a/lib/fog/rackspace/examples/storage/storage_metadata.rb +++ b/lib/fog/rackspace/examples/storage/storage_metadata.rb @@ -32,7 +32,6 @@ service = Fog::Storage.new({ :rackspace_region => :ord #Use Chicago Region }) - # create directory puts "Creating directory 'metadata-tester'" directory = service.directories.create :key => "metadata-tester" diff --git a/lib/fog/rackspace/examples/storage/upload_large_files.rb b/lib/fog/rackspace/examples/storage/upload_large_files.rb index 29d5a69f5..52f9d59ba 100644 --- a/lib/fog/rackspace/examples/storage/upload_large_files.rb +++ b/lib/fog/rackspace/examples/storage/upload_large_files.rb @@ -49,7 +49,6 @@ service = Fog::Storage.new({ :rackspace_region => :ord }) - # retrieve directories with files directories = service.directories @@ -64,7 +63,6 @@ File.open(file_name) do |f| num_segments = (f.stat.size / SEGMENT_LIMIT).round + 1 puts "\nThis upload of '#{file_name}' will require #{num_segments} segment(s) and 1 manifest file\n" - segment = 0 until f.eof? segment += 1 diff --git a/lib/fog/rackspace/identity.rb b/lib/fog/rackspace/identity.rb index cef5cceeb..ec86a5c0b 100644 --- a/lib/fog/rackspace/identity.rb +++ b/lib/fog/rackspace/identity.rb @@ -3,7 +3,6 @@ require 'fog/rackspace/core' module Fog module Rackspace class Identity < Fog::Service - US_ENDPOINT = 'https://identity.api.rackspacecloud.com/v2.0' UK_ENDPOINT = 'https://lon.identity.api.rackspacecloud.com/v2.0' diff --git a/lib/fog/rackspace/load_balancers.rb b/lib/fog/rackspace/load_balancers.rb index 56ca430fa..708e4dec3 100644 --- a/lib/fog/rackspace/load_balancers.rb +++ b/lib/fog/rackspace/load_balancers.rb @@ -76,7 +76,6 @@ module Fog request :get_stats module Shared - def algorithms list_algorithms.body['algorithms'].collect { |i| i['name'] } end @@ -88,7 +87,6 @@ module Fog def usage(options = {}) get_usage(options).body end - end class Mock < Fog::Rackspace::Service @@ -99,7 +97,6 @@ module Fog @rackspace_username = options[:rackspace_username] @rackspace_auth_url = options[:rackspace_auth_url] end - end class Real < Fog::Rackspace::Service @@ -207,7 +204,6 @@ module Fog append_tenant_v1 credentials @auth_token = credentials['X-Auth-Token'] end - end end end diff --git a/lib/fog/rackspace/mock_data.rb b/lib/fog/rackspace/mock_data.rb index 060a38fc6..c39f639c3 100644 --- a/lib/fog/rackspace/mock_data.rb +++ b/lib/fog/rackspace/mock_data.rb @@ -1,7 +1,6 @@ module Fog module Rackspace module MockData - NOT_FOUND_ID = "NOT-FOUND" def data diff --git a/lib/fog/rackspace/models/auto_scale/group.rb b/lib/fog/rackspace/models/auto_scale/group.rb index eb5ef721a..a0375c452 100644 --- a/lib/fog/rackspace/models/auto_scale/group.rb +++ b/lib/fog/rackspace/models/auto_scale/group.rb @@ -7,7 +7,6 @@ module Fog module Rackspace class AutoScale class Group < Fog::Model - # @!attribute [r] id # @return [String] The autoscale group's id identity :id @@ -200,7 +199,6 @@ module Fog end model end - end end end diff --git a/lib/fog/rackspace/models/auto_scale/group_builder.rb b/lib/fog/rackspace/models/auto_scale/group_builder.rb index 905cdd0d5..fd7573702 100644 --- a/lib/fog/rackspace/models/auto_scale/group_builder.rb +++ b/lib/fog/rackspace/models/auto_scale/group_builder.rb @@ -7,7 +7,6 @@ module Fog module Rackspace class AutoScale class GroupBuilder - class << self def build(service, attributes) service.groups.new :group_config => build_group_config(attributes), :launch_config => build_server_launch_config(attributes) diff --git a/lib/fog/rackspace/models/auto_scale/group_config.rb b/lib/fog/rackspace/models/auto_scale/group_config.rb index 88553fe93..462fdcd22 100644 --- a/lib/fog/rackspace/models/auto_scale/group_config.rb +++ b/lib/fog/rackspace/models/auto_scale/group_config.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class AutoScale class GroupConfig < Fog::Model - # @!attribute [r] group # @return [Fog::Rackspace::AutoScale::Group] The parent group attribute :group @@ -40,7 +39,6 @@ module Fog # # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/PUT_putGroupConfig_v1.0__tenantId__groups__groupId__config_Configurations.html def update - options = {} options['name'] = name unless name.nil? options['cooldown'] = cooldown unless cooldown.nil? @@ -72,7 +70,6 @@ module Fog merge_attributes data.body['groupConfiguration'] end end - end end end diff --git a/lib/fog/rackspace/models/auto_scale/groups.rb b/lib/fog/rackspace/models/auto_scale/groups.rb index 5fe9ea987..e4dfd071f 100644 --- a/lib/fog/rackspace/models/auto_scale/groups.rb +++ b/lib/fog/rackspace/models/auto_scale/groups.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class AutoScale class Groups < Fog::Collection - model Fog::Rackspace::AutoScale::Group # Returns list of autoscale groups diff --git a/lib/fog/rackspace/models/auto_scale/launch_config.rb b/lib/fog/rackspace/models/auto_scale/launch_config.rb index 23871d5ba..2de801413 100644 --- a/lib/fog/rackspace/models/auto_scale/launch_config.rb +++ b/lib/fog/rackspace/models/auto_scale/launch_config.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class AutoScale class LaunchConfig < Fog::Model - # @!attribute [r] group # @return [Fog::Rackspace::AutoScale::Group] The parent group attribute :group @@ -28,7 +27,6 @@ module Fog # # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/PUT_putLaunchConfig_v1.0__tenantId__groups__groupId__launch_Configurations.html def update - options = {} options['type'] = type unless type.nil? options['args'] = args unless args.nil? @@ -57,7 +55,6 @@ module Fog merge_attributes data.body['launchConfiguration'] end end - end end end diff --git a/lib/fog/rackspace/models/auto_scale/policies.rb b/lib/fog/rackspace/models/auto_scale/policies.rb index 5f77f2b8f..ad066ba11 100644 --- a/lib/fog/rackspace/models/auto_scale/policies.rb +++ b/lib/fog/rackspace/models/auto_scale/policies.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class AutoScale class Policies < Fog::Collection - model Fog::Rackspace::AutoScale::Policy attr_accessor :group @@ -60,7 +59,6 @@ module Fog def new(attributes = {}) super({:group => group}.merge(attributes)) end - end end end diff --git a/lib/fog/rackspace/models/auto_scale/policy.rb b/lib/fog/rackspace/models/auto_scale/policy.rb index 56d8d625d..5d96518ca 100644 --- a/lib/fog/rackspace/models/auto_scale/policy.rb +++ b/lib/fog/rackspace/models/auto_scale/policy.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class AutoScale class Policy < Fog::Model - # @!attribute [r] id # @return [String] The policy id identity :id @@ -215,7 +214,6 @@ module Fog :group => group }) end - end end end diff --git a/lib/fog/rackspace/models/auto_scale/webhook.rb b/lib/fog/rackspace/models/auto_scale/webhook.rb index 8da6e53b3..87dd27ae6 100644 --- a/lib/fog/rackspace/models/auto_scale/webhook.rb +++ b/lib/fog/rackspace/models/auto_scale/webhook.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class AutoScale class Webhook < Fog::Model - # @!attribute [r] id # @return [String] The webhook id identity :id @@ -111,7 +110,6 @@ module Fog link = links.find { |l| l['rel'] == 'capability' } link['href'] rescue nil end - end end end diff --git a/lib/fog/rackspace/models/auto_scale/webhooks.rb b/lib/fog/rackspace/models/auto_scale/webhooks.rb index c1c166268..ee6b0a051 100644 --- a/lib/fog/rackspace/models/auto_scale/webhooks.rb +++ b/lib/fog/rackspace/models/auto_scale/webhooks.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class AutoScale class Webhooks < Fog::Collection - model Fog::Rackspace::AutoScale::Webhook attr_accessor :group diff --git a/lib/fog/rackspace/models/block_storage/snapshots.rb b/lib/fog/rackspace/models/block_storage/snapshots.rb index a10c66b3e..d216d1c3d 100644 --- a/lib/fog/rackspace/models/block_storage/snapshots.rb +++ b/lib/fog/rackspace/models/block_storage/snapshots.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class BlockStorage class Snapshots < Fog::Collection - model Fog::Rackspace::BlockStorage::Snapshot # Returns list of snapshots diff --git a/lib/fog/rackspace/models/block_storage/volume.rb b/lib/fog/rackspace/models/block_storage/volume.rb index fd4896ec9..994fbd23d 100644 --- a/lib/fog/rackspace/models/block_storage/volume.rb +++ b/lib/fog/rackspace/models/block_storage/volume.rb @@ -70,7 +70,6 @@ module Fog service.snapshots.select { |s| s.volume_id == identity } end - # Creates a snapshot from the current volume # @param [Hash] options # @option options [String] :display_name of snapshot diff --git a/lib/fog/rackspace/models/block_storage/volume_type.rb b/lib/fog/rackspace/models/block_storage/volume_type.rb index 731e0d101..84454c694 100644 --- a/lib/fog/rackspace/models/block_storage/volume_type.rb +++ b/lib/fog/rackspace/models/block_storage/volume_type.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class BlockStorage class VolumeType < Fog::Model - # @!attribute [r] id # @return [String] The volume type id identity :id diff --git a/lib/fog/rackspace/models/block_storage/volume_types.rb b/lib/fog/rackspace/models/block_storage/volume_types.rb index 09f58c3aa..b15baa7df 100644 --- a/lib/fog/rackspace/models/block_storage/volume_types.rb +++ b/lib/fog/rackspace/models/block_storage/volume_types.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class BlockStorage class VolumeTypes < Fog::Collection - model Fog::Rackspace::BlockStorage::VolumeType # Returns list of volume types diff --git a/lib/fog/rackspace/models/block_storage/volumes.rb b/lib/fog/rackspace/models/block_storage/volumes.rb index 261091b20..b1e5452d2 100644 --- a/lib/fog/rackspace/models/block_storage/volumes.rb +++ b/lib/fog/rackspace/models/block_storage/volumes.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class BlockStorage class Volumes < Fog::Collection - model Fog::Rackspace::BlockStorage::Volume # Returns list of volumes diff --git a/lib/fog/rackspace/models/compute/flavor.rb b/lib/fog/rackspace/models/compute/flavor.rb index 497231216..13c490638 100644 --- a/lib/fog/rackspace/models/compute/flavor.rb +++ b/lib/fog/rackspace/models/compute/flavor.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Rackspace - class Flavor < Fog::Model - identity :id attribute :disk @@ -38,9 +36,7 @@ module Fog 2 end end - end - end end end diff --git a/lib/fog/rackspace/models/compute/flavors.rb b/lib/fog/rackspace/models/compute/flavors.rb index 301a0bca7..590527def 100644 --- a/lib/fog/rackspace/models/compute/flavors.rb +++ b/lib/fog/rackspace/models/compute/flavors.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/compute/flavor' module Fog module Compute class Rackspace - class Flavors < Fog::Collection - model Fog::Compute::Rackspace::Flavor def all @@ -20,9 +18,7 @@ module Fog rescue Fog::Compute::Rackspace::NotFound nil end - end - end end end diff --git a/lib/fog/rackspace/models/compute/image.rb b/lib/fog/rackspace/models/compute/image.rb index 1e423b84e..89238f42a 100644 --- a/lib/fog/rackspace/models/compute/image.rb +++ b/lib/fog/rackspace/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Rackspace - class Image < Fog::Model - identity :id attribute :name @@ -40,9 +38,7 @@ module Fog merge_attributes(data.body['image']) true end - end - end end end diff --git a/lib/fog/rackspace/models/compute/images.rb b/lib/fog/rackspace/models/compute/images.rb index e2c18cc55..80e4c510e 100644 --- a/lib/fog/rackspace/models/compute/images.rb +++ b/lib/fog/rackspace/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/compute/image' module Fog module Compute class Rackspace - class Images < Fog::Collection - model Fog::Compute::Rackspace::Image attribute :server @@ -27,9 +25,7 @@ module Fog rescue Fog::Compute::Rackspace::NotFound nil end - end - end end end diff --git a/lib/fog/rackspace/models/compute/server.rb b/lib/fog/rackspace/models/compute/server.rb index 9bb4a5e77..b4d9631a7 100644 --- a/lib/fog/rackspace/models/compute/server.rb +++ b/lib/fog/rackspace/models/compute/server.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class Rackspace - class Server < Fog::Compute::Server - identity :id attribute :addresses @@ -98,10 +96,7 @@ module Fog def adminPass=(new_admin_pass) @password = new_admin_pass end - end - end end - end diff --git a/lib/fog/rackspace/models/compute/servers.rb b/lib/fog/rackspace/models/compute/servers.rb index 907fff422..b32968ed9 100644 --- a/lib/fog/rackspace/models/compute/servers.rb +++ b/lib/fog/rackspace/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/compute/server' module Fog module Compute class Rackspace - class Servers < Fog::Collection - model Fog::Compute::Rackspace::Server def all @@ -28,9 +26,7 @@ module Fog rescue Fog::Compute::Rackspace::NotFound nil end - end - end end end diff --git a/lib/fog/rackspace/models/compute_v2/attachment.rb b/lib/fog/rackspace/models/compute_v2/attachment.rb index 4bdb8baab..878560989 100644 --- a/lib/fog/rackspace/models/compute_v2/attachment.rb +++ b/lib/fog/rackspace/models/compute_v2/attachment.rb @@ -4,7 +4,6 @@ module Fog module Compute class RackspaceV2 class Attachment < Fog::Model - # @!attribute [r] server_id # @return [String] The server id attribute :server_id, :aliases => 'serverId' diff --git a/lib/fog/rackspace/models/compute_v2/attachments.rb b/lib/fog/rackspace/models/compute_v2/attachments.rb index 993353355..afb03e4ce 100644 --- a/lib/fog/rackspace/models/compute_v2/attachments.rb +++ b/lib/fog/rackspace/models/compute_v2/attachments.rb @@ -5,7 +5,6 @@ module Fog module Compute class RackspaceV2 class Attachments < Fog::Collection - model Fog::Compute::RackspaceV2::Attachment attr_accessor :server diff --git a/lib/fog/rackspace/models/compute_v2/flavor.rb b/lib/fog/rackspace/models/compute_v2/flavor.rb index 538a0607d..da38ee3a7 100644 --- a/lib/fog/rackspace/models/compute_v2/flavor.rb +++ b/lib/fog/rackspace/models/compute_v2/flavor.rb @@ -4,12 +4,10 @@ module Fog module Compute class RackspaceV2 class Flavor < Fog::Model - # @!attribute [r] id # @return [String] The flavor id identity :id - # @!attribute [r] name # @return [String] flavor name attribute :name diff --git a/lib/fog/rackspace/models/compute_v2/flavors.rb b/lib/fog/rackspace/models/compute_v2/flavors.rb index 9c6f5a763..5991d4228 100644 --- a/lib/fog/rackspace/models/compute_v2/flavors.rb +++ b/lib/fog/rackspace/models/compute_v2/flavors.rb @@ -5,7 +5,6 @@ module Fog module Compute class RackspaceV2 class Flavors < Fog::Collection - model Fog::Compute::RackspaceV2::Flavor # Retrieves information for all available flavors diff --git a/lib/fog/rackspace/models/compute_v2/image.rb b/lib/fog/rackspace/models/compute_v2/image.rb index 74e98a25b..d2f75b4fc 100644 --- a/lib/fog/rackspace/models/compute_v2/image.rb +++ b/lib/fog/rackspace/models/compute_v2/image.rb @@ -102,7 +102,6 @@ module Fog state == ready_state end - # Destroy image # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 diff --git a/lib/fog/rackspace/models/compute_v2/images.rb b/lib/fog/rackspace/models/compute_v2/images.rb index 9dcacf39b..185c1194c 100644 --- a/lib/fog/rackspace/models/compute_v2/images.rb +++ b/lib/fog/rackspace/models/compute_v2/images.rb @@ -5,7 +5,6 @@ module Fog module Compute class RackspaceV2 class Images < Fog::Collection - # @!attribute [rw] name # @return [String] Given a string value x, filters the list of images by image name. attribute :name diff --git a/lib/fog/rackspace/models/compute_v2/key_pair.rb b/lib/fog/rackspace/models/compute_v2/key_pair.rb index b0041408f..e6ec5916b 100644 --- a/lib/fog/rackspace/models/compute_v2/key_pair.rb +++ b/lib/fog/rackspace/models/compute_v2/key_pair.rb @@ -4,7 +4,6 @@ module Fog module Compute class RackspaceV2 class KeyPair < Fog::Model - # @!attribute [rw] name # @return [String] the keypair name identity :name @@ -49,7 +48,6 @@ module Fog service.delete_keypair(identity) true end - end end end diff --git a/lib/fog/rackspace/models/compute_v2/key_pairs.rb b/lib/fog/rackspace/models/compute_v2/key_pairs.rb index dd152ed7f..aba09ffbd 100644 --- a/lib/fog/rackspace/models/compute_v2/key_pairs.rb +++ b/lib/fog/rackspace/models/compute_v2/key_pairs.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/compute_v2/key_pair' module Fog module Compute class RackspaceV2 - class KeyPairs < Fog::Collection - model Fog::Compute::RackspaceV2::KeyPair # Fetch the list of known keypairs @@ -36,7 +34,6 @@ module Fog nil end end - end end end diff --git a/lib/fog/rackspace/models/compute_v2/meta_parent.rb b/lib/fog/rackspace/models/compute_v2/meta_parent.rb index 4c996abe8..8a37b1afa 100644 --- a/lib/fog/rackspace/models/compute_v2/meta_parent.rb +++ b/lib/fog/rackspace/models/compute_v2/meta_parent.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 module MetaParent - # Parent of metadata # @return [#parent] parent of metadata def parent @@ -35,7 +34,6 @@ module Fog metas.each { |meta| hash[meta.key] = meta.value } hash end - end end end diff --git a/lib/fog/rackspace/models/compute_v2/metadata.rb b/lib/fog/rackspace/models/compute_v2/metadata.rb index ac2d057b0..71adba423 100644 --- a/lib/fog/rackspace/models/compute_v2/metadata.rb +++ b/lib/fog/rackspace/models/compute_v2/metadata.rb @@ -7,9 +7,7 @@ require 'fog/rackspace/models/compute_v2/server' module Fog module Compute class RackspaceV2 - class Metadata < Fog::Collection - model Fog::Compute::RackspaceV2::Metadatum include Fog::Compute::RackspaceV2::MetaParent @@ -104,7 +102,6 @@ module Fog self.each { |datum| h[datum.key] = datum.value } h end - end end end diff --git a/lib/fog/rackspace/models/compute_v2/metadatum.rb b/lib/fog/rackspace/models/compute_v2/metadatum.rb index 3bd03c209..03ebf0a0c 100644 --- a/lib/fog/rackspace/models/compute_v2/metadatum.rb +++ b/lib/fog/rackspace/models/compute_v2/metadatum.rb @@ -5,7 +5,6 @@ module Fog module Compute class RackspaceV2 class Metadatum < Fog::Model - include Fog::Compute::RackspaceV2::MetaParent identity :key @@ -34,7 +33,6 @@ module Fog service.set_metadata_item(collection_name, parent.id, key, value) true end - end end end diff --git a/lib/fog/rackspace/models/compute_v2/server.rb b/lib/fog/rackspace/models/compute_v2/server.rb index 190a5d6dc..c37a32c5a 100644 --- a/lib/fog/rackspace/models/compute_v2/server.rb +++ b/lib/fog/rackspace/models/compute_v2/server.rb @@ -111,7 +111,6 @@ module Fog # and so on, and enables you to manage the disk configuration. attribute :disk_config, :aliases => 'OS-DCF:diskConfig' - # @!attribute [rw] config_drive_ext # @return [Boolean] whether a read-only configuration drive is attached # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/config_drive_ext.html @@ -160,7 +159,6 @@ module Fog # @note The key_pair/key_name is used to specify the keypair used for server creation. It is not populated by cloud servers. attribute :key_name - def initialize(attributes={}) @service = attributes[:service] super @@ -426,7 +424,6 @@ module Fog true end - # Rebuild removes all data on the server and replaces it with the specified image. The id and all IP addresses remain the same. # @param [String] image_id image to use for rebuild # @return [Boolean] returns true if rebuild is in process diff --git a/lib/fog/rackspace/models/compute_v2/servers.rb b/lib/fog/rackspace/models/compute_v2/servers.rb index 695f54159..c8b85487a 100644 --- a/lib/fog/rackspace/models/compute_v2/servers.rb +++ b/lib/fog/rackspace/models/compute_v2/servers.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/compute_v2/server' module Fog module Compute class RackspaceV2 - class Servers < Fog::Collection - model Fog::Compute::RackspaceV2::Server # Returns list of servers diff --git a/lib/fog/rackspace/models/compute_v2/virtual_interface.rb b/lib/fog/rackspace/models/compute_v2/virtual_interface.rb index f4bffb308..0854591d6 100644 --- a/lib/fog/rackspace/models/compute_v2/virtual_interface.rb +++ b/lib/fog/rackspace/models/compute_v2/virtual_interface.rb @@ -5,7 +5,6 @@ module Fog module Compute class RackspaceV2 class VirtualInterface < Fog::Model - # @!attribute [r] id # @return [String] The virtual interface id identity :id @@ -80,7 +79,6 @@ module Fog def network_id attributes[:network].is_a?(Network) ? attributes[:network].id : attributes[:network] end - end end end diff --git a/lib/fog/rackspace/models/databases/databases.rb b/lib/fog/rackspace/models/databases/databases.rb index a3cc0760b..0c21ba58a 100644 --- a/lib/fog/rackspace/models/databases/databases.rb +++ b/lib/fog/rackspace/models/databases/databases.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Databases class Databases < Fog::Collection - model Fog::Rackspace::Databases::Database attr_accessor :instance diff --git a/lib/fog/rackspace/models/databases/flavors.rb b/lib/fog/rackspace/models/databases/flavors.rb index 6cd938564..f53d7a2b4 100644 --- a/lib/fog/rackspace/models/databases/flavors.rb +++ b/lib/fog/rackspace/models/databases/flavors.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Databases class Flavors < Fog::Collection - model Fog::Rackspace::Databases::Flavor def all diff --git a/lib/fog/rackspace/models/databases/instances.rb b/lib/fog/rackspace/models/databases/instances.rb index 31a75d5d1..6bb9164c0 100644 --- a/lib/fog/rackspace/models/databases/instances.rb +++ b/lib/fog/rackspace/models/databases/instances.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Databases class Instances < Fog::Collection - model Fog::Rackspace::Databases::Instance def all diff --git a/lib/fog/rackspace/models/databases/users.rb b/lib/fog/rackspace/models/databases/users.rb index ad37777a3..bfad020e5 100644 --- a/lib/fog/rackspace/models/databases/users.rb +++ b/lib/fog/rackspace/models/databases/users.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Databases class Users < Fog::Collection - model Fog::Rackspace::Databases::User attr_accessor :instance diff --git a/lib/fog/rackspace/models/dns/callback.rb b/lib/fog/rackspace/models/dns/callback.rb index 33c0c536f..a0bfb2896 100644 --- a/lib/fog/rackspace/models/dns/callback.rb +++ b/lib/fog/rackspace/models/dns/callback.rb @@ -1,9 +1,7 @@ module Fog module DNS class Rackspace - module Callback - protected def wait_for_job(job_id, timeout=Fog.timeout, interval=1) diff --git a/lib/fog/rackspace/models/dns/record.rb b/lib/fog/rackspace/models/dns/record.rb index dafa462cf..ddd974c69 100644 --- a/lib/fog/rackspace/models/dns/record.rb +++ b/lib/fog/rackspace/models/dns/record.rb @@ -5,7 +5,6 @@ require 'ipaddr' module Fog module DNS class Rackspace - class Record < Fog::Model include Fog::DNS::Rackspace::Callback extend Fog::Deprecation @@ -93,7 +92,6 @@ module Fog def zone=(new_zone) @zone = new_zone end - end end end diff --git a/lib/fog/rackspace/models/dns/records.rb b/lib/fog/rackspace/models/dns/records.rb index 5ce3f1982..8b59ac5be 100644 --- a/lib/fog/rackspace/models/dns/records.rb +++ b/lib/fog/rackspace/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/dns/record' module Fog module DNS class Rackspace - class Records < Fog::Collection - attribute :zone attribute :total_entries, :aliases => 'totalEntries' diff --git a/lib/fog/rackspace/models/dns/zone.rb b/lib/fog/rackspace/models/dns/zone.rb index a1a0c8934..badb81428 100644 --- a/lib/fog/rackspace/models/dns/zone.rb +++ b/lib/fog/rackspace/models/dns/zone.rb @@ -4,7 +4,6 @@ require 'fog/rackspace/models/dns/records' module Fog module DNS class Rackspace - class Zone < Fog::Model include Fog::DNS::Rackspace::Callback diff --git a/lib/fog/rackspace/models/dns/zones.rb b/lib/fog/rackspace/models/dns/zones.rb index 59bc84d2e..1081b19da 100644 --- a/lib/fog/rackspace/models/dns/zones.rb +++ b/lib/fog/rackspace/models/dns/zones.rb @@ -5,7 +5,6 @@ module Fog module DNS class Rackspace class Zones < Fog::Collection - attribute :total_entries, :aliases => "totalEntries" model Fog::DNS::Rackspace::Zone @@ -69,7 +68,6 @@ module Fog CGI.parse uri.query end end - end end end diff --git a/lib/fog/rackspace/models/identity/credentials.rb b/lib/fog/rackspace/models/identity/credentials.rb index ebab09e32..de8600f19 100644 --- a/lib/fog/rackspace/models/identity/credentials.rb +++ b/lib/fog/rackspace/models/identity/credentials.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Identity class Credentials < Fog::Collection - model Fog::Rackspace::Identity::Credential attr_accessor :user diff --git a/lib/fog/rackspace/models/identity/roles.rb b/lib/fog/rackspace/models/identity/roles.rb index c433296f2..7274a06b0 100644 --- a/lib/fog/rackspace/models/identity/roles.rb +++ b/lib/fog/rackspace/models/identity/roles.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Identity class Roles < Fog::Collection - model Fog::Rackspace::Identity::Role attr_accessor :user diff --git a/lib/fog/rackspace/models/identity/service_catalog.rb b/lib/fog/rackspace/models/identity/service_catalog.rb index 0e54553d8..32adc54af 100644 --- a/lib/fog/rackspace/models/identity/service_catalog.rb +++ b/lib/fog/rackspace/models/identity/service_catalog.rb @@ -22,7 +22,6 @@ module Fog h["endpoints"].select {|e| e[key]} end - def display_service_regions(service_name, service_net=false) endpoints = get_endpoints(service_name, service_net) regions = endpoints.collect do |e| @@ -79,7 +78,6 @@ module Fog return region.to_s.upcase if region.is_a? Symbol (region.nil? || region.empty?) ? "GLOBAL" : region.to_s.upcase end - end end end diff --git a/lib/fog/rackspace/models/identity/tenants.rb b/lib/fog/rackspace/models/identity/tenants.rb index 269de919e..f68ad3a0e 100644 --- a/lib/fog/rackspace/models/identity/tenants.rb +++ b/lib/fog/rackspace/models/identity/tenants.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Identity class Tenants < Fog::Collection - model Fog::Rackspace::Identity::Tenant def all diff --git a/lib/fog/rackspace/models/identity/users.rb b/lib/fog/rackspace/models/identity/users.rb index 646dadf31..704582074 100644 --- a/lib/fog/rackspace/models/identity/users.rb +++ b/lib/fog/rackspace/models/identity/users.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Identity class Users < Fog::Collection - model Fog::Rackspace::Identity::User def all diff --git a/lib/fog/rackspace/models/load_balancers/access_rule.rb b/lib/fog/rackspace/models/load_balancers/access_rule.rb index 34f86ae8d..415a1eba7 100644 --- a/lib/fog/rackspace/models/load_balancers/access_rule.rb +++ b/lib/fog/rackspace/models/load_balancers/access_rule.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class LoadBalancers class AccessRule < Fog::Model - identity :id attribute :address diff --git a/lib/fog/rackspace/models/load_balancers/load_balancer.rb b/lib/fog/rackspace/models/load_balancers/load_balancer.rb index 9f8fd0db9..3bc0792fc 100644 --- a/lib/fog/rackspace/models/load_balancers/load_balancer.rb +++ b/lib/fog/rackspace/models/load_balancers/load_balancer.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class LoadBalancers class LoadBalancer < Fog::Model - #States ACTIVE = 'ACTIVE' ERROR = 'ERROR' @@ -254,7 +253,6 @@ module Fog virtual_ips.collect do |virtual_ip| { :type => virtual_ip.type } end - end def nodes_hash diff --git a/lib/fog/rackspace/models/load_balancers/load_balancers.rb b/lib/fog/rackspace/models/load_balancers/load_balancers.rb index 21aad405d..c6b01502a 100644 --- a/lib/fog/rackspace/models/load_balancers/load_balancers.rb +++ b/lib/fog/rackspace/models/load_balancers/load_balancers.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/load_balancers/load_balancer' module Fog module Rackspace class LoadBalancers - class LoadBalancers < Fog::Collection - model Fog::Rackspace::LoadBalancers::LoadBalancer def all diff --git a/lib/fog/rackspace/models/load_balancers/node.rb b/lib/fog/rackspace/models/load_balancers/node.rb index 9a77ef802..947df343c 100644 --- a/lib/fog/rackspace/models/load_balancers/node.rb +++ b/lib/fog/rackspace/models/load_balancers/node.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class LoadBalancers class Node < Fog::Model - identity :id attribute :address @@ -32,6 +31,7 @@ module Fog def load_balancer collection.load_balancer end + def create requires :load_balancer, :address, :condition, :port options = {} diff --git a/lib/fog/rackspace/models/load_balancers/virtual_ip.rb b/lib/fog/rackspace/models/load_balancers/virtual_ip.rb index 94e14ec27..68d0e0421 100644 --- a/lib/fog/rackspace/models/load_balancers/virtual_ip.rb +++ b/lib/fog/rackspace/models/load_balancers/virtual_ip.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class LoadBalancers class VirtualIp < Fog::Model - identity :id attribute :address diff --git a/lib/fog/rackspace/models/monitoring/agent_token.rb b/lib/fog/rackspace/models/monitoring/agent_token.rb index f429bc331..9917e54ee 100644 --- a/lib/fog/rackspace/models/monitoring/agent_token.rb +++ b/lib/fog/rackspace/models/monitoring/agent_token.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class AgentToken < Fog::Rackspace::Monitoring::Base - identity :id attribute :label @@ -33,7 +32,6 @@ module Fog requires :id service.delete_agent_token(id) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/agent_tokens.rb b/lib/fog/rackspace/models/monitoring/agent_tokens.rb index ebaf94ebb..fac2fcf62 100644 --- a/lib/fog/rackspace/models/monitoring/agent_tokens.rb +++ b/lib/fog/rackspace/models/monitoring/agent_tokens.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class AgentTokens < Fog::Collection - attribute :marker model Fog::Rackspace::Monitoring::AgentToken @@ -24,7 +23,6 @@ module Fog rescue Fog::Rackspace::Monitoring::NotFound nil end - end end end diff --git a/lib/fog/rackspace/models/monitoring/alarm.rb b/lib/fog/rackspace/models/monitoring/alarm.rb index a59fa071c..107951667 100644 --- a/lib/fog/rackspace/models/monitoring/alarm.rb +++ b/lib/fog/rackspace/models/monitoring/alarm.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Alarm < Fog::Rackspace::Monitoring::Base - identity :id attribute :entity, :aliases => 'entity_id' attribute :check, :aliases => 'check_id' @@ -53,9 +52,7 @@ module Fog requires :id service.delete_alarm(entity.id, id) end - end - end end end diff --git a/lib/fog/rackspace/models/monitoring/alarm_example.rb b/lib/fog/rackspace/models/monitoring/alarm_example.rb index a3f7b25ee..f01cca40c 100644 --- a/lib/fog/rackspace/models/monitoring/alarm_example.rb +++ b/lib/fog/rackspace/models/monitoring/alarm_example.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class AlarmExample < Fog::Rackspace::Monitoring::Base - identity :id attribute :label @@ -14,7 +13,6 @@ module Fog attribute :criteria attribute :fields - attribute :bound_criteria def bound? diff --git a/lib/fog/rackspace/models/monitoring/alarm_examples.rb b/lib/fog/rackspace/models/monitoring/alarm_examples.rb index 3b879c1ff..1ab7d8d11 100644 --- a/lib/fog/rackspace/models/monitoring/alarm_examples.rb +++ b/lib/fog/rackspace/models/monitoring/alarm_examples.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class AlarmExamples < Fog::Collection - model Fog::Rackspace::Monitoring::AlarmExample def all @@ -24,7 +23,6 @@ module Fog data = service.evaluate_alarm_example(alarm_example_id, options).body new(data) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/alarms.rb b/lib/fog/rackspace/models/monitoring/alarms.rb index f1ae3e62d..296575b62 100644 --- a/lib/fog/rackspace/models/monitoring/alarms.rb +++ b/lib/fog/rackspace/models/monitoring/alarms.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Alarms < Fog::Collection - attribute :entity attribute :marker @@ -36,7 +35,6 @@ module Fog requires :entity super({ :entity => entity }.merge!(attributes)) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/base.rb b/lib/fog/rackspace/models/monitoring/base.rb index 0cb1668b2..011f3f156 100644 --- a/lib/fog/rackspace/models/monitoring/base.rb +++ b/lib/fog/rackspace/models/monitoring/base.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class Monitoring class Base < Fog::Model - attribute :created_at attribute :updated_at diff --git a/lib/fog/rackspace/models/monitoring/check.rb b/lib/fog/rackspace/models/monitoring/check.rb index 6fdd70776..0cdb045c9 100644 --- a/lib/fog/rackspace/models/monitoring/check.rb +++ b/lib/fog/rackspace/models/monitoring/check.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Check < Fog::Rackspace::Monitoring::Base - identity :id attribute :entity @@ -67,9 +66,7 @@ module Fog ) end end - end - end end end diff --git a/lib/fog/rackspace/models/monitoring/check_types.rb b/lib/fog/rackspace/models/monitoring/check_types.rb index eab71e70d..45513364b 100644 --- a/lib/fog/rackspace/models/monitoring/check_types.rb +++ b/lib/fog/rackspace/models/monitoring/check_types.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class CheckTypes < Fog::Collection - model Fog::Rackspace::Monitoring::CheckType def all @@ -16,7 +15,6 @@ module Fog def new(attributes = {}) super({ }.merge!(attributes)) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/checks.rb b/lib/fog/rackspace/models/monitoring/checks.rb index 90d77904e..328b15091 100644 --- a/lib/fog/rackspace/models/monitoring/checks.rb +++ b/lib/fog/rackspace/models/monitoring/checks.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Checks < Fog::Collection - attribute :entity attribute :marker @@ -36,7 +35,6 @@ module Fog requires :entity unless attributes[:entity] super({ :entity => entity }.merge!(attributes)) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/data_points.rb b/lib/fog/rackspace/models/monitoring/data_points.rb index 476b44330..a236bd08e 100644 --- a/lib/fog/rackspace/models/monitoring/data_points.rb +++ b/lib/fog/rackspace/models/monitoring/data_points.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class DataPoints < Fog::Collection - attribute :metric model Fog::Rackspace::Monitoring::DataPoint @@ -42,7 +41,6 @@ module Fog requires :metric super({ :metric => metric }.merge!(attributes)) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/entities.rb b/lib/fog/rackspace/models/monitoring/entities.rb index 77acf779c..5805a24e0 100644 --- a/lib/fog/rackspace/models/monitoring/entities.rb +++ b/lib/fog/rackspace/models/monitoring/entities.rb @@ -6,7 +6,6 @@ module Fog module Rackspace class Monitoring class Entities < Fog::Collection - model Fog::Rackspace::Monitoring::Entity attribute :marker diff --git a/lib/fog/rackspace/models/monitoring/entity.rb b/lib/fog/rackspace/models/monitoring/entity.rb index 8966ce117..18ac4b572 100644 --- a/lib/fog/rackspace/models/monitoring/entity.rb +++ b/lib/fog/rackspace/models/monitoring/entity.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Entity < Fog::Rackspace::Monitoring::Base - identity :id attribute :label @@ -57,7 +56,6 @@ module Fog requires :id service.delete_entity(id) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/metric.rb b/lib/fog/rackspace/models/monitoring/metric.rb index ce24c82d5..055b53e86 100644 --- a/lib/fog/rackspace/models/monitoring/metric.rb +++ b/lib/fog/rackspace/models/monitoring/metric.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Metric < Fog::Rackspace::Monitoring::Base - identity :name attribute :check @@ -17,9 +16,7 @@ module Fog ) end end - end - end end end diff --git a/lib/fog/rackspace/models/monitoring/metrics.rb b/lib/fog/rackspace/models/monitoring/metrics.rb index 8e33a3526..66dc06f90 100644 --- a/lib/fog/rackspace/models/monitoring/metrics.rb +++ b/lib/fog/rackspace/models/monitoring/metrics.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Metrics < Fog::Collection - attribute :check model Fog::Rackspace::Monitoring::Metric @@ -20,7 +19,6 @@ module Fog requires :check super({ :check => check }.merge!(attributes)) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/notification.rb b/lib/fog/rackspace/models/monitoring/notification.rb index 3ee89f113..94a975ebe 100644 --- a/lib/fog/rackspace/models/monitoring/notification.rb +++ b/lib/fog/rackspace/models/monitoring/notification.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Notification < Fog::Rackspace::Monitoring::Base - identity :id attribute :label @@ -35,7 +34,6 @@ module Fog requires :id service.delete_notification(id) end - end end end diff --git a/lib/fog/rackspace/models/monitoring/notifications.rb b/lib/fog/rackspace/models/monitoring/notifications.rb index 7e2297e55..e12af0c50 100644 --- a/lib/fog/rackspace/models/monitoring/notifications.rb +++ b/lib/fog/rackspace/models/monitoring/notifications.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Monitoring class Notifications < Fog::Collection - model Fog::Rackspace::Monitoring::Notification attribute :marker @@ -23,7 +22,6 @@ module Fog rescue Fog::Rackspace::Monitoring::NotFound nil end - end end end diff --git a/lib/fog/rackspace/models/queues/claim.rb b/lib/fog/rackspace/models/queues/claim.rb index 1e440301e..647086024 100644 --- a/lib/fog/rackspace/models/queues/claim.rb +++ b/lib/fog/rackspace/models/queues/claim.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class Queues class Claim < Fog::Model - # @!attribute [r] identity # @return [String] The claim's id identity :identity diff --git a/lib/fog/rackspace/models/queues/claims.rb b/lib/fog/rackspace/models/queues/claims.rb index 83802b360..4c3960c79 100644 --- a/lib/fog/rackspace/models/queues/claims.rb +++ b/lib/fog/rackspace/models/queues/claims.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Queues class Claims < Fog::Collection - model Fog::Rackspace::Queues::Claim # @!attribute [rw] queue diff --git a/lib/fog/rackspace/models/queues/message.rb b/lib/fog/rackspace/models/queues/message.rb index 9e6ca265b..f81f0cc03 100644 --- a/lib/fog/rackspace/models/queues/message.rb +++ b/lib/fog/rackspace/models/queues/message.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class Queues class Message < Fog::Model - # @!attribute [r] age # @return [Integer] The number of seconds relative to the server's clock. attribute :age diff --git a/lib/fog/rackspace/models/queues/messages.rb b/lib/fog/rackspace/models/queues/messages.rb index 375e8fab2..00dfb3f76 100644 --- a/lib/fog/rackspace/models/queues/messages.rb +++ b/lib/fog/rackspace/models/queues/messages.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Queues class Messages < Fog::Collection - model Fog::Rackspace::Queues::Message # @!attribute [r] client_id diff --git a/lib/fog/rackspace/models/queues/queue.rb b/lib/fog/rackspace/models/queues/queue.rb index 73091100b..4fbb23dda 100644 --- a/lib/fog/rackspace/models/queues/queue.rb +++ b/lib/fog/rackspace/models/queues/queue.rb @@ -4,7 +4,6 @@ module Fog module Rackspace class Queues class Queue < Fog::Model - # @!attribute [rw] name # @return [String] name of queue identity :name diff --git a/lib/fog/rackspace/models/queues/queues.rb b/lib/fog/rackspace/models/queues/queues.rb index 3b835eaa2..e17a9e651 100644 --- a/lib/fog/rackspace/models/queues/queues.rb +++ b/lib/fog/rackspace/models/queues/queues.rb @@ -5,7 +5,6 @@ module Fog module Rackspace class Queues class Queues < Fog::Collection - model Fog::Rackspace::Queues::Queue # Returns list of queues diff --git a/lib/fog/rackspace/models/storage/directories.rb b/lib/fog/rackspace/models/storage/directories.rb index 91f6a3fc6..c65821b9a 100644 --- a/lib/fog/rackspace/models/storage/directories.rb +++ b/lib/fog/rackspace/models/storage/directories.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/storage/directory' module Fog module Storage class Rackspace - class Directories < Fog::Collection - model Fog::Storage::Rackspace::Directory # Returns list of directories @@ -58,9 +56,7 @@ module Fog rescue Fog::Storage::Rackspace::NotFound nil end - end - end end end diff --git a/lib/fog/rackspace/models/storage/directory.rb b/lib/fog/rackspace/models/storage/directory.rb index b17742eac..e41bef5a3 100644 --- a/lib/fog/rackspace/models/storage/directory.rb +++ b/lib/fog/rackspace/models/storage/directory.rb @@ -5,9 +5,7 @@ require 'fog/rackspace/models/storage/metadata' module Fog module Storage class Rackspace - class Directory < Fog::Model - # @!attribute [r] key # @return [String] The name of the directory identity :key, :aliases => 'name' diff --git a/lib/fog/rackspace/models/storage/file.rb b/lib/fog/rackspace/models/storage/file.rb index b255b2db3..bdc011dfb 100644 --- a/lib/fog/rackspace/models/storage/file.rb +++ b/lib/fog/rackspace/models/storage/file.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Storage class Rackspace - class File < Fog::Model - # @!attribute [r] key # @return [String] The name of the file identity :key, :aliases => 'name' @@ -178,7 +176,6 @@ module Fog directory.public? end - # Get a url for file. # # required attributes: key @@ -284,7 +281,6 @@ module Fog merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)}) end end - end end end diff --git a/lib/fog/rackspace/models/storage/files.rb b/lib/fog/rackspace/models/storage/files.rb index fe0afe8e1..33ed6dd64 100644 --- a/lib/fog/rackspace/models/storage/files.rb +++ b/lib/fog/rackspace/models/storage/files.rb @@ -4,9 +4,7 @@ require 'fog/rackspace/models/storage/file' module Fog module Storage class Rackspace - class Files < Fog::Collection - # @!attribute [rw] directory # @return [String] The name of the directory # @note Methods in this class require this attribute to be set @@ -197,7 +195,6 @@ module Fog return nil unless path "#{path}/#{Fog::Rackspace.escape(key, '/')}" end - end end end diff --git a/lib/fog/rackspace/models/storage/metadata.rb b/lib/fog/rackspace/models/storage/metadata.rb index 5c1bf9ac7..1bcc7bed2 100644 --- a/lib/fog/rackspace/models/storage/metadata.rb +++ b/lib/fog/rackspace/models/storage/metadata.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Metadata - OBJECT_META_PREFIX = "X-Object-Meta-" OBJECT_REMOVE_META_PREFIX = "X-Remove-Object-Meta-" CONTAINER_META_PREFIX = "X-Container-Meta-" @@ -15,7 +13,6 @@ module Fog CONTAINER_KEY_REGEX = /^#{CONTAINER_META_PREFIX}(.*)/ OBJECT_KEY_REGEX = /^#{OBJECT_META_PREFIX}(.*)/ - # @!attribute [rw] data # @return [Hash] underlying data store for metadata class attr_reader :data @@ -33,7 +30,6 @@ module Fog @parent = parent end - # Delete key value pair from metadata # @param [String] key to be deleted # @return [Object] returns value for key @@ -163,9 +159,7 @@ module Fog prefix = value.nil? ? remove_meta_prefix : meta_prefix prefix + key.to_s.split(/[-_]/).collect(&:capitalize).join('-') end - end - end end end diff --git a/lib/fog/rackspace/monitoring.rb b/lib/fog/rackspace/monitoring.rb index 1a0a77d01..3ea37264c 100644 --- a/lib/fog/rackspace/monitoring.rb +++ b/lib/fog/rackspace/monitoring.rb @@ -3,7 +3,6 @@ require 'fog/rackspace/core' # https://github.com/racker/rackspace-monitoring-rb # It has been heavily modified for import into Fog master. - module Fog module Rackspace class Monitoring < Fog::Service @@ -15,7 +14,6 @@ module Fog class Conflict < Fog::Rackspace::Errors::Conflict; end class ServiceUnavailable < Fog::Rackspace::Errors::ServiceUnavailable; end - class BadRequest < Fog::Rackspace::Errors::BadRequest attr_reader :validation_errors @@ -110,9 +108,7 @@ module Fog request :list_monitoring_zones request :get_monitoring_zone - class Mock < Fog::Rackspace::Service - def initialize(options={}) end diff --git a/lib/fog/rackspace/queues.rb b/lib/fog/rackspace/queues.rb index 8efd6bda6..3e5b4ed75 100644 --- a/lib/fog/rackspace/queues.rb +++ b/lib/fog/rackspace/queues.rb @@ -17,7 +17,6 @@ module Fog recognizes :rackspace_queues_url recognizes :rackspace_queues_client_id - model_path 'fog/rackspace/models/queues' model :queue collection :queues @@ -395,7 +394,6 @@ module Fog raise ServiceError.slurp(error, self) end end - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/create_group.rb b/lib/fog/rackspace/requests/auto_scale/create_group.rb index 4964c5ef0..c263a3737 100644 --- a/lib/fog/rackspace/requests/auto_scale/create_group.rb +++ b/lib/fog/rackspace/requests/auto_scale/create_group.rb @@ -2,9 +2,7 @@ module Fog module Rackspace class AutoScale class Real - def create_group(launch_config, group_config, policies) - body = { 'launchConfiguration' => launch_config, 'groupConfiguration' => group_config, @@ -22,7 +20,6 @@ module Fog class Mock def create_group(launch_config, group_config, policies) - group_id = Fog::Rackspace::MockData.uuid # Construct group structure diff --git a/lib/fog/rackspace/requests/auto_scale/create_policy.rb b/lib/fog/rackspace/requests/auto_scale/create_policy.rb index c7338660d..ef35d0e2c 100644 --- a/lib/fog/rackspace/requests/auto_scale/create_policy.rb +++ b/lib/fog/rackspace/requests/auto_scale/create_policy.rb @@ -3,7 +3,6 @@ module Fog class AutoScale class Real def create_policy(group_id, options) - data = [options] request( @@ -17,7 +16,6 @@ module Fog class Mock def create_policy(group_id, options) - group = self.data[:autoscale_groups][group_id] if group.nil? @@ -37,7 +35,6 @@ module Fog body = [policy] response(:body => body) - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/create_webhook.rb b/lib/fog/rackspace/requests/auto_scale/create_webhook.rb index 388b90826..362e45755 100644 --- a/lib/fog/rackspace/requests/auto_scale/create_webhook.rb +++ b/lib/fog/rackspace/requests/auto_scale/create_webhook.rb @@ -3,7 +3,6 @@ module Fog class AutoScale class Real def create_webhook(group_id, policy_id, options) - body = [options] request( @@ -17,7 +16,6 @@ module Fog class Mock def create_webhook(group_id, policy_id, options) - group = self.data[:autoscale_groups][group_id] if group.nil? raise Fog::Rackspace::AutoScale::NotFound @@ -49,7 +47,6 @@ module Fog body = {'webhook' => webhook} response(:body => body) - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/delete_group.rb b/lib/fog/rackspace/requests/auto_scale/delete_group.rb index f5f073d09..304c1286a 100644 --- a/lib/fog/rackspace/requests/auto_scale/delete_group.rb +++ b/lib/fog/rackspace/requests/auto_scale/delete_group.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def delete_group(group_id) request( :expects => [204], diff --git a/lib/fog/rackspace/requests/auto_scale/delete_policy.rb b/lib/fog/rackspace/requests/auto_scale/delete_policy.rb index 914ab75e9..e15c3f10d 100644 --- a/lib/fog/rackspace/requests/auto_scale/delete_policy.rb +++ b/lib/fog/rackspace/requests/auto_scale/delete_policy.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def delete_policy(group_id, policy_id) request( :expects => [204], @@ -23,7 +22,6 @@ module Fog group['policies'].delete_if { |p| p['id'] == policy_id } response(:status => 204) - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/delete_webhook.rb b/lib/fog/rackspace/requests/auto_scale/delete_webhook.rb index d9beccbe3..3fe482d69 100644 --- a/lib/fog/rackspace/requests/auto_scale/delete_webhook.rb +++ b/lib/fog/rackspace/requests/auto_scale/delete_webhook.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def delete_webhook(group_id, policy_id, webhook_id) request( :expects => [204], diff --git a/lib/fog/rackspace/requests/auto_scale/execute_anonymous_webhook.rb b/lib/fog/rackspace/requests/auto_scale/execute_anonymous_webhook.rb index 3bd34defb..1721ee1ef 100644 --- a/lib/fog/rackspace/requests/auto_scale/execute_anonymous_webhook.rb +++ b/lib/fog/rackspace/requests/auto_scale/execute_anonymous_webhook.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def execute_anonymous_webhook(capability_version, capability_hash) request( :expects => [202], diff --git a/lib/fog/rackspace/requests/auto_scale/execute_policy.rb b/lib/fog/rackspace/requests/auto_scale/execute_policy.rb index 876433ba6..3ec33a674 100644 --- a/lib/fog/rackspace/requests/auto_scale/execute_policy.rb +++ b/lib/fog/rackspace/requests/auto_scale/execute_policy.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def execute_policy(group_id, policy_id) request( :expects => [202], diff --git a/lib/fog/rackspace/requests/auto_scale/get_group.rb b/lib/fog/rackspace/requests/auto_scale/get_group.rb index da94a8606..d69c09b21 100644 --- a/lib/fog/rackspace/requests/auto_scale/get_group.rb +++ b/lib/fog/rackspace/requests/auto_scale/get_group.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class AutoScale - class Real - def get_group(group_id) request( :expects => [200], @@ -23,7 +21,6 @@ module Fog end end end - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/get_group_config.rb b/lib/fog/rackspace/requests/auto_scale/get_group_config.rb index 468deeb82..fcfa0fbff 100644 --- a/lib/fog/rackspace/requests/auto_scale/get_group_config.rb +++ b/lib/fog/rackspace/requests/auto_scale/get_group_config.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class AutoScale - class Real - def get_group_config(group_id) request( :expects => [200], @@ -24,7 +22,6 @@ module Fog response(:body => {"groupConfiguration" => group['groupConfiguration']}) end end - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/get_group_state.rb b/lib/fog/rackspace/requests/auto_scale/get_group_state.rb index 656f8c5e6..3fabd9bcc 100644 --- a/lib/fog/rackspace/requests/auto_scale/get_group_state.rb +++ b/lib/fog/rackspace/requests/auto_scale/get_group_state.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class AutoScale - class Real - def get_group_state(group_id) request( :expects => [200], @@ -15,7 +13,6 @@ module Fog class Mock def get_group_state(group_id) - instance_id_1 = Fog::Rackspace::AutoScale::MockData.uuid instance_id_2 = Fog::Rackspace::AutoScale::MockData.uuid @@ -56,7 +53,6 @@ module Fog response(:body => {'group' => state}) end end - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/get_launch_config.rb b/lib/fog/rackspace/requests/auto_scale/get_launch_config.rb index 3ef10d2e1..e17cf1a32 100644 --- a/lib/fog/rackspace/requests/auto_scale/get_launch_config.rb +++ b/lib/fog/rackspace/requests/auto_scale/get_launch_config.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class AutoScale - class Real - def get_launch_config(group_id) request( :expects => [200], @@ -24,7 +22,6 @@ module Fog response(:body => {"launchConfiguration" => group['launchConfiguration']}) end end - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/get_policy.rb b/lib/fog/rackspace/requests/auto_scale/get_policy.rb index ba551d86b..b0445b339 100644 --- a/lib/fog/rackspace/requests/auto_scale/get_policy.rb +++ b/lib/fog/rackspace/requests/auto_scale/get_policy.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class AutoScale - class Real - def get_policy(group_id, policy_id) request( :expects => [200], @@ -15,7 +13,6 @@ module Fog class Mock def get_policy(group_id, policy_id) - group = self.data[:autoscale_groups][group_id] if group.nil? raise Fog::Rackspace::AutoScale::NotFound @@ -29,7 +26,6 @@ module Fog response(:body => {'policy' => policy}) end end - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/get_webhook.rb b/lib/fog/rackspace/requests/auto_scale/get_webhook.rb index a1e3295c9..b7f234273 100644 --- a/lib/fog/rackspace/requests/auto_scale/get_webhook.rb +++ b/lib/fog/rackspace/requests/auto_scale/get_webhook.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class AutoScale - class Real - def get_webhook(group_id, policy_id, webhook_id) request( :expects => [200], @@ -33,7 +31,6 @@ module Fog response(:body => {'webhook' => webhook}) end end - end end end diff --git a/lib/fog/rackspace/requests/auto_scale/list_groups.rb b/lib/fog/rackspace/requests/auto_scale/list_groups.rb index e9c6e0763..1eb97302a 100644 --- a/lib/fog/rackspace/requests/auto_scale/list_groups.rb +++ b/lib/fog/rackspace/requests/auto_scale/list_groups.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - # Retrieves a list of images # @return [Excon::Response] response: # * body [Hash]: diff --git a/lib/fog/rackspace/requests/auto_scale/list_policies.rb b/lib/fog/rackspace/requests/auto_scale/list_policies.rb index 76eeee47b..7b2b62ae6 100644 --- a/lib/fog/rackspace/requests/auto_scale/list_policies.rb +++ b/lib/fog/rackspace/requests/auto_scale/list_policies.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def list_policies(group_id) request( :expects => [200], diff --git a/lib/fog/rackspace/requests/auto_scale/list_webhooks.rb b/lib/fog/rackspace/requests/auto_scale/list_webhooks.rb index 507657b7e..b5c34a82a 100644 --- a/lib/fog/rackspace/requests/auto_scale/list_webhooks.rb +++ b/lib/fog/rackspace/requests/auto_scale/list_webhooks.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def list_webhooks(group_id, policy_id) request( :expects => [200], @@ -14,7 +13,6 @@ module Fog class Mock def list_webhooks(group_id, policy_id) - group = self.data[:autoscale_groups][group_id] if group.nil? raise Fog::Rackspace::AutoScale::NotFound diff --git a/lib/fog/rackspace/requests/auto_scale/pause_group_state.rb b/lib/fog/rackspace/requests/auto_scale/pause_group_state.rb index c04f0c3da..89700d23e 100644 --- a/lib/fog/rackspace/requests/auto_scale/pause_group_state.rb +++ b/lib/fog/rackspace/requests/auto_scale/pause_group_state.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def pause_group_state(group_id) Fog::Real.not_implemented # request( diff --git a/lib/fog/rackspace/requests/auto_scale/resume_group_state.rb b/lib/fog/rackspace/requests/auto_scale/resume_group_state.rb index adf345b47..8ba670d7a 100644 --- a/lib/fog/rackspace/requests/auto_scale/resume_group_state.rb +++ b/lib/fog/rackspace/requests/auto_scale/resume_group_state.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class AutoScale class Real - def resume_group_state(group_id) request( :expects => [204], diff --git a/lib/fog/rackspace/requests/auto_scale/update_group_config.rb b/lib/fog/rackspace/requests/auto_scale/update_group_config.rb index a7dd38264..dfc76ddaa 100644 --- a/lib/fog/rackspace/requests/auto_scale/update_group_config.rb +++ b/lib/fog/rackspace/requests/auto_scale/update_group_config.rb @@ -2,9 +2,7 @@ module Fog module Rackspace class AutoScale class Real - def update_group_config(group_id, options) - body = options request( diff --git a/lib/fog/rackspace/requests/auto_scale/update_launch_config.rb b/lib/fog/rackspace/requests/auto_scale/update_launch_config.rb index 4fd6f20c3..c77fe1f97 100644 --- a/lib/fog/rackspace/requests/auto_scale/update_launch_config.rb +++ b/lib/fog/rackspace/requests/auto_scale/update_launch_config.rb @@ -2,9 +2,7 @@ module Fog module Rackspace class AutoScale class Real - def update_launch_config(group_id, options) - body = options request( diff --git a/lib/fog/rackspace/requests/auto_scale/update_policy.rb b/lib/fog/rackspace/requests/auto_scale/update_policy.rb index 29fb9b5ae..6ee6a7c18 100644 --- a/lib/fog/rackspace/requests/auto_scale/update_policy.rb +++ b/lib/fog/rackspace/requests/auto_scale/update_policy.rb @@ -2,9 +2,7 @@ module Fog module Rackspace class AutoScale class Real - def update_policy(group_id, policy_id, options) - request( :expects => [204], :method => 'PUT', diff --git a/lib/fog/rackspace/requests/auto_scale/update_webhook.rb b/lib/fog/rackspace/requests/auto_scale/update_webhook.rb index 57c352cbb..7d06d32da 100644 --- a/lib/fog/rackspace/requests/auto_scale/update_webhook.rb +++ b/lib/fog/rackspace/requests/auto_scale/update_webhook.rb @@ -2,9 +2,7 @@ module Fog module Rackspace class AutoScale class Real - def update_webhook(group_id, policy_id, webhook_id, options) - body = options request( @@ -36,7 +34,6 @@ module Fog webhook.merge(options) response(:body => webhook) - end end end diff --git a/lib/fog/rackspace/requests/block_storage/create_snapshot.rb b/lib/fog/rackspace/requests/block_storage/create_snapshot.rb index ecd520cc8..fc7972b0d 100644 --- a/lib/fog/rackspace/requests/block_storage/create_snapshot.rb +++ b/lib/fog/rackspace/requests/block_storage/create_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Create a snapshot from a volume # # @param [String] volume_id Id of server to create image from diff --git a/lib/fog/rackspace/requests/block_storage/create_volume.rb b/lib/fog/rackspace/requests/block_storage/create_volume.rb index ffacdd0bd..8d56c0eac 100644 --- a/lib/fog/rackspace/requests/block_storage/create_volume.rb +++ b/lib/fog/rackspace/requests/block_storage/create_volume.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Create volume # # @param [Integer] size size of volume in GB. Minimum size is 100 diff --git a/lib/fog/rackspace/requests/block_storage/delete_snapshot.rb b/lib/fog/rackspace/requests/block_storage/delete_snapshot.rb index f0e7ad07d..4f2d97032 100644 --- a/lib/fog/rackspace/requests/block_storage/delete_snapshot.rb +++ b/lib/fog/rackspace/requests/block_storage/delete_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Delete snapshot # # @param [String] snapshot_id Id of snapshot to delete diff --git a/lib/fog/rackspace/requests/block_storage/delete_volume.rb b/lib/fog/rackspace/requests/block_storage/delete_volume.rb index 472b42ca9..a06004be8 100644 --- a/lib/fog/rackspace/requests/block_storage/delete_volume.rb +++ b/lib/fog/rackspace/requests/block_storage/delete_volume.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Delete volume # # @param [String] volume_id Id of volume to delete diff --git a/lib/fog/rackspace/requests/block_storage/get_snapshot.rb b/lib/fog/rackspace/requests/block_storage/get_snapshot.rb index acd41c07e..2400740d5 100644 --- a/lib/fog/rackspace/requests/block_storage/get_snapshot.rb +++ b/lib/fog/rackspace/requests/block_storage/get_snapshot.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Retrieves snapshot detail # @param [String] snapshot_id # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/block_storage/get_volume.rb b/lib/fog/rackspace/requests/block_storage/get_volume.rb index 643347c33..c62498b58 100644 --- a/lib/fog/rackspace/requests/block_storage/get_volume.rb +++ b/lib/fog/rackspace/requests/block_storage/get_volume.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Retrieves volume detail # @param [String] volume_id # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/block_storage/get_volume_type.rb b/lib/fog/rackspace/requests/block_storage/get_volume_type.rb index 675fb89c7..8caf87482 100644 --- a/lib/fog/rackspace/requests/block_storage/get_volume_type.rb +++ b/lib/fog/rackspace/requests/block_storage/get_volume_type.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Retrieves volume type detail # @param [String] volume_type_id # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/block_storage/list_snapshots.rb b/lib/fog/rackspace/requests/block_storage/list_snapshots.rb index 8cf4b6308..b750af1b7 100644 --- a/lib/fog/rackspace/requests/block_storage/list_snapshots.rb +++ b/lib/fog/rackspace/requests/block_storage/list_snapshots.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Retrieves list of snapshots # @return [Excon::Response] response: # * body [Hash]: diff --git a/lib/fog/rackspace/requests/block_storage/list_volume_types.rb b/lib/fog/rackspace/requests/block_storage/list_volume_types.rb index d4285c5c7..47452b982 100644 --- a/lib/fog/rackspace/requests/block_storage/list_volume_types.rb +++ b/lib/fog/rackspace/requests/block_storage/list_volume_types.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Retrieves list of volume types # @return [Excon::Response] response # * body [Hash]: diff --git a/lib/fog/rackspace/requests/block_storage/list_volumes.rb b/lib/fog/rackspace/requests/block_storage/list_volumes.rb index 725fff873..3a38d3a21 100644 --- a/lib/fog/rackspace/requests/block_storage/list_volumes.rb +++ b/lib/fog/rackspace/requests/block_storage/list_volumes.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class BlockStorage class Real - # Retrieves list of volumes # @return [Excon::Response] response: # * body [Hash]: diff --git a/lib/fog/rackspace/requests/cdn/delete_object.rb b/lib/fog/rackspace/requests/cdn/delete_object.rb index b0a97f047..a30f02e9f 100644 --- a/lib/fog/rackspace/requests/cdn/delete_object.rb +++ b/lib/fog/rackspace/requests/cdn/delete_object.rb @@ -2,7 +2,6 @@ module Fog module CDN class Rackspace class Real - # Delete an existing object # # ==== Parameters @@ -23,7 +22,6 @@ module Fog end class Mock - def delete_object(container, object) response = Excon::Response.new response.status = 204 diff --git a/lib/fog/rackspace/requests/cdn/get_containers.rb b/lib/fog/rackspace/requests/cdn/get_containers.rb index 54960a72d..7b7f4b045 100644 --- a/lib/fog/rackspace/requests/cdn/get_containers.rb +++ b/lib/fog/rackspace/requests/cdn/get_containers.rb @@ -2,7 +2,6 @@ module Fog module CDN class Rackspace class Real - # List existing cdn-enabled storage containers # # ==== Parameters @@ -29,11 +28,9 @@ module Fog ) response end - end class Mock - def get_containers(options = {}) response = Excon::Response.new response.status = 200 @@ -64,7 +61,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/cdn/head_container.rb b/lib/fog/rackspace/requests/cdn/head_container.rb index 9797beaa4..7bd7d7d1d 100644 --- a/lib/fog/rackspace/requests/cdn/head_container.rb +++ b/lib/fog/rackspace/requests/cdn/head_container.rb @@ -2,7 +2,6 @@ module Fog module CDN class Rackspace class Real - # List cdn properties for a container # # ==== Parameters @@ -31,11 +30,9 @@ module Fog ) response end - end class Mock - def head_container(container) raise Fog::Storage::Rackspace::NotFound.new "#{container} not found" unless container == 'fogcontainertests' response = Excon::Response.new @@ -56,7 +53,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/cdn/post_container.rb b/lib/fog/rackspace/requests/cdn/post_container.rb index 5f3dae474..c9b4adf2a 100644 --- a/lib/fog/rackspace/requests/cdn/post_container.rb +++ b/lib/fog/rackspace/requests/cdn/post_container.rb @@ -2,7 +2,6 @@ module Fog module CDN class Rackspace class Real - # modify CDN properties for a container # # ==== Parameters @@ -28,11 +27,9 @@ module Fog ) response end - end class Mock - def post_container(name, options = {}) raise Fog::Storage::Rackspace::NotFound.new "#{name} not found" unless name == 'fogcontainertests' response = Excon::Response.new @@ -50,7 +47,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/cdn/put_container.rb b/lib/fog/rackspace/requests/cdn/put_container.rb index 65d4c24a7..28227e813 100644 --- a/lib/fog/rackspace/requests/cdn/put_container.rb +++ b/lib/fog/rackspace/requests/cdn/put_container.rb @@ -2,7 +2,6 @@ module Fog module CDN class Rackspace class Real - # enable CDN for a container # # ==== Parameters @@ -28,11 +27,9 @@ module Fog ) response end - end class Mock - def put_container(name, options = {}) response = Excon::Response.new response.status = 201 @@ -50,7 +47,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/compute/confirm_resized_server.rb b/lib/fog/rackspace/requests/compute/confirm_resized_server.rb index 635b90dfa..d679ba244 100644 --- a/lib/fog/rackspace/requests/compute/confirm_resized_server.rb +++ b/lib/fog/rackspace/requests/compute/confirm_resized_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Confirm resizing # # ==== Parameters @@ -12,11 +11,9 @@ module Fog body = { 'confirmResize' => nil } server_action(server_id, body, 204) end - end class Mock - def confirm_resized_server(server_id) response = Excon::Response.new response.status = 204 @@ -27,7 +24,6 @@ module Fog response end - end end end diff --git a/lib/fog/rackspace/requests/compute/create_image.rb b/lib/fog/rackspace/requests/compute/create_image.rb index c101344cc..e82cc5a6a 100644 --- a/lib/fog/rackspace/requests/compute/create_image.rb +++ b/lib/fog/rackspace/requests/compute/create_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Create an image from a running server # # ==== Parameters @@ -29,11 +28,9 @@ module Fog :path => "images" ) end - end class Mock - def create_image(server_id, options = {}) response = Excon::Response.new response.status = 202 @@ -53,7 +50,6 @@ module Fog response.body = { 'image' => data.reject {|key, value| !['id', 'name', 'serverId', 'status', 'updated'].include?(key)} } response end - end end end diff --git a/lib/fog/rackspace/requests/compute/create_server.rb b/lib/fog/rackspace/requests/compute/create_server.rb index 6f73cca73..02ae3c593 100644 --- a/lib/fog/rackspace/requests/compute/create_server.rb +++ b/lib/fog/rackspace/requests/compute/create_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Create a new server # # ==== Parameters @@ -62,11 +61,9 @@ module Fog :path => 'servers.json' ) end - end class Mock - def create_server(flavor_id, image_id, options = {}) response = Excon::Response.new response.status = 202 @@ -87,7 +84,6 @@ module Fog response.body = { 'server' => data.merge({'adminPass' => 'password'}) } response end - end end end diff --git a/lib/fog/rackspace/requests/compute/delete_image.rb b/lib/fog/rackspace/requests/compute/delete_image.rb index 2ea4a4562..6f85ba8ae 100644 --- a/lib/fog/rackspace/requests/compute/delete_image.rb +++ b/lib/fog/rackspace/requests/compute/delete_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Delete an image # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "images/#{image_id}" ) end - end class Mock - def delete_image(image_id) response = Excon::Response.new if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id} @@ -36,9 +33,7 @@ module Fog response.status = 400 raise Fog::Compute::Rackspace::NotFound.new end - end - end end end diff --git a/lib/fog/rackspace/requests/compute/delete_server.rb b/lib/fog/rackspace/requests/compute/delete_server.rb index 64e0db053..c4fc3f8fa 100644 --- a/lib/fog/rackspace/requests/compute/delete_server.rb +++ b/lib/fog/rackspace/requests/compute/delete_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Delete an existing server # # ==== Parameters @@ -15,11 +14,9 @@ module Fog :path => "servers/#{server_id}" ) end - end class Mock - def delete_server(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -36,7 +33,6 @@ module Fog raise Fog::Compute::Rackspace::NotFound end end - end end end diff --git a/lib/fog/rackspace/requests/compute/get_flavor_details.rb b/lib/fog/rackspace/requests/compute/get_flavor_details.rb index b2f68b1d6..67e8112a0 100644 --- a/lib/fog/rackspace/requests/compute/get_flavor_details.rb +++ b/lib/fog/rackspace/requests/compute/get_flavor_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Get details for flavor by id # # ==== Returns @@ -19,11 +18,9 @@ module Fog :path => "flavors/#{flavor_id}.json" ) end - end class Mock - def get_flavor_details(flavor_id) response = Excon::Response.new flavor = { @@ -45,7 +42,6 @@ module Fog raise Fog::Compute::Rackspace::NotFound end end - end end end diff --git a/lib/fog/rackspace/requests/compute/get_image_details.rb b/lib/fog/rackspace/requests/compute/get_image_details.rb index de4ec2dc7..b9fca41b7 100644 --- a/lib/fog/rackspace/requests/compute/get_image_details.rb +++ b/lib/fog/rackspace/requests/compute/get_image_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Get details for image by id # # ==== Returns @@ -20,7 +19,6 @@ module Fog :path => "images/#{image_id}.json" ) end - end end end diff --git a/lib/fog/rackspace/requests/compute/get_server_details.rb b/lib/fog/rackspace/requests/compute/get_server_details.rb index 6f0aaefce..61fecc552 100644 --- a/lib/fog/rackspace/requests/compute/get_server_details.rb +++ b/lib/fog/rackspace/requests/compute/get_server_details.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Get details about a server # # ==== Parameters @@ -30,11 +29,9 @@ module Fog :path => "servers/#{server_id}.json" ) end - end class Mock - def get_server_details(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'].to_s == server_id.to_s} @@ -45,7 +42,6 @@ module Fog raise Fog::Compute::Rackspace::NotFound end end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_addresses.rb b/lib/fog/rackspace/requests/compute/list_addresses.rb index 3c313dcb4..15e0e5f1a 100644 --- a/lib/fog/rackspace/requests/compute/list_addresses.rb +++ b/lib/fog/rackspace/requests/compute/list_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List all server addresses # # ==== Parameters @@ -21,11 +20,9 @@ module Fog :path => "servers/#{server_id}/ips.json" ) end - end class Mock - def list_addresses(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -36,7 +33,6 @@ module Fog raise Fog::Compute::Rackspace::NotFound end end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_flavors.rb b/lib/fog/rackspace/requests/compute/list_flavors.rb index e064ca897..bbc7e6fca 100644 --- a/lib/fog/rackspace/requests/compute/list_flavors.rb +++ b/lib/fog/rackspace/requests/compute/list_flavors.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List all flavors (IDs and names only) # # ==== Returns @@ -17,11 +16,9 @@ module Fog :path => 'flavors.json' ) end - end class Mock - def list_flavors response = Excon::Response.new response.status = 200 @@ -38,7 +35,6 @@ module Fog } response end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_flavors_detail.rb b/lib/fog/rackspace/requests/compute/list_flavors_detail.rb index fbace8ce5..bb9ac2a57 100644 --- a/lib/fog/rackspace/requests/compute/list_flavors_detail.rb +++ b/lib/fog/rackspace/requests/compute/list_flavors_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List all flavors # # ==== Returns @@ -19,11 +18,9 @@ module Fog :path => 'flavors/detail.json' ) end - end class Mock - def list_flavors_detail response = Excon::Response.new response.status = 200 @@ -40,7 +37,6 @@ module Fog } response end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_images.rb b/lib/fog/rackspace/requests/compute/list_images.rb index 7125add74..f1ae8f5da 100644 --- a/lib/fog/rackspace/requests/compute/list_images.rb +++ b/lib/fog/rackspace/requests/compute/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List all images (IDs and names only) # # ==== Returns @@ -17,11 +16,9 @@ module Fog :path => 'images.json' ) end - end class Mock - def list_images response = Excon::Response.new data = list_images_detail.body['images'] @@ -33,7 +30,6 @@ module Fog response.body = { 'images' => images } response end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_images_detail.rb b/lib/fog/rackspace/requests/compute/list_images_detail.rb index bed4ded92..f3f12c1a0 100644 --- a/lib/fog/rackspace/requests/compute/list_images_detail.rb +++ b/lib/fog/rackspace/requests/compute/list_images_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List all images # # ==== Returns @@ -20,11 +19,9 @@ module Fog :path => 'images/detail.json' ) end - end class Mock - def list_images_detail response = Excon::Response.new @@ -42,7 +39,6 @@ module Fog response.body = { 'images' => images.map {|image| image.reject {|key, value| !['id', 'name', 'status', 'updated'].include?(key)}} } response end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_private_addresses.rb b/lib/fog/rackspace/requests/compute/list_private_addresses.rb index 633104b26..feda46c84 100644 --- a/lib/fog/rackspace/requests/compute/list_private_addresses.rb +++ b/lib/fog/rackspace/requests/compute/list_private_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List private server addresses # # ==== Parameters @@ -19,11 +18,9 @@ module Fog :path => "servers/#{server_id}/ips/private.json" ) end - end class Mock - def list_private_addresses(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -34,7 +31,6 @@ module Fog raise Fog::Compute::Rackspace::NotFound end end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_public_addresses.rb b/lib/fog/rackspace/requests/compute/list_public_addresses.rb index 8a7750553..c58f3dac0 100644 --- a/lib/fog/rackspace/requests/compute/list_public_addresses.rb +++ b/lib/fog/rackspace/requests/compute/list_public_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List public server addresses # # ==== Parameters @@ -19,11 +18,9 @@ module Fog :path => "servers/#{server_id}/ips/public.json" ) end - end class Mock - def list_public_addresses(server_id) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -34,7 +31,6 @@ module Fog raise Fog::Compute::Rackspace::NotFound end end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_servers.rb b/lib/fog/rackspace/requests/compute/list_servers.rb index 9c658b051..daff0d2d9 100644 --- a/lib/fog/rackspace/requests/compute/list_servers.rb +++ b/lib/fog/rackspace/requests/compute/list_servers.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List all servers (IDs and names only) # # ==== Returns @@ -18,11 +17,9 @@ module Fog :path => 'servers.json' ) end - end class Mock - def list_servers response = Excon::Response.new data = list_servers_detail.body['servers'] @@ -34,7 +31,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/rackspace/requests/compute/list_servers_detail.rb b/lib/fog/rackspace/requests/compute/list_servers_detail.rb index 449faf7d5..dbbd66f0b 100644 --- a/lib/fog/rackspace/requests/compute/list_servers_detail.rb +++ b/lib/fog/rackspace/requests/compute/list_servers_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # List all servers details # # ==== Returns @@ -27,11 +26,9 @@ module Fog :path => 'servers/detail.json' ) end - end class Mock - def list_servers_detail response = Excon::Response.new @@ -49,7 +46,6 @@ module Fog response.body = { 'servers' => servers } response end - end end end diff --git a/lib/fog/rackspace/requests/compute/reboot_server.rb b/lib/fog/rackspace/requests/compute/reboot_server.rb index 49095b34e..167df87f5 100644 --- a/lib/fog/rackspace/requests/compute/reboot_server.rb +++ b/lib/fog/rackspace/requests/compute/reboot_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Reboot an existing server # # ==== Parameters @@ -13,17 +12,14 @@ module Fog body = { 'reboot' => { 'type' => type }} server_action(server_id, body) end - end class Mock - def reboot_server(server_id, type = 'SOFT') response = Excon::Response.new response.status = 202 response end - end end end diff --git a/lib/fog/rackspace/requests/compute/resize_server.rb b/lib/fog/rackspace/requests/compute/resize_server.rb index 39b42bf15..641fac7dd 100644 --- a/lib/fog/rackspace/requests/compute/resize_server.rb +++ b/lib/fog/rackspace/requests/compute/resize_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Reboot an existing server # # ==== Parameters @@ -13,11 +12,9 @@ module Fog body = { 'resize' => { 'flavorId' => flavor_id }} server_action(server_id, body) end - end class Mock - # FIXME: should probably transition instead of skipping to VERIFY_RESIZE def resize_server(server_id, flavor_id) response = Excon::Response.new @@ -32,7 +29,6 @@ module Fog response end - end end end diff --git a/lib/fog/rackspace/requests/compute/revert_resized_server.rb b/lib/fog/rackspace/requests/compute/revert_resized_server.rb index 3c17e190c..c735156c3 100644 --- a/lib/fog/rackspace/requests/compute/revert_resized_server.rb +++ b/lib/fog/rackspace/requests/compute/revert_resized_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Revert resizing # # ==== Parameters @@ -12,11 +11,9 @@ module Fog body = { 'revertResize' => nil } server_action(server_id, body) end - end class Mock - def revert_resized_server(server_id) response = Excon::Response.new response.status = 202 @@ -28,7 +25,6 @@ module Fog response end - end end end diff --git a/lib/fog/rackspace/requests/compute/server_action.rb b/lib/fog/rackspace/requests/compute/server_action.rb index 60920f679..ba84f1768 100644 --- a/lib/fog/rackspace/requests/compute/server_action.rb +++ b/lib/fog/rackspace/requests/compute/server_action.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Reboot an existing server # # ==== Parameters @@ -18,7 +17,6 @@ module Fog :path => "servers/#{server_id}/action.json" ) end - end end end diff --git a/lib/fog/rackspace/requests/compute/update_server.rb b/lib/fog/rackspace/requests/compute/update_server.rb index 3ed7e2ff7..776463232 100644 --- a/lib/fog/rackspace/requests/compute/update_server.rb +++ b/lib/fog/rackspace/requests/compute/update_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class Rackspace class Real - # Update an existing server # # ==== Parameters @@ -18,11 +17,9 @@ module Fog :path => "servers/#{server_id}.json" ) end - end class Mock - def update_server(server_id, options) response = Excon::Response.new if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id} @@ -38,7 +35,6 @@ module Fog raise Fog::Compute::Rackspace::NotFound end end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/attach_volume.rb b/lib/fog/rackspace/requests/compute_v2/attach_volume.rb index e06f82b7f..cf6c6386d 100644 --- a/lib/fog/rackspace/requests/compute_v2/attach_volume.rb +++ b/lib/fog/rackspace/requests/compute_v2/attach_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # This operation attaches a volume to the specified server. # @param [String] server_id # @param [String] volume_id diff --git a/lib/fog/rackspace/requests/compute_v2/change_server_password.rb b/lib/fog/rackspace/requests/compute_v2/change_server_password.rb index d3f8f491c..c16c41b7d 100644 --- a/lib/fog/rackspace/requests/compute_v2/change_server_password.rb +++ b/lib/fog/rackspace/requests/compute_v2/change_server_password.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Changes server admin password # @param [String] server_id # @param [String] password diff --git a/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb b/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb index e0b03eeb4..2f5bab5c4 100644 --- a/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Confirm server resize operation # @param [String] server_id The id of the server to revert # @return [Excon::Response] response diff --git a/lib/fog/rackspace/requests/compute_v2/create_image.rb b/lib/fog/rackspace/requests/compute_v2/create_image.rb index 6d0e69d2d..c6e6b5487 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Create an image from a running server # # @param [String] server_id Id of server to create image from diff --git a/lib/fog/rackspace/requests/compute_v2/create_keypair.rb b/lib/fog/rackspace/requests/compute_v2/create_keypair.rb index 522e01e38..e2dc3490a 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_keypair.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_keypair.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Request a new keypair to be created # @param [String] key_name: unique name of the keypair to create # @return [Excon::Response] response : @@ -58,7 +57,6 @@ module Fog :body => { 'keypair' => k } ) end end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb b/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb index a2d2f7fb4..6543c4255 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Creates virtual interface for a server # @param [String] server_id The server id to create the virtual interface on # @param [String] network_id The network id to attach the virtual interface to @@ -26,7 +25,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb b/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb index 753111dc2..d6c192057 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Deletes a specified volume attachment from a specified server instance. # @param [String] server_id id of server containing volume to delete # @param [String] volume_id id of volume on server to delete diff --git a/lib/fog/rackspace/requests/compute_v2/delete_image.rb b/lib/fog/rackspace/requests/compute_v2/delete_image.rb index d0bd07628..2fbb61460 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Delete an image # @param [String] image_id Id of image to delete # @return [Excon::Response] response @@ -18,7 +17,6 @@ module Fog :path => "images/#{image_id}" ) end - end class Mock @@ -28,7 +26,6 @@ module Fog response.status = 202 response.body = "" end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb b/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb index 49806b917..475cc8d6a 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Delete the key specified with key_name # @param [String] key_name name of the key to delete # @return [Excon::Response] response @@ -30,7 +29,6 @@ module Fog end end end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb index 907f421d0..1bd7365ce 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Deletes a metadata item. # @param [String] collection type of metadata # @param [String] obj_id id of the object where the metadata is attached diff --git a/lib/fog/rackspace/requests/compute_v2/delete_server.rb b/lib/fog/rackspace/requests/compute_v2/delete_server.rb index 2370aebc5..e1ffa81ff 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Deletes a specified server instance from the system. # @param [String] server_id the id of the server to delete # @return [Excon::Response] response diff --git a/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb b/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb index 58877016c..137615b35 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Deletes virtual interface from server # @param [String] server_id The server id that contains the virtual interface # @param [String] interface_id The id of the virtual interface @@ -19,7 +18,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/get_attachment.rb b/lib/fog/rackspace/requests/compute_v2/get_attachment.rb index 8a514012f..b76d8caee 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_attachment.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_attachment.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves attachment # @param [String] server_id # @param [String] volume_id diff --git a/lib/fog/rackspace/requests/compute_v2/get_flavor.rb b/lib/fog/rackspace/requests/compute_v2/get_flavor.rb index b03810126..55d90d0b6 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_flavor.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_flavor.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves flavor detail # @param [Sring] flavor_id # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/compute_v2/get_image.rb b/lib/fog/rackspace/requests/compute_v2/get_image.rb index 49f785963..f7a904d0d 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_image.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves image detail # @param [String] image_id # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/compute_v2/get_keypair.rb b/lib/fog/rackspace/requests/compute_v2/get_keypair.rb index 2476525cf..3e760187b 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_keypair.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_keypair.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retreive single keypair details # @param [String] key_name name of the key for which to request the details # @return [Excon::Response] response : @@ -35,7 +34,6 @@ module Fog response(:body => key, :status => 200) end end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb index 8791af064..fd448bf56 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves single metadatum item by key. # @param [String] collection type of metadata # @param [String] obj_id id of the object where the metadata is attached diff --git a/lib/fog/rackspace/requests/compute_v2/get_server.rb b/lib/fog/rackspace/requests/compute_v2/get_server.rb index b35dcdab0..189a3395a 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves server detail # @param [String] server_id # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/compute_v2/list_addresses.rb b/lib/fog/rackspace/requests/compute_v2/list_addresses.rb index 875514766..40cd449f2 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_addresses.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_addresses.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Lists all networks and addresses associated with a specified server. # @param [String] server_id # @return [Excon::Response] response: @@ -19,11 +18,9 @@ module Fog :path => "/servers/#{server_id}/ips" ) end - end class Mock - def list_addresses(server_id) raise Fog::Compute::RackspaceV2::NotFound.new if server_id == 0 response = Excon::Response.new @@ -36,7 +33,6 @@ module Fog } response end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb b/lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb index a7b1f993e..d5de018a2 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Lists all addresses associated with a specified server and network # @param [String] server_id # @param [String] network_id @@ -26,11 +25,9 @@ module Fog :path => "servers/#{server_id}/ips/#{network_id}" ) end - end class Mock - RESPONSE_BODY = { "addresses" => { "public"=>[{"version"=>6, "addr"=>"2001:4800:7811:0513:0fe1:75e8:ff04:760b"}, {"version"=>4, "addr"=>"166.78.18.176"}], @@ -45,7 +42,6 @@ module Fog response.body = { network_id => RESPONSE_BODY["addresses"][network_id] } response end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/list_attachments.rb b/lib/fog/rackspace/requests/compute_v2/list_attachments.rb index 5ba2ce9b8..5ceeda393 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_attachments.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_attachments.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves list of attached volumes # @param [String] server_id # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/compute_v2/list_flavors.rb b/lib/fog/rackspace/requests/compute_v2/list_flavors.rb index 5293d483f..35b273c86 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_flavors.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_flavors.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves a list of flavors # @return [Excon::Response] response: # * body [Hash]: diff --git a/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb b/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb index 198b7d474..3d87db013 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves a list of flavors # @return [Excon::Response] response: # * body [Hash]: diff --git a/lib/fog/rackspace/requests/compute_v2/list_images.rb b/lib/fog/rackspace/requests/compute_v2/list_images.rb index d332bfcd4..14be0c40d 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_images.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_images.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves a list of images # ==== Parameters # * options<~String>: diff --git a/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb b/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb index 1fa7e0719..a68e63d71 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves a list of images # ==== Parameters # * options<~String>: diff --git a/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb b/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb index 137f39032..38ca33388 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Returns a list of all key pairs associated with an account. # @return [Excon::Response] response : # * body [Hash]: - @@ -31,7 +30,6 @@ module Fog :body => { 'keypairs' => self.data[:keypairs] }) end end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/list_metadata.rb b/lib/fog/rackspace/requests/compute_v2/list_metadata.rb index 484cffa11..7759a4bd8 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves all metadata associated with a server or an image. # @param [String] collection type of metadata # @param [String] obj_id id of the object where the metadata is attached diff --git a/lib/fog/rackspace/requests/compute_v2/list_servers.rb b/lib/fog/rackspace/requests/compute_v2/list_servers.rb index 61fc4be95..5adfe1804 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_servers.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_servers.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Retrieves list of servers # @return [Excon::Response] response: # * body [Hash]: diff --git a/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb b/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb index 11b57be64..c1280d630 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Lists virtual interfaces for a server # @param [String] server_id # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 @@ -18,7 +17,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/rackspace/requests/compute_v2/reboot_server.rb b/lib/fog/rackspace/requests/compute_v2/reboot_server.rb index 0c4aa6ad7..83a0796f2 100644 --- a/lib/fog/rackspace/requests/compute_v2/reboot_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/reboot_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Reboots server # @param [String] server_id # @param [String] type type of reboot diff --git a/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb b/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb index 79ba7d53b..4b00a7ce1 100644 --- a/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # The rebuild operation removes all data on the server and replaces it with the specified image. # The serverRef and all IP addresses remain the same. If you specify name, metadata, accessIPv4, # or accessIPv6 in the rebuild request, new values replace existing values. Otherwise, these values do not change. diff --git a/lib/fog/rackspace/requests/compute_v2/resize_server.rb b/lib/fog/rackspace/requests/compute_v2/resize_server.rb index 945a3e088..db7fbdb7f 100644 --- a/lib/fog/rackspace/requests/compute_v2/resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/resize_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Reverts server resize operation # @param [String] server_id id of server to resize # @param [String] flavor_id id of the desired flavor diff --git a/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb b/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb index 717068c8b..32e35e0d4 100644 --- a/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Reverts server resize operation # @param [String] server_id # @return [Excon::Response] response diff --git a/lib/fog/rackspace/requests/compute_v2/set_metadata.rb b/lib/fog/rackspace/requests/compute_v2/set_metadata.rb index e02ae2983..17becdac8 100644 --- a/lib/fog/rackspace/requests/compute_v2/set_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/set_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Sets metadata associated with a server or an image. # @param [String] collection type of metadata # @param [String] obj_id id of the object where the metadata is attached @@ -25,7 +24,6 @@ module Fog end end - class Mock def set_metadata(collection, obj_id, metadata = {}) raise Fog::Compute::RackspaceV2::NotFound if obj_id == 0 diff --git a/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb index 4981123b5..b89c21282 100644 --- a/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Sets a single metadatum item by key. # @param [String] collection type of metadata # @param [String] obj_id id of the object where the metadata is attached diff --git a/lib/fog/rackspace/requests/compute_v2/update_metadata.rb b/lib/fog/rackspace/requests/compute_v2/update_metadata.rb index 338e0b912..b0b3bf2b3 100644 --- a/lib/fog/rackspace/requests/compute_v2/update_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/update_metadata.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Updates metadata items for a specified server or image. # @param [String] collection type of metadata # @param [String] obj_id id of the object where the metadata is attached diff --git a/lib/fog/rackspace/requests/compute_v2/update_server.rb b/lib/fog/rackspace/requests/compute_v2/update_server.rb index a3d6ca1a4..d89b835bf 100644 --- a/lib/fog/rackspace/requests/compute_v2/update_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/update_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class RackspaceV2 class Real - # Update the editable attributes of a specified server. # @param [String] server_id # @param [Hash] options diff --git a/lib/fog/rackspace/requests/dns/add_records.rb b/lib/fog/rackspace/requests/dns/add_records.rb index e374afbe7..8d8c01e0e 100644 --- a/lib/fog/rackspace/requests/dns/add_records.rb +++ b/lib/fog/rackspace/requests/dns/add_records.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def add_records(domain_id, records) - validate_path_fragment :domain_id, domain_id data = { diff --git a/lib/fog/rackspace/requests/dns/callback.rb b/lib/fog/rackspace/requests/dns/callback.rb index d9107d5f5..b2f91d724 100644 --- a/lib/fog/rackspace/requests/dns/callback.rb +++ b/lib/fog/rackspace/requests/dns/callback.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def callback(job_id, show_details=true) - validate_path_fragment :job_id, job_id request( diff --git a/lib/fog/rackspace/requests/dns/list_domain_details.rb b/lib/fog/rackspace/requests/dns/list_domain_details.rb index ccf665261..4aa72c6e3 100644 --- a/lib/fog/rackspace/requests/dns/list_domain_details.rb +++ b/lib/fog/rackspace/requests/dns/list_domain_details.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def list_domain_details(domain_id, options={}) - validate_path_fragment :domain_id, domain_id path = "domains/#{domain_id}" diff --git a/lib/fog/rackspace/requests/dns/list_domains.rb b/lib/fog/rackspace/requests/dns/list_domains.rb index f9e2bc099..cb6cf3658 100644 --- a/lib/fog/rackspace/requests/dns/list_domains.rb +++ b/lib/fog/rackspace/requests/dns/list_domains.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def list_domains(options={}) - path = 'domains' unless options.empty? path += "?#{array_to_query_string(options)}" diff --git a/lib/fog/rackspace/requests/dns/list_record_details.rb b/lib/fog/rackspace/requests/dns/list_record_details.rb index c4eb169e6..63b1b0b51 100644 --- a/lib/fog/rackspace/requests/dns/list_record_details.rb +++ b/lib/fog/rackspace/requests/dns/list_record_details.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def list_record_details(domain_id, record_id) - validate_path_fragment :domain_id, domain_id validate_path_fragment :record_id, record_id diff --git a/lib/fog/rackspace/requests/dns/list_records.rb b/lib/fog/rackspace/requests/dns/list_records.rb index 62083d20d..593568f4b 100644 --- a/lib/fog/rackspace/requests/dns/list_records.rb +++ b/lib/fog/rackspace/requests/dns/list_records.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def list_records(domain_id, options={}) - validate_path_fragment :domain_id, domain_id path = "domains/#{domain_id}/records" diff --git a/lib/fog/rackspace/requests/dns/list_subdomains.rb b/lib/fog/rackspace/requests/dns/list_subdomains.rb index 3371ee167..88f227f09 100644 --- a/lib/fog/rackspace/requests/dns/list_subdomains.rb +++ b/lib/fog/rackspace/requests/dns/list_subdomains.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def list_subdomains(domain_id, options={}) - validate_path_fragment :domain_id, domain_id path = "domains/#{domain_id}/subdomains" diff --git a/lib/fog/rackspace/requests/dns/modify_domain.rb b/lib/fog/rackspace/requests/dns/modify_domain.rb index f438bc46e..152283df4 100644 --- a/lib/fog/rackspace/requests/dns/modify_domain.rb +++ b/lib/fog/rackspace/requests/dns/modify_domain.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def modify_domain(domain_id, options={}) - validate_path_fragment :domain_id, domain_id path = "domains/#{domain_id}" diff --git a/lib/fog/rackspace/requests/dns/modify_record.rb b/lib/fog/rackspace/requests/dns/modify_record.rb index c12027b8d..67b1a0414 100644 --- a/lib/fog/rackspace/requests/dns/modify_record.rb +++ b/lib/fog/rackspace/requests/dns/modify_record.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def modify_record(domain_id, record_id, options={}) - validate_path_fragment :domain_id, domain_id validate_path_fragment :record_id, record_id diff --git a/lib/fog/rackspace/requests/dns/remove_domain.rb b/lib/fog/rackspace/requests/dns/remove_domain.rb index 5484c84a2..d07898738 100644 --- a/lib/fog/rackspace/requests/dns/remove_domain.rb +++ b/lib/fog/rackspace/requests/dns/remove_domain.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def remove_domain(domain_id, options={}) - validate_path_fragment :domain_id, domain_id path = "domains/#{domain_id}" diff --git a/lib/fog/rackspace/requests/dns/remove_domains.rb b/lib/fog/rackspace/requests/dns/remove_domains.rb index 35e43ee2e..145ad2ef4 100644 --- a/lib/fog/rackspace/requests/dns/remove_domains.rb +++ b/lib/fog/rackspace/requests/dns/remove_domains.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def remove_domains(domain_ids, options={}) - path = "domains?" + domain_ids.collect { |domain_id| "id=#{domain_id}" }.join('&') query_data = {} diff --git a/lib/fog/rackspace/requests/dns/remove_record.rb b/lib/fog/rackspace/requests/dns/remove_record.rb index 42c3df8bc..650a24005 100644 --- a/lib/fog/rackspace/requests/dns/remove_record.rb +++ b/lib/fog/rackspace/requests/dns/remove_record.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def remove_record(domain_id, record_id) - validate_path_fragment :domain_id, domain_id validate_path_fragment :record_id, record_id diff --git a/lib/fog/rackspace/requests/dns/remove_records.rb b/lib/fog/rackspace/requests/dns/remove_records.rb index f1126f894..9d3247596 100644 --- a/lib/fog/rackspace/requests/dns/remove_records.rb +++ b/lib/fog/rackspace/requests/dns/remove_records.rb @@ -3,7 +3,6 @@ module Fog class Rackspace class Real def remove_records(domain_id, record_ids) - validate_path_fragment :domain_id, domain_id path = "domains/#{domain_id}/records?" + record_ids.collect { |record_id| "id=#{record_id}" }.join('&') diff --git a/lib/fog/rackspace/requests/load_balancers/delete_load_balancer.rb b/lib/fog/rackspace/requests/load_balancers/delete_load_balancer.rb index 7ea20e61d..2b87e33bf 100644 --- a/lib/fog/rackspace/requests/load_balancers/delete_load_balancer.rb +++ b/lib/fog/rackspace/requests/load_balancers/delete_load_balancer.rb @@ -1,7 +1,6 @@ module Fog module Rackspace class LoadBalancers - class Real def delete_load_balancer(load_balancer_id) request( @@ -19,7 +18,6 @@ module Fog response.body = "" end end - end end end diff --git a/lib/fog/rackspace/requests/load_balancers/get_load_balancer.rb b/lib/fog/rackspace/requests/load_balancers/get_load_balancer.rb index d974b3471..0f7d84e45 100644 --- a/lib/fog/rackspace/requests/load_balancers/get_load_balancer.rb +++ b/lib/fog/rackspace/requests/load_balancers/get_load_balancer.rb @@ -11,7 +11,6 @@ module Fog end end - class Mock def get_load_balancer(load_balancer_id) response = Excon::Response.new @@ -39,7 +38,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/load_balancers/get_stats.rb b/lib/fog/rackspace/requests/load_balancers/get_stats.rb index ae8f01096..61f01064b 100644 --- a/lib/fog/rackspace/requests/load_balancers/get_stats.rb +++ b/lib/fog/rackspace/requests/load_balancers/get_stats.rb @@ -3,7 +3,6 @@ module Fog class LoadBalancers class Real def get_stats(load_balancer_id) - request( :expects => 200, :path => "loadbalancers/#{load_balancer_id}/stats", diff --git a/lib/fog/rackspace/requests/monitoring/create_agent_token.rb b/lib/fog/rackspace/requests/monitoring/create_agent_token.rb index 639ea7659..65008019d 100644 --- a/lib/fog/rackspace/requests/monitoring/create_agent_token.rb +++ b/lib/fog/rackspace/requests/monitoring/create_agent_token.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def create_agent_token(options = {}) data = options.dup request( @@ -16,7 +15,6 @@ module Fog class Mock def create_agent_token(options = {}) - account_id = Fog::Mock.random_numbers(6).to_s token = Fog::Mock.random_letters(50).to_s diff --git a/lib/fog/rackspace/requests/monitoring/create_alarm.rb b/lib/fog/rackspace/requests/monitoring/create_alarm.rb index d0d182f3f..6e321d147 100644 --- a/lib/fog/rackspace/requests/monitoring/create_alarm.rb +++ b/lib/fog/rackspace/requests/monitoring/create_alarm.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def create_alarm(entity_id, options = {}) data = options.dup request( @@ -16,7 +15,6 @@ module Fog class Mock def create_alarm(entity_id, options = {}) - alarm_id = Fog::Mock.random_letters(10) account_id = Fog::Mock.random_numbers(6).to_s @@ -42,7 +40,6 @@ module Fog } response.remote_ip = Fog::Rackspace::MockData.ipv4_address response - end end end diff --git a/lib/fog/rackspace/requests/monitoring/create_check.rb b/lib/fog/rackspace/requests/monitoring/create_check.rb index 9783cf35b..278bdb2e3 100644 --- a/lib/fog/rackspace/requests/monitoring/create_check.rb +++ b/lib/fog/rackspace/requests/monitoring/create_check.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def create_check(entity_id, options = {}) data = options.dup request( @@ -16,7 +15,6 @@ module Fog class Mock def create_check(entity_id, options = {}) - account_id = Fog::Mock.random_numbers(6).to_s mock_id = Fog::Mock.random_letters(10).to_s diff --git a/lib/fog/rackspace/requests/monitoring/create_entity.rb b/lib/fog/rackspace/requests/monitoring/create_entity.rb index 53255030d..2384a73e9 100644 --- a/lib/fog/rackspace/requests/monitoring/create_entity.rb +++ b/lib/fog/rackspace/requests/monitoring/create_entity.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def create_entity(options = {}) data = options.dup request( @@ -15,9 +14,7 @@ module Fog end class Mock - def create_entity(options = {}) - account_id = Fog::Mock.random_numbers(6).to_s entity_id = Fog::Mock.random_letters(10) diff --git a/lib/fog/rackspace/requests/monitoring/delete_agent_token.rb b/lib/fog/rackspace/requests/monitoring/delete_agent_token.rb index 72ecd89cc..ee6fc8e00 100644 --- a/lib/fog/rackspace/requests/monitoring/delete_agent_token.rb +++ b/lib/fog/rackspace/requests/monitoring/delete_agent_token.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def delete_agent_token(token_id) request( :expects => [204], @@ -14,7 +13,6 @@ module Fog class Mock def delete_agent_token(options = {}) - account_id = Fog::Mock.random_numbers(6).to_s token = Fog::Mock.random_letters(50).to_s @@ -42,7 +40,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/monitoring/delete_alarm.rb b/lib/fog/rackspace/requests/monitoring/delete_alarm.rb index 16d949d8e..2f7f75dc6 100644 --- a/lib/fog/rackspace/requests/monitoring/delete_alarm.rb +++ b/lib/fog/rackspace/requests/monitoring/delete_alarm.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def delete_alarm(entity_id, alarm_id) request( :expects => [204], @@ -13,9 +12,7 @@ module Fog end class Mock - def delete_alarm(entity_id, alarm_id) - if entity_id == -1 || alarm_id == -1 raise Fog::Rackspace::Monitoring::NotFound end diff --git a/lib/fog/rackspace/requests/monitoring/delete_check.rb b/lib/fog/rackspace/requests/monitoring/delete_check.rb index eadcf6509..820c73dc7 100644 --- a/lib/fog/rackspace/requests/monitoring/delete_check.rb +++ b/lib/fog/rackspace/requests/monitoring/delete_check.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def delete_check(entity_id, check_id) request( :expects => [204], @@ -14,7 +13,6 @@ module Fog class Mock def delete_check(entity_id, check_id) - if entity_id == -1 || check_id == -1 raise Fog::Rackspace::Monitoring::NotFound end diff --git a/lib/fog/rackspace/requests/monitoring/delete_entity.rb b/lib/fog/rackspace/requests/monitoring/delete_entity.rb index a50b6ac6e..b07975b50 100644 --- a/lib/fog/rackspace/requests/monitoring/delete_entity.rb +++ b/lib/fog/rackspace/requests/monitoring/delete_entity.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def delete_entity(entity_id) request( :expects => [204], @@ -13,9 +12,7 @@ module Fog end class Mock - def delete_entity(entity_id) - if entity_id == -1 raise Fog::Rackspace::Monitoring::NotFound end diff --git a/lib/fog/rackspace/requests/monitoring/evaluate_alarm_example.rb b/lib/fog/rackspace/requests/monitoring/evaluate_alarm_example.rb index 8217f73bb..b5d427dfd 100644 --- a/lib/fog/rackspace/requests/monitoring/evaluate_alarm_example.rb +++ b/lib/fog/rackspace/requests/monitoring/evaluate_alarm_example.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def evaluate_alarm_example(id, options = {}) options ||= {} data = {:values => options.dup} diff --git a/lib/fog/rackspace/requests/monitoring/get_agent.rb b/lib/fog/rackspace/requests/monitoring/get_agent.rb index f2c0c430b..0c7b6e807 100644 --- a/lib/fog/rackspace/requests/monitoring/get_agent.rb +++ b/lib/fog/rackspace/requests/monitoring/get_agent.rb @@ -13,7 +13,6 @@ module Fog class Mock def get_agent(agent_id) - if agent_id == -1 raise Fog::Rackspace::Monitoring::NotFound end diff --git a/lib/fog/rackspace/requests/monitoring/get_agent_token.rb b/lib/fog/rackspace/requests/monitoring/get_agent_token.rb index f390bceaa..95932b5b5 100644 --- a/lib/fog/rackspace/requests/monitoring/get_agent_token.rb +++ b/lib/fog/rackspace/requests/monitoring/get_agent_token.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_agent_token(id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_agent_token(id) - token = Fog::Mock.random_letters(50).to_s if id == -1 @@ -44,7 +42,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/monitoring/get_alarm.rb b/lib/fog/rackspace/requests/monitoring/get_alarm.rb index c1c42eeeb..4e205bfea 100644 --- a/lib/fog/rackspace/requests/monitoring/get_alarm.rb +++ b/lib/fog/rackspace/requests/monitoring/get_alarm.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_alarm(entity_id, alarm_id) request( :expects => [200, 203], @@ -10,13 +9,10 @@ module Fog :path => "entities/#{entity_id}/alarms/#{alarm_id}" ) end - end class Mock - def get_alarm(entity_id, alarm_id) - if entity_id == -1 || alarm_id == -1 raise Fog::Rackspace::Monitoring::NotFound end diff --git a/lib/fog/rackspace/requests/monitoring/get_alarm_example.rb b/lib/fog/rackspace/requests/monitoring/get_alarm_example.rb index b1340cb7c..8d9a390b4 100644 --- a/lib/fog/rackspace/requests/monitoring/get_alarm_example.rb +++ b/lib/fog/rackspace/requests/monitoring/get_alarm_example.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_alarm_example(id) request( :expects => [200, 203], @@ -10,7 +9,6 @@ module Fog :path => "alarm_examples/#{id}" ) end - end end end diff --git a/lib/fog/rackspace/requests/monitoring/get_check.rb b/lib/fog/rackspace/requests/monitoring/get_check.rb index 7e4391bfc..a78b2e0b4 100644 --- a/lib/fog/rackspace/requests/monitoring/get_check.rb +++ b/lib/fog/rackspace/requests/monitoring/get_check.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_check(entity_id, check_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_check(entity_id, check_id) - if entity_id == -1 || check_id == -1 raise Fog::Rackspace::Monitoring::NotFound end diff --git a/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb b/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb index 2369bc6a1..702e67918 100644 --- a/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_cpus_info(agent_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_cpus_info(agent_id) - if agent_id == -1 raise Fog::Rackspace::Monitoring::BadRequest end diff --git a/lib/fog/rackspace/requests/monitoring/get_disks_info.rb b/lib/fog/rackspace/requests/monitoring/get_disks_info.rb index 761adb6c0..816bd4871 100644 --- a/lib/fog/rackspace/requests/monitoring/get_disks_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_disks_info.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_disks_info(agent_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_disks_info(agent_id) - if agent_id == -1 raise Fog::Rackspace::Monitoring::BadRequest end diff --git a/lib/fog/rackspace/requests/monitoring/get_entity.rb b/lib/fog/rackspace/requests/monitoring/get_entity.rb index 109f8a37e..7c60c4df6 100644 --- a/lib/fog/rackspace/requests/monitoring/get_entity.rb +++ b/lib/fog/rackspace/requests/monitoring/get_entity.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_entity(entity_id) request( :expects => [200, 203], @@ -10,13 +9,10 @@ module Fog :path => "entities/#{entity_id}" ) end - end class Mock - def get_entity(entity_id) - account_id = Fog::Mock.random_numbers(6).to_s server_id = Fog::Rackspace::MockData.uuid entity_label = Fog::Mock.random_letters(10) diff --git a/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb b/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb index 81358d5c6..d18361fbe 100644 --- a/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_filesystems_info(agent_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_filesystems_info(agent_id) - if agent_id == -1 raise Fog::Rackspace::Monitoring::BadRequest end diff --git a/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb b/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb index 913028437..8d6b7a9ad 100644 --- a/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_logged_in_user_info(agent_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_logged_in_user_info(agent_id) - if agent_id == -1 raise Fog::Rackspace::Monitoring::BadRequest end diff --git a/lib/fog/rackspace/requests/monitoring/get_memory_info.rb b/lib/fog/rackspace/requests/monitoring/get_memory_info.rb index e1a6277b6..26be6cc12 100644 --- a/lib/fog/rackspace/requests/monitoring/get_memory_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_memory_info.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_memory_info(agent_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_memory_info(agent_id) - if agent_id == -1 raise Fog::Rackspace::Monitoring::BadRequest end diff --git a/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb b/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb index 9ee29ca50..9d36fe35d 100644 --- a/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_network_interfaces_info(agent_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_network_interfaces_info(agent_id) - if agent_id == -1 raise Fog::Rackspace::Monitoring::BadRequest end diff --git a/lib/fog/rackspace/requests/monitoring/get_notification.rb b/lib/fog/rackspace/requests/monitoring/get_notification.rb index 00ef2fb61..93e9b608f 100644 --- a/lib/fog/rackspace/requests/monitoring/get_notification.rb +++ b/lib/fog/rackspace/requests/monitoring/get_notification.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_notification(notification_id) request( :expects => [200], @@ -10,7 +9,6 @@ module Fog :path => "notifications/#{notification_id}" ) end - end class Mock diff --git a/lib/fog/rackspace/requests/monitoring/get_processes_info.rb b/lib/fog/rackspace/requests/monitoring/get_processes_info.rb index 1395220ea..61e9b833e 100644 --- a/lib/fog/rackspace/requests/monitoring/get_processes_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_processes_info.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_processes_info(agent_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_processes_info(agent_id) - memory_major_faults = Fog::Mock.random_numbers(1).to_i memory_minor_faults = Fog::Mock.random_numbers(3).to_i memory_page_faults = memory_major_faults+memory_minor_faults diff --git a/lib/fog/rackspace/requests/monitoring/get_system_info.rb b/lib/fog/rackspace/requests/monitoring/get_system_info.rb index ed3a5a132..7af32b46f 100644 --- a/lib/fog/rackspace/requests/monitoring/get_system_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_system_info.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def get_system_info(agent_id) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog class Mock def get_system_info(agent_id) - if agent_id == -1 raise Fog::Rackspace::Monitoring::BadRequest end diff --git a/lib/fog/rackspace/requests/monitoring/list_agent_tokens.rb b/lib/fog/rackspace/requests/monitoring/list_agent_tokens.rb index 6cf6ec9b2..806143125 100644 --- a/lib/fog/rackspace/requests/monitoring/list_agent_tokens.rb +++ b/lib/fog/rackspace/requests/monitoring/list_agent_tokens.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_agent_tokens(options={}) request( :expects => [200, 203], @@ -14,7 +13,6 @@ module Fog end class Mock - def list_agent_tokens(options={}) token = Fog::Mock.random_letters(50).to_s diff --git a/lib/fog/rackspace/requests/monitoring/list_agents.rb b/lib/fog/rackspace/requests/monitoring/list_agents.rb index dd8b4ca47..03eaf4a8c 100644 --- a/lib/fog/rackspace/requests/monitoring/list_agents.rb +++ b/lib/fog/rackspace/requests/monitoring/list_agents.rb @@ -13,7 +13,6 @@ module Fog class Mock def list_agents - response = Excon::Response.new response.status = 200 response.body = { diff --git a/lib/fog/rackspace/requests/monitoring/list_alarm_examples.rb b/lib/fog/rackspace/requests/monitoring/list_alarm_examples.rb index 67364d2ca..0daefccd2 100644 --- a/lib/fog/rackspace/requests/monitoring/list_alarm_examples.rb +++ b/lib/fog/rackspace/requests/monitoring/list_alarm_examples.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_alarm_examples request( :expects => [200, 203], @@ -10,7 +9,6 @@ module Fog :path => 'alarm_examples' ) end - end end end diff --git a/lib/fog/rackspace/requests/monitoring/list_alarms.rb b/lib/fog/rackspace/requests/monitoring/list_alarms.rb index b5d956eef..473e72344 100644 --- a/lib/fog/rackspace/requests/monitoring/list_alarms.rb +++ b/lib/fog/rackspace/requests/monitoring/list_alarms.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_alarms(entity_id, options={}) request( :expects => [200, 203], @@ -11,13 +10,10 @@ module Fog :query => options ) end - end class Mock - def list_alarms(entity_id) - if entity_id == -1 raise Fog::Rackspace::Monitoring::NotFound end diff --git a/lib/fog/rackspace/requests/monitoring/list_check_types.rb b/lib/fog/rackspace/requests/monitoring/list_check_types.rb index b1f669e63..9237bb8c8 100644 --- a/lib/fog/rackspace/requests/monitoring/list_check_types.rb +++ b/lib/fog/rackspace/requests/monitoring/list_check_types.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_check_types request( :expects => [200, 203], @@ -56,8 +55,6 @@ module Fog } ], - - "metadata" => { "count" => 2, "limit" => 100, diff --git a/lib/fog/rackspace/requests/monitoring/list_checks.rb b/lib/fog/rackspace/requests/monitoring/list_checks.rb index 2b2b6b68f..b0829ca4e 100644 --- a/lib/fog/rackspace/requests/monitoring/list_checks.rb +++ b/lib/fog/rackspace/requests/monitoring/list_checks.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_checks(entity_id, options={}) request( :expects => [200, 203], @@ -15,7 +14,6 @@ module Fog class Mock def list_checks(entity_id) - check_id = Fog::Mock.random_letters(10) if entity_id == -1 diff --git a/lib/fog/rackspace/requests/monitoring/list_data_points.rb b/lib/fog/rackspace/requests/monitoring/list_data_points.rb index 6671f6756..6080e78ad 100644 --- a/lib/fog/rackspace/requests/monitoring/list_data_points.rb +++ b/lib/fog/rackspace/requests/monitoring/list_data_points.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_data_points(entity_id, check_id, metric_name, options) request( :expects => [200, 203], @@ -11,13 +10,10 @@ module Fog :query => options ) end - end class Mock - def list_data_points(entity_id, check_id, metric_name, options) - if entity_id == -1 || check_id == -1 || metric_name == -1 || options == -1 raise Fog::Rackspace::Monitoring::BadRequest end diff --git a/lib/fog/rackspace/requests/monitoring/list_entities.rb b/lib/fog/rackspace/requests/monitoring/list_entities.rb index 30784f594..5ed551868 100644 --- a/lib/fog/rackspace/requests/monitoring/list_entities.rb +++ b/lib/fog/rackspace/requests/monitoring/list_entities.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_entities(options={}) request( :expects => [200, 203], diff --git a/lib/fog/rackspace/requests/monitoring/list_metrics.rb b/lib/fog/rackspace/requests/monitoring/list_metrics.rb index e30e42230..6d68ca358 100644 --- a/lib/fog/rackspace/requests/monitoring/list_metrics.rb +++ b/lib/fog/rackspace/requests/monitoring/list_metrics.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_metrics(entity_id, check_id) request( :expects => [200, 203], @@ -76,7 +75,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/monitoring/list_notification_plans.rb b/lib/fog/rackspace/requests/monitoring/list_notification_plans.rb index de811d67c..941a8c0c0 100644 --- a/lib/fog/rackspace/requests/monitoring/list_notification_plans.rb +++ b/lib/fog/rackspace/requests/monitoring/list_notification_plans.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_notification_plans request( :expects => [200], @@ -66,7 +65,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/monitoring/list_notifications.rb b/lib/fog/rackspace/requests/monitoring/list_notifications.rb index cbde654bb..889797b55 100644 --- a/lib/fog/rackspace/requests/monitoring/list_notifications.rb +++ b/lib/fog/rackspace/requests/monitoring/list_notifications.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_notifications(options={}) request( :expects => [200], @@ -11,7 +10,6 @@ module Fog :query => options ) end - end class Mock @@ -60,7 +58,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/monitoring/list_overview.rb b/lib/fog/rackspace/requests/monitoring/list_overview.rb index 8f513802b..1d0d57bb6 100644 --- a/lib/fog/rackspace/requests/monitoring/list_overview.rb +++ b/lib/fog/rackspace/requests/monitoring/list_overview.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def list_overview(options={}) request( :expects => [200, 203], @@ -15,7 +14,6 @@ module Fog class Mock def list_overview(options={}) - alarm_id = Fog::Mock.random_letters(10) check_id = Fog::Mock.random_letters(10) entity_id = Fog::Mock.random_letters(10) @@ -108,7 +106,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/monitoring/update_alarm.rb b/lib/fog/rackspace/requests/monitoring/update_alarm.rb index 950cc3e3e..5c923d929 100644 --- a/lib/fog/rackspace/requests/monitoring/update_alarm.rb +++ b/lib/fog/rackspace/requests/monitoring/update_alarm.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def update_alarm(entity_id, alarm_id, options) request( :body => JSON.encode(options), @@ -14,9 +13,7 @@ module Fog end class Mock - def update_alarm(entity_id, alarm_id, options) - account_id = Fog::Mock.random_numbers(6).to_s if entity_id == -1 || alarm_id == -1 || options[:testing] diff --git a/lib/fog/rackspace/requests/monitoring/update_check.rb b/lib/fog/rackspace/requests/monitoring/update_check.rb index 377a734f6..5b8761b69 100644 --- a/lib/fog/rackspace/requests/monitoring/update_check.rb +++ b/lib/fog/rackspace/requests/monitoring/update_check.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def update_check(entity_id, check_id, options) request( :body => JSON.encode(options), @@ -15,7 +14,6 @@ module Fog class Mock def update_check(entity_id, check_id, options) - account_id = Fog::Mock.random_numbers(6).to_s if entity_id == -1 || check_id == -1 || options[:testing] diff --git a/lib/fog/rackspace/requests/monitoring/update_entity.rb b/lib/fog/rackspace/requests/monitoring/update_entity.rb index 3a0fecf3d..1c5170a39 100644 --- a/lib/fog/rackspace/requests/monitoring/update_entity.rb +++ b/lib/fog/rackspace/requests/monitoring/update_entity.rb @@ -2,7 +2,6 @@ module Fog module Rackspace class Monitoring class Real - def update_entity(entity_id, options) request( :body => JSON.encode(options), @@ -14,9 +13,7 @@ module Fog end class Mock - def update_entity(entity_id, options) - account_id = Fog::Mock.random_numbers(6).to_s if entity_id == -1 diff --git a/lib/fog/rackspace/requests/queues/create_claim.rb b/lib/fog/rackspace/requests/queues/create_claim.rb index 23fe92a57..382a57857 100644 --- a/lib/fog/rackspace/requests/queues/create_claim.rb +++ b/lib/fog/rackspace/requests/queues/create_claim.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation claims a set of messages (up to the value of the limit parameter) from oldest to newest and skips any messages that are already claimed. # If no unclaimed messages are available, the API returns a 204 No Content message. # @@ -34,7 +32,6 @@ module Fog :query => query ) end - end class Mock @@ -70,7 +67,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/create_message.rb b/lib/fog/rackspace/requests/queues/create_message.rb index c952a905a..da0617a2e 100644 --- a/lib/fog/rackspace/requests/queues/create_message.rb +++ b/lib/fog/rackspace/requests/queues/create_message.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation posts the specified message or messages. # @note You can submit up to 10 messages in a single request. # @@ -53,7 +51,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/create_queue.rb b/lib/fog/rackspace/requests/queues/create_queue.rb index b24b95a95..1b1dbad1c 100644 --- a/lib/fog/rackspace/requests/queues/create_queue.rb +++ b/lib/fog/rackspace/requests/queues/create_queue.rb @@ -1,7 +1,6 @@ module Fog module Rackspace class Queues - class Real # This operation creates a new queue. # The body of the request is empty. @@ -35,7 +34,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/delete_claim.rb b/lib/fog/rackspace/requests/queues/delete_claim.rb index 9891f6f48..5ee7e90a1 100644 --- a/lib/fog/rackspace/requests/queues/delete_claim.rb +++ b/lib/fog/rackspace/requests/queues/delete_claim.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation immediately releases a claim, making any remaining, undeleted) messages that are associated with the claim available to other workers. # Claims with malformed IDs or claims that are not found by ID are ignored. # @@ -39,7 +37,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/delete_message.rb b/lib/fog/rackspace/requests/queues/delete_message.rb index ad8935c0e..2f1143854 100644 --- a/lib/fog/rackspace/requests/queues/delete_message.rb +++ b/lib/fog/rackspace/requests/queues/delete_message.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation immediately deletes the specified message. # @note If you do not specify claim_id, but the message is claimed, the operation fails. You can only delete claimed messages by providing an appropriate claim_id. # @@ -27,7 +25,6 @@ module Fog :query => query ) end - end class Mock @@ -60,7 +57,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/delete_queue.rb b/lib/fog/rackspace/requests/queues/delete_queue.rb index c5972eeb4..b3f9705a4 100644 --- a/lib/fog/rackspace/requests/queues/delete_queue.rb +++ b/lib/fog/rackspace/requests/queues/delete_queue.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation immediately deletes a queue and all of its existing messages. # # @param [String] queue_name Specifies the name of the queue. @@ -20,7 +18,6 @@ module Fog :path => "queues/#{queue_name}" ) end - end class Mock @@ -31,7 +28,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/get_claim.rb b/lib/fog/rackspace/requests/queues/get_claim.rb index e9fc3cc67..b50f6b347 100644 --- a/lib/fog/rackspace/requests/queues/get_claim.rb +++ b/lib/fog/rackspace/requests/queues/get_claim.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation queries the specified claim for the specified queue. Claims with malformed IDs or claims that are not found by ID are ignored. # # @param [String] queue_name Specifies the name of the queue. @@ -21,7 +19,6 @@ module Fog :path => "queues/#{queue_name}/claims/#{claim_id}" ) end - end class Mock @@ -35,7 +32,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/get_message.rb b/lib/fog/rackspace/requests/queues/get_message.rb index 37bfe261b..609789bf3 100644 --- a/lib/fog/rackspace/requests/queues/get_message.rb +++ b/lib/fog/rackspace/requests/queues/get_message.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation gets the specified message from the specified queue. # # @param [String] client_id UUID for the client instance. @@ -23,7 +21,6 @@ module Fog :headers => { 'Client-ID' => client_id } ) end - end class Mock @@ -39,7 +36,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/get_queue.rb b/lib/fog/rackspace/requests/queues/get_queue.rb index 749af6cf5..69e435b50 100644 --- a/lib/fog/rackspace/requests/queues/get_queue.rb +++ b/lib/fog/rackspace/requests/queues/get_queue.rb @@ -1,7 +1,6 @@ module Fog module Rackspace class Queues - class Real # This operation verifies whether the specified queue exists. # @@ -32,7 +31,6 @@ module Fog end end end - end end end diff --git a/lib/fog/rackspace/requests/queues/get_queue_stats.rb b/lib/fog/rackspace/requests/queues/get_queue_stats.rb index e263babf3..6bbbe1cc7 100644 --- a/lib/fog/rackspace/requests/queues/get_queue_stats.rb +++ b/lib/fog/rackspace/requests/queues/get_queue_stats.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation returns queue statistics, including how many messages are in the queue, categorized by status. # # @param [String] queue_name Specifies the name of the queue. @@ -20,7 +18,6 @@ module Fog :path => "queues/#{queue_name}/stats" ) end - end class Mock @@ -55,7 +52,6 @@ module Fog } end end - end end end diff --git a/lib/fog/rackspace/requests/queues/list_messages.rb b/lib/fog/rackspace/requests/queues/list_messages.rb index 9d33f1856..974d7207c 100644 --- a/lib/fog/rackspace/requests/queues/list_messages.rb +++ b/lib/fog/rackspace/requests/queues/list_messages.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation gets the message or messages in the specified queue. # # A request to list messages when the queue is not found or when messages are not found returns 204, instead of 200, because there was no information to send back. @@ -70,7 +68,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/list_queues.rb b/lib/fog/rackspace/requests/queues/list_queues.rb index 13e265bae..9aefa2f35 100644 --- a/lib/fog/rackspace/requests/queues/list_queues.rb +++ b/lib/fog/rackspace/requests/queues/list_queues.rb @@ -1,7 +1,6 @@ module Fog module Rackspace class Queues - class Real # This operation lists queues for the project. The queues are sorted alphabetically by name. # @note A request to list queues when you have no queues in your account returns 204, instead of 200, because there was no information to send back. @@ -58,7 +57,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/queues/update_claim.rb b/lib/fog/rackspace/requests/queues/update_claim.rb index 2a9164ee7..82df7afb2 100644 --- a/lib/fog/rackspace/requests/queues/update_claim.rb +++ b/lib/fog/rackspace/requests/queues/update_claim.rb @@ -1,9 +1,7 @@ module Fog module Rackspace class Queues - class Real - # This operation posts the specified message or messages. # @note You can submit up to 10 messages in a single request. # @@ -21,7 +19,6 @@ module Fog :path => "queues/#{queue_name}/claims/#{claim_id}" ) end - end class Mock @@ -37,7 +34,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/copy_object.rb b/lib/fog/rackspace/requests/storage/copy_object.rb index 629ababb4..b53a1449d 100644 --- a/lib/fog/rackspace/requests/storage/copy_object.rb +++ b/lib/fog/rackspace/requests/storage/copy_object.rb @@ -2,7 +2,6 @@ module Fog module Storage class Rackspace class Real - # Copy object # # ==== Parameters @@ -24,7 +23,6 @@ module Fog :path => "#{Fog::Rackspace.escape(target_container_name)}/#{Fog::Rackspace.escape(target_object_name)}" }) end - end end end diff --git a/lib/fog/rackspace/requests/storage/delete_container.rb b/lib/fog/rackspace/requests/storage/delete_container.rb index a7f12d419..86469d398 100644 --- a/lib/fog/rackspace/requests/storage/delete_container.rb +++ b/lib/fog/rackspace/requests/storage/delete_container.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Delete an existing container # # ==== Parameters @@ -19,7 +17,6 @@ module Fog :path => Fog::Rackspace.escape(name) ) end - end class Mock @@ -34,7 +31,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb b/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb index 3d3ac1dc3..8bd67fc6d 100644 --- a/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb +++ b/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Deletes multiple objects or containers with a single request. # # To delete objects from a single container, +container+ may be provided @@ -69,7 +67,6 @@ module Fog response.body = Fog::JSON.decode(response.body) response end - end class Mock @@ -126,7 +123,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/delete_object.rb b/lib/fog/rackspace/requests/storage/delete_object.rb index c4bc60f26..08071d07f 100644 --- a/lib/fog/rackspace/requests/storage/delete_object.rb +++ b/lib/fog/rackspace/requests/storage/delete_object.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Delete an existing object # # ==== Parameters @@ -20,7 +18,6 @@ module Fog :path => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}" ) end - end class Mock @@ -34,7 +31,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/delete_static_large_object.rb b/lib/fog/rackspace/requests/storage/delete_static_large_object.rb index 6314a1293..f385e5d19 100644 --- a/lib/fog/rackspace/requests/storage/delete_static_large_object.rb +++ b/lib/fog/rackspace/requests/storage/delete_static_large_object.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Delete a static large object. # # Deletes the SLO manifest +object+ and all segments that it references. @@ -43,7 +41,6 @@ module Fog response.body = Fog::JSON.decode(response.body) response end - end class Mock @@ -76,7 +73,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/extract_archive.rb b/lib/fog/rackspace/requests/storage/extract_archive.rb index 3317c0de3..23050025f 100644 --- a/lib/fog/rackspace/requests/storage/extract_archive.rb +++ b/lib/fog/rackspace/requests/storage/extract_archive.rb @@ -2,7 +2,6 @@ module Fog module Storage class Rackspace class Real - # Extract Archive # # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Extract_Archive-d1e2338.html diff --git a/lib/fog/rackspace/requests/storage/get_container.rb b/lib/fog/rackspace/requests/storage/get_container.rb index fe09724c5..04f6045e3 100644 --- a/lib/fog/rackspace/requests/storage/get_container.rb +++ b/lib/fog/rackspace/requests/storage/get_container.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Get details for container and total bytes stored # # ==== Parameters @@ -42,7 +40,6 @@ module Fog :query => {'format' => 'json'}.merge!(options) ) end - end class Mock @@ -67,7 +64,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/get_containers.rb b/lib/fog/rackspace/requests/storage/get_containers.rb index 0ea7a28b1..a4ef7823e 100644 --- a/lib/fog/rackspace/requests/storage/get_containers.rb +++ b/lib/fog/rackspace/requests/storage/get_containers.rb @@ -2,7 +2,6 @@ module Fog module Storage class Rackspace class Real - # List existing storage containers # # ==== Parameters @@ -30,7 +29,6 @@ module Fog :query => {'format' => 'json'}.merge!(options) ) end - end class Mock @@ -48,7 +46,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/get_object.rb b/lib/fog/rackspace/requests/storage/get_object.rb index 0490a13e4..c0d12c09d 100644 --- a/lib/fog/rackspace/requests/storage/get_object.rb +++ b/lib/fog/rackspace/requests/storage/get_object.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Get details for object # # ==== Parameters @@ -26,7 +24,6 @@ module Fog request(params, false) end - end class Mock @@ -52,7 +49,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/get_object_http_url.rb b/lib/fog/rackspace/requests/storage/get_object_http_url.rb index 7b66d3c91..7e0612a45 100644 --- a/lib/fog/rackspace/requests/storage/get_object_http_url.rb +++ b/lib/fog/rackspace/requests/storage/get_object_http_url.rb @@ -1,7 +1,6 @@ module Fog module Storage class Rackspace - module Common # Get an expiring object http url from Cloud Files # @@ -31,7 +30,6 @@ module Fog class Mock include Common end - end end end diff --git a/lib/fog/rackspace/requests/storage/get_object_https_url.rb b/lib/fog/rackspace/requests/storage/get_object_https_url.rb index c81c7f575..5aefd52f5 100644 --- a/lib/fog/rackspace/requests/storage/get_object_https_url.rb +++ b/lib/fog/rackspace/requests/storage/get_object_https_url.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - module Common - # Get an expiring object https url from Cloud Files # # ==== Parameters @@ -56,7 +54,6 @@ module Fog class Real include Common end - end end end diff --git a/lib/fog/rackspace/requests/storage/head_container.rb b/lib/fog/rackspace/requests/storage/head_container.rb index 860a59d11..55d9757f4 100644 --- a/lib/fog/rackspace/requests/storage/head_container.rb +++ b/lib/fog/rackspace/requests/storage/head_container.rb @@ -2,7 +2,6 @@ module Fog module Storage class Rackspace class Real - # List number of objects and total bytes stored # # ==== Parameters @@ -25,7 +24,6 @@ module Fog :query => {'format' => 'json'} ) end - end class Mock @@ -38,7 +36,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/head_containers.rb b/lib/fog/rackspace/requests/storage/head_containers.rb index 22f175233..b7e5fbb96 100644 --- a/lib/fog/rackspace/requests/storage/head_containers.rb +++ b/lib/fog/rackspace/requests/storage/head_containers.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # List number of containers and total bytes stored # # ==== Returns @@ -23,7 +21,6 @@ module Fog :query => {'format' => 'json'} ) end - end class Mock @@ -42,7 +39,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/head_object.rb b/lib/fog/rackspace/requests/storage/head_object.rb index 87b834cdd..49a3f38ed 100644 --- a/lib/fog/rackspace/requests/storage/head_object.rb +++ b/lib/fog/rackspace/requests/storage/head_object.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Get headers for object # # ==== Parameters @@ -20,7 +18,6 @@ module Fog :path => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}" }, false) end - end class Mock @@ -46,7 +43,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb b/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb index 8a6eb0234..b21649f08 100644 --- a/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb +++ b/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Set the account wide Temp URL Key. This is a secret key that's # used to generate signed expiring URLs. # @@ -32,7 +30,6 @@ module Fog :headers => {'X-Account-Meta-Temp-Url-Key' => key} ) end - end class Mock @@ -44,7 +41,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/put_container.rb b/lib/fog/rackspace/requests/storage/put_container.rb index 7d2b4674a..3422364fb 100644 --- a/lib/fog/rackspace/requests/storage/put_container.rb +++ b/lib/fog/rackspace/requests/storage/put_container.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Create a new container # # ==== Parameters @@ -20,7 +18,6 @@ module Fog :path => Fog::Rackspace.escape(name) ) end - end class Mock @@ -36,7 +33,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb b/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb index 7d5ad2c8e..68859c952 100644 --- a/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb +++ b/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Create a new dynamic large object manifest # # Creates an object with a +X-Object-Manifest+ header that specifies the common prefix ("/") @@ -38,7 +36,6 @@ module Fog :path => path ) end - end class Mock @@ -61,7 +58,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/put_object.rb b/lib/fog/rackspace/requests/storage/put_object.rb index 8c1c18950..04147d21d 100644 --- a/lib/fog/rackspace/requests/storage/put_object.rb +++ b/lib/fog/rackspace/requests/storage/put_object.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Create a new object # # When passed a block, it will make a chunked request, calling @@ -74,7 +72,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/requests/storage/put_object_manifest.rb b/lib/fog/rackspace/requests/storage/put_object_manifest.rb index 6ed5448ac..47fe59954 100644 --- a/lib/fog/rackspace/requests/storage/put_object_manifest.rb +++ b/lib/fog/rackspace/requests/storage/put_object_manifest.rb @@ -1,7 +1,6 @@ module Fog module Storage class Rackspace - module Common # Create a new dynamic large object manifest # @@ -18,7 +17,6 @@ module Fog class Mock include Common end - end end end diff --git a/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb b/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb index 12cb5b1fc..ebe0c4c74 100644 --- a/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb +++ b/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb @@ -1,9 +1,7 @@ module Fog module Storage class Rackspace - class Real - # Create a new static large object manifest. # # A static large object is similar to a dynamic large object. Whereas a GET for a dynamic large object manifest @@ -52,7 +50,6 @@ module Fog :query => { 'multipart-manifest' => 'put' } ) end - end class Mock @@ -100,7 +97,6 @@ module Fog response end end - end end end diff --git a/lib/fog/rackspace/service.rb b/lib/fog/rackspace/service.rb index f555a81e3..995100b20 100644 --- a/lib/fog/rackspace/service.rb +++ b/lib/fog/rackspace/service.rb @@ -1,7 +1,6 @@ module Fog module Rackspace class Service - def service_name raise Fog::Errors::NotImplemented.new("Please implement the #service_name method") end @@ -138,7 +137,6 @@ module Fog selected end - end end end diff --git a/lib/fog/rackspace/storage.rb b/lib/fog/rackspace/storage.rb index 433c33a71..1cdf07df3 100644 --- a/lib/fog/rackspace/storage.rb +++ b/lib/fog/rackspace/storage.rb @@ -454,7 +454,6 @@ module Fog @auth_token = credentials['X-Auth-Token'] end end - end end end diff --git a/lib/fog/rage4/core.rb b/lib/fog/rage4/core.rb index cc6b41d4b..d58721748 100644 --- a/lib/fog/rage4/core.rb +++ b/lib/fog/rage4/core.rb @@ -3,10 +3,8 @@ require 'fog/json' module Fog module Rage4 - extend Fog::Provider service(:dns, 'DNS') - end end diff --git a/lib/fog/rage4/dns.rb b/lib/fog/rage4/dns.rb index 7f0e8fcff..86352b8ba 100644 --- a/lib/fog/rage4/dns.rb +++ b/lib/fog/rage4/dns.rb @@ -3,7 +3,6 @@ require 'fog/rage4/core' module Fog module DNS class Rage4 < Fog::Service - requires :rage4_email, :rage4_api_key recognizes :rage4_url, :host, :path, :port, :scheme, :persistent @@ -33,7 +32,6 @@ module Fog request :set_record_failover class Real - def initialize(options={}) @rage4_email = options[:rage4_email] @rage4_password = options[:rage4_api_key] diff --git a/lib/fog/rage4/models/dns/record.rb b/lib/fog/rage4/models/dns/record.rb index a463246e3..522c3ab15 100644 --- a/lib/fog/rage4/models/dns/record.rb +++ b/lib/fog/rage4/models/dns/record.rb @@ -3,10 +3,7 @@ require 'fog/core/model' module Fog module DNS class Rage4 - class Record < Fog::Model - - identity :id attribute :name @@ -25,7 +22,6 @@ module Fog attribute :is_active attribute :udp_limit - def initialize(attributes={}) super end @@ -71,9 +67,7 @@ module Fog def zone=(new_zone) @zone = new_zone end - end - end end end diff --git a/lib/fog/rage4/models/dns/records.rb b/lib/fog/rage4/models/dns/records.rb index a35c71685..d3fad1da1 100644 --- a/lib/fog/rage4/models/dns/records.rb +++ b/lib/fog/rage4/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/rage4/models/dns/record' module Fog module DNS class Rage4 - class Records < Fog::Collection - attribute :zone model Fog::DNS::Rage4::Record @@ -34,9 +32,7 @@ module Fog requires :zone super({ :zone => zone }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/rage4/models/dns/zone.rb b/lib/fog/rage4/models/dns/zone.rb index 4bec49031..c38cb2260 100644 --- a/lib/fog/rage4/models/dns/zone.rb +++ b/lib/fog/rage4/models/dns/zone.rb @@ -4,9 +4,7 @@ require 'fog/rage4/models/dns/records' module Fog module DNS class Rage4 - class Zone < Fog::Model - identity :id attribute :domain, :aliases => 'name' @@ -38,9 +36,7 @@ module Fog merge_attributes(data) true end - end - end end end diff --git a/lib/fog/rage4/models/dns/zones.rb b/lib/fog/rage4/models/dns/zones.rb index d7b255ff6..f7c4754b6 100644 --- a/lib/fog/rage4/models/dns/zones.rb +++ b/lib/fog/rage4/models/dns/zones.rb @@ -4,9 +4,7 @@ require 'fog/rage4/models/dns/zone' module Fog module DNS class Rage4 - class Zones < Fog::Collection - model Fog::DNS::Rage4::Zone def all @@ -26,9 +24,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/rage4/requests/dns/create_domain.rb b/lib/fog/rage4/requests/dns/create_domain.rb index 01239289b..f4a3e37e6 100644 --- a/lib/fog/rage4/requests/dns/create_domain.rb +++ b/lib/fog/rage4/requests/dns/create_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Create a domain. # ==== Parameters # * name<~String> - domain name @@ -24,10 +23,7 @@ module Fog :path => "/rapi/createregulardomain/?name=#{name}&email=#{email}" ) end - end - - end end end diff --git a/lib/fog/rage4/requests/dns/create_domain_vanity.rb b/lib/fog/rage4/requests/dns/create_domain_vanity.rb index 8c0cda1fc..21e802d62 100644 --- a/lib/fog/rage4/requests/dns/create_domain_vanity.rb +++ b/lib/fog/rage4/requests/dns/create_domain_vanity.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Create a domain with a vanity name server. # ==== Parameters # * name<~String> - domain name @@ -25,10 +24,7 @@ module Fog "&nsname=#{nsname}&nsprefix=#{nsprefix}" ) end - end - - end end end diff --git a/lib/fog/rage4/requests/dns/create_record.rb b/lib/fog/rage4/requests/dns/create_record.rb index 710b81e99..0ea95d7c4 100644 --- a/lib/fog/rage4/requests/dns/create_record.rb +++ b/lib/fog/rage4/requests/dns/create_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Create a record # ==== Parameters # * domain id <~Integer> The id of the domain you wish to create a record for @@ -26,13 +25,9 @@ module Fog # * 'id'<~Integer> # * 'error'<~String> - # https://secure.rage4.com/rapi/createrecord/ - def create_record(domain_id, name, content, type, options = {}) - - path = "/rapi/createrecord/#{domain_id}" path << "?name=#{name}&content=#{content}&type=#{type}" @@ -58,10 +53,7 @@ module Fog :path => path ) end - end - - end end end diff --git a/lib/fog/rage4/requests/dns/create_reverse_domain_4.rb b/lib/fog/rage4/requests/dns/create_reverse_domain_4.rb index 25dfc5df5..dea459da3 100644 --- a/lib/fog/rage4/requests/dns/create_reverse_domain_4.rb +++ b/lib/fog/rage4/requests/dns/create_reverse_domain_4.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Create a reverse domain for an ipv4 address . # ==== Parameters # * name<~String> - expects an ipv5 address @@ -23,10 +22,7 @@ module Fog "&subnet=#{subnet}" ) end - end - - end end end diff --git a/lib/fog/rage4/requests/dns/delete_domain.rb b/lib/fog/rage4/requests/dns/delete_domain.rb index a58fec3bd..98467f012 100644 --- a/lib/fog/rage4/requests/dns/delete_domain.rb +++ b/lib/fog/rage4/requests/dns/delete_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Delete a specific domain # ==== Parameters # * id<~Integer> - numeric ID @@ -18,11 +17,8 @@ module Fog :expects => 200, :method => 'GET', :path => "/rapi/deletedomain/#{id}" ) - end - end - end end end diff --git a/lib/fog/rage4/requests/dns/delete_record.rb b/lib/fog/rage4/requests/dns/delete_record.rb index 087750e1d..4a43a5581 100644 --- a/lib/fog/rage4/requests/dns/delete_record.rb +++ b/lib/fog/rage4/requests/dns/delete_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Delete a specific record # ==== Parameters # * id<~Integer> - numeric record ID @@ -18,11 +17,8 @@ module Fog :expects => 200, :method => 'GET', :path => "/rapi/deleterecord/#{id}" ) - end - end - end end end diff --git a/lib/fog/rage4/requests/dns/get_domain.rb b/lib/fog/rage4/requests/dns/get_domain.rb index f9cdbd1ef..1c8f689d5 100644 --- a/lib/fog/rage4/requests/dns/get_domain.rb +++ b/lib/fog/rage4/requests/dns/get_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Get the details for a specific domain in your account. # ==== Parameters # * id<~Integer> - numeric ID @@ -20,11 +19,8 @@ module Fog :expects => 200, :method => 'GET', :path => "/rapi/getdomain/#{id}" ) - end - end - end end end diff --git a/lib/fog/rage4/requests/dns/get_domain_by_name.rb b/lib/fog/rage4/requests/dns/get_domain_by_name.rb index 57c59a734..f4129c317 100644 --- a/lib/fog/rage4/requests/dns/get_domain_by_name.rb +++ b/lib/fog/rage4/requests/dns/get_domain_by_name.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Get the details for a specific domain in your account. # ==== Parameters # * name<~String> - name of domain @@ -20,11 +19,8 @@ module Fog :expects => 200, :method => 'GET', :path => "/rapi/getdomainbyname/?name=#{name}") - end - end - end end end diff --git a/lib/fog/rage4/requests/dns/list_domains.rb b/lib/fog/rage4/requests/dns/list_domains.rb index ac57b2ba1..3f818787b 100644 --- a/lib/fog/rage4/requests/dns/list_domains.rb +++ b/lib/fog/rage4/requests/dns/list_domains.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Get the lsit of all domains for your account. # ==== Parameters # @@ -22,20 +21,16 @@ module Fog :path => '/rapi/getdomains' ) end - end class Mock - def list_domains response = Excon::Response.new response.status = 200 response.body = self.data[:domains] response end - end - end end end diff --git a/lib/fog/rage4/requests/dns/list_geo_regions.rb b/lib/fog/rage4/requests/dns/list_geo_regions.rb index f61a0434a..8357bde94 100644 --- a/lib/fog/rage4/requests/dns/list_geo_regions.rb +++ b/lib/fog/rage4/requests/dns/list_geo_regions.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # List all the geo regions available # ==== Parameters # @@ -20,7 +19,6 @@ module Fog :path => '/rapi/listgeoregions' ) end - end end end diff --git a/lib/fog/rage4/requests/dns/list_record_types.rb b/lib/fog/rage4/requests/dns/list_record_types.rb index d129b0742..aadba76b2 100644 --- a/lib/fog/rage4/requests/dns/list_record_types.rb +++ b/lib/fog/rage4/requests/dns/list_record_types.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # List all the record types available # ==== Parameters # @@ -19,7 +18,6 @@ module Fog :path => '/rapi/listrecordtypes' ) end - end end end diff --git a/lib/fog/rage4/requests/dns/list_records.rb b/lib/fog/rage4/requests/dns/list_records.rb index 9bd0f4aed..b65f7aa53 100644 --- a/lib/fog/rage4/requests/dns/list_records.rb +++ b/lib/fog/rage4/requests/dns/list_records.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Get the list of records for the specific domain. # # ==== Parameters @@ -23,9 +22,7 @@ module Fog :method => "GET", :path => "/rapi/getrecords/#{id}" ) end - end - end end end diff --git a/lib/fog/rage4/requests/dns/set_record_failover.rb b/lib/fog/rage4/requests/dns/set_record_failover.rb index dc4596212..50a56a302 100644 --- a/lib/fog/rage4/requests/dns/set_record_failover.rb +++ b/lib/fog/rage4/requests/dns/set_record_failover.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Set a failover to on or off # ==== Parameters # * id<~Integer> - numeric ID @@ -19,11 +18,8 @@ module Fog :method => 'GET', :path => "/rapi/setrecordfailover/#{id}&active=#{active}&failover=#{failover}" ) - end - end - end end end diff --git a/lib/fog/rage4/requests/dns/show_current_usage.rb b/lib/fog/rage4/requests/dns/show_current_usage.rb index 26bd724f2..345fe40b4 100644 --- a/lib/fog/rage4/requests/dns/show_current_usage.rb +++ b/lib/fog/rage4/requests/dns/show_current_usage.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Shows current usage for a single domain # ==== Parameters # * id<~Integer> - domain name numeric ID @@ -15,11 +14,8 @@ module Fog :expects => 200, :method => 'GET', :path => "/rapi/showcurrentusage/#{id}" ) - end - end - end end end diff --git a/lib/fog/rage4/requests/dns/show_global_usage.rb b/lib/fog/rage4/requests/dns/show_global_usage.rb index 834835e2b..47ebe3186 100644 --- a/lib/fog/rage4/requests/dns/show_global_usage.rb +++ b/lib/fog/rage4/requests/dns/show_global_usage.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Shows global usage for all domains # ==== Parameters # @@ -15,11 +14,8 @@ module Fog :expects => 200, :method => 'GET', :path => "/rapi/showcurrentglobalusage/" ) - end - end - end end end diff --git a/lib/fog/rage4/requests/dns/update_domain.rb b/lib/fog/rage4/requests/dns/update_domain.rb index 81e31c76e..32453d62e 100644 --- a/lib/fog/rage4/requests/dns/update_domain.rb +++ b/lib/fog/rage4/requests/dns/update_domain.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Update an existing domain # ==== Parameters # * id<~Integer> - domain integer value @@ -34,10 +33,7 @@ module Fog :path => path ) end - end - - end end end diff --git a/lib/fog/rage4/requests/dns/update_record.rb b/lib/fog/rage4/requests/dns/update_record.rb index 33db82bee..9fb383977 100644 --- a/lib/fog/rage4/requests/dns/update_record.rb +++ b/lib/fog/rage4/requests/dns/update_record.rb @@ -2,7 +2,6 @@ module Fog module DNS class Rage4 class Real - # Updates an existing record # ==== Parameters # * record_id <~Integer> The id of the record you wish to update @@ -26,12 +25,9 @@ module Fog # * 'id'<~Integer> # * 'error'<~String> - # https://secure.rage4.com/rapi/createrecord/ - def update_record(record_id, name, content, type, options = {}) - path = "/rapi/updaterecord/#{record_id}" path << "?name=#{name}&content=#{content}&type=#{type}" @@ -57,10 +53,7 @@ module Fog :path => path ) end - end - - end end end diff --git a/lib/fog/riakcs/core.rb b/lib/fog/riakcs/core.rb index 51413a2a0..de79d0d73 100644 --- a/lib/fog/riakcs/core.rb +++ b/lib/fog/riakcs/core.rb @@ -3,7 +3,6 @@ require 'fog/json' module Fog module RiakCS - module MultipartUtils require 'net/http' @@ -118,6 +117,5 @@ module Fog service(:provisioning, 'Provisioning') service(:usage, 'Usage') - end end diff --git a/lib/fog/riakcs/provisioning.rb b/lib/fog/riakcs/provisioning.rb index 064a95151..1304efbef 100644 --- a/lib/fog/riakcs/provisioning.rb +++ b/lib/fog/riakcs/provisioning.rb @@ -3,7 +3,6 @@ require 'fog/riakcs/core' module Fog module RiakCS class Provisioning < Fog::Service - class UserAlreadyExists < Fog::RiakCS::Provisioning::Error; end class ServiceUnavailable < Fog::RiakCS::Provisioning::Error; end @@ -92,7 +91,6 @@ module Fog response end end - end end end diff --git a/lib/fog/riakcs/usage.rb b/lib/fog/riakcs/usage.rb index 1f549f7ca..241a1471c 100644 --- a/lib/fog/riakcs/usage.rb +++ b/lib/fog/riakcs/usage.rb @@ -4,7 +4,6 @@ require 'time' module Fog module RiakCS class Usage < Fog::Service - requires :riakcs_access_key_id, :riakcs_secret_access_key recognizes :host, :path, :port, :scheme, :persistent @@ -58,7 +57,6 @@ module Fog ) end end - end end end diff --git a/lib/fog/sakuracloud/compute.rb b/lib/fog/sakuracloud/compute.rb index aba01c0c0..27c92068f 100644 --- a/lib/fog/sakuracloud/compute.rb +++ b/lib/fog/sakuracloud/compute.rb @@ -4,7 +4,6 @@ require 'fog/compute' module Fog module Compute class SakuraCloud < Fog::Service - requires :sakuracloud_api_token requires :sakuracloud_api_token_secret @@ -61,7 +60,6 @@ module Fog def initialize(options = {}) end end - end #SakuraCloud end #Compute end diff --git a/lib/fog/sakuracloud/models/compute/plan.rb b/lib/fog/sakuracloud/models/compute/plan.rb index 5b416d5f8..a1ab79871 100644 --- a/lib/fog/sakuracloud/models/compute/plan.rb +++ b/lib/fog/sakuracloud/models/compute/plan.rb @@ -4,14 +4,11 @@ module Fog module Compute class SakuraCloud class Plan < Fog::Model - identity :id, :aliases => 'ID' attribute :name, :aliases => 'Name' attribute :server_class, :aliases => 'ServiceClass' attribute :cpu, :aliases => 'CPU' attribute :memory_mb, :aliases => 'MemoryMB' - - end end end diff --git a/lib/fog/sakuracloud/models/compute/plans.rb b/lib/fog/sakuracloud/models/compute/plans.rb index fafafb50e..3ba29305c 100644 --- a/lib/fog/sakuracloud/models/compute/plans.rb +++ b/lib/fog/sakuracloud/models/compute/plans.rb @@ -4,7 +4,6 @@ require 'fog/sakuracloud/models/compute/plan' module Fog module Compute class SakuraCloud - class Plans < Fog::Collection model Fog::Compute::SakuraCloud::Plan @@ -17,9 +16,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/sakuracloud/models/compute/server.rb b/lib/fog/sakuracloud/models/compute/server.rb index 2a4f14aef..2ee677a4a 100644 --- a/lib/fog/sakuracloud/models/compute/server.rb +++ b/lib/fog/sakuracloud/models/compute/server.rb @@ -4,7 +4,6 @@ module Fog module Compute class SakuraCloud class Server < Fog::Model - identity :id, :aliases => 'ID' attribute :name, :aliases => 'Name' attribute :server_plan, :aliases => 'ServerPlan' @@ -35,7 +34,6 @@ module Fog true end alias_method :destroy, :delete - end end end diff --git a/lib/fog/sakuracloud/models/compute/servers.rb b/lib/fog/sakuracloud/models/compute/servers.rb index 66830c254..addbb2471 100644 --- a/lib/fog/sakuracloud/models/compute/servers.rb +++ b/lib/fog/sakuracloud/models/compute/servers.rb @@ -4,7 +4,6 @@ require 'fog/sakuracloud/models/compute/server' module Fog module Compute class SakuraCloud - class Servers < Fog::Collection model Fog::Compute::SakuraCloud::Server @@ -59,7 +58,6 @@ module Fog end end end - end end end diff --git a/lib/fog/sakuracloud/models/compute/ssh_key.rb b/lib/fog/sakuracloud/models/compute/ssh_key.rb index 8441c1ccb..46910ed15 100644 --- a/lib/fog/sakuracloud/models/compute/ssh_key.rb +++ b/lib/fog/sakuracloud/models/compute/ssh_key.rb @@ -4,11 +4,9 @@ module Fog module Compute class SakuraCloud class SshKey < Fog::Model - identity :id, :aliases => 'ID' attribute :name, :aliases => 'Name' attribute :public_key, :aliases => 'PublicKey' - end end end diff --git a/lib/fog/sakuracloud/models/compute/ssh_keys.rb b/lib/fog/sakuracloud/models/compute/ssh_keys.rb index 7c985b82c..993740979 100644 --- a/lib/fog/sakuracloud/models/compute/ssh_keys.rb +++ b/lib/fog/sakuracloud/models/compute/ssh_keys.rb @@ -4,7 +4,6 @@ require 'fog/sakuracloud/models/compute/ssh_key' module Fog module Compute class SakuraCloud - class SshKeys < Fog::Collection model Fog::Compute::SakuraCloud::SshKey @@ -17,9 +16,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/sakuracloud/models/compute/zone.rb b/lib/fog/sakuracloud/models/compute/zone.rb index 9ebdc1a73..8f50114d7 100644 --- a/lib/fog/sakuracloud/models/compute/zone.rb +++ b/lib/fog/sakuracloud/models/compute/zone.rb @@ -4,11 +4,9 @@ module Fog module Compute class SakuraCloud class Zone < Fog::Model - identity :id, :aliases => 'ID' attribute :name, :aliases => 'Name' attribute :description, :aliases => 'Description' - end end end diff --git a/lib/fog/sakuracloud/models/compute/zones.rb b/lib/fog/sakuracloud/models/compute/zones.rb index a79b2d556..c9e9867c6 100644 --- a/lib/fog/sakuracloud/models/compute/zones.rb +++ b/lib/fog/sakuracloud/models/compute/zones.rb @@ -4,7 +4,6 @@ require 'fog/sakuracloud/models/compute/zone' module Fog module Compute class SakuraCloud - class Zones < Fog::Collection model Fog::Compute::SakuraCloud::Zone @@ -17,9 +16,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/sakuracloud/models/volume/archive.rb b/lib/fog/sakuracloud/models/volume/archive.rb index 51e1758a5..c9596b9ef 100644 --- a/lib/fog/sakuracloud/models/volume/archive.rb +++ b/lib/fog/sakuracloud/models/volume/archive.rb @@ -4,12 +4,10 @@ module Fog module Volume class SakuraCloud class Archive < Fog::Model - identity :id, :aliases => 'ID' attribute :name, :aliases => 'Name' attribute :size_mb, :aliases => 'SizeMB' attribute :plan, :aliases => 'Plan' - end end end diff --git a/lib/fog/sakuracloud/models/volume/archives.rb b/lib/fog/sakuracloud/models/volume/archives.rb index 49dc1d32c..c5b2fc247 100644 --- a/lib/fog/sakuracloud/models/volume/archives.rb +++ b/lib/fog/sakuracloud/models/volume/archives.rb @@ -4,7 +4,6 @@ require 'fog/sakuracloud/models/volume/archive' module Fog module Volume class SakuraCloud - class Archives < Fog::Collection model Fog::Volume::SakuraCloud::Archive @@ -17,9 +16,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/sakuracloud/models/volume/disk.rb b/lib/fog/sakuracloud/models/volume/disk.rb index 0226b2d90..d28bd650a 100644 --- a/lib/fog/sakuracloud/models/volume/disk.rb +++ b/lib/fog/sakuracloud/models/volume/disk.rb @@ -4,7 +4,6 @@ module Fog module Volume class SakuraCloud class Disk < Fog::Model - identity :id, :aliases => 'ID' attribute :name, :aliases => 'Name' attribute :connection, :aliases => 'Connection' diff --git a/lib/fog/sakuracloud/models/volume/disks.rb b/lib/fog/sakuracloud/models/volume/disks.rb index 7189fa6b5..f58a4feb5 100644 --- a/lib/fog/sakuracloud/models/volume/disks.rb +++ b/lib/fog/sakuracloud/models/volume/disks.rb @@ -4,7 +4,6 @@ require 'fog/sakuracloud/models/volume/disk' module Fog module Volume class SakuraCloud - class Disks < Fog::Collection model Fog::Volume::SakuraCloud::Disk @@ -22,9 +21,7 @@ module Fog service.delete_disk(id) true end - end - end end end diff --git a/lib/fog/sakuracloud/models/volume/plan.rb b/lib/fog/sakuracloud/models/volume/plan.rb index 549af5212..8a15720cc 100644 --- a/lib/fog/sakuracloud/models/volume/plan.rb +++ b/lib/fog/sakuracloud/models/volume/plan.rb @@ -4,10 +4,8 @@ module Fog module Volume class SakuraCloud class Plan < Fog::Model - identity :id, :aliases => 'ID' attribute :name, :aliases => 'Name' - end end end diff --git a/lib/fog/sakuracloud/models/volume/plans.rb b/lib/fog/sakuracloud/models/volume/plans.rb index 30e9589d4..68342adac 100644 --- a/lib/fog/sakuracloud/models/volume/plans.rb +++ b/lib/fog/sakuracloud/models/volume/plans.rb @@ -4,7 +4,6 @@ require 'fog/sakuracloud/models/volume/plan' module Fog module Volume class SakuraCloud - class Plans < Fog::Collection model Fog::Volume::SakuraCloud::Plan @@ -17,9 +16,7 @@ module Fog rescue Fog::Errors::NotFound nil end - end - end end end diff --git a/lib/fog/sakuracloud/requests/compute/boot_server.rb b/lib/fog/sakuracloud/requests/compute/boot_server.rb index f3cc07f9c..8856dd2f0 100644 --- a/lib/fog/sakuracloud/requests/compute/boot_server.rb +++ b/lib/fog/sakuracloud/requests/compute/boot_server.rb @@ -4,7 +4,6 @@ module Fog module Compute class SakuraCloud class Real - def boot_server( id ) request( :headers => { diff --git a/lib/fog/sakuracloud/requests/compute/create_server.rb b/lib/fog/sakuracloud/requests/compute/create_server.rb index d4343e902..617fcf8b4 100644 --- a/lib/fog/sakuracloud/requests/compute/create_server.rb +++ b/lib/fog/sakuracloud/requests/compute/create_server.rb @@ -4,7 +4,6 @@ module Fog module Compute class SakuraCloud class Real - def create_server( name, serverplan ) body = { "Server" => { @@ -16,8 +15,6 @@ module Fog } } - - request( :headers => { 'Authorization' => "Basic #{@auth_encord}" diff --git a/lib/fog/sakuracloud/requests/compute/delete_server.rb b/lib/fog/sakuracloud/requests/compute/delete_server.rb index c08eee8ca..6ef51777b 100644 --- a/lib/fog/sakuracloud/requests/compute/delete_server.rb +++ b/lib/fog/sakuracloud/requests/compute/delete_server.rb @@ -4,7 +4,6 @@ module Fog module Compute class SakuraCloud class Real - def delete_server( id, force = false, disks = [] ) body = { "Force" => force, 'WithDisk' => disks } diff --git a/lib/fog/sakuracloud/requests/compute/stop_server.rb b/lib/fog/sakuracloud/requests/compute/stop_server.rb index 3593daa92..2e8f53bad 100644 --- a/lib/fog/sakuracloud/requests/compute/stop_server.rb +++ b/lib/fog/sakuracloud/requests/compute/stop_server.rb @@ -4,7 +4,6 @@ module Fog module Compute class SakuraCloud class Real - def stop_server( id, force = false ) if force body = { "Force" => true } diff --git a/lib/fog/sakuracloud/requests/volume/attach_disk.rb b/lib/fog/sakuracloud/requests/volume/attach_disk.rb index fbca4b4de..dba26c0fa 100644 --- a/lib/fog/sakuracloud/requests/volume/attach_disk.rb +++ b/lib/fog/sakuracloud/requests/volume/attach_disk.rb @@ -4,9 +4,7 @@ module Fog module Volume class SakuraCloud class Real - def attach_disk( disk_id, server_id ) - request( :headers => { 'Authorization' => "Basic #{@auth_encord}" diff --git a/lib/fog/sakuracloud/requests/volume/configure_disk.rb b/lib/fog/sakuracloud/requests/volume/configure_disk.rb index 300ea236c..0eaddb141 100644 --- a/lib/fog/sakuracloud/requests/volume/configure_disk.rb +++ b/lib/fog/sakuracloud/requests/volume/configure_disk.rb @@ -4,7 +4,6 @@ module Fog module Volume class SakuraCloud class Real - def configure_disk( disk_id, sshkey_id ) body = { "SSHKey" => {"ID" => sshkey_id.to_s } diff --git a/lib/fog/sakuracloud/requests/volume/create_disk.rb b/lib/fog/sakuracloud/requests/volume/create_disk.rb index ab255cb1b..312895aed 100644 --- a/lib/fog/sakuracloud/requests/volume/create_disk.rb +++ b/lib/fog/sakuracloud/requests/volume/create_disk.rb @@ -4,7 +4,6 @@ module Fog module Volume class SakuraCloud class Real - def create_disk( name, plan, sourcearchive ) body = { "Disk" => { diff --git a/lib/fog/sakuracloud/requests/volume/delete_disk.rb b/lib/fog/sakuracloud/requests/volume/delete_disk.rb index 78f74deed..1a3e2dc1b 100644 --- a/lib/fog/sakuracloud/requests/volume/delete_disk.rb +++ b/lib/fog/sakuracloud/requests/volume/delete_disk.rb @@ -4,7 +4,6 @@ module Fog module Volume class SakuraCloud class Real - def delete_disk( id ) request( :headers => { diff --git a/lib/fog/sakuracloud/volume.rb b/lib/fog/sakuracloud/volume.rb index 924f556ca..1d290aefb 100644 --- a/lib/fog/sakuracloud/volume.rb +++ b/lib/fog/sakuracloud/volume.rb @@ -4,7 +4,6 @@ require 'fog/volume' module Fog module Volume class SakuraCloud < Fog::Service - requires :sakuracloud_api_token requires :sakuracloud_api_token_secret @@ -55,7 +54,6 @@ module Fog end class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -84,9 +82,7 @@ module Fog self.class.data.delete(@sakuracloud_api_token) self.class.data.delete(@sakuracloud_api_token_secret) end - end - end #SakuraCloud end #Volume end diff --git a/lib/fog/schema/data_validator.rb b/lib/fog/schema/data_validator.rb index 68a7d7a77..991234573 100644 --- a/lib/fog/schema/data_validator.rb +++ b/lib/fog/schema/data_validator.rb @@ -61,7 +61,6 @@ module Fog # } # class DataValidator - def initialize @message = nil end diff --git a/lib/fog/serverlove/compute.rb b/lib/fog/serverlove/compute.rb index 1cd3d54fd..3bc9d8bd9 100644 --- a/lib/fog/serverlove/compute.rb +++ b/lib/fog/serverlove/compute.rb @@ -3,7 +3,6 @@ require 'fog/serverlove/core' module Fog module Compute class Serverlove < Fog::Service - API_HOST = "api.z1-man.serverlove.com" requires :serverlove_uuid, :serverlove_api_key @@ -40,7 +39,6 @@ module Fog collection :servers class Mock - def initialize(options) @serverlove_uuid = options[:serverlove_uuid] @serverlove_api_key = options[:serverlove_api_key] @@ -49,11 +47,9 @@ module Fog def request(options) raise "Not implemented" end - end class Real - def initialize(options) @api_uuid = options[:serverlove_uuid] || Fog.credentials[:serverlove_uuid] @api_key = options[:serverlove_api_key] || Fog.credentials[:serverlove_api_key] @@ -94,9 +90,7 @@ module Fog raise 'omg' end end - end - end end end diff --git a/lib/fog/serverlove/core.rb b/lib/fog/serverlove/core.rb index ecf261b88..6f05186af 100644 --- a/lib/fog/serverlove/core.rb +++ b/lib/fog/serverlove/core.rb @@ -6,6 +6,5 @@ module Fog extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/lib/fog/serverlove/models/compute/image.rb b/lib/fog/serverlove/models/compute/image.rb index 335719cab..0ad1b2488 100644 --- a/lib/fog/serverlove/models/compute/image.rb +++ b/lib/fog/serverlove/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Serverlove - class Image < Fog::Model - identity :id, :aliases => 'drive' attribute :name @@ -50,7 +48,6 @@ module Fog allowed = [:name, :size] attributes.select {|k,v| allowed.include? k} end - end end end diff --git a/lib/fog/serverlove/models/compute/images.rb b/lib/fog/serverlove/models/compute/images.rb index a9a2a83f6..181e80f7b 100644 --- a/lib/fog/serverlove/models/compute/images.rb +++ b/lib/fog/serverlove/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/serverlove/models/compute/image' module Fog module Compute class Serverlove - class Images < Fog::Collection - model Fog::Compute::Serverlove::Image def all @@ -18,9 +16,7 @@ module Fog data = service.get_image(image_id).body new(data) end - end - end end end diff --git a/lib/fog/serverlove/models/compute/server.rb b/lib/fog/serverlove/models/compute/server.rb index 99c5b6c20..ad18db8ce 100644 --- a/lib/fog/serverlove/models/compute/server.rb +++ b/lib/fog/serverlove/models/compute/server.rb @@ -4,9 +4,7 @@ require 'fog/serverlove/util/compute/password_generator' module Fog module Compute class Serverlove - class Server < Fog::Model - identity :id, :aliases => 'server' attribute :name diff --git a/lib/fog/serverlove/models/compute/servers.rb b/lib/fog/serverlove/models/compute/servers.rb index 55107f11f..3481d33f6 100644 --- a/lib/fog/serverlove/models/compute/servers.rb +++ b/lib/fog/serverlove/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/serverlove/models/compute/server' module Fog module Compute class Serverlove - class Servers < Fog::Collection - model Fog::Compute::Serverlove::Server def all @@ -18,9 +16,7 @@ module Fog data = service.get_server(server_id).body new(data) end - end - end end end diff --git a/lib/fog/serverlove/requests/compute/create_image.rb b/lib/fog/serverlove/requests/compute/create_image.rb index 521185886..f6addb1de 100644 --- a/lib/fog/serverlove/requests/compute/create_image.rb +++ b/lib/fog/serverlove/requests/compute/create_image.rb @@ -2,16 +2,13 @@ module Fog module Compute class Serverlove class Real - def create_image(options) return nil if options.empty? || options.nil? request(:method => "post", :path => "/drives/create", :expects => 200, :options => options) end - end class Mock - def create_image(options = {}) response = Excon::Response.new response.status = 200 @@ -25,7 +22,6 @@ module Fog response.body = data response end - end end end diff --git a/lib/fog/serverlove/requests/compute/create_server.rb b/lib/fog/serverlove/requests/compute/create_server.rb index 0213853b1..cb870af88 100644 --- a/lib/fog/serverlove/requests/compute/create_server.rb +++ b/lib/fog/serverlove/requests/compute/create_server.rb @@ -2,16 +2,13 @@ module Fog module Compute class Serverlove class Real - def create_server(options) return nil if options.empty? || options.nil? request(:method => "post", :path => "/servers/create/stopped", :expects => 200, :options => options) end - end class Mock - def create_server(options = {}) response = Excon::Response.new response.status = 200 @@ -27,7 +24,6 @@ module Fog response.body = data response end - end end end diff --git a/lib/fog/serverlove/requests/compute/destroy_image.rb b/lib/fog/serverlove/requests/compute/destroy_image.rb index d0cc0c2bd..43ad4b65c 100644 --- a/lib/fog/serverlove/requests/compute/destroy_image.rb +++ b/lib/fog/serverlove/requests/compute/destroy_image.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def destroy_image(drive_id) request(:method => "post", :path => "/drives/#{drive_id}/destroy", :expects => 204) end - end end end diff --git a/lib/fog/serverlove/requests/compute/destroy_server.rb b/lib/fog/serverlove/requests/compute/destroy_server.rb index aa1ba713d..69588b578 100644 --- a/lib/fog/serverlove/requests/compute/destroy_server.rb +++ b/lib/fog/serverlove/requests/compute/destroy_server.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def destroy_server(server_id) request(:method => "post", :path => "/servers/#{server_id}/destroy", :expects => 204) end - end end end diff --git a/lib/fog/serverlove/requests/compute/get_image.rb b/lib/fog/serverlove/requests/compute/get_image.rb index 7aa00635b..2b3e8a6fb 100644 --- a/lib/fog/serverlove/requests/compute/get_image.rb +++ b/lib/fog/serverlove/requests/compute/get_image.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def get_image(image_id) request(:method => "get", :path => "/drives/#{image_id}/info", :expects => 200) end - end end end diff --git a/lib/fog/serverlove/requests/compute/get_images.rb b/lib/fog/serverlove/requests/compute/get_images.rb index 771296fc1..e718e6791 100644 --- a/lib/fog/serverlove/requests/compute/get_images.rb +++ b/lib/fog/serverlove/requests/compute/get_images.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def get_images request(:method => "get", :path => "/drives/info", :expects => 200) end - end end end diff --git a/lib/fog/serverlove/requests/compute/get_server.rb b/lib/fog/serverlove/requests/compute/get_server.rb index 5f42e2b3d..9f4716cd4 100644 --- a/lib/fog/serverlove/requests/compute/get_server.rb +++ b/lib/fog/serverlove/requests/compute/get_server.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def get_server(server_id) request(:method => "get", :path => "/servers/#{server_id}/info", :expects => 200) end - end end end diff --git a/lib/fog/serverlove/requests/compute/get_servers.rb b/lib/fog/serverlove/requests/compute/get_servers.rb index 6fe172a68..f7f720484 100644 --- a/lib/fog/serverlove/requests/compute/get_servers.rb +++ b/lib/fog/serverlove/requests/compute/get_servers.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def get_servers request(:method => "get", :path => "/servers/info", :expects => 200) end - end end end diff --git a/lib/fog/serverlove/requests/compute/load_standard_image.rb b/lib/fog/serverlove/requests/compute/load_standard_image.rb index 813378112..a4c64c197 100644 --- a/lib/fog/serverlove/requests/compute/load_standard_image.rb +++ b/lib/fog/serverlove/requests/compute/load_standard_image.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def load_standard_image(destination_image, source_image) request(:method => "post", :path => "/drives/#{destination_image}/image/#{source_image}/gunzip", :expects => 204) end - end end end diff --git a/lib/fog/serverlove/requests/compute/reset_server.rb b/lib/fog/serverlove/requests/compute/reset_server.rb index aef2fd4e4..f680a6550 100644 --- a/lib/fog/serverlove/requests/compute/reset_server.rb +++ b/lib/fog/serverlove/requests/compute/reset_server.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def reset_server(server_id) request(:method => "post", :path => "/servers/#{server_id}/reset", :expects => 204) end - end end end diff --git a/lib/fog/serverlove/requests/compute/shutdown_server.rb b/lib/fog/serverlove/requests/compute/shutdown_server.rb index be91bab97..ed9d85bc9 100644 --- a/lib/fog/serverlove/requests/compute/shutdown_server.rb +++ b/lib/fog/serverlove/requests/compute/shutdown_server.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def shutdown_server(server_id) request(:method => "post", :path => "/servers/#{server_id}/shutdown", :expects => 204) end - end end end diff --git a/lib/fog/serverlove/requests/compute/start_server.rb b/lib/fog/serverlove/requests/compute/start_server.rb index e0084069d..d3c5e2344 100644 --- a/lib/fog/serverlove/requests/compute/start_server.rb +++ b/lib/fog/serverlove/requests/compute/start_server.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def start_server(server_id) request(:method => "post", :path => "/servers/#{server_id}/start", :expects => 200) end - end end end diff --git a/lib/fog/serverlove/requests/compute/stop_server.rb b/lib/fog/serverlove/requests/compute/stop_server.rb index da181a1ce..e7a8613f0 100644 --- a/lib/fog/serverlove/requests/compute/stop_server.rb +++ b/lib/fog/serverlove/requests/compute/stop_server.rb @@ -2,11 +2,9 @@ module Fog module Compute class Serverlove class Real - def stop_server(server_id) request(:method => "post", :path => "/servers/#{server_id}/stop", :expects => 204) end - end end end diff --git a/lib/fog/serverlove/requests/compute/update_image.rb b/lib/fog/serverlove/requests/compute/update_image.rb index be344c339..8d682394c 100644 --- a/lib/fog/serverlove/requests/compute/update_image.rb +++ b/lib/fog/serverlove/requests/compute/update_image.rb @@ -2,13 +2,11 @@ module Fog module Compute class Serverlove class Real - def update_image(identifier, options) return nil if identifier.nil? || identifier == "" return nil if options.empty? || options.nil? request(:method => "post", :path => "/drives/#{identifier}/set", :expects => 200, :options => options) end - end end end diff --git a/lib/fog/serverlove/requests/compute/update_server.rb b/lib/fog/serverlove/requests/compute/update_server.rb index eef5d3f1f..96b8a93ce 100644 --- a/lib/fog/serverlove/requests/compute/update_server.rb +++ b/lib/fog/serverlove/requests/compute/update_server.rb @@ -2,13 +2,11 @@ module Fog module Compute class Serverlove class Real - def update_server(identifier, options) return nil if identifier.nil? || identifier == "" return nil if options.empty? || options.nil? request(:method => "post", :path => "/servers/#{identifier}/set", :expects => 200, :options => options) end - end end end diff --git a/lib/fog/storm_on_demand/account.rb b/lib/fog/storm_on_demand/account.rb index 6c728ba45..309aab9ea 100644 --- a/lib/fog/storm_on_demand/account.rb +++ b/lib/fog/storm_on_demand/account.rb @@ -3,9 +3,7 @@ require 'fog/storm_on_demand/shared' module Fog module Account - class StormOnDemand < Fog::Service - requires :storm_on_demand_username, :storm_on_demand_password recognizes :storm_on_demand_auth_url @@ -18,7 +16,6 @@ module Fog request :expire_token class Mock - def self.data @data ||= Hash.new end @@ -44,13 +41,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/storm_on_demand/billing.rb b/lib/fog/storm_on_demand/billing.rb index cb772ad35..c26cfc475 100644 --- a/lib/fog/storm_on_demand/billing.rb +++ b/lib/fog/storm_on_demand/billing.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/shared' module Fog module Billing class StormOnDemand < Fog::Service - requires :storm_on_demand_username, :storm_on_demand_password recognizes :storm_on_demand_auth_url @@ -21,7 +20,6 @@ module Fog request :make_payment class Mock - def self.data @data ||= Hash.new end @@ -47,13 +45,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/storm_on_demand/compute.rb b/lib/fog/storm_on_demand/compute.rb index 74f0ff632..8fee8cf4a 100644 --- a/lib/fog/storm_on_demand/compute.rb +++ b/lib/fog/storm_on_demand/compute.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/shared' module Fog module Compute class StormOnDemand < Fog::Service - requires :storm_on_demand_username, :storm_on_demand_password recognizes :storm_on_demand_auth_url @@ -62,7 +61,6 @@ module Fog request :resolve_notification class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = { @@ -97,13 +95,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/storm_on_demand/core.rb b/lib/fog/storm_on_demand/core.rb index f3ad8ae1e..5c1becf04 100644 --- a/lib/fog/storm_on_demand/core.rb +++ b/lib/fog/storm_on_demand/core.rb @@ -3,7 +3,6 @@ require 'fog/json' module Fog module StormOnDemand - extend Fog::Provider service(:compute, 'Compute') @@ -15,7 +14,6 @@ module Fog service(:support, 'Support') service(:account, 'Account') service(:vpn, 'VPN') - end end diff --git a/lib/fog/storm_on_demand/dns.rb b/lib/fog/storm_on_demand/dns.rb index 38beb46f5..661e23ea5 100644 --- a/lib/fog/storm_on_demand/dns.rb +++ b/lib/fog/storm_on_demand/dns.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/shared' module Fog module DNS class StormOnDemand < Fog::Service - API_URL = 'https://api.stormondemand.com' API_VERSION = 'v1' @@ -45,7 +44,6 @@ module Fog request :update_zone class Mock - def self.data @data ||= Hash.new end @@ -71,13 +69,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/storm_on_demand/models/account/token.rb b/lib/fog/storm_on_demand/models/account/token.rb index 6768c93e2..bd87a0b39 100644 --- a/lib/fog/storm_on_demand/models/account/token.rb +++ b/lib/fog/storm_on_demand/models/account/token.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Account class StormOnDemand - class Token < Fog::Model attribute :token attribute :expires @@ -15,9 +14,7 @@ module Fog def expire service.expire_token.body['expired'].to_i == 1 ? true : false end - end - end end end diff --git a/lib/fog/storm_on_demand/models/account/tokens.rb b/lib/fog/storm_on_demand/models/account/tokens.rb index dd52966b5..70751fd82 100644 --- a/lib/fog/storm_on_demand/models/account/tokens.rb +++ b/lib/fog/storm_on_demand/models/account/tokens.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/account/token' module Fog module Account class StormOnDemand - class Tokens < Fog::Collection model Fog::Account::StormOnDemand::Token @@ -12,9 +11,7 @@ module Fog t = service.create_token(options).body new(t) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/billing/invoice.rb b/lib/fog/storm_on_demand/models/billing/invoice.rb index 6d39cc54e..32b4df15c 100644 --- a/lib/fog/storm_on_demand/models/billing/invoice.rb +++ b/lib/fog/storm_on_demand/models/billing/invoice.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Billing class StormOnDemand - class Invoice < Fog::Model identity :id attribute :accnt @@ -20,9 +19,7 @@ module Fog def initialize(attributes={}) super end - end - end end end diff --git a/lib/fog/storm_on_demand/models/billing/invoices.rb b/lib/fog/storm_on_demand/models/billing/invoices.rb index f62b7662f..9782741d1 100644 --- a/lib/fog/storm_on_demand/models/billing/invoices.rb +++ b/lib/fog/storm_on_demand/models/billing/invoices.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/billing/invoice' module Fog module Billing class StormOnDemand - class Invoices < Fog::Collection model Fog::Billing::StormOnDemand::Invoice @@ -22,9 +21,7 @@ module Fog invoice = service.next_invoice.body new(invoice) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/billing/payment.rb b/lib/fog/storm_on_demand/models/billing/payment.rb index d7c3074d5..eceefd1e0 100644 --- a/lib/fog/storm_on_demand/models/billing/payment.rb +++ b/lib/fog/storm_on_demand/models/billing/payment.rb @@ -3,15 +3,11 @@ require 'fog/core/model' module Fog module Billing class StormOnDemand - class Payment < Fog::Model - def initialize(attributes={}) super end - end - end end end diff --git a/lib/fog/storm_on_demand/models/billing/payments.rb b/lib/fog/storm_on_demand/models/billing/payments.rb index 230c69d54..8ab6ad66e 100644 --- a/lib/fog/storm_on_demand/models/billing/payments.rb +++ b/lib/fog/storm_on_demand/models/billing/payments.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/billing/payment' module Fog module Billing class StormOnDemand - class Payments < Fog::Collection model Fog::Billing::StormOnDemand::Payment @@ -13,7 +12,6 @@ module Fog :card_code => card_code).body['amount'] end end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/config.rb b/lib/fog/storm_on_demand/models/compute/config.rb index cf0d34db3..6d88c6626 100644 --- a/lib/fog/storm_on_demand/models/compute/config.rb +++ b/lib/fog/storm_on_demand/models/compute/config.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class StormOnDemand - class Config < Fog::Model identity :id @@ -32,7 +31,6 @@ module Fog def initialize(attributes={}) super end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/configs.rb b/lib/fog/storm_on_demand/models/compute/configs.rb index eb0768e3c..35e568137 100644 --- a/lib/fog/storm_on_demand/models/compute/configs.rb +++ b/lib/fog/storm_on_demand/models/compute/configs.rb @@ -4,9 +4,7 @@ require 'fog/storm_on_demand/models/compute/config' module Fog module Compute class StormOnDemand - class Configs < Fog::Collection - model Fog::Compute::StormOnDemand::Config def all(options={}) @@ -18,9 +16,7 @@ module Fog data = service.get_config_details(:id => config_id).body new(data) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/image.rb b/lib/fog/storm_on_demand/models/compute/image.rb index 9cfe6bf11..565af4903 100644 --- a/lib/fog/storm_on_demand/models/compute/image.rb +++ b/lib/fog/storm_on_demand/models/compute/image.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class StormOnDemand - class Image < Fog::Model identity :id attribute :accnt @@ -16,7 +15,6 @@ module Fog attribute :template_description attribute :time_taken - def destroy requires :identity service.delete_image(:id => identity) @@ -33,9 +31,7 @@ module Fog service.restore_image({:id => identity}.merge!(options)) true end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/images.rb b/lib/fog/storm_on_demand/models/compute/images.rb index b1dba372d..8a8295cbb 100644 --- a/lib/fog/storm_on_demand/models/compute/images.rb +++ b/lib/fog/storm_on_demand/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/storm_on_demand/models/compute/image' module Fog module Compute class StormOnDemand - class Images < Fog::Collection - model Fog::Compute::StormOnDemand::Image def create(options={}) @@ -23,9 +21,7 @@ module Fog data = service.list_images(options).body['items'] load(data) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/notification.rb b/lib/fog/storm_on_demand/models/compute/notification.rb index eae1b0b90..417283a78 100644 --- a/lib/fog/storm_on_demand/models/compute/notification.rb +++ b/lib/fog/storm_on_demand/models/compute/notification.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class StormOnDemand - class Notification < Fog::Model identity :id attribute :category @@ -26,9 +25,7 @@ module Fog requires :identity service.resolve_notification(:id => identity).body end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/notifications.rb b/lib/fog/storm_on_demand/models/compute/notifications.rb index 76a969701..cced0a8e6 100644 --- a/lib/fog/storm_on_demand/models/compute/notifications.rb +++ b/lib/fog/storm_on_demand/models/compute/notifications.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/compute/notification' module Fog module Compute class StormOnDemand - class Notifications < Fog::Collection model Fog::Compute::StormOnDemand::Notification @@ -22,9 +21,7 @@ module Fog data = service.get_notification(options).body new(data) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/product.rb b/lib/fog/storm_on_demand/models/compute/product.rb index 9535eb962..8ea08f43d 100644 --- a/lib/fog/storm_on_demand/models/compute/product.rb +++ b/lib/fog/storm_on_demand/models/compute/product.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class StormOnDemand - class Product < Fog::Model identity :code attribute :alias @@ -32,9 +31,7 @@ module Fog requires :identity service.get_product_starting_price(:code => identity).body['items'] end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/products.rb b/lib/fog/storm_on_demand/models/compute/products.rb index 59bcfca8e..460e99c19 100644 --- a/lib/fog/storm_on_demand/models/compute/products.rb +++ b/lib/fog/storm_on_demand/models/compute/products.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/compute/product' module Fog module Compute class StormOnDemand - class Products < Fog::Collection model Fog::Compute::StormOnDemand::Product @@ -20,9 +19,7 @@ module Fog def all(options={}) service.list_products(options).body['items'] end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/server.rb b/lib/fog/storm_on_demand/models/compute/server.rb index 2722123ee..348eb0b90 100644 --- a/lib/fog/storm_on_demand/models/compute/server.rb +++ b/lib/fog/storm_on_demand/models/compute/server.rb @@ -3,7 +3,6 @@ require 'fog/compute/models/server' module Fog module Compute class StormOnDemand - class Server < Fog::Compute::Server identity :uniq_id @@ -86,9 +85,7 @@ module Fog requires :identity service.update_server({:uniq_id => identity}.merge!(options)).body end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/servers.rb b/lib/fog/storm_on_demand/models/compute/servers.rb index 2cca03223..f68567f6f 100644 --- a/lib/fog/storm_on_demand/models/compute/servers.rb +++ b/lib/fog/storm_on_demand/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/storm_on_demand/models/compute/server' module Fog module Compute class StormOnDemand - class Servers < Fog::Collection - model Fog::Compute::StormOnDemand::Server def all(options={}) @@ -23,9 +21,7 @@ module Fog server = service.create_server(options).body new(server) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/template.rb b/lib/fog/storm_on_demand/models/compute/template.rb index 98a58cb3b..74dc09df3 100644 --- a/lib/fog/storm_on_demand/models/compute/template.rb +++ b/lib/fog/storm_on_demand/models/compute/template.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class StormOnDemand - class Template < Fog::Model identity :id attribute :name @@ -22,7 +21,6 @@ module Fog requires :identity service.restore_template({:id => identity}.merge!(options)) end - end end end diff --git a/lib/fog/storm_on_demand/models/compute/templates.rb b/lib/fog/storm_on_demand/models/compute/templates.rb index 5b28623ea..1228fc9c2 100644 --- a/lib/fog/storm_on_demand/models/compute/templates.rb +++ b/lib/fog/storm_on_demand/models/compute/templates.rb @@ -4,9 +4,7 @@ require 'fog/storm_on_demand/models/compute/template' module Fog module Compute class StormOnDemand - class Templates < Fog::Collection - model Fog::Compute::StormOnDemand::Template def all(options={}) @@ -18,9 +16,7 @@ module Fog tpl = service.get_template_details(:id => template_id).body new(tpl) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/dns/domain.rb b/lib/fog/storm_on_demand/models/dns/domain.rb index ef0374b71..f219dfea3 100644 --- a/lib/fog/storm_on_demand/models/dns/domain.rb +++ b/lib/fog/storm_on_demand/models/dns/domain.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class StormOnDemand - class Domain < Fog::Model identity :domain attribute :admin_handle @@ -26,9 +25,7 @@ module Fog service.renew_domain(:domain => identity, :years => years) true end - end - end end end diff --git a/lib/fog/storm_on_demand/models/dns/domains.rb b/lib/fog/storm_on_demand/models/dns/domains.rb index 5d8500f07..45d09eadb 100644 --- a/lib/fog/storm_on_demand/models/dns/domains.rb +++ b/lib/fog/storm_on_demand/models/dns/domains.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/dns/domain' module Fog module DNS class StormOnDemand - class Domains < Fog::Collection model Fog::DNS::StormOnDemand::Domain @@ -12,9 +11,7 @@ module Fog domains = service.list_domains(options).body['items'] load(domains) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/dns/record.rb b/lib/fog/storm_on_demand/models/dns/record.rb index ee034d341..c2e2a4a03 100644 --- a/lib/fog/storm_on_demand/models/dns/record.rb +++ b/lib/fog/storm_on_demand/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class StormOnDemand - class Record < Fog::Model identity :id attribute :adminEmail @@ -56,9 +55,7 @@ module Fog requires :identity service.update_record_region({:record_id => identity}.merge!(options)) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/dns/records.rb b/lib/fog/storm_on_demand/models/dns/records.rb index 297f02d32..8b06908a2 100644 --- a/lib/fog/storm_on_demand/models/dns/records.rb +++ b/lib/fog/storm_on_demand/models/dns/records.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/dns/record' module Fog module DNS class StormOnDemand - class Records < Fog::Collection model Fog::DNS::StormOnDemand::Record @@ -22,9 +21,7 @@ module Fog recs = service.list_records(options).body['items'] load(recs) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/dns/reverse.rb b/lib/fog/storm_on_demand/models/dns/reverse.rb index 5df7ddd7a..30dd38d5e 100644 --- a/lib/fog/storm_on_demand/models/dns/reverse.rb +++ b/lib/fog/storm_on_demand/models/dns/reverse.rb @@ -4,11 +4,9 @@ module Fog module DNS class StormOnDemand class Reverse < Fog::Model - def initialize(attributes={}) super end - end end end diff --git a/lib/fog/storm_on_demand/models/dns/reverses.rb b/lib/fog/storm_on_demand/models/dns/reverses.rb index 230583163..e3e978629 100644 --- a/lib/fog/storm_on_demand/models/dns/reverses.rb +++ b/lib/fog/storm_on_demand/models/dns/reverses.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/dns/reverse' module Fog module DNS class StormOnDemand - class Reverses < Fog::Collection model Fog::DNS::StormOnDemand::Reverse @@ -15,9 +14,7 @@ module Fog def update(options) service.update_reverse(options).body end - end - end end end diff --git a/lib/fog/storm_on_demand/models/dns/zone.rb b/lib/fog/storm_on_demand/models/dns/zone.rb index 5e3992d49..5cb72584d 100644 --- a/lib/fog/storm_on_demand/models/dns/zone.rb +++ b/lib/fog/storm_on_demand/models/dns/zone.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class StormOnDemand - class Zone < Fog::Model identity :id attribute :active @@ -33,7 +32,6 @@ module Fog requires :identity service.update_zone({:id => identity}.merge!(options)) end - end end end diff --git a/lib/fog/storm_on_demand/models/dns/zones.rb b/lib/fog/storm_on_demand/models/dns/zones.rb index 88aa8a58e..8647587a5 100644 --- a/lib/fog/storm_on_demand/models/dns/zones.rb +++ b/lib/fog/storm_on_demand/models/dns/zones.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/dns/zone' module Fog module DNS class StormOnDemand - class Zones < Fog::Collection model Fog::DNS::StormOnDemand::Zone @@ -22,9 +21,7 @@ module Fog zones = service.list_zones(options).body['items'] load(zones) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/monitoring/bandwidth.rb b/lib/fog/storm_on_demand/models/monitoring/bandwidth.rb index 23a64616f..50d716cf4 100644 --- a/lib/fog/storm_on_demand/models/monitoring/bandwidth.rb +++ b/lib/fog/storm_on_demand/models/monitoring/bandwidth.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Monitoring class StormOnDemand - class Bandwidth < Fog::Model attribute :actual attribute :averages @@ -15,9 +14,7 @@ module Fog def initialize(attributes={}) super end - end - end end end diff --git a/lib/fog/storm_on_demand/models/monitoring/bandwidths.rb b/lib/fog/storm_on_demand/models/monitoring/bandwidths.rb index 04a9fcd4b..509abc775 100644 --- a/lib/fog/storm_on_demand/models/monitoring/bandwidths.rb +++ b/lib/fog/storm_on_demand/models/monitoring/bandwidths.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/monitoring/bandwidth' module Fog module Monitoring class StormOnDemand - class Bandwidths < Fog::Collection model Fog::Monitoring::StormOnDemand::Bandwidth @@ -16,7 +15,6 @@ module Fog bw = service.get_bandwidth_stats(:uniq_id => uniq_id).body new(bw) end - end end end diff --git a/lib/fog/storm_on_demand/models/monitoring/load.rb b/lib/fog/storm_on_demand/models/monitoring/load.rb index 47b2cdac1..30f359d34 100644 --- a/lib/fog/storm_on_demand/models/monitoring/load.rb +++ b/lib/fog/storm_on_demand/models/monitoring/load.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Monitoring class StormOnDemand - class Load < Fog::Model attribute :disk attribute :domain @@ -15,9 +14,7 @@ module Fog def initialize(attributes={}) super end - end - end end end diff --git a/lib/fog/storm_on_demand/models/monitoring/loads.rb b/lib/fog/storm_on_demand/models/monitoring/loads.rb index 56919d1e5..c896f4ac9 100644 --- a/lib/fog/storm_on_demand/models/monitoring/loads.rb +++ b/lib/fog/storm_on_demand/models/monitoring/loads.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/monitoring/load' module Fog module Monitoring class StormOnDemand - class Loads < Fog::Collection model Fog::Monitoring::StormOnDemand::Load @@ -16,9 +15,7 @@ module Fog load = service.get_load_stats(:uniq_id => uniq_id).body new(load) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/monitoring/monitor_service.rb b/lib/fog/storm_on_demand/models/monitoring/monitor_service.rb index a0b8c1548..2b6cff510 100644 --- a/lib/fog/storm_on_demand/models/monitoring/monitor_service.rb +++ b/lib/fog/storm_on_demand/models/monitoring/monitor_service.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Monitoring class StormOnDemand - class MonitorService < Fog::Model attribute :can_monitor attribute :enabled @@ -14,9 +13,7 @@ module Fog def initialize(attributes={}) super end - end - end end end diff --git a/lib/fog/storm_on_demand/models/monitoring/monitor_services.rb b/lib/fog/storm_on_demand/models/monitoring/monitor_services.rb index add4aaccb..9bc09da50 100644 --- a/lib/fog/storm_on_demand/models/monitoring/monitor_services.rb +++ b/lib/fog/storm_on_demand/models/monitoring/monitor_services.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/monitoring/monitor_service' module Fog module Monitoring class StormOnDemand - class MonitorServices < Fog::Collection model Fog::Monitoring::StormOnDemand::MonitorService @@ -25,7 +24,6 @@ module Fog status = service.update_service(options).body new(status) end - end end end diff --git a/lib/fog/storm_on_demand/models/network/balancer.rb b/lib/fog/storm_on_demand/models/network/balancer.rb index c61637b09..d4ab6de62 100644 --- a/lib/fog/storm_on_demand/models/network/balancer.rb +++ b/lib/fog/storm_on_demand/models/network/balancer.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Network class StormOnDemand - class Balancer < Fog::Model - identity :uniq_id attribute :capabilities @@ -52,9 +50,7 @@ module Fog requires :identity service.update_balancer({:uniq_id => identity}.merge!(options)) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/network/balancers.rb b/lib/fog/storm_on_demand/models/network/balancers.rb index 3c863ca43..6fdf15407 100644 --- a/lib/fog/storm_on_demand/models/network/balancers.rb +++ b/lib/fog/storm_on_demand/models/network/balancers.rb @@ -4,9 +4,7 @@ require 'fog/storm_on_demand/models/network/balancer' module Fog module Network class StormOnDemand - class Balancers < Fog::Collection - model Fog::Network::StormOnDemand::Balancer def all(options={}) @@ -36,9 +34,7 @@ module Fog def strategies service.get_balancer_strategies.body['strategies'] end - end - end end end diff --git a/lib/fog/storm_on_demand/models/network/firewall.rb b/lib/fog/storm_on_demand/models/network/firewall.rb index 3b52f854f..9487f5819 100644 --- a/lib/fog/storm_on_demand/models/network/firewall.rb +++ b/lib/fog/storm_on_demand/models/network/firewall.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Network class StormOnDemand - class Firewall < Fog::Model attribute :allow attribute :rules @@ -13,7 +12,6 @@ module Fog def initialize(attributes={}) super end - end end end diff --git a/lib/fog/storm_on_demand/models/network/firewalls.rb b/lib/fog/storm_on_demand/models/network/firewalls.rb index a32c0cdf7..21a4b4b54 100644 --- a/lib/fog/storm_on_demand/models/network/firewalls.rb +++ b/lib/fog/storm_on_demand/models/network/firewalls.rb @@ -25,7 +25,6 @@ module Fog service.update_firewall(options) true end - end end end diff --git a/lib/fog/storm_on_demand/models/network/network_ip.rb b/lib/fog/storm_on_demand/models/network/network_ip.rb index 445b16f3d..cfb766264 100644 --- a/lib/fog/storm_on_demand/models/network/network_ip.rb +++ b/lib/fog/storm_on_demand/models/network/network_ip.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Network class StormOnDemand - class NetworkIP < Fog::Model identity :id @@ -16,7 +15,6 @@ module Fog def initialize(attributes={}) super end - end end end diff --git a/lib/fog/storm_on_demand/models/network/network_ips.rb b/lib/fog/storm_on_demand/models/network/network_ips.rb index a608f0ebc..cc0fa6a0d 100644 --- a/lib/fog/storm_on_demand/models/network/network_ips.rb +++ b/lib/fog/storm_on_demand/models/network/network_ips.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/network/network_ip' module Fog module Network class StormOnDemand - class NetworkIPs < Fog::Collection model Fog::Network::StormOnDemand::NetworkIP @@ -41,7 +40,6 @@ module Fog service.request_new_ips(options) true end - end end end diff --git a/lib/fog/storm_on_demand/models/network/pool.rb b/lib/fog/storm_on_demand/models/network/pool.rb index a78f8ea59..092b2c028 100644 --- a/lib/fog/storm_on_demand/models/network/pool.rb +++ b/lib/fog/storm_on_demand/models/network/pool.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Network class StormOnDemand - class Pool < Fog::Model identity :uniq_id attribute :accnt @@ -25,7 +24,6 @@ module Fog requires :identity service.update_pool({:uniq_id => identity}.merge!(options)) end - end end end diff --git a/lib/fog/storm_on_demand/models/network/pools.rb b/lib/fog/storm_on_demand/models/network/pools.rb index 3e4f4e9da..f83d8e66d 100644 --- a/lib/fog/storm_on_demand/models/network/pools.rb +++ b/lib/fog/storm_on_demand/models/network/pools.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/network/pool' module Fog module Network class StormOnDemand - class Pools < Fog::Collection model Fog::Network::StormOnDemand::Pool @@ -21,7 +20,6 @@ module Fog def get_assignments(options={}) service.get_assignments(options).body['items'] end - end end end diff --git a/lib/fog/storm_on_demand/models/network/private_ip.rb b/lib/fog/storm_on_demand/models/network/private_ip.rb index 9f803b6bd..c739153ab 100644 --- a/lib/fog/storm_on_demand/models/network/private_ip.rb +++ b/lib/fog/storm_on_demand/models/network/private_ip.rb @@ -3,16 +3,13 @@ require 'fog/core/model' module Fog module Network class StormOnDemand - class PrivateIp < Fog::Model attribute :zones def initialize(attributes={}) super end - end - end end end diff --git a/lib/fog/storm_on_demand/models/network/private_ips.rb b/lib/fog/storm_on_demand/models/network/private_ips.rb index 2b5b2ce79..8bb3f9c65 100644 --- a/lib/fog/storm_on_demand/models/network/private_ips.rb +++ b/lib/fog/storm_on_demand/models/network/private_ips.rb @@ -4,9 +4,7 @@ require 'fog/storm_on_demand/models/network/private_ip' module Fog module Network class StormOnDemand - class PrivateIps < Fog::Collection - model Fog::Network::StormOnDemand::PrivateIp def all @@ -32,9 +30,7 @@ module Fog r = service.check_server_attached(:uniq_id => server_id).body r['is_attached'].to_i == 1 ? true : false end - end - end end end diff --git a/lib/fog/storm_on_demand/models/network/ruleset.rb b/lib/fog/storm_on_demand/models/network/ruleset.rb index 7b94d6fbe..7d117d401 100644 --- a/lib/fog/storm_on_demand/models/network/ruleset.rb +++ b/lib/fog/storm_on_demand/models/network/ruleset.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Network class StormOnDemand - class Ruleset < Fog::Model attribute :accnt attribute :destination_ip @@ -20,7 +19,6 @@ module Fog service.update_ruleset(:ruleset => ruleset, :rules => rules) true end - end end end diff --git a/lib/fog/storm_on_demand/models/network/rulesets.rb b/lib/fog/storm_on_demand/models/network/rulesets.rb index 9b936b8e6..f4a280b37 100644 --- a/lib/fog/storm_on_demand/models/network/rulesets.rb +++ b/lib/fog/storm_on_demand/models/network/rulesets.rb @@ -21,7 +21,6 @@ module Fog r = service.list_rulesets(options).body['item'] load(r) end - end end end diff --git a/lib/fog/storm_on_demand/models/network/zone.rb b/lib/fog/storm_on_demand/models/network/zone.rb index a98111bbf..78918d0ba 100644 --- a/lib/fog/storm_on_demand/models/network/zone.rb +++ b/lib/fog/storm_on_demand/models/network/zone.rb @@ -3,7 +3,6 @@ require "fog/core/model" module Fog module Network class StormOnDemand - class Zone < Fog::Model identity :id attribute :is_default @@ -20,7 +19,6 @@ module Fog requires :identity service.set_default_zone(:id => identity) end - end end end diff --git a/lib/fog/storm_on_demand/models/network/zones.rb b/lib/fog/storm_on_demand/models/network/zones.rb index fabd454d5..08a9f8910 100644 --- a/lib/fog/storm_on_demand/models/network/zones.rb +++ b/lib/fog/storm_on_demand/models/network/zones.rb @@ -4,7 +4,6 @@ require "fog/storm_on_demand/models/network/zone" module Fog module Network class StormOnDemand - class Zones < Fog::Collection model Fog::Network::StormOnDemand::Zone @@ -17,7 +16,6 @@ module Fog data = service.list_zones(options).body load(data) end - end end end diff --git a/lib/fog/storm_on_demand/models/storage/cluster.rb b/lib/fog/storm_on_demand/models/storage/cluster.rb index 653502349..def212d89 100644 --- a/lib/fog/storm_on_demand/models/storage/cluster.rb +++ b/lib/fog/storm_on_demand/models/storage/cluster.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Storage class StormOnDemand - class Cluster < Fog::Model identity :id attribute :description @@ -12,9 +11,7 @@ module Fog def initialize(attributes={}) super end - end - end end end diff --git a/lib/fog/storm_on_demand/models/storage/clusters.rb b/lib/fog/storm_on_demand/models/storage/clusters.rb index 066a1827b..91b810c20 100644 --- a/lib/fog/storm_on_demand/models/storage/clusters.rb +++ b/lib/fog/storm_on_demand/models/storage/clusters.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/storage/cluster' module Fog module Storage class StormOnDemand - class Clusters < Fog::Collection model Fog::Storage::StormOnDemand::Cluster @@ -12,9 +11,7 @@ module Fog data = service.list_clusters(options).body['items'] load(data) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/storage/volume.rb b/lib/fog/storm_on_demand/models/storage/volume.rb index 0ab7971b6..52c9ebd9c 100644 --- a/lib/fog/storm_on_demand/models/storage/volume.rb +++ b/lib/fog/storm_on_demand/models/storage/volume.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Storage class StormOnDemand - class Volume < Fog::Model identity :uniq_id attribute :attachedTo @@ -46,9 +45,7 @@ module Fog requires :identity service.update_volume({:uniq_id => identity}.merge!(options)) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/storage/volumes.rb b/lib/fog/storm_on_demand/models/storage/volumes.rb index 8eab04c8f..dce8e6763 100644 --- a/lib/fog/storm_on_demand/models/storage/volumes.rb +++ b/lib/fog/storm_on_demand/models/storage/volumes.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/storage/volume' module Fog module Storage class StormOnDemand - class Volumes < Fog::Collection model Fog::Storage::StormOnDemand::Volume @@ -22,9 +21,7 @@ module Fog vols = service.list_volumes(options).body['items'] load(vols) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/support/alert.rb b/lib/fog/storm_on_demand/models/support/alert.rb index 978a81bce..f9a254389 100644 --- a/lib/fog/storm_on_demand/models/support/alert.rb +++ b/lib/fog/storm_on_demand/models/support/alert.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Support class StormOnDemand - class Alert < Fog::Model attribute :message attribute :subject @@ -11,9 +10,7 @@ module Fog def initialize(attributes={}) super end - end - end end end diff --git a/lib/fog/storm_on_demand/models/support/alerts.rb b/lib/fog/storm_on_demand/models/support/alerts.rb index 768346a12..34b0f1c8d 100644 --- a/lib/fog/storm_on_demand/models/support/alerts.rb +++ b/lib/fog/storm_on_demand/models/support/alerts.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/support/alert' module Fog module Support class StormOnDemand - class Alerts < Fog::Collection model Fog::Support::StormOnDemand::Alert @@ -12,9 +11,7 @@ module Fog alert = service.get_active_alert.body['active_alert'] new(alert) end - end - end end end diff --git a/lib/fog/storm_on_demand/models/support/ticket.rb b/lib/fog/storm_on_demand/models/support/ticket.rb index 2f36378f8..cb2afbba1 100644 --- a/lib/fog/storm_on_demand/models/support/ticket.rb +++ b/lib/fog/storm_on_demand/models/support/ticket.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Support class StormOnDemand - class Ticket < Fog::Model identity :id attribute :accnt @@ -65,10 +64,7 @@ module Fog :secid => secid}.merge!(options)).body res['reply'].to_i == 1 ? true : false end - - end - end end end diff --git a/lib/fog/storm_on_demand/models/support/tickets.rb b/lib/fog/storm_on_demand/models/support/tickets.rb index 2df5ac9c0..6abd7edbe 100644 --- a/lib/fog/storm_on_demand/models/support/tickets.rb +++ b/lib/fog/storm_on_demand/models/support/tickets.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/models/support/ticket' module Fog module Support class StormOnDemand - class Tickets < Fog::Collection model Fog::Support::StormOnDemand::Ticket @@ -25,9 +24,7 @@ module Fog def types service.list_ticket_types.body['types'] end - end - end end end diff --git a/lib/fog/storm_on_demand/models/vpn/vpn.rb b/lib/fog/storm_on_demand/models/vpn/vpn.rb index 617fe75f9..6799fad60 100644 --- a/lib/fog/storm_on_demand/models/vpn/vpn.rb +++ b/lib/fog/storm_on_demand/models/vpn/vpn.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module VPN class StormOnDemand - class Vpn < Fog::Model identity :uniq_id attribute :active @@ -23,7 +22,6 @@ module Fog requires :identity service.update_vpn({:uniq_id => identity}.merge!(options)) end - end end end diff --git a/lib/fog/storm_on_demand/models/vpn/vpns.rb b/lib/fog/storm_on_demand/models/vpn/vpns.rb index 5ef45d2eb..3c475486a 100644 --- a/lib/fog/storm_on_demand/models/vpn/vpns.rb +++ b/lib/fog/storm_on_demand/models/vpn/vpns.rb @@ -20,7 +20,6 @@ module Fog def all_users(options={}) service.list_vpn_users(options).body['items'] end - end end end diff --git a/lib/fog/storm_on_demand/monitoring.rb b/lib/fog/storm_on_demand/monitoring.rb index 13de2da93..83edf85a2 100644 --- a/lib/fog/storm_on_demand/monitoring.rb +++ b/lib/fog/storm_on_demand/monitoring.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/shared' module Fog module Monitoring class StormOnDemand < Fog::Service - requires :storm_on_demand_username, :storm_on_demand_password recognizes :storm_on_demand_auth_url @@ -26,9 +25,7 @@ module Fog request :get_service_status request :update_service - class Mock - def self.data @data ||= Hash.new end @@ -54,13 +51,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/storm_on_demand/network.rb b/lib/fog/storm_on_demand/network.rb index 547f116a7..93fb0af72 100644 --- a/lib/fog/storm_on_demand/network.rb +++ b/lib/fog/storm_on_demand/network.rb @@ -4,7 +4,6 @@ require 'fog/storm_on_demand/shared' module Fog module Network class StormOnDemand < Fog::Service - requires :storm_on_demand_username, :storm_on_demand_password recognizes :storm_on_demand_auth_url @@ -73,7 +72,6 @@ module Fog request :set_default_zone class Mock - def self.data @data ||= Hash.new end @@ -99,13 +97,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/storm_on_demand/requests/account/create_token.rb b/lib/fog/storm_on_demand/requests/account/create_token.rb index 8055f62d7..973011097 100644 --- a/lib/fog/storm_on_demand/requests/account/create_token.rb +++ b/lib/fog/storm_on_demand/requests/account/create_token.rb @@ -2,14 +2,12 @@ module Fog module Account class StormOnDemand class Real - def create_token(options={}) request( :path => '/Account/Auth/token', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/account/expire_token.rb b/lib/fog/storm_on_demand/requests/account/expire_token.rb index 24a8fb4a5..9b893fdbe 100644 --- a/lib/fog/storm_on_demand/requests/account/expire_token.rb +++ b/lib/fog/storm_on_demand/requests/account/expire_token.rb @@ -2,14 +2,12 @@ module Fog module Account class StormOnDemand class Real - def expire_token(options={}) request( :path => '/Account/Auth/expireToken', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/billing/get_invoice.rb b/lib/fog/storm_on_demand/requests/billing/get_invoice.rb index 952bcf13e..e65f0b7e1 100644 --- a/lib/fog/storm_on_demand/requests/billing/get_invoice.rb +++ b/lib/fog/storm_on_demand/requests/billing/get_invoice.rb @@ -2,14 +2,12 @@ module Fog module Billing class StormOnDemand class Real - def get_invoice(options={}) request( :path => '/Billing/Invoice/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/billing/list_invoices.rb b/lib/fog/storm_on_demand/requests/billing/list_invoices.rb index ae2b54f6d..3ab498d57 100644 --- a/lib/fog/storm_on_demand/requests/billing/list_invoices.rb +++ b/lib/fog/storm_on_demand/requests/billing/list_invoices.rb @@ -2,14 +2,12 @@ module Fog module Billing class StormOnDemand class Real - def list_invoices(options={}) request( :path => '/Billing/Invoice/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/billing/make_payment.rb b/lib/fog/storm_on_demand/requests/billing/make_payment.rb index 4cd59a3ce..c7d43e307 100644 --- a/lib/fog/storm_on_demand/requests/billing/make_payment.rb +++ b/lib/fog/storm_on_demand/requests/billing/make_payment.rb @@ -2,14 +2,12 @@ module Fog module Billing class StormOnDemand class Real - def make_payment(options={}) request( :path => '/Billing/Payment/make', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/billing/next_invoice.rb b/lib/fog/storm_on_demand/requests/billing/next_invoice.rb index f126e03b9..96f348e90 100644 --- a/lib/fog/storm_on_demand/requests/billing/next_invoice.rb +++ b/lib/fog/storm_on_demand/requests/billing/next_invoice.rb @@ -2,14 +2,12 @@ module Fog module Billing class StormOnDemand class Real - def next_invoice(options={}) request( :path => '/Billing/Invoice/next', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/clone_server.rb b/lib/fog/storm_on_demand/requests/compute/clone_server.rb index 9f9ed9ed2..a2e7da660 100644 --- a/lib/fog/storm_on_demand/requests/compute/clone_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/clone_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def clone_server(options = {}) request( :path => "/Storm/Server/clone", :body => Fog::JSON.encode({:params => options}) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/create_image.rb b/lib/fog/storm_on_demand/requests/compute/create_image.rb index 2fac34ecb..c05740cae 100644 --- a/lib/fog/storm_on_demand/requests/compute/create_image.rb +++ b/lib/fog/storm_on_demand/requests/compute/create_image.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def create_image(options={}) request( :path => '/Storm/Image/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/create_server.rb b/lib/fog/storm_on_demand/requests/compute/create_server.rb index aee53ec18..921881efd 100644 --- a/lib/fog/storm_on_demand/requests/compute/create_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/create_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def create_server(options = {}) request( :path => "/Storm/Server/create", :body => Fog::JSON.encode({:params => options}) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/current_notifications.rb b/lib/fog/storm_on_demand/requests/compute/current_notifications.rb index f7a6a9dea..c34cf0b62 100644 --- a/lib/fog/storm_on_demand/requests/compute/current_notifications.rb +++ b/lib/fog/storm_on_demand/requests/compute/current_notifications.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def current_notifications(options={}) request( :path => '/Notifications/current', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/delete_image.rb b/lib/fog/storm_on_demand/requests/compute/delete_image.rb index f1493ef18..5265a53fd 100644 --- a/lib/fog/storm_on_demand/requests/compute/delete_image.rb +++ b/lib/fog/storm_on_demand/requests/compute/delete_image.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def delete_image(options={}) request( :path => '/Storm/Image/delete', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/delete_server.rb b/lib/fog/storm_on_demand/requests/compute/delete_server.rb index a22437056..d13da5493 100644 --- a/lib/fog/storm_on_demand/requests/compute/delete_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/delete_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def delete_server(options = {}) request( :path => "/Storm/Server/destroy", :body => Fog::JSON.encode({:params => options}) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_config_details.rb b/lib/fog/storm_on_demand/requests/compute/get_config_details.rb index e430f1db7..bf2420584 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_config_details.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_config_details.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_config_details(options={}) request( :path => '/Storm/Config/details', :body => Fog::JSON.encode({ :params => options }) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_image_details.rb b/lib/fog/storm_on_demand/requests/compute/get_image_details.rb index 793c663a9..6a5f37ee8 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_image_details.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_image_details.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_image_details(options={}) request( :path => '/Storm/Image/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_notification.rb b/lib/fog/storm_on_demand/requests/compute/get_notification.rb index 2723ce7a0..7112a6144 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_notification.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_notification.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_notification(options={}) request( :path => '/Notifications/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_product.rb b/lib/fog/storm_on_demand/requests/compute/get_product.rb index 72f97bbf8..836188cb6 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_product.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_product.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_product(options={}) request( :path => '/Product/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_product_code.rb b/lib/fog/storm_on_demand/requests/compute/get_product_code.rb index f07e6bd2d..954297be2 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_product_code.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_product_code.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_product_code(options={}) request( :path => '/Product/getProductCodeFromPath', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_product_price.rb b/lib/fog/storm_on_demand/requests/compute/get_product_price.rb index 5fab79797..5709a8a1a 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_product_price.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_product_price.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_product_price(options={}) request( :path => '/Product/price', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_product_starting_price.rb b/lib/fog/storm_on_demand/requests/compute/get_product_starting_price.rb index 2f6d3efcb..cfdeacdda 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_product_starting_price.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_product_starting_price.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_product_starting_price(options={}) request( :path => '/Product/startingPrice', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_server.rb b/lib/fog/storm_on_demand/requests/compute/get_server.rb index 20e532215..28236ec22 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_server(options = {}) request( :path => "/Storm/Server/details", :body => Fog::JSON.encode({:params => options}) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/get_template_details.rb b/lib/fog/storm_on_demand/requests/compute/get_template_details.rb index 6580a4994..7fa1597ee 100644 --- a/lib/fog/storm_on_demand/requests/compute/get_template_details.rb +++ b/lib/fog/storm_on_demand/requests/compute/get_template_details.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def get_template_details(options={}) request( :path => '/Storm/Template/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/list_configs.rb b/lib/fog/storm_on_demand/requests/compute/list_configs.rb index 3d6bfd1df..9cf342a12 100644 --- a/lib/fog/storm_on_demand/requests/compute/list_configs.rb +++ b/lib/fog/storm_on_demand/requests/compute/list_configs.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def list_configs(options = {}) request( :path => "/storm/config/list", :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/list_images.rb b/lib/fog/storm_on_demand/requests/compute/list_images.rb index 16243471e..c4dcff026 100644 --- a/lib/fog/storm_on_demand/requests/compute/list_images.rb +++ b/lib/fog/storm_on_demand/requests/compute/list_images.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def list_images(options = {}) request( :path => "/Storm/Image/list", :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/list_notifications.rb b/lib/fog/storm_on_demand/requests/compute/list_notifications.rb index 19470526c..8724c3b99 100644 --- a/lib/fog/storm_on_demand/requests/compute/list_notifications.rb +++ b/lib/fog/storm_on_demand/requests/compute/list_notifications.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def list_notifications(options={}) request( :path => '/Notifications/all', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/list_products.rb b/lib/fog/storm_on_demand/requests/compute/list_products.rb index 7e53e5484..4a098a66f 100644 --- a/lib/fog/storm_on_demand/requests/compute/list_products.rb +++ b/lib/fog/storm_on_demand/requests/compute/list_products.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def list_products(options={}) request( :path => '/Product/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/list_servers.rb b/lib/fog/storm_on_demand/requests/compute/list_servers.rb index 5bd11726f..ddd282ea7 100644 --- a/lib/fog/storm_on_demand/requests/compute/list_servers.rb +++ b/lib/fog/storm_on_demand/requests/compute/list_servers.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def list_servers(options = {}) request( :path => "/Storm/Server/list", :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/list_templates.rb b/lib/fog/storm_on_demand/requests/compute/list_templates.rb index 0bd778caf..6278ef064 100644 --- a/lib/fog/storm_on_demand/requests/compute/list_templates.rb +++ b/lib/fog/storm_on_demand/requests/compute/list_templates.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def list_templates(options = {}) request( :path => "/Storm/Template/list", :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/reboot_server.rb b/lib/fog/storm_on_demand/requests/compute/reboot_server.rb index e74a61b6c..5eb71d813 100644 --- a/lib/fog/storm_on_demand/requests/compute/reboot_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/reboot_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def reboot_server(options = {}) request( :path => "/Storm/Server/reboot", :body => Fog::JSON.encode({:params => options}) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/resize_server.rb b/lib/fog/storm_on_demand/requests/compute/resize_server.rb index fe834c498..1aa7e341f 100644 --- a/lib/fog/storm_on_demand/requests/compute/resize_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/resize_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def resize_server(options = {}) request( :path => "/Storm/Server/resize", :body => Fog::JSON.encode({:params => options}) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/resolve_notification.rb b/lib/fog/storm_on_demand/requests/compute/resolve_notification.rb index 881b52269..1247920db 100644 --- a/lib/fog/storm_on_demand/requests/compute/resolve_notification.rb +++ b/lib/fog/storm_on_demand/requests/compute/resolve_notification.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def resolve_notification(options={}) request( :path => '/Notifications/resolve', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/restore_image.rb b/lib/fog/storm_on_demand/requests/compute/restore_image.rb index 24fe53ad4..b9f793d13 100644 --- a/lib/fog/storm_on_demand/requests/compute/restore_image.rb +++ b/lib/fog/storm_on_demand/requests/compute/restore_image.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def restore_image(options={}) request( :path => '/Storm/Image/restore', :body => Fog::JSON.encode(params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/restore_template.rb b/lib/fog/storm_on_demand/requests/compute/restore_template.rb index 38a2016f6..445cc9edd 100644 --- a/lib/fog/storm_on_demand/requests/compute/restore_template.rb +++ b/lib/fog/storm_on_demand/requests/compute/restore_template.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def restore_template(options={}) request( :path => '/Storm/Template/restore', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/server_history.rb b/lib/fog/storm_on_demand/requests/compute/server_history.rb index 79f8f3937..5967abf4b 100644 --- a/lib/fog/storm_on_demand/requests/compute/server_history.rb +++ b/lib/fog/storm_on_demand/requests/compute/server_history.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def server_history(options={}) request( :path => '/Storm/Server/history', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/server_status.rb b/lib/fog/storm_on_demand/requests/compute/server_status.rb index 2c8db69ca..6c732b728 100644 --- a/lib/fog/storm_on_demand/requests/compute/server_status.rb +++ b/lib/fog/storm_on_demand/requests/compute/server_status.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def server_status(options={}) request( :path => '/Storm/Server/status', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/shutdown_server.rb b/lib/fog/storm_on_demand/requests/compute/shutdown_server.rb index ae2d675fe..9cab7765e 100644 --- a/lib/fog/storm_on_demand/requests/compute/shutdown_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/shutdown_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def shutdown_server(options={}) request( :path => '/Storm/Server/shutdown', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/start_server.rb b/lib/fog/storm_on_demand/requests/compute/start_server.rb index 2c61475e1..bd8702157 100644 --- a/lib/fog/storm_on_demand/requests/compute/start_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/start_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def start_server(options={}) request( :path => '/Storm/Server/start', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/update_image.rb b/lib/fog/storm_on_demand/requests/compute/update_image.rb index b8c3aba08..f837bfb80 100644 --- a/lib/fog/storm_on_demand/requests/compute/update_image.rb +++ b/lib/fog/storm_on_demand/requests/compute/update_image.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def update_image(options={}) request( :path => '/Storm/Image/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/compute/update_server.rb b/lib/fog/storm_on_demand/requests/compute/update_server.rb index cc9dc7d6e..74f2d9e35 100644 --- a/lib/fog/storm_on_demand/requests/compute/update_server.rb +++ b/lib/fog/storm_on_demand/requests/compute/update_server.rb @@ -2,14 +2,12 @@ module Fog module Compute class StormOnDemand class Real - def update_server(options={}) request( :path => '/Storm/Server/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/check_zone_delegation.rb b/lib/fog/storm_on_demand/requests/dns/check_zone_delegation.rb index a300df269..f6c21f926 100644 --- a/lib/fog/storm_on_demand/requests/dns/check_zone_delegation.rb +++ b/lib/fog/storm_on_demand/requests/dns/check_zone_delegation.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def check_zone_delegation(options={}) request( :path => '/Network/DNS/Zone/delegation', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/create_record.rb b/lib/fog/storm_on_demand/requests/dns/create_record.rb index fd3640247..2d33fc360 100644 --- a/lib/fog/storm_on_demand/requests/dns/create_record.rb +++ b/lib/fog/storm_on_demand/requests/dns/create_record.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def create_record(options={}) request( :path => '/Network/DNS/Record/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/create_record_region.rb b/lib/fog/storm_on_demand/requests/dns/create_record_region.rb index 1acac734d..22b208c97 100644 --- a/lib/fog/storm_on_demand/requests/dns/create_record_region.rb +++ b/lib/fog/storm_on_demand/requests/dns/create_record_region.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def create_record_region(options={}) request( :path => '/Network/DNS/Record/Region/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/create_zone.rb b/lib/fog/storm_on_demand/requests/dns/create_zone.rb index a1dfc0a1d..115bd6ea2 100644 --- a/lib/fog/storm_on_demand/requests/dns/create_zone.rb +++ b/lib/fog/storm_on_demand/requests/dns/create_zone.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def create_zone(options={}) request( :path => '/Network/DNS/Zone/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/delete_record.rb b/lib/fog/storm_on_demand/requests/dns/delete_record.rb index 0f1eb34f6..34c5c8b50 100644 --- a/lib/fog/storm_on_demand/requests/dns/delete_record.rb +++ b/lib/fog/storm_on_demand/requests/dns/delete_record.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def delete_record(options={}) request( :path => '/Network/DNS/Record/delete', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/delete_record_region.rb b/lib/fog/storm_on_demand/requests/dns/delete_record_region.rb index 12e2ba995..51bb9f5c9 100644 --- a/lib/fog/storm_on_demand/requests/dns/delete_record_region.rb +++ b/lib/fog/storm_on_demand/requests/dns/delete_record_region.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def delete_record_region(options={}) request( :path => '/Network/DNS/Record/Region/delete', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/delete_reverse.rb b/lib/fog/storm_on_demand/requests/dns/delete_reverse.rb index 72e97022b..30e0b0f5a 100644 --- a/lib/fog/storm_on_demand/requests/dns/delete_reverse.rb +++ b/lib/fog/storm_on_demand/requests/dns/delete_reverse.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def delete_reverse(options={}) request( :path => '/Network/DNS/Reverse/delete', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/delete_zone.rb b/lib/fog/storm_on_demand/requests/dns/delete_zone.rb index 0c5ee34b2..38bfd9f36 100644 --- a/lib/fog/storm_on_demand/requests/dns/delete_zone.rb +++ b/lib/fog/storm_on_demand/requests/dns/delete_zone.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def delete_zone(options={}) request( :path => '/Network/DNS/Zone/delete', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/get_record.rb b/lib/fog/storm_on_demand/requests/dns/get_record.rb index 9a95dfdb2..9b408cc69 100644 --- a/lib/fog/storm_on_demand/requests/dns/get_record.rb +++ b/lib/fog/storm_on_demand/requests/dns/get_record.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def get_record(options={}) request( :path => '/Network/DNS/Record/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/get_zone.rb b/lib/fog/storm_on_demand/requests/dns/get_zone.rb index 01498c29d..e81acae01 100644 --- a/lib/fog/storm_on_demand/requests/dns/get_zone.rb +++ b/lib/fog/storm_on_demand/requests/dns/get_zone.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def get_zone(options={}) request( :path => '/Network/DNS/Zone/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/list_domains.rb b/lib/fog/storm_on_demand/requests/dns/list_domains.rb index 5d13c5e2d..a01848d2d 100644 --- a/lib/fog/storm_on_demand/requests/dns/list_domains.rb +++ b/lib/fog/storm_on_demand/requests/dns/list_domains.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def list_domains(options={}) request( :path => '/Network/DNS/Domain/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/list_records.rb b/lib/fog/storm_on_demand/requests/dns/list_records.rb index 10b91423d..17e8a3b95 100644 --- a/lib/fog/storm_on_demand/requests/dns/list_records.rb +++ b/lib/fog/storm_on_demand/requests/dns/list_records.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def list_records(options={}) request( :path => '/Network/DNS/Record/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/list_zones.rb b/lib/fog/storm_on_demand/requests/dns/list_zones.rb index 79c6bb5c8..fa8503254 100644 --- a/lib/fog/storm_on_demand/requests/dns/list_zones.rb +++ b/lib/fog/storm_on_demand/requests/dns/list_zones.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def list_zones(options={}) request( :path => '/Network/DNS/Zone/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/renew_domain.rb b/lib/fog/storm_on_demand/requests/dns/renew_domain.rb index 2a5655b64..463c108c8 100644 --- a/lib/fog/storm_on_demand/requests/dns/renew_domain.rb +++ b/lib/fog/storm_on_demand/requests/dns/renew_domain.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def renew_domain(options={}) request( :path => '/Network/DNS/Domain/renew', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/update_record.rb b/lib/fog/storm_on_demand/requests/dns/update_record.rb index 05de854a7..faa00ccc0 100644 --- a/lib/fog/storm_on_demand/requests/dns/update_record.rb +++ b/lib/fog/storm_on_demand/requests/dns/update_record.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def update_record(options={}) request( :path => '/Network/DNS/Record/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/update_record_region.rb b/lib/fog/storm_on_demand/requests/dns/update_record_region.rb index 9a4ee74db..1e9a30b33 100644 --- a/lib/fog/storm_on_demand/requests/dns/update_record_region.rb +++ b/lib/fog/storm_on_demand/requests/dns/update_record_region.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def update_record_region(options={}) request( :path => '/Network/DNS/Record/Region/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/update_reverse.rb b/lib/fog/storm_on_demand/requests/dns/update_reverse.rb index 2e5dae3e2..d0d5d853a 100644 --- a/lib/fog/storm_on_demand/requests/dns/update_reverse.rb +++ b/lib/fog/storm_on_demand/requests/dns/update_reverse.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def update_reverse(options={}) request( :path => '/Network/DNS/Reverse/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/dns/update_zone.rb b/lib/fog/storm_on_demand/requests/dns/update_zone.rb index 338333c0e..89c34991c 100644 --- a/lib/fog/storm_on_demand/requests/dns/update_zone.rb +++ b/lib/fog/storm_on_demand/requests/dns/update_zone.rb @@ -2,14 +2,12 @@ module Fog module DNS class StormOnDemand class Real - def update_zone(options={}) request( :path => '/Network/DNS/Zone/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/monitoring/get_bandwidth_graph.rb b/lib/fog/storm_on_demand/requests/monitoring/get_bandwidth_graph.rb index 0f4df54e3..f9c3c5a38 100644 --- a/lib/fog/storm_on_demand/requests/monitoring/get_bandwidth_graph.rb +++ b/lib/fog/storm_on_demand/requests/monitoring/get_bandwidth_graph.rb @@ -2,14 +2,12 @@ module Fog module Monitoring class StormOnDemand class Real - def get_bandwidth_graph(options={}) request( :path => '/Monitoring/Bandwidth/graph', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/monitoring/get_bandwidth_stats.rb b/lib/fog/storm_on_demand/requests/monitoring/get_bandwidth_stats.rb index 49a1b8f27..f455a7d83 100644 --- a/lib/fog/storm_on_demand/requests/monitoring/get_bandwidth_stats.rb +++ b/lib/fog/storm_on_demand/requests/monitoring/get_bandwidth_stats.rb @@ -2,14 +2,12 @@ module Fog module Monitoring class StormOnDemand class Real - def get_bandwidth_stats(options={}) request( :path => '/Monitoring/Bandwidth/stats', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/monitoring/get_load_graph.rb b/lib/fog/storm_on_demand/requests/monitoring/get_load_graph.rb index 489b9a2b0..8dbd39e3c 100644 --- a/lib/fog/storm_on_demand/requests/monitoring/get_load_graph.rb +++ b/lib/fog/storm_on_demand/requests/monitoring/get_load_graph.rb @@ -2,14 +2,12 @@ module Fog module Monitoring class StormOnDemand class Real - def get_load_graph(options={}) request( :path => '/Monitoring/Load/graph', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/monitoring/get_load_stats.rb b/lib/fog/storm_on_demand/requests/monitoring/get_load_stats.rb index c59dfb4b8..00b137815 100644 --- a/lib/fog/storm_on_demand/requests/monitoring/get_load_stats.rb +++ b/lib/fog/storm_on_demand/requests/monitoring/get_load_stats.rb @@ -2,14 +2,12 @@ module Fog module Monitoring class StormOnDemand class Real - def get_load_stats(options={}) request( :path => '/Monitoring/Load/stats', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/monitoring/get_service.rb b/lib/fog/storm_on_demand/requests/monitoring/get_service.rb index d6d00b8f7..61664286f 100644 --- a/lib/fog/storm_on_demand/requests/monitoring/get_service.rb +++ b/lib/fog/storm_on_demand/requests/monitoring/get_service.rb @@ -2,14 +2,12 @@ module Fog module Monitoring class StormOnDemand class Real - def get_service(options={}) request( :path => '/Monitoring/Services/get', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/monitoring/get_service_status.rb b/lib/fog/storm_on_demand/requests/monitoring/get_service_status.rb index f9c76e3df..4000f8efd 100644 --- a/lib/fog/storm_on_demand/requests/monitoring/get_service_status.rb +++ b/lib/fog/storm_on_demand/requests/monitoring/get_service_status.rb @@ -2,14 +2,12 @@ module Fog module Monitoring class StormOnDemand class Real - def get_service_status(options={}) request( :path => '/Monitoring/Services/status', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/monitoring/monitoring_ips.rb b/lib/fog/storm_on_demand/requests/monitoring/monitoring_ips.rb index 2484af628..4522bf0b5 100644 --- a/lib/fog/storm_on_demand/requests/monitoring/monitoring_ips.rb +++ b/lib/fog/storm_on_demand/requests/monitoring/monitoring_ips.rb @@ -2,14 +2,12 @@ module Fog module Monitoring class StormOnDemand class Real - def monitoring_ips(options={}) request( :path => '/Monitoring/Services/monitoringIps', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/monitoring/update_service.rb b/lib/fog/storm_on_demand/requests/monitoring/update_service.rb index 4f0f1322d..e2b7d3da4 100644 --- a/lib/fog/storm_on_demand/requests/monitoring/update_service.rb +++ b/lib/fog/storm_on_demand/requests/monitoring/update_service.rb @@ -2,14 +2,12 @@ module Fog module Monitoring class StormOnDemand class Real - def update_service(options={}) request( :path => '/Monitoring/Services/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/add_balancer_node.rb b/lib/fog/storm_on_demand/requests/network/add_balancer_node.rb index ba687c56d..21254642e 100644 --- a/lib/fog/storm_on_demand/requests/network/add_balancer_node.rb +++ b/lib/fog/storm_on_demand/requests/network/add_balancer_node.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def add_balancer_node(options = {}) request( :path => "/Network/LoadBalancer/addNode", :body => Fog::JSON.encode({:params => options}) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/add_balancer_service.rb b/lib/fog/storm_on_demand/requests/network/add_balancer_service.rb index 594d9dc21..9f090af6e 100644 --- a/lib/fog/storm_on_demand/requests/network/add_balancer_service.rb +++ b/lib/fog/storm_on_demand/requests/network/add_balancer_service.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def add_balancer_service(options={}) request( :path => '/Network/LoadBalancer/addService', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/add_ip_to_server.rb b/lib/fog/storm_on_demand/requests/network/add_ip_to_server.rb index bdf958ac7..b9a6696cf 100644 --- a/lib/fog/storm_on_demand/requests/network/add_ip_to_server.rb +++ b/lib/fog/storm_on_demand/requests/network/add_ip_to_server.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def add_ip_to_server(options={}) request( :path => '/Network/IP/add', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/attach_server_to_private_ip.rb b/lib/fog/storm_on_demand/requests/network/attach_server_to_private_ip.rb index 461ec4887..3547fe117 100644 --- a/lib/fog/storm_on_demand/requests/network/attach_server_to_private_ip.rb +++ b/lib/fog/storm_on_demand/requests/network/attach_server_to_private_ip.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def attach_server_to_private_ip(options={}) request( :path => '/Network/Private/attach', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/check_balancer_available.rb b/lib/fog/storm_on_demand/requests/network/check_balancer_available.rb index 7f54a3f15..df158a833 100644 --- a/lib/fog/storm_on_demand/requests/network/check_balancer_available.rb +++ b/lib/fog/storm_on_demand/requests/network/check_balancer_available.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def check_balancer_available(options={}) request( :path => '/Network/LoadBalancer/available', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/check_server_attached.rb b/lib/fog/storm_on_demand/requests/network/check_server_attached.rb index 8171a9b3a..f628de1c4 100644 --- a/lib/fog/storm_on_demand/requests/network/check_server_attached.rb +++ b/lib/fog/storm_on_demand/requests/network/check_server_attached.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def check_server_attached(options={}) request( :path => '/Network/Private/isAttached', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/create_balancer.rb b/lib/fog/storm_on_demand/requests/network/create_balancer.rb index 340e1b859..77d1efe3e 100644 --- a/lib/fog/storm_on_demand/requests/network/create_balancer.rb +++ b/lib/fog/storm_on_demand/requests/network/create_balancer.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def create_balancer(options={}) request( :path => '/Network/LoadBalancer/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/create_pool.rb b/lib/fog/storm_on_demand/requests/network/create_pool.rb index 35e87b0ee..ab82c45b1 100644 --- a/lib/fog/storm_on_demand/requests/network/create_pool.rb +++ b/lib/fog/storm_on_demand/requests/network/create_pool.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def create_pool(options={}) request( :path => '/Network/Pool/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/create_ruleset.rb b/lib/fog/storm_on_demand/requests/network/create_ruleset.rb index ec02bde72..1f4b3dd69 100644 --- a/lib/fog/storm_on_demand/requests/network/create_ruleset.rb +++ b/lib/fog/storm_on_demand/requests/network/create_ruleset.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def create_ruleset(options={}) request( :path => '/Network/Firewall/Ruleset/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/delete_balancer.rb b/lib/fog/storm_on_demand/requests/network/delete_balancer.rb index 9216a00ed..39a8b3c64 100644 --- a/lib/fog/storm_on_demand/requests/network/delete_balancer.rb +++ b/lib/fog/storm_on_demand/requests/network/delete_balancer.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def delete_balancer(options={}) request( :path => '/Network/LoadBalancer/delete', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/delete_pool.rb b/lib/fog/storm_on_demand/requests/network/delete_pool.rb index dece37a5a..348e4154d 100644 --- a/lib/fog/storm_on_demand/requests/network/delete_pool.rb +++ b/lib/fog/storm_on_demand/requests/network/delete_pool.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def delete_pool(options={}) request( :path => '/Network/Pool/delete', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/detach_server_from_private_ip.rb b/lib/fog/storm_on_demand/requests/network/detach_server_from_private_ip.rb index fd072811f..aa76cd430 100644 --- a/lib/fog/storm_on_demand/requests/network/detach_server_from_private_ip.rb +++ b/lib/fog/storm_on_demand/requests/network/detach_server_from_private_ip.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def detach_server_from_private_ip(options={}) request( :path => '/Network/Private/detach', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_assignments.rb b/lib/fog/storm_on_demand/requests/network/get_assignments.rb index a9381a641..de01824a0 100644 --- a/lib/fog/storm_on_demand/requests/network/get_assignments.rb +++ b/lib/fog/storm_on_demand/requests/network/get_assignments.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_assignments(options={}) request( :path => '/Network/Pool/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_balancer_details.rb b/lib/fog/storm_on_demand/requests/network/get_balancer_details.rb index 6cee54a7e..649afe4af 100644 --- a/lib/fog/storm_on_demand/requests/network/get_balancer_details.rb +++ b/lib/fog/storm_on_demand/requests/network/get_balancer_details.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_balancer_details(options={}) request( :path => '/Network/LoadBalancer/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_balancer_possible_nodes.rb b/lib/fog/storm_on_demand/requests/network/get_balancer_possible_nodes.rb index f42dd67e8..087bf19db 100644 --- a/lib/fog/storm_on_demand/requests/network/get_balancer_possible_nodes.rb +++ b/lib/fog/storm_on_demand/requests/network/get_balancer_possible_nodes.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_balancer_possible_nodes(options={}) request( :path => '/Network/LoadBalancer/possibleNodes', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_balancer_strategies.rb b/lib/fog/storm_on_demand/requests/network/get_balancer_strategies.rb index ee03f03b7..3a8b06826 100644 --- a/lib/fog/storm_on_demand/requests/network/get_balancer_strategies.rb +++ b/lib/fog/storm_on_demand/requests/network/get_balancer_strategies.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_balancer_strategies(options={}) request( :path => '/Network/LoadBalancer/strategies', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_firewall.rb b/lib/fog/storm_on_demand/requests/network/get_firewall.rb index 0f3a001b4..01bb50ffe 100644 --- a/lib/fog/storm_on_demand/requests/network/get_firewall.rb +++ b/lib/fog/storm_on_demand/requests/network/get_firewall.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_firewall(options={}) request( :path => '/Network/Firewall/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_firewall_basic_options.rb b/lib/fog/storm_on_demand/requests/network/get_firewall_basic_options.rb index e5376cbae..dd1054576 100644 --- a/lib/fog/storm_on_demand/requests/network/get_firewall_basic_options.rb +++ b/lib/fog/storm_on_demand/requests/network/get_firewall_basic_options.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_firewall_basic_options(options={}) request( :path => '/Network/Firewall/getBasicOptions', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_firewall_rules.rb b/lib/fog/storm_on_demand/requests/network/get_firewall_rules.rb index 6913b993e..7d2db415e 100644 --- a/lib/fog/storm_on_demand/requests/network/get_firewall_rules.rb +++ b/lib/fog/storm_on_demand/requests/network/get_firewall_rules.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_firewall_rules(options={}) request( :path => '/Network/Firewall/rules', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_ip_details.rb b/lib/fog/storm_on_demand/requests/network/get_ip_details.rb index baf0e5f16..830d55d97 100644 --- a/lib/fog/storm_on_demand/requests/network/get_ip_details.rb +++ b/lib/fog/storm_on_demand/requests/network/get_ip_details.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_ip_details(options={}) request( :path => '/Network/IP/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_pool.rb b/lib/fog/storm_on_demand/requests/network/get_pool.rb index 451e7e28a..5fed757a0 100644 --- a/lib/fog/storm_on_demand/requests/network/get_pool.rb +++ b/lib/fog/storm_on_demand/requests/network/get_pool.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_pool(options={}) request( :path => '/Network/Pool/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_private_ip.rb b/lib/fog/storm_on_demand/requests/network/get_private_ip.rb index 34773737d..b343ace04 100644 --- a/lib/fog/storm_on_demand/requests/network/get_private_ip.rb +++ b/lib/fog/storm_on_demand/requests/network/get_private_ip.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_private_ip(options={}) request( :path => '/Network/Private/getIP', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_ruleset.rb b/lib/fog/storm_on_demand/requests/network/get_ruleset.rb index b77552dc1..848f6213e 100644 --- a/lib/fog/storm_on_demand/requests/network/get_ruleset.rb +++ b/lib/fog/storm_on_demand/requests/network/get_ruleset.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_ruleset(options={}) request( :path => '/Network/Firewall/Ruleset/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/get_zone.rb b/lib/fog/storm_on_demand/requests/network/get_zone.rb index c51dd2223..4bfb1d69d 100644 --- a/lib/fog/storm_on_demand/requests/network/get_zone.rb +++ b/lib/fog/storm_on_demand/requests/network/get_zone.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def get_zone(options={}) request( :path => '/Network/Zone/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/list_balancers.rb b/lib/fog/storm_on_demand/requests/network/list_balancers.rb index 766490dd3..0a7fc5f18 100644 --- a/lib/fog/storm_on_demand/requests/network/list_balancers.rb +++ b/lib/fog/storm_on_demand/requests/network/list_balancers.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def list_balancers(options = {}) request( :path => "/Network/LoadBalancer/list", :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/list_ip_public_accounts.rb b/lib/fog/storm_on_demand/requests/network/list_ip_public_accounts.rb index 45481b302..23df51955 100644 --- a/lib/fog/storm_on_demand/requests/network/list_ip_public_accounts.rb +++ b/lib/fog/storm_on_demand/requests/network/list_ip_public_accounts.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def list_ip_public_accounts(options={}) request( :path => '/Network/IP/listAccntPublic', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/list_network_ips.rb b/lib/fog/storm_on_demand/requests/network/list_network_ips.rb index 7b77fdbf0..22d63e101 100644 --- a/lib/fog/storm_on_demand/requests/network/list_network_ips.rb +++ b/lib/fog/storm_on_demand/requests/network/list_network_ips.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def list_network_ips(options={}) request( :path => '/Network/IP/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/list_network_public_ips.rb b/lib/fog/storm_on_demand/requests/network/list_network_public_ips.rb index f9c25b00e..0e82f2339 100644 --- a/lib/fog/storm_on_demand/requests/network/list_network_public_ips.rb +++ b/lib/fog/storm_on_demand/requests/network/list_network_public_ips.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def list_network_public_ips(options={}) request( :path => '/Network/IP/listPublic', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/list_private_ips.rb b/lib/fog/storm_on_demand/requests/network/list_private_ips.rb index 3bcd5ed30..cdabdbb10 100644 --- a/lib/fog/storm_on_demand/requests/network/list_private_ips.rb +++ b/lib/fog/storm_on_demand/requests/network/list_private_ips.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def list_private_ips(options = {}) request( :path => "/Network/Private/get", :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/list_rulesets.rb b/lib/fog/storm_on_demand/requests/network/list_rulesets.rb index 4a8e3f30d..0c9cab47a 100644 --- a/lib/fog/storm_on_demand/requests/network/list_rulesets.rb +++ b/lib/fog/storm_on_demand/requests/network/list_rulesets.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def list_rulesets(options={}) request( :path => '/Network/Firewall/Ruleset/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/list_zones.rb b/lib/fog/storm_on_demand/requests/network/list_zones.rb index 0c2f01157..5884e6c3b 100644 --- a/lib/fog/storm_on_demand/requests/network/list_zones.rb +++ b/lib/fog/storm_on_demand/requests/network/list_zones.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def list_zones(options={}) request( :path => '/Network/Zone/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/remove_balancer_node.rb b/lib/fog/storm_on_demand/requests/network/remove_balancer_node.rb index 57efd3151..e61f819a2 100644 --- a/lib/fog/storm_on_demand/requests/network/remove_balancer_node.rb +++ b/lib/fog/storm_on_demand/requests/network/remove_balancer_node.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def remove_balancer_node(options = {}) request( :path => "/Network/LoadBalancer/removeNode", :body => Fog::JSON.encode({:params => options}) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/remove_balancer_service.rb b/lib/fog/storm_on_demand/requests/network/remove_balancer_service.rb index 73cf1b57d..6837d6c04 100644 --- a/lib/fog/storm_on_demand/requests/network/remove_balancer_service.rb +++ b/lib/fog/storm_on_demand/requests/network/remove_balancer_service.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def remove_balancer_service(options={}) request( :path => '/Network/LoadBalancer/removeService', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/remove_ip_from_server.rb b/lib/fog/storm_on_demand/requests/network/remove_ip_from_server.rb index 3fbc95292..f5450b845 100644 --- a/lib/fog/storm_on_demand/requests/network/remove_ip_from_server.rb +++ b/lib/fog/storm_on_demand/requests/network/remove_ip_from_server.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def remove_ip_from_server(options={}) request( :path => '/Network/IP/remove', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/request_new_ips.rb b/lib/fog/storm_on_demand/requests/network/request_new_ips.rb index e8d95f69e..87b7611da 100644 --- a/lib/fog/storm_on_demand/requests/network/request_new_ips.rb +++ b/lib/fog/storm_on_demand/requests/network/request_new_ips.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def request_new_ips(options={}) request( :path => '/Network/IP/request', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/set_default_zone.rb b/lib/fog/storm_on_demand/requests/network/set_default_zone.rb index b9e1c29ed..8b1af02cc 100644 --- a/lib/fog/storm_on_demand/requests/network/set_default_zone.rb +++ b/lib/fog/storm_on_demand/requests/network/set_default_zone.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def set_default_zone(options={}) request( :path => '/Network/Zone/setDefault', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/update_balancer.rb b/lib/fog/storm_on_demand/requests/network/update_balancer.rb index 10161423a..7cb39a4cd 100644 --- a/lib/fog/storm_on_demand/requests/network/update_balancer.rb +++ b/lib/fog/storm_on_demand/requests/network/update_balancer.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def update_balancer(options={}) request( :path => '/Network/LoadBalancer/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/update_firewall.rb b/lib/fog/storm_on_demand/requests/network/update_firewall.rb index 891cb4091..62ea3a7d0 100644 --- a/lib/fog/storm_on_demand/requests/network/update_firewall.rb +++ b/lib/fog/storm_on_demand/requests/network/update_firewall.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def update_firewalls(options={}) request( :path => '/Network/Firewall/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/update_pool.rb b/lib/fog/storm_on_demand/requests/network/update_pool.rb index 3089c52e3..bea152de2 100644 --- a/lib/fog/storm_on_demand/requests/network/update_pool.rb +++ b/lib/fog/storm_on_demand/requests/network/update_pool.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def update_pool(options={}) request( :path => '/Network/Pool/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/network/update_ruleset.rb b/lib/fog/storm_on_demand/requests/network/update_ruleset.rb index a0c22fab4..dc1a624c1 100644 --- a/lib/fog/storm_on_demand/requests/network/update_ruleset.rb +++ b/lib/fog/storm_on_demand/requests/network/update_ruleset.rb @@ -2,14 +2,12 @@ module Fog module Network class StormOnDemand class Real - def update_ruleset(options={}) request( :path => '/Network/Firewall/Ruleset/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/attach_volume_to_server.rb b/lib/fog/storm_on_demand/requests/storage/attach_volume_to_server.rb index 8f4cbf8bb..d89fcaeef 100644 --- a/lib/fog/storm_on_demand/requests/storage/attach_volume_to_server.rb +++ b/lib/fog/storm_on_demand/requests/storage/attach_volume_to_server.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def attach_volume_to_server(options={}) request( :path => '/Storage/Block/Volume/attach', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/create_volume.rb b/lib/fog/storm_on_demand/requests/storage/create_volume.rb index be9338d0f..16e730b78 100644 --- a/lib/fog/storm_on_demand/requests/storage/create_volume.rb +++ b/lib/fog/storm_on_demand/requests/storage/create_volume.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def create_volume(options={}) request( :path => '/Storage/Block/Volume/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/delete_volume.rb b/lib/fog/storm_on_demand/requests/storage/delete_volume.rb index a37c6e39e..d86961dd7 100644 --- a/lib/fog/storm_on_demand/requests/storage/delete_volume.rb +++ b/lib/fog/storm_on_demand/requests/storage/delete_volume.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def delete_volume(options={}) request( :path => '/Storage/Block/Volume/delete', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/detach_volume_from_server.rb b/lib/fog/storm_on_demand/requests/storage/detach_volume_from_server.rb index 6d6b9ad1f..41c0497f8 100644 --- a/lib/fog/storm_on_demand/requests/storage/detach_volume_from_server.rb +++ b/lib/fog/storm_on_demand/requests/storage/detach_volume_from_server.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def detach_volume_from_server(options={}) request( :path => '/Storage/Block/Volume/detach', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/get_volume.rb b/lib/fog/storm_on_demand/requests/storage/get_volume.rb index e1c4f80a1..208cc5432 100644 --- a/lib/fog/storm_on_demand/requests/storage/get_volume.rb +++ b/lib/fog/storm_on_demand/requests/storage/get_volume.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def get_volume(options={}) request( :path => '/Storage/Block/Volume/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/list_clusters.rb b/lib/fog/storm_on_demand/requests/storage/list_clusters.rb index 385dddc80..cdc0a186f 100644 --- a/lib/fog/storm_on_demand/requests/storage/list_clusters.rb +++ b/lib/fog/storm_on_demand/requests/storage/list_clusters.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def list_clusters(options={}) request( :path => '/Storage/Block/Cluster/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/list_volumes.rb b/lib/fog/storm_on_demand/requests/storage/list_volumes.rb index 427df6636..a113dc2b5 100644 --- a/lib/fog/storm_on_demand/requests/storage/list_volumes.rb +++ b/lib/fog/storm_on_demand/requests/storage/list_volumes.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def list_volumes(options={}) request( :path => '/Storage/Block/Volume/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/resize_volume.rb b/lib/fog/storm_on_demand/requests/storage/resize_volume.rb index 6d1152f3e..cad70fedf 100644 --- a/lib/fog/storm_on_demand/requests/storage/resize_volume.rb +++ b/lib/fog/storm_on_demand/requests/storage/resize_volume.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def resize_volume(options={}) request( :path => '/Storage/Block/Volume/resize', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/storage/update_volume.rb b/lib/fog/storm_on_demand/requests/storage/update_volume.rb index f37f2dce5..7a66400db 100644 --- a/lib/fog/storm_on_demand/requests/storage/update_volume.rb +++ b/lib/fog/storm_on_demand/requests/storage/update_volume.rb @@ -2,14 +2,12 @@ module Fog module Storage class StormOnDemand class Real - def update_volume(options={}) request( :path => '/Storage/Block/Volume/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/add_feedback.rb b/lib/fog/storm_on_demand/requests/support/add_feedback.rb index ac956da46..aeccb4dfd 100644 --- a/lib/fog/storm_on_demand/requests/support/add_feedback.rb +++ b/lib/fog/storm_on_demand/requests/support/add_feedback.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def add_feedback(options={}) request( :path => '/Support/Ticket/addFeedback', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/add_transaction_feedback.rb b/lib/fog/storm_on_demand/requests/support/add_transaction_feedback.rb index 6403cc7d9..4aaecb597 100644 --- a/lib/fog/storm_on_demand/requests/support/add_transaction_feedback.rb +++ b/lib/fog/storm_on_demand/requests/support/add_transaction_feedback.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def add_transaction_feedback(options={}) request( :path => '/Support/Ticket/addTransactionFeedback', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/authenticate.rb b/lib/fog/storm_on_demand/requests/support/authenticate.rb index 36182e268..fe95295cb 100644 --- a/lib/fog/storm_on_demand/requests/support/authenticate.rb +++ b/lib/fog/storm_on_demand/requests/support/authenticate.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def authenticate(options={}) request( :path => '/Support/Ticket/authenticate', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/close_ticket.rb b/lib/fog/storm_on_demand/requests/support/close_ticket.rb index 93e6231b6..fbf7df5da 100644 --- a/lib/fog/storm_on_demand/requests/support/close_ticket.rb +++ b/lib/fog/storm_on_demand/requests/support/close_ticket.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def close_ticket(options={}) request( :path => '/Support/Ticket/close', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/create_ticket.rb b/lib/fog/storm_on_demand/requests/support/create_ticket.rb index 5ec009728..0d2b9479b 100644 --- a/lib/fog/storm_on_demand/requests/support/create_ticket.rb +++ b/lib/fog/storm_on_demand/requests/support/create_ticket.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def create_ticket(options={}) request( :path => '/Support/Ticket/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/get_active_alert.rb b/lib/fog/storm_on_demand/requests/support/get_active_alert.rb index 337d0a941..14436b300 100644 --- a/lib/fog/storm_on_demand/requests/support/get_active_alert.rb +++ b/lib/fog/storm_on_demand/requests/support/get_active_alert.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def get_active_alert(options={}) request( :path => '/Support/Alert/getActive', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/get_ticket_details.rb b/lib/fog/storm_on_demand/requests/support/get_ticket_details.rb index c1174bd91..3b9030c0f 100644 --- a/lib/fog/storm_on_demand/requests/support/get_ticket_details.rb +++ b/lib/fog/storm_on_demand/requests/support/get_ticket_details.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def get_ticket_details(options={}) request( :path => '/Support/Ticket/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/list_ticket_types.rb b/lib/fog/storm_on_demand/requests/support/list_ticket_types.rb index 7b7275dea..db726be94 100644 --- a/lib/fog/storm_on_demand/requests/support/list_ticket_types.rb +++ b/lib/fog/storm_on_demand/requests/support/list_ticket_types.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def list_ticket_types(options={}) request( :path => '/Support/Ticket/types', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/list_tickets.rb b/lib/fog/storm_on_demand/requests/support/list_tickets.rb index 29f414eb4..6f3f96322 100644 --- a/lib/fog/storm_on_demand/requests/support/list_tickets.rb +++ b/lib/fog/storm_on_demand/requests/support/list_tickets.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def list_tickets(options={}) request( :path => '/Support/Ticket/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/reopen_ticket.rb b/lib/fog/storm_on_demand/requests/support/reopen_ticket.rb index 2af38d5aa..4c1531d1c 100644 --- a/lib/fog/storm_on_demand/requests/support/reopen_ticket.rb +++ b/lib/fog/storm_on_demand/requests/support/reopen_ticket.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def reopen_ticket(options={}) request( :path => '/Support/Ticket/reopen', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/support/reply_ticket.rb b/lib/fog/storm_on_demand/requests/support/reply_ticket.rb index 546b64ce5..4adba59fc 100644 --- a/lib/fog/storm_on_demand/requests/support/reply_ticket.rb +++ b/lib/fog/storm_on_demand/requests/support/reply_ticket.rb @@ -2,14 +2,12 @@ module Fog module Support class StormOnDemand class Real - def reply_ticket(options={}) request( :path => '/Support/Ticket/reply', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/vpn/create_vpn.rb b/lib/fog/storm_on_demand/requests/vpn/create_vpn.rb index 040943709..bc2d407f3 100644 --- a/lib/fog/storm_on_demand/requests/vpn/create_vpn.rb +++ b/lib/fog/storm_on_demand/requests/vpn/create_vpn.rb @@ -2,14 +2,12 @@ module Fog module VPN class StormOnDemand class Real - def create_vpn(options={}) request( :path => '/VPN/create', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/vpn/get_vpn.rb b/lib/fog/storm_on_demand/requests/vpn/get_vpn.rb index 1a1f533c7..7f989a451 100644 --- a/lib/fog/storm_on_demand/requests/vpn/get_vpn.rb +++ b/lib/fog/storm_on_demand/requests/vpn/get_vpn.rb @@ -2,14 +2,12 @@ module Fog module VPN class StormOnDemand class Real - def get_vpn(options={}) request( :path => '/VPN/details', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/vpn/list_vpn_users.rb b/lib/fog/storm_on_demand/requests/vpn/list_vpn_users.rb index 7d3705ee8..6e076c07b 100644 --- a/lib/fog/storm_on_demand/requests/vpn/list_vpn_users.rb +++ b/lib/fog/storm_on_demand/requests/vpn/list_vpn_users.rb @@ -2,14 +2,12 @@ module Fog module VPN class StormOnDemand class Real - def list_vpn_users(options={}) request( :path => '/VPN/list', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/requests/vpn/update_vpn.rb b/lib/fog/storm_on_demand/requests/vpn/update_vpn.rb index 555a8e2b4..c98ee8bd1 100644 --- a/lib/fog/storm_on_demand/requests/vpn/update_vpn.rb +++ b/lib/fog/storm_on_demand/requests/vpn/update_vpn.rb @@ -2,14 +2,12 @@ module Fog module VPN class StormOnDemand class Real - def update_vpn(options={}) request( :path => '/VPN/update', :body => Fog::JSON.encode(:params => options) ) end - end end end diff --git a/lib/fog/storm_on_demand/shared.rb b/lib/fog/storm_on_demand/shared.rb index c7ce0c8cc..0367d7de4 100644 --- a/lib/fog/storm_on_demand/shared.rb +++ b/lib/fog/storm_on_demand/shared.rb @@ -1,7 +1,6 @@ module Fog module StormOnDemand module RealShared - API_URL = 'https://api.stormondemand.com' API_VERSION = 'v1' diff --git a/lib/fog/storm_on_demand/storage.rb b/lib/fog/storm_on_demand/storage.rb index 22dccf07e..dfeac50c4 100644 --- a/lib/fog/storm_on_demand/storage.rb +++ b/lib/fog/storm_on_demand/storage.rb @@ -4,7 +4,6 @@ require "fog/storm_on_demand/shared" module Fog module Storage class StormOnDemand < Fog::Service - API_URL = 'https://api.stormondemand.com' API_VERSION = 'v1' @@ -29,7 +28,6 @@ module Fog request :update_volume class Mock - def self.data @data ||= Hash.new end @@ -55,13 +53,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/storm_on_demand/support.rb b/lib/fog/storm_on_demand/support.rb index 76f8924d3..665665a29 100644 --- a/lib/fog/storm_on_demand/support.rb +++ b/lib/fog/storm_on_demand/support.rb @@ -3,9 +3,7 @@ require 'fog/storm_on_demand/shared' module Fog module Support - class StormOnDemand < Fog::Service - requires :storm_on_demand_username, :storm_on_demand_password recognizes :storm_on_demand_auth_url @@ -28,7 +26,6 @@ module Fog request :list_ticket_types class Mock - def self.data @data ||= Hash.new end @@ -54,13 +51,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/storm_on_demand/vpn.rb b/lib/fog/storm_on_demand/vpn.rb index 6a2ed9967..42bb248af 100644 --- a/lib/fog/storm_on_demand/vpn.rb +++ b/lib/fog/storm_on_demand/vpn.rb @@ -18,7 +18,6 @@ module Fog request :update_vpn class Mock - def self.data @data ||= Hash.new end @@ -44,13 +43,10 @@ module Fog def reset_data self.class.data.delete(@storm_on_demand_username) end - end class Real - include Fog::StormOnDemand::RealShared - end end end diff --git a/lib/fog/terremark/models/shared/address.rb b/lib/fog/terremark/models/shared/address.rb index 278b5d0ad..b75391a47 100644 --- a/lib/fog/terremark/models/shared/address.rb +++ b/lib/fog/terremark/models/shared/address.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Terremark module Shared - class Address < Fog::Model - identity :id attribute :ip, :aliases => 'name' @@ -21,9 +19,7 @@ module Fog def href=(new_href) self.id = new_href.split('/').last.to_i end - end - end end end diff --git a/lib/fog/terremark/models/shared/addresses.rb b/lib/fog/terremark/models/shared/addresses.rb index 964dbb2d7..5d2bed7c0 100644 --- a/lib/fog/terremark/models/shared/addresses.rb +++ b/lib/fog/terremark/models/shared/addresses.rb @@ -1,7 +1,6 @@ module Fog module Terremark module Shared - module Mock def addresses(options = {}) Fog::Terremark::Shared::Addresses.new(options.merge(:service => self)) @@ -15,7 +14,6 @@ module Fog end class Addresses < Fog::Collection - model Fog::Terremark::Shared::Address def all @@ -41,9 +39,7 @@ module Fog def vdc_id=(new_vdc_id) @vdc_id = new_vdc_id end - end - end end end diff --git a/lib/fog/terremark/models/shared/image.rb b/lib/fog/terremark/models/shared/image.rb index 52595ac78..6a39de883 100644 --- a/lib/fog/terremark/models/shared/image.rb +++ b/lib/fog/terremark/models/shared/image.rb @@ -3,13 +3,10 @@ require 'fog/core/model' module Fog module Terremark module Shared - class Image < Fog::Model - identity :id attribute :name - end private diff --git a/lib/fog/terremark/models/shared/images.rb b/lib/fog/terremark/models/shared/images.rb index 47c0fc5d3..e104b294d 100644 --- a/lib/fog/terremark/models/shared/images.rb +++ b/lib/fog/terremark/models/shared/images.rb @@ -4,8 +4,6 @@ require 'fog/terremark/models/shared/image' module Fog module Terremark module Shared - - module Mock def images(options = {}) Fog::Terremark::Shared::Images.new(options.merge(:service => self)) @@ -19,8 +17,6 @@ module Fog end class Images < Fog::Collection - - model Fog::Terremark::Shared::Image def all @@ -30,7 +26,6 @@ module Fog load(data) end - def vdc_id @vdc_id ||= service.default_vdc_id end @@ -40,9 +35,7 @@ module Fog def vdc_id=(new_vdc_id) @vdc_id = new_vdc_id end - end - end end end diff --git a/lib/fog/terremark/models/shared/internetservice.rb b/lib/fog/terremark/models/shared/internetservice.rb index 3849ea006..33690ef5d 100644 --- a/lib/fog/terremark/models/shared/internetservice.rb +++ b/lib/fog/terremark/models/shared/internetservice.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Terremark module Shared - class InternetService < Fog::Model - identity :Id attribute :Name @@ -58,9 +56,10 @@ module Fog end def type=(new_type); @type = new_type; end - def size=(new_size); @size = new_size; end - def Links=(new_links); @Links = new_links; end + def size=(new_size); @size = new_size; end + + def Links=(new_links); @Links = new_links; end end end end diff --git a/lib/fog/terremark/models/shared/internetservices.rb b/lib/fog/terremark/models/shared/internetservices.rb index 0edb4e464..33d50c3be 100644 --- a/lib/fog/terremark/models/shared/internetservices.rb +++ b/lib/fog/terremark/models/shared/internetservices.rb @@ -4,7 +4,6 @@ require 'fog/terremark/models/shared/internetservice' module Fog module Terremark module Shared - module Mock def internetservices(options = {}) Fog::Terremark::Shared::Servers.new(options.merge(:service => self)) @@ -18,7 +17,6 @@ module Fog end class InternetServices < Fog::Collection - model Fog::Terremark::Shared::InternetService def all @@ -35,7 +33,6 @@ module Fog def vdc_id @vdc_id ||= service.default_vdc_id end - end end end diff --git a/lib/fog/terremark/models/shared/network.rb b/lib/fog/terremark/models/shared/network.rb index cdb5f4bfd..d9d499bea 100644 --- a/lib/fog/terremark/models/shared/network.rb +++ b/lib/fog/terremark/models/shared/network.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Terremark module Shared - class Network < Fog::Model - identity :id attribute :name @@ -27,9 +25,7 @@ module Fog end def type=(new_type); end - end - end end end diff --git a/lib/fog/terremark/models/shared/networks.rb b/lib/fog/terremark/models/shared/networks.rb index 7e587129c..8ca75fe75 100644 --- a/lib/fog/terremark/models/shared/networks.rb +++ b/lib/fog/terremark/models/shared/networks.rb @@ -1,7 +1,6 @@ module Fog module Terremark module Shared - module Mock def networks(options = {}) Fog::Terremark::Shared::Networks.new(options.merge(:service => self)) @@ -15,7 +14,6 @@ module Fog end class Networks < Fog::Collection - model Fog::Terremark::Shared::Network def all @@ -44,9 +42,7 @@ module Fog def vdc_id=(new_vdc_id) @vdc_id = new_vdc_id end - end - end end end diff --git a/lib/fog/terremark/models/shared/nodeservice.rb b/lib/fog/terremark/models/shared/nodeservice.rb index 2e42d66a7..3684c6f4b 100644 --- a/lib/fog/terremark/models/shared/nodeservice.rb +++ b/lib/fog/terremark/models/shared/nodeservice.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Terremark module Shared - class NodeService < Fog::Model - identity :Id attribute :Name attribute :Href @@ -42,11 +40,11 @@ module Fog end def type=(new_type); @type = new_type; end + def size=(new_size); @size = new_size; end + def Links=(new_links); @Links = new_links; end - end - end end end diff --git a/lib/fog/terremark/models/shared/nodeservices.rb b/lib/fog/terremark/models/shared/nodeservices.rb index 657e16257..fc3457898 100644 --- a/lib/fog/terremark/models/shared/nodeservices.rb +++ b/lib/fog/terremark/models/shared/nodeservices.rb @@ -4,7 +4,6 @@ require 'fog/terremark/models/shared/nodeservice' module Fog module Terremark module Shared - module Mock def nodeservices(options = {}) Fog::Terremark::Shared::Servers.new(options.merge(:service => self)) @@ -18,14 +17,12 @@ module Fog end class NodeServices < Fog::Collection - model Fog::Terremark::Shared::NodeService def all(internet_service_id) data = service.get_node_services(internet_service_id).body["NodeServices"] load(data) end - end end end diff --git a/lib/fog/terremark/models/shared/server.rb b/lib/fog/terremark/models/shared/server.rb index 6c113dc6d..39b01d10c 100644 --- a/lib/fog/terremark/models/shared/server.rb +++ b/lib/fog/terremark/models/shared/server.rb @@ -10,13 +10,10 @@ module VAppStatus POWERED_ON = "4" end - module Fog module Terremark module Shared - class Server < Fog::Model - identity :id attribute :name @@ -33,6 +30,7 @@ module Fog def reload merge_attributes(service.get_vapp(id).body) end + def destroy case self.status when VAppStatus::BEING_CREATED, VAppStatus::BEING_DEPLOYED @@ -202,9 +200,10 @@ module Fog end def type=(new_type); @type = new_type; end - def size=(new_size); @size = new_size; end - def Links=(new_links); @Links = new_links; end + def size=(new_size); @size = new_size; end + + def Links=(new_links); @Links = new_links; end end end end diff --git a/lib/fog/terremark/models/shared/servers.rb b/lib/fog/terremark/models/shared/servers.rb index 9c90dded3..578ddfbf1 100644 --- a/lib/fog/terremark/models/shared/servers.rb +++ b/lib/fog/terremark/models/shared/servers.rb @@ -4,7 +4,6 @@ require 'fog/terremark/models/shared/server' module Fog module Terremark module Shared - module Mock def servers(options = {}) Fog::Terremark::Shared::Servers.new(options.merge(:service => self)) @@ -18,7 +17,6 @@ module Fog end class Servers < Fog::Collection - model Fog::Terremark::Shared::Server def all @@ -46,9 +44,7 @@ module Fog def vdc_id=(new_vdc_id) @vdc_id = new_vdc_id end - end - end end end diff --git a/lib/fog/terremark/models/shared/task.rb b/lib/fog/terremark/models/shared/task.rb index 5a4eb87d8..82f6cbc16 100644 --- a/lib/fog/terremark/models/shared/task.rb +++ b/lib/fog/terremark/models/shared/task.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Terremark module Shared - class Task < Fog::Model - identity :id attribute :end_time, :aliases => 'endTime' @@ -42,9 +40,7 @@ module Fog end def type=(new_type); end - end - end end end diff --git a/lib/fog/terremark/models/shared/tasks.rb b/lib/fog/terremark/models/shared/tasks.rb index b2f1ed786..0c3648eaa 100644 --- a/lib/fog/terremark/models/shared/tasks.rb +++ b/lib/fog/terremark/models/shared/tasks.rb @@ -4,7 +4,6 @@ require 'fog/terremark/models/shared/server' module Fog module Terremark module Shared - module Mock def tasks Fog::Terremark::Shared::Tasks.new(:service => self) @@ -18,7 +17,6 @@ module Fog end class Tasks < Fog::Collection - model Fog::Terremark::Shared::Task def all @@ -50,9 +48,7 @@ module Fog def task_list_id=(new_task_list_id) @task_list_id = new_task_list_id end - end - end end end diff --git a/lib/fog/terremark/models/shared/vdc.rb b/lib/fog/terremark/models/shared/vdc.rb index 6bb1f5428..fcb94988c 100644 --- a/lib/fog/terremark/models/shared/vdc.rb +++ b/lib/fog/terremark/models/shared/vdc.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Terremark module Shared - class Vdc < Fog::Model - identity :id attribute :name @@ -36,9 +34,7 @@ module Fog def type=(new_type); end def rel=(new_rel); end - end - end end end diff --git a/lib/fog/terremark/models/shared/vdcs.rb b/lib/fog/terremark/models/shared/vdcs.rb index ac68080f2..d2498d699 100644 --- a/lib/fog/terremark/models/shared/vdcs.rb +++ b/lib/fog/terremark/models/shared/vdcs.rb @@ -1,7 +1,6 @@ module Fog module Terremark module Shared - module Mock def vdcs(options = {}) Fog::Terremark::Shared::Vdcs.new(options.merge(:service => self)) @@ -15,7 +14,6 @@ module Fog end class Vdcs < Fog::Collection - model Fog::Terremark::Shared::Vdc def all @@ -44,9 +42,7 @@ module Fog def organization_id=(new_organization_id) @organization_id = new_organization_id end - end - end end end diff --git a/lib/fog/terremark/parser.rb b/lib/fog/terremark/parser.rb index 651520e04..a46a3451a 100644 --- a/lib/fog/terremark/parser.rb +++ b/lib/fog/terremark/parser.rb @@ -1,6 +1,5 @@ class TerremarkParser < Fog::Parsers::Base - def extract_attributes(attributes_xml) attributes = {} until attributes_xml.empty? diff --git a/lib/fog/terremark/parsers/shared/get_catalog.rb b/lib/fog/terremark/parsers/shared/get_catalog.rb index 35d9d7693..33f99c52a 100644 --- a/lib/fog/terremark/parsers/shared/get_catalog.rb +++ b/lib/fog/terremark/parsers/shared/get_catalog.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetCatalog < TerremarkParser - def reset @response = { 'CatalogItems' => [] } end @@ -28,9 +26,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_catalog_item.rb b/lib/fog/terremark/parsers/shared/get_catalog_item.rb index 59897564f..258813cae 100644 --- a/lib/fog/terremark/parsers/shared/get_catalog_item.rb +++ b/lib/fog/terremark/parsers/shared/get_catalog_item.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetCatalogItem < TerremarkParser - def reset @response = { 'Entity' => {}, 'Properties' => {} } end @@ -27,9 +25,7 @@ module Fog @response['Properties'][@property_key] = value end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_internet_services.rb b/lib/fog/terremark/parsers/shared/get_internet_services.rb index ce9df2a89..88652388a 100644 --- a/lib/fog/terremark/parsers/shared/get_internet_services.rb +++ b/lib/fog/terremark/parsers/shared/get_internet_services.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetInternetServices < TerremarkParser - def reset @in_public_ip_address = false @internet_service = {} @@ -53,7 +51,6 @@ module Fog end end end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_keys_list.rb b/lib/fog/terremark/parsers/shared/get_keys_list.rb index 0211bd2f4..096d94983 100644 --- a/lib/fog/terremark/parsers/shared/get_keys_list.rb +++ b/lib/fog/terremark/parsers/shared/get_keys_list.rb @@ -3,7 +3,6 @@ module Fog module Parsers module Terremark module Shared - class GetKeysList < TerremarkParser def reset @response = { 'Keys' => [] } @@ -33,9 +32,7 @@ module Fog @key = {} end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_network_ips.rb b/lib/fog/terremark/parsers/shared/get_network_ips.rb index 4aafa1d73..c7598e79a 100644 --- a/lib/fog/terremark/parsers/shared/get_network_ips.rb +++ b/lib/fog/terremark/parsers/shared/get_network_ips.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetNetworkIps< TerremarkParser - def reset @ip_address = {} @response = { 'IpAddresses' => [] } @@ -19,9 +17,7 @@ module Fog @ip_address = {} end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_node_services.rb b/lib/fog/terremark/parsers/shared/get_node_services.rb index e84934eb7..38119b74f 100644 --- a/lib/fog/terremark/parsers/shared/get_node_services.rb +++ b/lib/fog/terremark/parsers/shared/get_node_services.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetNodeServices < TerremarkParser - def reset @node_service = {} @response = { 'NodeServices' => [] } @@ -27,9 +25,7 @@ module Fog @node_service = {} end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_organization.rb b/lib/fog/terremark/parsers/shared/get_organization.rb index c0f9bb5ec..068d97f46 100644 --- a/lib/fog/terremark/parsers/shared/get_organization.rb +++ b/lib/fog/terremark/parsers/shared/get_organization.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Terremark module Shared - class GetOrganization < TerremarkParser # include Fog::Terremark::Shared::Parser @@ -44,9 +43,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_organizations.rb b/lib/fog/terremark/parsers/shared/get_organizations.rb index 6b5c06447..bd3ae6765 100644 --- a/lib/fog/terremark/parsers/shared/get_organizations.rb +++ b/lib/fog/terremark/parsers/shared/get_organizations.rb @@ -2,7 +2,6 @@ module Fog module Parsers module Terremark module Shared - class GetOrganizations < TerremarkParser # include Fog::Terremark::Shared::Parser @@ -25,7 +24,6 @@ module Fog @response['OrgList'] << organization end end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_public_ips.rb b/lib/fog/terremark/parsers/shared/get_public_ips.rb index b2518dcd4..a5c75b62a 100644 --- a/lib/fog/terremark/parsers/shared/get_public_ips.rb +++ b/lib/fog/terremark/parsers/shared/get_public_ips.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetPublicIps< TerremarkParser - def reset @ip_address = {} @response = { 'PublicIpAddresses' => [] } @@ -21,9 +19,7 @@ module Fog @ip_address = {} end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_tasks_list.rb b/lib/fog/terremark/parsers/shared/get_tasks_list.rb index bae3675d8..f387ca61b 100644 --- a/lib/fog/terremark/parsers/shared/get_tasks_list.rb +++ b/lib/fog/terremark/parsers/shared/get_tasks_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetTasksList < TerremarkParser - def reset @response = { 'Tasks' => [] } @task = {} @@ -30,9 +28,7 @@ module Fog @task = {} end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_vapp_template.rb b/lib/fog/terremark/parsers/shared/get_vapp_template.rb index 1ee556789..2b172ed03 100644 --- a/lib/fog/terremark/parsers/shared/get_vapp_template.rb +++ b/lib/fog/terremark/parsers/shared/get_vapp_template.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetVappTemplate < TerremarkParser - def reset @response = { 'Links' => [] } end @@ -26,9 +24,7 @@ module Fog @response['Description'] = value end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/get_vdc.rb b/lib/fog/terremark/parsers/shared/get_vdc.rb index 30ce55ad7..4c8ff1d3b 100644 --- a/lib/fog/terremark/parsers/shared/get_vdc.rb +++ b/lib/fog/terremark/parsers/shared/get_vdc.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class GetVdc < TerremarkParser - def reset @in_storage_capacity = false @in_cpu = false @@ -82,9 +80,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb b/lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb index 4fd0eb630..3fe5e5faf 100644 --- a/lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb +++ b/lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class InstantiateVappTemplate < TerremarkParser - def reset @property_key @response = { 'Links' => [] } @@ -21,9 +19,7 @@ module Fog @response.merge!(vapp_template.reject {|key, value| !['href', 'name', 'size', 'status', 'type'].include?(key)}) end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/internet_service.rb b/lib/fog/terremark/parsers/shared/internet_service.rb index ad4e24a52..d65ffcc86 100644 --- a/lib/fog/terremark/parsers/shared/internet_service.rb +++ b/lib/fog/terremark/parsers/shared/internet_service.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class InternetService < TerremarkParser - def reset @in_public_ip_address = false @response = { 'PublicIpAddress' => {} } @@ -53,9 +51,7 @@ module Fog @in_public_ip_address = false end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/network.rb b/lib/fog/terremark/parsers/shared/network.rb index b5c01b9e0..4b2c5fbe4 100644 --- a/lib/fog/terremark/parsers/shared/network.rb +++ b/lib/fog/terremark/parsers/shared/network.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class Network < TerremarkParser - def reset @response = { "links" => [] @@ -34,9 +32,7 @@ module Fog @response[name.downcase] = value end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/node_service.rb b/lib/fog/terremark/parsers/shared/node_service.rb index 4532ffa97..35ded9f69 100644 --- a/lib/fog/terremark/parsers/shared/node_service.rb +++ b/lib/fog/terremark/parsers/shared/node_service.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class NodeService < TerremarkParser - def reset @response = {} end @@ -23,9 +21,7 @@ module Fog @response[name] = value.to_i end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/public_ip.rb b/lib/fog/terremark/parsers/shared/public_ip.rb index 17471687b..b564349cb 100644 --- a/lib/fog/terremark/parsers/shared/public_ip.rb +++ b/lib/fog/terremark/parsers/shared/public_ip.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class PublicIp < TerremarkParser - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response['id'] = value.to_i end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/task.rb b/lib/fog/terremark/parsers/shared/task.rb index fa0d2d9c2..3fa39ea50 100644 --- a/lib/fog/terremark/parsers/shared/task.rb +++ b/lib/fog/terremark/parsers/shared/task.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class Task < TerremarkParser - def reset @response = {} end @@ -20,9 +18,7 @@ module Fog @response.merge!(task.reject {|key,value| !['endTime', 'href', 'startTime', 'status', 'type'].include?(key)}) end end - end - end end end diff --git a/lib/fog/terremark/parsers/shared/vapp.rb b/lib/fog/terremark/parsers/shared/vapp.rb index 7e41ac60f..7002a4e89 100644 --- a/lib/fog/terremark/parsers/shared/vapp.rb +++ b/lib/fog/terremark/parsers/shared/vapp.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Terremark module Shared - class Vapp < TerremarkParser - def reset @response = { 'Links' => [], 'VirtualHardware' => {}, 'OperatingSystem' => {} } @in_operating_system = false @@ -56,9 +54,7 @@ module Fog end end end - end - end end end diff --git a/lib/fog/terremark/requests/shared/add_internet_service.rb b/lib/fog/terremark/requests/shared/add_internet_service.rb index 7f2c39fea..2a4f9e434 100644 --- a/lib/fog/terremark/requests/shared/add_internet_service.rb +++ b/lib/fog/terremark/requests/shared/add_internet_service.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Reserve requested resources and deploy vApp # # ==== Parameters @@ -49,7 +48,6 @@ module Fog :override_path => true ) end - end end end diff --git a/lib/fog/terremark/requests/shared/add_node_service.rb b/lib/fog/terremark/requests/shared/add_node_service.rb index 46b5d8a8d..17b79572e 100644 --- a/lib/fog/terremark/requests/shared/add_node_service.rb +++ b/lib/fog/terremark/requests/shared/add_node_service.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Reserve requested resources and deploy vApp # # ==== Parameters @@ -46,7 +45,6 @@ module Fog response end - end end end diff --git a/lib/fog/terremark/requests/shared/configure_vapp.rb b/lib/fog/terremark/requests/shared/configure_vapp.rb index ec7c1a965..b90c44a08 100644 --- a/lib/fog/terremark/requests/shared/configure_vapp.rb +++ b/lib/fog/terremark/requests/shared/configure_vapp.rb @@ -4,7 +4,6 @@ module Fog module Real include Common def configure_vapp(vapp_id, vapp_name, options = {}) - items = "" vapp_uri = [@host, @path, "vApp", vapp_id.to_s].join("/") @@ -54,7 +53,6 @@ DATA :path => "vapp/#{vapp_id}" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/create_internet_service.rb b/lib/fog/terremark/requests/shared/create_internet_service.rb index 576cc3936..c7fe3ff0c 100644 --- a/lib/fog/terremark/requests/shared/create_internet_service.rb +++ b/lib/fog/terremark/requests/shared/create_internet_service.rb @@ -53,7 +53,6 @@ module Fog ) response end - end end end diff --git a/lib/fog/terremark/requests/shared/delete_internet_service.rb b/lib/fog/terremark/requests/shared/delete_internet_service.rb index 00fa587a7..a2a910029 100644 --- a/lib/fog/terremark/requests/shared/delete_internet_service.rb +++ b/lib/fog/terremark/requests/shared/delete_internet_service.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Destroy an internet service # # ==== Parameters @@ -16,7 +15,6 @@ module Fog :override_path => true ) end - end end end diff --git a/lib/fog/terremark/requests/shared/delete_node_service.rb b/lib/fog/terremark/requests/shared/delete_node_service.rb index 4f34c7e5f..277b8cda3 100644 --- a/lib/fog/terremark/requests/shared/delete_node_service.rb +++ b/lib/fog/terremark/requests/shared/delete_node_service.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Destroy a node # # ==== Parameters @@ -16,7 +15,6 @@ module Fog :override_path => true ) end - end end end diff --git a/lib/fog/terremark/requests/shared/delete_public_ip.rb b/lib/fog/terremark/requests/shared/delete_public_ip.rb index cc77e3c80..e88764eeb 100644 --- a/lib/fog/terremark/requests/shared/delete_public_ip.rb +++ b/lib/fog/terremark/requests/shared/delete_public_ip.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Destroy a public ip # # ==== Parameters @@ -16,7 +15,6 @@ module Fog :override_path => true ) end - end end end diff --git a/lib/fog/terremark/requests/shared/delete_vapp.rb b/lib/fog/terremark/requests/shared/delete_vapp.rb index e7cf04871..d25543de7 100644 --- a/lib/fog/terremark/requests/shared/delete_vapp.rb +++ b/lib/fog/terremark/requests/shared/delete_vapp.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Destroy a vapp # # ==== Parameters @@ -15,7 +14,6 @@ module Fog :path => "vApp/#{vapp_id}" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/deploy_vapp.rb b/lib/fog/terremark/requests/shared/deploy_vapp.rb index 01501930c..c94cdd748 100644 --- a/lib/fog/terremark/requests/shared/deploy_vapp.rb +++ b/lib/fog/terremark/requests/shared/deploy_vapp.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Reserve requested resources and deploy vApp # # ==== Parameters @@ -28,7 +27,6 @@ module Fog :path => "vApp/#{vapp_id}/action/deploy" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_catalog.rb b/lib/fog/terremark/requests/shared/get_catalog.rb index 370d4d630..0296727b3 100644 --- a/lib/fog/terremark/requests/shared/get_catalog.rb +++ b/lib/fog/terremark/requests/shared/get_catalog.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details of a catalog # # ==== Parameters @@ -25,7 +24,6 @@ module Fog :path => "vdc/#{vdc_id}/catalog" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_catalog_item.rb b/lib/fog/terremark/requests/shared/get_catalog_item.rb index 4ed3e2835..192d96649 100644 --- a/lib/fog/terremark/requests/shared/get_catalog_item.rb +++ b/lib/fog/terremark/requests/shared/get_catalog_item.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details of a catalog item # # ==== Parameters @@ -28,7 +27,6 @@ module Fog :path => "catalogItem/#{catalog_item_id}" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_internet_services.rb b/lib/fog/terremark/requests/shared/get_internet_services.rb index 2b3ee59f6..db1abc25e 100644 --- a/lib/fog/terremark/requests/shared/get_internet_services.rb +++ b/lib/fog/terremark/requests/shared/get_internet_services.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - require 'fog/terremark/parsers/shared/get_internet_services' # Get a list of all internet services for a vdc @@ -29,7 +28,6 @@ module Fog :override_path => true ) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_keys_list.rb b/lib/fog/terremark/requests/shared/get_keys_list.rb index 89c48ad2c..9864710a3 100644 --- a/lib/fog/terremark/requests/shared/get_keys_list.rb +++ b/lib/fog/terremark/requests/shared/get_keys_list.rb @@ -28,9 +28,7 @@ module Fog ) response end - end - end end end diff --git a/lib/fog/terremark/requests/shared/get_network.rb b/lib/fog/terremark/requests/shared/get_network.rb index c19467cfb..6243a8c45 100644 --- a/lib/fog/terremark/requests/shared/get_network.rb +++ b/lib/fog/terremark/requests/shared/get_network.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details for a Network # # ==== Parameters @@ -20,11 +19,9 @@ module Fog :path => "network/#{network_id}" ) end - end module Mock - def get_network(network_id) network_id = network_id.to_i response = Excon::Response.new @@ -66,7 +63,6 @@ module Fog response end - end end end diff --git a/lib/fog/terremark/requests/shared/get_network_ips.rb b/lib/fog/terremark/requests/shared/get_network_ips.rb index fe649e4da..c4282fa76 100644 --- a/lib/fog/terremark/requests/shared/get_network_ips.rb +++ b/lib/fog/terremark/requests/shared/get_network_ips.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details for a Network # # ==== Parameters @@ -24,7 +23,6 @@ module Fog end request(opts) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_node_services.rb b/lib/fog/terremark/requests/shared/get_node_services.rb index ce2e1612e..efb936808 100644 --- a/lib/fog/terremark/requests/shared/get_node_services.rb +++ b/lib/fog/terremark/requests/shared/get_node_services.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - require 'fog/terremark/parsers/shared/get_node_services' # Get a list of all internet services for a vdc @@ -24,7 +23,6 @@ module Fog :override_path => true ) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_organization.rb b/lib/fog/terremark/requests/shared/get_organization.rb index 8d2180585..eca2a8a7b 100644 --- a/lib/fog/terremark/requests/shared/get_organization.rb +++ b/lib/fog/terremark/requests/shared/get_organization.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details of an organization # # ==== Parameters @@ -27,11 +26,9 @@ module Fog ) response end - end module Mock - def get_organization(organization_id) organization_id = organization_id.to_i response = Excon::Response.new @@ -80,7 +77,6 @@ module Fog ] end end - end end end diff --git a/lib/fog/terremark/requests/shared/get_organizations.rb b/lib/fog/terremark/requests/shared/get_organizations.rb index 4fc2f9b0d..3dbfb8b9a 100644 --- a/lib/fog/terremark/requests/shared/get_organizations.rb +++ b/lib/fog/terremark/requests/shared/get_organizations.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get list of organizations # # ==== Returns @@ -24,11 +23,9 @@ module Fog :path => 'login' }) end - end module Mock - def get_organizations response = Excon::Response.new org_list = self.data[:organizations].map do |organization| @@ -42,7 +39,6 @@ module Fog response.headers = Fog::Terremark::Shared::Mock.headers(response.body, "application/vnd.vmware.vcloud.orgList+xml") response end - end end end diff --git a/lib/fog/terremark/requests/shared/get_public_ip.rb b/lib/fog/terremark/requests/shared/get_public_ip.rb index aed5ec487..eceeb1077 100644 --- a/lib/fog/terremark/requests/shared/get_public_ip.rb +++ b/lib/fog/terremark/requests/shared/get_public_ip.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details for a public ip # # ==== Parameters @@ -26,7 +25,6 @@ module Fog end request(opts) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_public_ips.rb b/lib/fog/terremark/requests/shared/get_public_ips.rb index 6815320fc..6a724e811 100644 --- a/lib/fog/terremark/requests/shared/get_public_ips.rb +++ b/lib/fog/terremark/requests/shared/get_public_ips.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get list of public ips # # ==== Parameters @@ -26,11 +25,9 @@ module Fog end request(opts) end - end module Mock - def get_public_ips(vdc_id) vdc_id = vdc_id.to_i response = Excon::Response.new @@ -65,7 +62,6 @@ module Fog response end - end end end diff --git a/lib/fog/terremark/requests/shared/get_task.rb b/lib/fog/terremark/requests/shared/get_task.rb index d3e2f9a83..e0b589267 100644 --- a/lib/fog/terremark/requests/shared/get_task.rb +++ b/lib/fog/terremark/requests/shared/get_task.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details of a task # # ==== Parameters @@ -32,7 +31,6 @@ module Fog :path => "task/#{task_id}" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_tasks_list.rb b/lib/fog/terremark/requests/shared/get_tasks_list.rb index e96fd71b9..a162a1b68 100644 --- a/lib/fog/terremark/requests/shared/get_tasks_list.rb +++ b/lib/fog/terremark/requests/shared/get_tasks_list.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get list of tasks # # ==== Parameters @@ -25,9 +24,7 @@ module Fog :path => "tasksList/#{tasks_list_id}" ) end - end - end end end diff --git a/lib/fog/terremark/requests/shared/get_vapp.rb b/lib/fog/terremark/requests/shared/get_vapp.rb index 7a7d47765..681fa577d 100644 --- a/lib/fog/terremark/requests/shared/get_vapp.rb +++ b/lib/fog/terremark/requests/shared/get_vapp.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details of a vapp # # ==== Parameters @@ -35,7 +34,6 @@ module Fog :path => "vapp/#{vapp_id}" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_vapp_template.rb b/lib/fog/terremark/requests/shared/get_vapp_template.rb index 734316f0f..c58962805 100644 --- a/lib/fog/terremark/requests/shared/get_vapp_template.rb +++ b/lib/fog/terremark/requests/shared/get_vapp_template.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details of a vapp template # # ==== Parameters @@ -28,7 +27,6 @@ module Fog :path => "vAppTemplate/#{vapp_template_id}" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/get_vdc.rb b/lib/fog/terremark/requests/shared/get_vdc.rb index 46fcfa22f..2e8f2cd85 100644 --- a/lib/fog/terremark/requests/shared/get_vdc.rb +++ b/lib/fog/terremark/requests/shared/get_vdc.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Get details of a vdc # # ==== Parameters @@ -28,11 +27,9 @@ module Fog :path => "vdc/#{vdc_id}" ) end - end module Mock - def get_vdc(vdc_id) vdc_id = vdc_id.to_i response = Excon::Response.new @@ -118,7 +115,6 @@ module Fog response end - end end end diff --git a/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb b/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb index 8b41ac559..9c99fde42 100644 --- a/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb +++ b/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Instatiate a vapp template # # ==== Parameters @@ -74,7 +73,6 @@ DATA :path => "vdc/#{options['vdc_id']}/action/instantiatevAppTemplate" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/power_off.rb b/lib/fog/terremark/requests/shared/power_off.rb index d82e1affa..1999d8b6c 100644 --- a/lib/fog/terremark/requests/shared/power_off.rb +++ b/lib/fog/terremark/requests/shared/power_off.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Power off a vapp # # ==== Parameters @@ -28,7 +27,6 @@ module Fog :path => "vApp/#{vapp_id}/power/action/powerOff" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/power_on.rb b/lib/fog/terremark/requests/shared/power_on.rb index 18d98a754..709ce4773 100644 --- a/lib/fog/terremark/requests/shared/power_on.rb +++ b/lib/fog/terremark/requests/shared/power_on.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Power on a vapp # # ==== Parameters @@ -28,7 +27,6 @@ module Fog :path => "vApp/#{vapp_id}/power/action/powerOn" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/power_reset.rb b/lib/fog/terremark/requests/shared/power_reset.rb index e4e747656..a4432278e 100644 --- a/lib/fog/terremark/requests/shared/power_reset.rb +++ b/lib/fog/terremark/requests/shared/power_reset.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Reset a vapp # # ==== Parameters @@ -28,7 +27,6 @@ module Fog :path => "vApp/#{vapp_id}/power/action/reset" ) end - end end end diff --git a/lib/fog/terremark/requests/shared/power_shutdown.rb b/lib/fog/terremark/requests/shared/power_shutdown.rb index ecfa97891..0c946656f 100644 --- a/lib/fog/terremark/requests/shared/power_shutdown.rb +++ b/lib/fog/terremark/requests/shared/power_shutdown.rb @@ -2,7 +2,6 @@ module Fog module Terremark module Shared module Real - # Shutdown a vapp # # ==== Parameters @@ -17,7 +16,6 @@ module Fog :path => "vApp/#{vapp_id}/power/action/shutdown" ) end - end end end diff --git a/lib/fog/terremark/shared.rb b/lib/fog/terremark/shared.rb index b5e709cdb..f002ca930 100644 --- a/lib/fog/terremark/shared.rb +++ b/lib/fog/terremark/shared.rb @@ -1,10 +1,8 @@ module Fog module Terremark module Shared - # Commond methods shared by Real and Mock module Common - def default_organization_id @default_organization_id ||= begin org_list = get_organizations.body['OrgList'] @@ -15,11 +13,9 @@ module Fog end end end - end module Parser - def parse(data) case data['type'] when 'application/vnd.vmware.vcloud.vApp+xml' @@ -28,7 +24,6 @@ module Fog data end end - end module Real @@ -91,7 +86,6 @@ module Fog :path => path }) end - end module Mock @@ -305,7 +299,6 @@ module Fog require 'fog/terremark/requests/shared/power_reset' require 'fog/terremark/requests/shared/power_shutdown' end - end end end diff --git a/lib/fog/terremark/vcloud.rb b/lib/fog/terremark/vcloud.rb index 24863673f..9ffff3493 100644 --- a/lib/fog/terremark/vcloud.rb +++ b/lib/fog/terremark/vcloud.rb @@ -1,7 +1,6 @@ module Fog module Terremark module Vcloud - module Bin end @@ -33,7 +32,6 @@ module Fog end class Real - include Fog::Terremark::Shared::Real include Fog::Terremark::Shared::Parser @@ -125,9 +123,7 @@ module Fog def reset_data self.class.data.delete(@terremark_username) end - end - end end end diff --git a/lib/fog/vcloud/compute.rb b/lib/fog/vcloud/compute.rb index 1ce57af88..95b0d81b5 100644 --- a/lib/fog/vcloud/compute.rb +++ b/lib/fog/vcloud/compute.rb @@ -3,7 +3,6 @@ require 'fog/vcloud/core' module Fog module Vcloud class Collection < Fog::Collection - def load(objects) objects = [ objects ] if objects.is_a?(Hash) super @@ -27,7 +26,6 @@ module Fog raise Fog::Errors::Error.new(msg) end end - end end end @@ -35,7 +33,6 @@ end module Fog module Vcloud class Model < Fog::Model - attr_accessor :loaded alias_method :loaded?, :loaded @@ -64,7 +61,6 @@ module Fog end EOS end - end end end @@ -72,7 +68,6 @@ end module Fog module Vcloud class Compute < Fog::Service - BASE_PATH = '/api' DEFAULT_VERSION = '1.5' SUPPORTED_VERSIONS = [ '1.5', '1.0' ] @@ -142,17 +137,13 @@ module Fog request :configure_vm_customization_script class Mock - def initialize(options={}) Fog::Mock.not_implemented end - end class Real - class << self - def basic_request(*args) self.class_eval <<-EOS, __FILE__,__LINE__ def #{args[0]}(uri) @@ -270,7 +261,6 @@ module Fog end end - def basic_request_params(uri,*args) { :expects => args[0] || 200, @@ -352,7 +342,6 @@ module Fog response end - end def self.item_requests(*types) types.each{|t| item_request(t) } diff --git a/lib/fog/vcloud/core.rb b/lib/fog/vcloud/core.rb index 35271568e..7722fd286 100644 --- a/lib/fog/vcloud/core.rb +++ b/lib/fog/vcloud/core.rb @@ -2,10 +2,8 @@ require 'fog/core' module Fog module Vcloud - extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/lib/fog/vcloud/models/compute/catalog.rb b/lib/fog/vcloud/models/compute/catalog.rb index 69ba1e0d2..42f513da1 100644 --- a/lib/fog/vcloud/models/compute/catalog.rb +++ b/lib/fog/vcloud/models/compute/catalog.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Catalog < Fog::Vcloud::Model - identity :href, :aliases => :Href attribute :links, :aliases => :Link, :type => :array ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd @@ -15,7 +14,6 @@ module Fog new( :service => service, :href => href ) end - end end end diff --git a/lib/fog/vcloud/models/compute/catalog_item.rb b/lib/fog/vcloud/models/compute/catalog_item.rb index da0fb0935..c63088ffb 100644 --- a/lib/fog/vcloud/models/compute/catalog_item.rb +++ b/lib/fog/vcloud/models/compute/catalog_item.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class CatalogItem < Fog::Vcloud::Model - identity :href, :aliases => :Href attribute :links, :aliases => :Link, :type => :array ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd diff --git a/lib/fog/vcloud/models/compute/catalog_items.rb b/lib/fog/vcloud/models/compute/catalog_items.rb index 6b7b43a88..3609f4522 100644 --- a/lib/fog/vcloud/models/compute/catalog_items.rb +++ b/lib/fog/vcloud/models/compute/catalog_items.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class CatalogItems < Fog::Vcloud::Collection - undef_method :create model Fog::Vcloud::Compute::CatalogItem @@ -29,7 +28,6 @@ module Fog def organization_uri @organization_uri ||= service.default_organization_uri end - end end end diff --git a/lib/fog/vcloud/models/compute/catalogs.rb b/lib/fog/vcloud/models/compute/catalogs.rb index cd73b195a..52a93ccd8 100644 --- a/lib/fog/vcloud/models/compute/catalogs.rb +++ b/lib/fog/vcloud/models/compute/catalogs.rb @@ -4,7 +4,6 @@ module Fog module Vcloud class Compute class Catalogs < Fog::Vcloud::Collection - model Fog::Vcloud::Compute::Catalog attribute :organization_uri @@ -31,7 +30,6 @@ module Fog end res end - end end end diff --git a/lib/fog/vcloud/models/compute/ip.rb b/lib/fog/vcloud/models/compute/ip.rb index 39287b843..9492563e7 100644 --- a/lib/fog/vcloud/models/compute/ip.rb +++ b/lib/fog/vcloud/models/compute/ip.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Ip < Fog::Vcloud::Model - identity :href, :aliases => :Href attribute :links, :aliases => :Link, :type => :array ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd @@ -35,7 +34,6 @@ module Fog :server => server } end - end end end diff --git a/lib/fog/vcloud/models/compute/ips.rb b/lib/fog/vcloud/models/compute/ips.rb index b09c942de..8633652b9 100644 --- a/lib/fog/vcloud/models/compute/ips.rb +++ b/lib/fog/vcloud/models/compute/ips.rb @@ -4,7 +4,6 @@ module Fog module Vcloud class Compute class Ips < Fog::Vcloud::Collection - model Fog::Vcloud::Compute::Ip undef_method :create @@ -26,7 +25,6 @@ module Fog rescue Fog::Errors::NotFound nil end - end end end diff --git a/lib/fog/vcloud/models/compute/network.rb b/lib/fog/vcloud/models/compute/network.rb index fe8d817a9..6b76b33f0 100644 --- a/lib/fog/vcloud/models/compute/network.rb +++ b/lib/fog/vcloud/models/compute/network.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Network < Fog::Vcloud::Model - identity :href, :aliases => :Href attribute :links, :aliases => :Link, :type => :array ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd diff --git a/lib/fog/vcloud/models/compute/networks.rb b/lib/fog/vcloud/models/compute/networks.rb index fba7766b4..6c0d7e200 100644 --- a/lib/fog/vcloud/models/compute/networks.rb +++ b/lib/fog/vcloud/models/compute/networks.rb @@ -3,9 +3,7 @@ require 'fog/vcloud/models/compute/network' module Fog module Vcloud class Compute - class Networks < Fog::Vcloud::Collection - undef_method :create model Fog::Vcloud::Compute::Network diff --git a/lib/fog/vcloud/models/compute/organization.rb b/lib/fog/vcloud/models/compute/organization.rb index 699ddb0fb..e8cf2fd8b 100644 --- a/lib/fog/vcloud/models/compute/organization.rb +++ b/lib/fog/vcloud/models/compute/organization.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Organization < Fog::Vcloud::Model - identity :href, :aliases => :Href attribute :links, :aliases => :Link, :type => :array ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd @@ -36,7 +35,6 @@ module Fog new( :service => service, :href => href ) end - end end end diff --git a/lib/fog/vcloud/models/compute/organizations.rb b/lib/fog/vcloud/models/compute/organizations.rb index 939bab9c5..381f30bd8 100644 --- a/lib/fog/vcloud/models/compute/organizations.rb +++ b/lib/fog/vcloud/models/compute/organizations.rb @@ -3,9 +3,7 @@ require 'fog/vcloud/models/compute/organization' module Fog module Vcloud class Compute - class Organizations < Collection - model Fog::Vcloud::Compute::Organization undef_method :create diff --git a/lib/fog/vcloud/models/compute/server.rb b/lib/fog/vcloud/models/compute/server.rb index 029384b4a..5656ddaad 100644 --- a/lib/fog/vcloud/models/compute/server.rb +++ b/lib/fog/vcloud/models/compute/server.rb @@ -3,7 +3,6 @@ module Fog module Vcloud class Compute class Server < Fog::Vcloud::Model - include Fog::Vcloud::Compute::Helpers::Status identity :href, :aliases => :Href @@ -100,6 +99,7 @@ module Fog attributes[:name] = new_name @changed = true end + def password guest_customization[:AdminPassword] end @@ -109,6 +109,7 @@ module Fog @changed = true @update_password = password end + def cpus if cpu_mess { :count => cpu_mess[:"rasd:VirtualQuantity"].to_i, @@ -137,14 +138,17 @@ module Fog @update_memory_value = amount amount end + def network network_connections[:NetworkConnection] if network_connections end + def network=(network_info) @changed = true @update_network = network_info network_info end + def disks disk_mess.map do |dm| { :number => dm[:"rasd:AddressOnParent"].to_i, :size => dm[:"rasd:HostResource"][:vcloud_capacity].to_i, :resource => dm[:"rasd:HostResource"], :disk_data => dm } diff --git a/lib/fog/vcloud/models/compute/servers.rb b/lib/fog/vcloud/models/compute/servers.rb index b98570a55..ffdb1d185 100644 --- a/lib/fog/vcloud/models/compute/servers.rb +++ b/lib/fog/vcloud/models/compute/servers.rb @@ -3,9 +3,7 @@ require 'fog/vcloud/models/compute/server' module Fog module Vcloud class Compute - class Servers < Fog::Vcloud::Collection - undef_method :create model Fog::Vcloud::Compute::Server @@ -45,7 +43,6 @@ module Fog :collection => Fog::Vcloud::Compute::Vapps.new(:service => service) ) end - end end end diff --git a/lib/fog/vcloud/models/compute/tags.rb b/lib/fog/vcloud/models/compute/tags.rb index 7b209de90..52968fc10 100644 --- a/lib/fog/vcloud/models/compute/tags.rb +++ b/lib/fog/vcloud/models/compute/tags.rb @@ -3,9 +3,7 @@ require 'fog/vcloud/models/compute/tag' module Fog module Vcloud class Compute - class Tags < Fog::Vcloud::Collection - undef_method :create model Fog::Vcloud::Compute::Tag diff --git a/lib/fog/vcloud/models/compute/task.rb b/lib/fog/vcloud/models/compute/task.rb index 2f8c1f61d..9ee9a381a 100644 --- a/lib/fog/vcloud/models/compute/task.rb +++ b/lib/fog/vcloud/models/compute/task.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Task < Fog::Vcloud::Model - identity :href, :aliases => :Href attribute :links, :aliases => :Link, :type => :array ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd @@ -14,7 +13,6 @@ module Fog attribute :start_time, :aliases => :startTime, :type => :time attribute :end_time, :aliases => :endTime, :type => :time attribute :error, :aliases => :Error - end end end diff --git a/lib/fog/vcloud/models/compute/tasks.rb b/lib/fog/vcloud/models/compute/tasks.rb index 61ba10c53..fc9b13a3b 100644 --- a/lib/fog/vcloud/models/compute/tasks.rb +++ b/lib/fog/vcloud/models/compute/tasks.rb @@ -3,9 +3,7 @@ require 'fog/vcloud/models/compute/task' module Fog module Vcloud class Compute - class Tasks < Fog::Vcloud::Collection - model Fog::Vcloud::Compute::Task attribute :href, :aliases => :Href @@ -23,7 +21,6 @@ module Fog rescue Fog::Errors::NotFound nil end - end end end diff --git a/lib/fog/vcloud/models/compute/vapp.rb b/lib/fog/vcloud/models/compute/vapp.rb index 30d40cc84..3bb2ee347 100644 --- a/lib/fog/vcloud/models/compute/vapp.rb +++ b/lib/fog/vcloud/models/compute/vapp.rb @@ -3,7 +3,6 @@ module Fog module Vcloud class Compute class Vapp < Fog::Vcloud::Model - include Fog::Vcloud::Compute::Helpers::Status identity :href, :aliases => :Href diff --git a/lib/fog/vcloud/models/compute/vapps.rb b/lib/fog/vcloud/models/compute/vapps.rb index 0aeac9157..bc1ca50ff 100644 --- a/lib/fog/vcloud/models/compute/vapps.rb +++ b/lib/fog/vcloud/models/compute/vapps.rb @@ -3,9 +3,7 @@ require 'fog/vcloud/models/compute/vapp' module Fog module Vcloud class Compute - class Vapps < Collection - model Fog::Vcloud::Compute::Vapp undef_method :create @@ -21,7 +19,6 @@ module Fog rescue Fog::Errors::NotFound nil end - end end end diff --git a/lib/fog/vcloud/models/compute/vdc.rb b/lib/fog/vcloud/models/compute/vdc.rb index 59757b939..1ccf3f5a8 100644 --- a/lib/fog/vcloud/models/compute/vdc.rb +++ b/lib/fog/vcloud/models/compute/vdc.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Vdc < Fog::Vcloud::Model - identity :href, :aliases => :Href attribute :links, :aliases => :Link, :type => :array ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd @@ -34,7 +33,6 @@ module Fog :href => href ) end - end end end diff --git a/lib/fog/vcloud/models/compute/vdcs.rb b/lib/fog/vcloud/models/compute/vdcs.rb index fd0418aa8..cd891c755 100644 --- a/lib/fog/vcloud/models/compute/vdcs.rb +++ b/lib/fog/vcloud/models/compute/vdcs.rb @@ -3,9 +3,7 @@ require 'fog/vcloud/models/compute/vdc' module Fog module Vcloud class Compute - class Vdcs < Collection - model Fog::Vcloud::Compute::Vdc undef_method :create diff --git a/lib/fog/vcloud/requests/compute/clone_vapp.rb b/lib/fog/vcloud/requests/compute/clone_vapp.rb index ac80756b6..719502ad1 100644 --- a/lib/fog/vcloud/requests/compute/clone_vapp.rb +++ b/lib/fog/vcloud/requests/compute/clone_vapp.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Real - def validate_clone_vapp_options(options) valid_opts = [:name, :poweron] unless valid_opts.all? { |opt| options.has_key?(opt) } diff --git a/lib/fog/vcloud/requests/compute/configure_metadata.rb b/lib/fog/vcloud/requests/compute/configure_metadata.rb index f47de8000..1347d010c 100644 --- a/lib/fog/vcloud/requests/compute/configure_metadata.rb +++ b/lib/fog/vcloud/requests/compute/configure_metadata.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Real - def configure_metadata(opts= {}) valid_opts = [:key, :value, :href] unless valid_opts.all? { |opt| opts.has_key?(opt) } @@ -29,7 +28,6 @@ EOF :parse => true ) end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_network.rb b/lib/fog/vcloud/requests/compute/configure_network.rb index 1ff175939..21d18b944 100644 --- a/lib/fog/vcloud/requests/compute/configure_network.rb +++ b/lib/fog/vcloud/requests/compute/configure_network.rb @@ -2,7 +2,6 @@ module Fog module Vcloud class Compute class Real - def validate_network_data(network_data, configure=false) valid_opts = [:id, :href, :name, :address, :broadcast, :gateway] unless valid_opts.all? { |opt| network_data.has_key?(opt) } @@ -36,7 +35,6 @@ module Fog builder.GatewayAddress(network_data[:gateway]) } end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_node.rb b/lib/fog/vcloud/requests/compute/configure_node.rb index 90325bc1d..92577178c 100644 --- a/lib/fog/vcloud/requests/compute/configure_node.rb +++ b/lib/fog/vcloud/requests/compute/configure_node.rb @@ -13,7 +13,6 @@ module Fog builder.Description(node_data[:description]) } end - end class Real @@ -31,7 +30,6 @@ module Fog :parse => true ) end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_org_network.rb b/lib/fog/vcloud/requests/compute/configure_org_network.rb index 133ccaa87..f8fe52195 100644 --- a/lib/fog/vcloud/requests/compute/configure_org_network.rb +++ b/lib/fog/vcloud/requests/compute/configure_org_network.rb @@ -3,7 +3,6 @@ module Fog module Vcloud class Compute class Real - def generate_outbound_rule() outbound_rule = < @@ -23,6 +22,7 @@ module Fog EOF outbound_rule end + def generate_tcp_rules(tcp_ports) firewall_rules = "" tcp_ports.each do |port| @@ -70,7 +70,6 @@ EOF end def generate_configure_org_network_request(vapp_id, vapp_network, vapp_network_uri, org_network, org_network_uri, enable_firewall=false, portmap=nil) - firewall_body = "" if not enable_firewall firewall_body = "false" diff --git a/lib/fog/vcloud/requests/compute/configure_vapp.rb b/lib/fog/vcloud/requests/compute/configure_vapp.rb index 748d5ba8f..f895fafef 100644 --- a/lib/fog/vcloud/requests/compute/configure_vapp.rb +++ b/lib/fog/vcloud/requests/compute/configure_vapp.rb @@ -105,7 +105,6 @@ module Fog :parse => true ) end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_vm.rb b/lib/fog/vcloud/requests/compute/configure_vm.rb index 5154647f1..bb19e0fed 100644 --- a/lib/fog/vcloud/requests/compute/configure_vm.rb +++ b/lib/fog/vcloud/requests/compute/configure_vm.rb @@ -62,8 +62,6 @@ module Fog } end - - # builder.Item(:xmlns => 'http://schemas.dmtf.org/ovf/envelope/1') { # #builder.Item { # builder.InstanceID(1, :xmlns => 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData') @@ -102,7 +100,6 @@ module Fog :parse => true ) end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_vm_cpus.rb b/lib/fog/vcloud/requests/compute/configure_vm_cpus.rb index e755b375d..7ea89dd68 100644 --- a/lib/fog/vcloud/requests/compute/configure_vm_cpus.rb +++ b/lib/fog/vcloud/requests/compute/configure_vm_cpus.rb @@ -3,7 +3,6 @@ module Fog module Vcloud class Compute class Real - def configure_vm_cpus(vm_data) edit_uri = vm_data.select {|k,v| k == :Link && v[:rel] == 'edit'} edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[1][:href] : edit_uri[:Link][:href] @@ -30,9 +29,7 @@ EOF :parse => true ) end - end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_vm_customization_script.rb b/lib/fog/vcloud/requests/compute/configure_vm_customization_script.rb index 021e0d32d..4b6861294 100644 --- a/lib/fog/vcloud/requests/compute/configure_vm_customization_script.rb +++ b/lib/fog/vcloud/requests/compute/configure_vm_customization_script.rb @@ -3,7 +3,6 @@ module Fog module Vcloud class Compute class Real - def configure_vm_customization_script(vmdata) edit_uri = vmdata[:href] body = < true ) end - end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_vm_disks.rb b/lib/fog/vcloud/requests/compute/configure_vm_disks.rb index b61713bc0..7e8bf4ed2 100644 --- a/lib/fog/vcloud/requests/compute/configure_vm_disks.rb +++ b/lib/fog/vcloud/requests/compute/configure_vm_disks.rb @@ -28,15 +28,10 @@ # # - - - - module Fog module Vcloud class Compute class Real - def generate_configure_vm_disks_request(href, disk_data) xmlns = { "xmlns:rasd" => "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", @@ -92,9 +87,7 @@ module Fog :parse => true ) end - end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_vm_memory.rb b/lib/fog/vcloud/requests/compute/configure_vm_memory.rb index ebd2411db..c75f53670 100644 --- a/lib/fog/vcloud/requests/compute/configure_vm_memory.rb +++ b/lib/fog/vcloud/requests/compute/configure_vm_memory.rb @@ -3,7 +3,6 @@ module Fog module Vcloud class Compute class Real - def configure_vm_memory(vm_data) edit_uri = vm_data.select {|k,v| k == :Link && v[:rel] == 'edit'} edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[1][:href] : edit_uri[:Link][:href] @@ -31,9 +30,7 @@ EOF :parse => true ) end - end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_vm_name_description.rb b/lib/fog/vcloud/requests/compute/configure_vm_name_description.rb index 898d71e28..5665efa4c 100644 --- a/lib/fog/vcloud/requests/compute/configure_vm_name_description.rb +++ b/lib/fog/vcloud/requests/compute/configure_vm_name_description.rb @@ -3,9 +3,7 @@ module Fog module Vcloud class Compute class Real - def configure_vm_name_description(edit_href, name, description) - body = < @@ -22,9 +20,7 @@ EOF :parse => true ) end - end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_vm_network.rb b/lib/fog/vcloud/requests/compute/configure_vm_network.rb index 5d18ddb74..e1f1158bc 100644 --- a/lib/fog/vcloud/requests/compute/configure_vm_network.rb +++ b/lib/fog/vcloud/requests/compute/configure_vm_network.rb @@ -3,7 +3,6 @@ module Fog module Vcloud class Compute class Real - def configure_vm_network(network_info) edit_uri = network_info.select {|k,v| k == :Link && v[:rel] == 'edit'} edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[1][:href] : edit_uri[:Link][:href] @@ -28,9 +27,7 @@ EOF :parse => true ) end - end - end end end diff --git a/lib/fog/vcloud/requests/compute/configure_vm_password.rb b/lib/fog/vcloud/requests/compute/configure_vm_password.rb index 426e85123..d17d313a1 100644 --- a/lib/fog/vcloud/requests/compute/configure_vm_password.rb +++ b/lib/fog/vcloud/requests/compute/configure_vm_password.rb @@ -3,7 +3,6 @@ module Fog module Vcloud class Compute class Real - def configure_vm_password(vmdata) edit_uri = vmdata[:href] body = < true ) end - end - end end end diff --git a/lib/fog/vcloud/requests/compute/delete_metadata.rb b/lib/fog/vcloud/requests/compute/delete_metadata.rb index dfea3a5eb..ccbcff8f7 100644 --- a/lib/fog/vcloud/requests/compute/delete_metadata.rb +++ b/lib/fog/vcloud/requests/compute/delete_metadata.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :delete_metadata, 202, "DELETE" end diff --git a/lib/fog/vcloud/requests/compute/delete_node.rb b/lib/fog/vcloud/requests/compute/delete_node.rb index 59dc11f7d..abd3ef002 100644 --- a/lib/fog/vcloud/requests/compute/delete_node.rb +++ b/lib/fog/vcloud/requests/compute/delete_node.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :delete_node, 200, 'DELETE', {}, "" end diff --git a/lib/fog/vcloud/requests/compute/delete_vapp.rb b/lib/fog/vcloud/requests/compute/delete_vapp.rb index 4d008b83b..cc103992f 100644 --- a/lib/fog/vcloud/requests/compute/delete_vapp.rb +++ b/lib/fog/vcloud/requests/compute/delete_vapp.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :delete_vapp, 202, "DELETE" end diff --git a/lib/fog/vcloud/requests/compute/get_catalog.rb b/lib/fog/vcloud/requests/compute/get_catalog.rb index d72c0782d..84f2a2ffe 100644 --- a/lib/fog/vcloud/requests/compute/get_catalog.rb +++ b/lib/fog/vcloud/requests/compute/get_catalog.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :get_catalog end diff --git a/lib/fog/vcloud/requests/compute/get_catalog_item.rb b/lib/fog/vcloud/requests/compute/get_catalog_item.rb index 827c2f9cd..21d74a0dc 100644 --- a/lib/fog/vcloud/requests/compute/get_catalog_item.rb +++ b/lib/fog/vcloud/requests/compute/get_catalog_item.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :get_catalog_item end diff --git a/lib/fog/vcloud/requests/compute/get_customization_options.rb b/lib/fog/vcloud/requests/compute/get_customization_options.rb index 4b4e1e23c..420fa64d9 100644 --- a/lib/fog/vcloud/requests/compute/get_customization_options.rb +++ b/lib/fog/vcloud/requests/compute/get_customization_options.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :get_customization_options end diff --git a/lib/fog/vcloud/requests/compute/get_metadata.rb b/lib/fog/vcloud/requests/compute/get_metadata.rb index 5f585d914..9ca2feda1 100644 --- a/lib/fog/vcloud/requests/compute/get_metadata.rb +++ b/lib/fog/vcloud/requests/compute/get_metadata.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :get_metadata end diff --git a/lib/fog/vcloud/requests/compute/get_network.rb b/lib/fog/vcloud/requests/compute/get_network.rb index 7a967fc50..fbd2d298d 100644 --- a/lib/fog/vcloud/requests/compute/get_network.rb +++ b/lib/fog/vcloud/requests/compute/get_network.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :get_network end diff --git a/lib/fog/vcloud/requests/compute/get_network_extensions.rb b/lib/fog/vcloud/requests/compute/get_network_extensions.rb index 1660ae22b..16a153cbb 100644 --- a/lib/fog/vcloud/requests/compute/get_network_extensions.rb +++ b/lib/fog/vcloud/requests/compute/get_network_extensions.rb @@ -1,11 +1,9 @@ module Fog module Vcloud class Compute - class Real basic_request :get_network_extensions end - end end end diff --git a/lib/fog/vcloud/requests/compute/get_network_ip.rb b/lib/fog/vcloud/requests/compute/get_network_ip.rb index f2b5fdc38..929ac3c47 100644 --- a/lib/fog/vcloud/requests/compute/get_network_ip.rb +++ b/lib/fog/vcloud/requests/compute/get_network_ip.rb @@ -5,11 +5,9 @@ module Fog module Vcloud class Compute - class Real basic_request :get_network_ip end - end end end diff --git a/lib/fog/vcloud/requests/compute/get_network_ips.rb b/lib/fog/vcloud/requests/compute/get_network_ips.rb index a569d9385..11f91ac59 100644 --- a/lib/fog/vcloud/requests/compute/get_network_ips.rb +++ b/lib/fog/vcloud/requests/compute/get_network_ips.rb @@ -5,11 +5,9 @@ module Fog module Vcloud class Compute - class Real basic_request :get_network_ips end - end end end diff --git a/lib/fog/vcloud/requests/compute/get_organization.rb b/lib/fog/vcloud/requests/compute/get_organization.rb index 8d5c2e392..1985cc887 100644 --- a/lib/fog/vcloud/requests/compute/get_organization.rb +++ b/lib/fog/vcloud/requests/compute/get_organization.rb @@ -1,11 +1,9 @@ module Fog module Vcloud class Compute - class Real basic_request :get_organization end - end end end diff --git a/lib/fog/vcloud/requests/compute/get_server.rb b/lib/fog/vcloud/requests/compute/get_server.rb index 633684f33..5cc5f772a 100644 --- a/lib/fog/vcloud/requests/compute/get_server.rb +++ b/lib/fog/vcloud/requests/compute/get_server.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :get_server end diff --git a/lib/fog/vcloud/requests/compute/get_task.rb b/lib/fog/vcloud/requests/compute/get_task.rb index 2a6b8b80f..f58b6e9de 100644 --- a/lib/fog/vcloud/requests/compute/get_task.rb +++ b/lib/fog/vcloud/requests/compute/get_task.rb @@ -1,11 +1,9 @@ module Fog module Vcloud class Compute - class Real basic_request :get_task end - end end end diff --git a/lib/fog/vcloud/requests/compute/get_task_list.rb b/lib/fog/vcloud/requests/compute/get_task_list.rb index 9dbb5d3f2..a5e95211e 100644 --- a/lib/fog/vcloud/requests/compute/get_task_list.rb +++ b/lib/fog/vcloud/requests/compute/get_task_list.rb @@ -1,11 +1,9 @@ module Fog module Vcloud class Compute - class Real basic_request :get_task_list end - end end end diff --git a/lib/fog/vcloud/requests/compute/get_vapp.rb b/lib/fog/vcloud/requests/compute/get_vapp.rb index 5b873742c..dd460bd17 100644 --- a/lib/fog/vcloud/requests/compute/get_vapp.rb +++ b/lib/fog/vcloud/requests/compute/get_vapp.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :get_vapp end diff --git a/lib/fog/vcloud/requests/compute/get_vapp_template.rb b/lib/fog/vcloud/requests/compute/get_vapp_template.rb index 72f556053..2865bedb7 100644 --- a/lib/fog/vcloud/requests/compute/get_vapp_template.rb +++ b/lib/fog/vcloud/requests/compute/get_vapp_template.rb @@ -1,11 +1,9 @@ module Fog module Vcloud class Compute - class Real basic_request :get_vapp_template end - end end end diff --git a/lib/fog/vcloud/requests/compute/get_vdc.rb b/lib/fog/vcloud/requests/compute/get_vdc.rb index 2c26be769..49999deeb 100644 --- a/lib/fog/vcloud/requests/compute/get_vdc.rb +++ b/lib/fog/vcloud/requests/compute/get_vdc.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :get_vdc end diff --git a/lib/fog/vcloud/requests/compute/get_vm_disks.rb b/lib/fog/vcloud/requests/compute/get_vm_disks.rb index 9b56f186f..49cc48982 100644 --- a/lib/fog/vcloud/requests/compute/get_vm_disks.rb +++ b/lib/fog/vcloud/requests/compute/get_vm_disks.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real def get_vm_disks(href) request( diff --git a/lib/fog/vcloud/requests/compute/get_vm_memory.rb b/lib/fog/vcloud/requests/compute/get_vm_memory.rb index 374fbe74b..f69c05ce9 100644 --- a/lib/fog/vcloud/requests/compute/get_vm_memory.rb +++ b/lib/fog/vcloud/requests/compute/get_vm_memory.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real def get_vm_memory(href, parse = true) request( diff --git a/lib/fog/vcloud/requests/compute/login.rb b/lib/fog/vcloud/requests/compute/login.rb index da7ebdc98..b7c3bdb81 100644 --- a/lib/fog/vcloud/requests/compute/login.rb +++ b/lib/fog/vcloud/requests/compute/login.rb @@ -1,10 +1,7 @@ module Fog module Vcloud class Compute - class Real - - def login headers = { 'Authorization' => authorization_header } uri = if version == '1.0' @@ -20,7 +17,6 @@ module Fog :uri => uri }) end - end end end diff --git a/lib/fog/vcloud/requests/compute/power_off.rb b/lib/fog/vcloud/requests/compute/power_off.rb index a742dcc0e..fb85da273 100644 --- a/lib/fog/vcloud/requests/compute/power_off.rb +++ b/lib/fog/vcloud/requests/compute/power_off.rb @@ -1,7 +1,6 @@ module Fog module Vcloud class Compute - class Real basic_request :power_off, 202, 'POST' end diff --git a/lib/fog/vcloud/requests/compute/power_on.rb b/lib/fog/vcloud/requests/compute/power_on.rb index 3b76debc1..aefeeede4 100644 --- a/lib/fog/vcloud/requests/compute/power_on.rb +++ b/lib/fog/vcloud/requests/compute/power_on.rb @@ -1,11 +1,9 @@ module Fog module Vcloud class Compute - class Real basic_request :power_on, 202, 'POST' end - end end end diff --git a/lib/fog/vcloud/requests/compute/power_reset.rb b/lib/fog/vcloud/requests/compute/power_reset.rb index 78942a94a..960f319a3 100644 --- a/lib/fog/vcloud/requests/compute/power_reset.rb +++ b/lib/fog/vcloud/requests/compute/power_reset.rb @@ -1,11 +1,9 @@ module Fog module Vcloud class Compute - class Real basic_request :power_reset, 202, 'POST' end - end end end diff --git a/lib/fog/vcloud/requests/compute/power_shutdown.rb b/lib/fog/vcloud/requests/compute/power_shutdown.rb index 0bb1e2c40..197fae56a 100644 --- a/lib/fog/vcloud/requests/compute/power_shutdown.rb +++ b/lib/fog/vcloud/requests/compute/power_shutdown.rb @@ -1,11 +1,9 @@ module Fog module Vcloud class Compute - class Real basic_request :power_shutdown, 204, 'POST' end - end end end diff --git a/lib/fog/vcloud_director/compute.rb b/lib/fog/vcloud_director/compute.rb index 3c0324105..41263de3e 100644 --- a/lib/fog/vcloud_director/compute.rb +++ b/lib/fog/vcloud_director/compute.rb @@ -24,7 +24,6 @@ end module Fog module Compute class VcloudDirector < Fog::Service - module Defaults PATH = '/api' PORT = 443 @@ -475,7 +474,6 @@ module Fog @vcloud_token = nil @org_name = nil end - end class Mock @@ -791,7 +789,6 @@ module Fog def xsi_schema_location "http://www.vmware.com/vcloud/v1.5 http://#{@host}#{@path}/v1.5/schema/master.xsd" end - end end end diff --git a/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb b/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb index effa0a698..f2b224fa6 100644 --- a/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb +++ b/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb @@ -151,7 +151,6 @@ module Fog end } end - end end end diff --git a/lib/fog/vcloud_director/generators/compute/org_vdc_network.rb b/lib/fog/vcloud_director/generators/compute/org_vdc_network.rb index 9e3017da3..3de7eb0aa 100644 --- a/lib/fog/vcloud_director/generators/compute/org_vdc_network.rb +++ b/lib/fog/vcloud_director/generators/compute/org_vdc_network.rb @@ -2,7 +2,6 @@ module Fog module Generators module Compute module VcloudDirector - # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/OrgVdcNetworkType.html class OrgVdcNetwork attr_reader :options @@ -12,7 +11,6 @@ module Fog end def generate_xml - body = Nokogiri::XML::Builder.new do attrs = { :xmlns => 'http://www.vmware.com/vcloud/v1.5', @@ -83,7 +81,6 @@ module Fog } end.to_xml end - end end end diff --git a/lib/fog/vcloud_director/generators/compute/vapp.rb b/lib/fog/vcloud_director/generators/compute/vapp.rb index 7dad183a7..061ab7585 100644 --- a/lib/fog/vcloud_director/generators/compute/vapp.rb +++ b/lib/fog/vcloud_director/generators/compute/vapp.rb @@ -2,7 +2,6 @@ module Fog module Generators module Compute module VcloudDirector - # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VAppType.html class Vapp attr_reader :name, :options @@ -22,7 +21,6 @@ module Fog } end.to_xml end - end end end diff --git a/lib/fog/vcloud_director/generators/compute/vm.rb b/lib/fog/vcloud_director/generators/compute/vm.rb index 38d5aeeb6..a84ee2852 100644 --- a/lib/fog/vcloud_director/generators/compute/vm.rb +++ b/lib/fog/vcloud_director/generators/compute/vm.rb @@ -2,7 +2,6 @@ module Fog module Generators module Compute module VcloudDirector - # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VmType.html class Vm attr_reader :attrs diff --git a/lib/fog/vcloud_director/models/compute/catalog.rb b/lib/fog/vcloud_director/models/compute/catalog.rb index 9c5b57fb1..673c3ed81 100644 --- a/lib/fog/vcloud_director/models/compute/catalog.rb +++ b/lib/fog/vcloud_director/models/compute/catalog.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Catalog < Model - identity :id attribute :name @@ -18,7 +16,6 @@ module Fog requires :id service.catalog_items(:catalog => self) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/catalog_item.rb b/lib/fog/vcloud_director/models/compute/catalog_item.rb index b99be1648..3e222ae4d 100644 --- a/lib/fog/vcloud_director/models/compute/catalog_item.rb +++ b/lib/fog/vcloud_director/models/compute/catalog_item.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class CatalogItem < Model - identity :id attribute :name @@ -19,7 +17,6 @@ module Fog service.process_task(response.body[:Tasks][:Task]) response.body[:href].split('/').last # returns the vapp_id if it was instantiated successfully . end - end end end diff --git a/lib/fog/vcloud_director/models/compute/catalog_items.rb b/lib/fog/vcloud_director/models/compute/catalog_items.rb index 2ed850b9c..06351f52a 100644 --- a/lib/fog/vcloud_director/models/compute/catalog_items.rb +++ b/lib/fog/vcloud_director/models/compute/catalog_items.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/catalog_item' module Fog module Compute class VcloudDirector - class CatalogItems < Collection model Fog::Compute::VcloudDirector::CatalogItem diff --git a/lib/fog/vcloud_director/models/compute/catalogs.rb b/lib/fog/vcloud_director/models/compute/catalogs.rb index 7fe07c562..d63255477 100644 --- a/lib/fog/vcloud_director/models/compute/catalogs.rb +++ b/lib/fog/vcloud_director/models/compute/catalogs.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/catalog' module Fog module Compute class VcloudDirector - class Catalogs < Collection model Fog::Compute::VcloudDirector::Catalog @@ -25,7 +24,6 @@ module Fog items.each{|item| service.add_id_from_href!(item) } items end - end end end diff --git a/lib/fog/vcloud_director/models/compute/disk.rb b/lib/fog/vcloud_director/models/compute/disk.rb index 994cc0548..db41b3fdb 100644 --- a/lib/fog/vcloud_director/models/compute/disk.rb +++ b/lib/fog/vcloud_director/models/compute/disk.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Disk < Model # there is no lazy_load in disks - identity :id attribute :address @@ -44,7 +42,6 @@ module Fog response = service.put_disks(attributes[:vm].id, data.disks) service.process_task(response.body) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/disks.rb b/lib/fog/vcloud_director/models/compute/disks.rb index d692f9483..d653d74e0 100644 --- a/lib/fog/vcloud_director/models/compute/disks.rb +++ b/lib/fog/vcloud_director/models/compute/disks.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/disk' module Fog module Compute class VcloudDirector - class Disks < Collection model Fog::Compute::VcloudDirector::Disk @@ -33,7 +32,6 @@ module Fog end items end - end end end diff --git a/lib/fog/vcloud_director/models/compute/media.rb b/lib/fog/vcloud_director/models/compute/media.rb index b1830bfb3..71adef01b 100644 --- a/lib/fog/vcloud_director/models/compute/media.rb +++ b/lib/fog/vcloud_director/models/compute/media.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Media < Model - identity :id attribute :href @@ -22,7 +20,6 @@ module Fog response = service.delete_media(id) service.process_task(response.body) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/medias.rb b/lib/fog/vcloud_director/models/compute/medias.rb index b50e944d3..521e1c896 100644 --- a/lib/fog/vcloud_director/models/compute/medias.rb +++ b/lib/fog/vcloud_director/models/compute/medias.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/media' module Fog module Compute class VcloudDirector - class Medias < Collection model Fog::Compute::VcloudDirector::Media @@ -70,7 +69,6 @@ module Fog items.each {|item| service.add_id_from_href!(item)} items end - end end end diff --git a/lib/fog/vcloud_director/models/compute/network.rb b/lib/fog/vcloud_director/models/compute/network.rb index 3245ded95..42586948d 100644 --- a/lib/fog/vcloud_director/models/compute/network.rb +++ b/lib/fog/vcloud_director/models/compute/network.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Network < Model - identity :id attribute :name @@ -21,7 +19,6 @@ module Fog attribute :dns2 attribute :dns_suffix attribute :ip_ranges, :type => :array - end end end diff --git a/lib/fog/vcloud_director/models/compute/networks.rb b/lib/fog/vcloud_director/models/compute/networks.rb index 03bd3b12a..2958abbcb 100644 --- a/lib/fog/vcloud_director/models/compute/networks.rb +++ b/lib/fog/vcloud_director/models/compute/networks.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/network' module Fog module Compute class VcloudDirector - class Networks < Collection model Fog::Compute::VcloudDirector::Network @@ -45,7 +44,6 @@ module Fog items.each{|item| service.add_id_from_href!(item) } items end - end end end diff --git a/lib/fog/vcloud_director/models/compute/organization.rb b/lib/fog/vcloud_director/models/compute/organization.rb index aea06d39b..372aec1f3 100644 --- a/lib/fog/vcloud_director/models/compute/organization.rb +++ b/lib/fog/vcloud_director/models/compute/organization.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Organization < Model - identity :id attribute :name @@ -33,9 +31,7 @@ module Fog requires :id service.tasks(:organization => self) end - end - end end end diff --git a/lib/fog/vcloud_director/models/compute/organizations.rb b/lib/fog/vcloud_director/models/compute/organizations.rb index 9e0af7755..123728dbf 100644 --- a/lib/fog/vcloud_director/models/compute/organizations.rb +++ b/lib/fog/vcloud_director/models/compute/organizations.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/organization' module Fog module Compute class VcloudDirector - class Organizations < Collection model Fog::Compute::VcloudDirector::Organization @@ -23,7 +22,6 @@ module Fog orgs.each {|org| service.add_id_from_href!(org)} orgs end - end end end diff --git a/lib/fog/vcloud_director/models/compute/tag.rb b/lib/fog/vcloud_director/models/compute/tag.rb index 278003a16..f1158f0f5 100644 --- a/lib/fog/vcloud_director/models/compute/tag.rb +++ b/lib/fog/vcloud_director/models/compute/tag.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Tag < Model - identity :id attribute :value @@ -27,7 +25,6 @@ module Fog def vm attributes[:vm] end - end end end diff --git a/lib/fog/vcloud_director/models/compute/tags.rb b/lib/fog/vcloud_director/models/compute/tags.rb index efe3617af..46cee0807 100644 --- a/lib/fog/vcloud_director/models/compute/tags.rb +++ b/lib/fog/vcloud_director/models/compute/tags.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/tag' module Fog module Compute class VcloudDirector - class Tags < Collection model Fog::Compute::VcloudDirector::Tag @@ -36,7 +35,6 @@ module Fog hash_items.each_pair{ |k,v| @items << {:id => k, :value => v }.merge(:vm => vm) } @items end - end end end diff --git a/lib/fog/vcloud_director/models/compute/task.rb b/lib/fog/vcloud_director/models/compute/task.rb index c3c3ebe3e..26d906df5 100644 --- a/lib/fog/vcloud_director/models/compute/task.rb +++ b/lib/fog/vcloud_director/models/compute/task.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Task < Fog::Model - identity :id attribute :href @@ -51,9 +49,7 @@ module Fog def cancel service.post_cancel_task(id) end - end - end end end diff --git a/lib/fog/vcloud_director/models/compute/tasks.rb b/lib/fog/vcloud_director/models/compute/tasks.rb index 406c0c792..caa6b4b5d 100644 --- a/lib/fog/vcloud_director/models/compute/tasks.rb +++ b/lib/fog/vcloud_director/models/compute/tasks.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/task' module Fog module Compute class VcloudDirector - class Tasks < Collection model Fog::Compute::VcloudDirector::Task @@ -24,7 +23,6 @@ module Fog data = service.get_task_list(organization.id).body data[:Task].each {|task| service.add_id_from_href!(task)} end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vapp.rb b/lib/fog/vcloud_director/models/compute/vapp.rb index 879755d4b..43a2f02c6 100644 --- a/lib/fog/vcloud_director/models/compute/vapp.rb +++ b/lib/fog/vcloud_director/models/compute/vapp.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Vapp < Model - identity :id attribute :name @@ -135,7 +133,6 @@ module Fog end service.process_task(response.body) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vapps.rb b/lib/fog/vcloud_director/models/compute/vapps.rb index e094b26dd..da372746e 100644 --- a/lib/fog/vcloud_director/models/compute/vapps.rb +++ b/lib/fog/vcloud_director/models/compute/vapps.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/vapp' module Fog module Compute class VcloudDirector - class Vapps < Collection model Fog::Compute::VcloudDirector::Vapp @@ -27,7 +26,6 @@ module Fog items.each{|item| service.add_id_from_href!(item) } items end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vdc.rb b/lib/fog/vcloud_director/models/compute/vdc.rb index f06eb92f0..42d6b61d8 100644 --- a/lib/fog/vcloud_director/models/compute/vdc.rb +++ b/lib/fog/vcloud_director/models/compute/vdc.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class Vdc < Model - identity :id attribute :name @@ -31,7 +29,6 @@ module Fog requires :id service.vapps(:vdc => self) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vdcs.rb b/lib/fog/vcloud_director/models/compute/vdcs.rb index cb12dc1c0..027f7df9e 100644 --- a/lib/fog/vcloud_director/models/compute/vdcs.rb +++ b/lib/fog/vcloud_director/models/compute/vdcs.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/vdc' module Fog module Compute class VcloudDirector - class Vdcs < Collection model Fog::Compute::VcloudDirector::Vdc @@ -25,7 +24,6 @@ module Fog items.each{|item| service.add_id_from_href!(item) } items end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vm.rb b/lib/fog/vcloud_director/models/compute/vm.rb index 31ddb4fb0..736d7d54b 100644 --- a/lib/fog/vcloud_director/models/compute/vm.rb +++ b/lib/fog/vcloud_director/models/compute/vm.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/vm_customization' module Fog module Compute class VcloudDirector - class Vm < Model identity :id @@ -66,7 +65,6 @@ module Fog service.process_task(response.body) end - # Reboot the VM. def reboot requires :id @@ -166,7 +164,6 @@ module Fog # get_by_metadata returns a vm collection where every vapp parent is orpahn collection.vapp ||= service.vapps.get(vapp_id) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vm_customization.rb b/lib/fog/vcloud_director/models/compute/vm_customization.rb index 8dee143ae..3f83e6ed4 100644 --- a/lib/fog/vcloud_director/models/compute/vm_customization.rb +++ b/lib/fog/vcloud_director/models/compute/vm_customization.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class VmCustomization < Model - identity :id attribute :type @@ -36,7 +34,6 @@ module Fog response = service.put_guest_customization_section_vapp(id, attributes) service.process_task(response.body) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vm_customizations.rb b/lib/fog/vcloud_director/models/compute/vm_customizations.rb index 9204003f6..e450e23b5 100644 --- a/lib/fog/vcloud_director/models/compute/vm_customizations.rb +++ b/lib/fog/vcloud_director/models/compute/vm_customizations.rb @@ -4,12 +4,10 @@ require 'fog/vcloud_director/models/compute/vm_customization' module Fog module Compute class VcloudDirector - class VmCustomizations < Collection model Fog::Compute::VcloudDirector::VmCustomization attribute :vm - end end end diff --git a/lib/fog/vcloud_director/models/compute/vm_network.rb b/lib/fog/vcloud_director/models/compute/vm_network.rb index 206db04ce..3c5fb6a19 100644 --- a/lib/fog/vcloud_director/models/compute/vm_network.rb +++ b/lib/fog/vcloud_director/models/compute/vm_network.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class VcloudDirector - class VmNetwork < Model - identity :id attribute :type @@ -23,7 +21,6 @@ module Fog response = service.put_network_connection_system_section_vapp(id, attributes) service.process_task(response.body) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vm_networks.rb b/lib/fog/vcloud_director/models/compute/vm_networks.rb index 970036e19..05504fda9 100644 --- a/lib/fog/vcloud_director/models/compute/vm_networks.rb +++ b/lib/fog/vcloud_director/models/compute/vm_networks.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/vm_network' module Fog module Compute class VcloudDirector - class VmNetworks < Collection model Fog::Compute::VcloudDirector::VmNetwork @@ -14,7 +13,6 @@ module Fog data = service.get_vm_network(id).body new(data) end - end end end diff --git a/lib/fog/vcloud_director/models/compute/vms.rb b/lib/fog/vcloud_director/models/compute/vms.rb index 4b4908c20..c8efd241a 100644 --- a/lib/fog/vcloud_director/models/compute/vms.rb +++ b/lib/fog/vcloud_director/models/compute/vms.rb @@ -4,7 +4,6 @@ require 'fog/vcloud_director/models/compute/vm' module Fog module Compute class VcloudDirector - class Vms < Collection model Fog::Compute::VcloudDirector::Vm @@ -34,7 +33,6 @@ module Fog items = data[:vms] items end - end end end diff --git a/lib/fog/vcloud_director/parsers/compute/disks.rb b/lib/fog/vcloud_director/parsers/compute/disks.rb index 0c29163d9..a83af0aee 100644 --- a/lib/fog/vcloud_director/parsers/compute/disks.rb +++ b/lib/fog/vcloud_director/parsers/compute/disks.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module VcloudDirector - class Disks < VcloudDirectorParser - def reset @disk = {} @response = { :disks => [] } @@ -48,9 +46,7 @@ module Fog @disk = {} end end - end - end end end diff --git a/lib/fog/vcloud_director/parsers/compute/metadata.rb b/lib/fog/vcloud_director/parsers/compute/metadata.rb index a2293b46c..9b826b60d 100644 --- a/lib/fog/vcloud_director/parsers/compute/metadata.rb +++ b/lib/fog/vcloud_director/parsers/compute/metadata.rb @@ -29,7 +29,6 @@ module Fog # :id=>"vm-18545e82-d919-4071-ae7e-d1300d9d8112"} # class Metadata < VcloudDirectorParser - def reset @response = { :metadata => {} } end @@ -55,7 +54,6 @@ module Fog @response[:metadata].merge!(Hash[@key, @val]) end end - end end end diff --git a/lib/fog/vcloud_director/parsers/compute/network.rb b/lib/fog/vcloud_director/parsers/compute/network.rb index 7ea9db8b5..b14108fe1 100644 --- a/lib/fog/vcloud_director/parsers/compute/network.rb +++ b/lib/fog/vcloud_director/parsers/compute/network.rb @@ -63,7 +63,6 @@ module Fog # # class Network < VcloudDirectorParser - def reset @response = { :ip_ranges => [] } @ip_range = {} @@ -98,7 +97,6 @@ module Fog @ip_range = {} end end - end end end diff --git a/lib/fog/vcloud_director/parsers/compute/vm.rb b/lib/fog/vcloud_director/parsers/compute/vm.rb index f9d251287..a00e3f302 100644 --- a/lib/fog/vcloud_director/parsers/compute/vm.rb +++ b/lib/fog/vcloud_director/parsers/compute/vm.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module VcloudDirector - class Vm < VcloudDirectorParser - def reset @in_operating_system = false @in_children = false @@ -58,7 +56,6 @@ module Fog when 'Link' @response[:vm][:links] = @links end - end def human_status(status) @@ -73,9 +70,7 @@ module Fog 'unknown' end end - end - end end end diff --git a/lib/fog/vcloud_director/parsers/compute/vm_customization.rb b/lib/fog/vcloud_director/parsers/compute/vm_customization.rb index a9f88a128..868fbdb08 100644 --- a/lib/fog/vcloud_director/parsers/compute/vm_customization.rb +++ b/lib/fog/vcloud_director/parsers/compute/vm_customization.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module VcloudDirector - class VmCustomization < VcloudDirectorParser - def reset @response = { } end @@ -49,9 +47,7 @@ module Fog @response[:customization_script] = CGI::unescapeHTML(value) if @response[:has_customization_script] end end - end - end end end diff --git a/lib/fog/vcloud_director/parsers/compute/vm_network.rb b/lib/fog/vcloud_director/parsers/compute/vm_network.rb index 832d16d20..e071021f4 100644 --- a/lib/fog/vcloud_director/parsers/compute/vm_network.rb +++ b/lib/fog/vcloud_director/parsers/compute/vm_network.rb @@ -63,7 +63,6 @@ module Fog # # class VmNetwork < VcloudDirectorParser - def reset @response = { } end @@ -101,7 +100,6 @@ module Fog @response[:ip_address_allocation_mode] = value end end - end end end diff --git a/lib/fog/vcloud_director/parsers/compute/vms.rb b/lib/fog/vcloud_director/parsers/compute/vms.rb index 0e6cba734..11ecd0f6f 100644 --- a/lib/fog/vcloud_director/parsers/compute/vms.rb +++ b/lib/fog/vcloud_director/parsers/compute/vms.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module VcloudDirector - class Vms < VcloudDirectorParser - def reset @vm = { :ip_address => '' } @in_operating_system = false @@ -72,7 +70,6 @@ module Fog @vm = {} end end - end def human_status(status) @@ -87,9 +84,7 @@ module Fog 'unknown' end end - end - end end end diff --git a/lib/fog/vcloud_director/parsers/compute/vms_by_metadata.rb b/lib/fog/vcloud_director/parsers/compute/vms_by_metadata.rb index 8f452eacb..28a36a1ef 100644 --- a/lib/fog/vcloud_director/parsers/compute/vms_by_metadata.rb +++ b/lib/fog/vcloud_director/parsers/compute/vms_by_metadata.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module VcloudDirector - class VmsByMetadata < VcloudDirectorParser - def reset @response = { :vm_records => [] } end @@ -32,9 +30,7 @@ module Fog @response[:vm_records] << results end end - end - end end end diff --git a/lib/fog/vcloud_director/requests/compute/delete_network.rb b/lib/fog/vcloud_director/requests/compute/delete_network.rb index 18c9d93ab..9d7b6c3b8 100644 --- a/lib/fog/vcloud_director/requests/compute/delete_network.rb +++ b/lib/fog/vcloud_director/requests/compute/delete_network.rb @@ -27,7 +27,6 @@ module Fog class Mock def delete_network(id) - unless data[:networks][id] raise Fog::Compute::VcloudDirector::Forbidden.new( "No access to entity \"(com.vmware.vcloud.entity.orgVdcNetwork:#{id})\"" @@ -57,7 +56,6 @@ module Fog :body => body ) end - end end end diff --git a/lib/fog/vcloud_director/requests/compute/get_execute_query.rb b/lib/fog/vcloud_director/requests/compute/get_execute_query.rb index 64d01bcc5..9346ced71 100644 --- a/lib/fog/vcloud_director/requests/compute/get_execute_query.rb +++ b/lib/fog/vcloud_director/requests/compute/get_execute_query.rb @@ -118,7 +118,6 @@ module Fog class Mock def get_execute_query(type=nil, options={}) - unless options[:fields].nil? Fog::Mock.not_implemented("Fields are not yet implemented in get_execute_query Mock for #{type}") end @@ -158,13 +157,11 @@ module Fog :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"}, :body => body ) - end private def fetch_items(type, opts) - if opts.key?(:filter) && opts[:filter] =~ /^name==([^;,]+)$/ name = $1 elsif opts.key?(:filter) @@ -555,7 +552,6 @@ module Fog ] } end - end end end diff --git a/lib/fog/vcloud_director/requests/compute/get_network_complete.rb b/lib/fog/vcloud_director/requests/compute/get_network_complete.rb index 67c1a5d80..ec854ba6e 100644 --- a/lib/fog/vcloud_director/requests/compute/get_network_complete.rb +++ b/lib/fog/vcloud_director/requests/compute/get_network_complete.rb @@ -2,7 +2,6 @@ module Fog module Compute class VcloudDirector class Real - # Retrieve an organization network. # # @param [String] id Object identifier of the network. @@ -72,7 +71,6 @@ module Fog :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"}, :body => body ) - end end end diff --git a/lib/fog/vcloud_director/requests/compute/get_vms_by_metadata.rb b/lib/fog/vcloud_director/requests/compute/get_vms_by_metadata.rb index 1de02048f..9a7c31b24 100644 --- a/lib/fog/vcloud_director/requests/compute/get_vms_by_metadata.rb +++ b/lib/fog/vcloud_director/requests/compute/get_vms_by_metadata.rb @@ -14,7 +14,6 @@ module Fog :path => "vms/query?format=records&filter=metadata:#{key}==STRING:#{value}" ) end - end end end diff --git a/lib/fog/vcloud_director/requests/compute/instantiate_vapp_template.rb b/lib/fog/vcloud_director/requests/compute/instantiate_vapp_template.rb index 0b261ddb0..61cc975be 100644 --- a/lib/fog/vcloud_director/requests/compute/instantiate_vapp_template.rb +++ b/lib/fog/vcloud_director/requests/compute/instantiate_vapp_template.rb @@ -89,7 +89,6 @@ module Fog def endpoint end_point end - end end end diff --git a/lib/fog/vcloud_director/requests/compute/post_configure_edge_gateway_services.rb b/lib/fog/vcloud_director/requests/compute/post_configure_edge_gateway_services.rb index 3793348c7..b0f083a12 100644 --- a/lib/fog/vcloud_director/requests/compute/post_configure_edge_gateway_services.rb +++ b/lib/fog/vcloud_director/requests/compute/post_configure_edge_gateway_services.rb @@ -2,7 +2,6 @@ module Fog module Compute class VcloudDirector class Real - require 'fog/vcloud_director/generators/compute/edge_gateway_service_configuration' # Configure edge gateway services like firewall, nat and load balancer. @@ -32,7 +31,6 @@ module Fog :path => "admin/edgeGateway/#{id}/action/configureServices" ) end - end class Mock diff --git a/lib/fog/vcloud_director/requests/compute/post_create_org_vdc_network.rb b/lib/fog/vcloud_director/requests/compute/post_create_org_vdc_network.rb index 2228a7e2d..99dc189c7 100644 --- a/lib/fog/vcloud_director/requests/compute/post_create_org_vdc_network.rb +++ b/lib/fog/vcloud_director/requests/compute/post_create_org_vdc_network.rb @@ -2,7 +2,6 @@ module Fog module Compute class VcloudDirector class Real - require 'fog/vcloud_director/generators/compute/org_vdc_network' # Create an Org vDC network. @@ -52,7 +51,6 @@ module Fog # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-CreateOrgVdcNetwork.html # @since vCloud API version 5.1 def post_create_org_vdc_network(vdc_id, name, options={}) - body = Fog::Generators::Compute::VcloudDirector::OrgVdcNetwork.new(options.merge(:name => name)).generate_xml request( @@ -63,12 +61,10 @@ module Fog :parser => Fog::ToHashDocument.new, :path => "admin/vdc/#{vdc_id}/networks" ) - end end class Mock - def post_create_org_vdc_network(vdc_id, name, options={}) unless data[:vdcs][vdc_id] raise Fog::Compute::VcloudDirector::Forbidden.new( @@ -168,7 +164,6 @@ module Fog :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"}, :body => body ) - end end end diff --git a/lib/fog/vcloud_director/requests/compute/put_vapp_name_and_description.rb b/lib/fog/vcloud_director/requests/compute/put_vapp_name_and_description.rb index a7110cf88..95afd3741 100644 --- a/lib/fog/vcloud_director/requests/compute/put_vapp_name_and_description.rb +++ b/lib/fog/vcloud_director/requests/compute/put_vapp_name_and_description.rb @@ -2,7 +2,6 @@ module Fog module Compute class VcloudDirector class Real - require 'fog/vcloud_director/generators/compute/vapp' # Modify the name or description of a vApp. diff --git a/lib/fog/vcloud_director/requests/compute/put_vm.rb b/lib/fog/vcloud_director/requests/compute/put_vm.rb index 11bfaa46b..bc3d865fb 100644 --- a/lib/fog/vcloud_director/requests/compute/put_vm.rb +++ b/lib/fog/vcloud_director/requests/compute/put_vm.rb @@ -2,7 +2,6 @@ module Fog module Compute class VcloudDirector class Real - require 'fog/vcloud_director/generators/compute/vm' # Update the name, description and storage profile for VM. diff --git a/lib/fog/vmfusion/compute.rb b/lib/fog/vmfusion/compute.rb index 1a7d7ee78..b21436cf7 100644 --- a/lib/fog/vmfusion/compute.rb +++ b/lib/fog/vmfusion/compute.rb @@ -3,21 +3,17 @@ require 'fog/vmfusion/core' module Fog module Compute class Vmfusion < Fog::Service - model_path 'fog/vmfusion/models/compute' model :server collection :servers class Mock - def initialize(options={}) Fog::Mock.not_implemented end - end class Real - def initialize(options={}) begin require 'fission' @@ -26,7 +22,6 @@ module Fog raise e.message end end - end end end diff --git a/lib/fog/vmfusion/core.rb b/lib/fog/vmfusion/core.rb index 49778d7ed..2deafe9a9 100644 --- a/lib/fog/vmfusion/core.rb +++ b/lib/fog/vmfusion/core.rb @@ -2,10 +2,8 @@ require 'fog/core' module Fog module Vmfusion - extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/lib/fog/vmfusion/models/compute/server.rb b/lib/fog/vmfusion/models/compute/server.rb index 0e3c6d25c..b0b786944 100644 --- a/lib/fog/vmfusion/models/compute/server.rb +++ b/lib/fog/vmfusion/models/compute/server.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class Vmfusion - class Server < Fog::Compute::Server - identity :name attribute :ipaddress diff --git a/lib/fog/vmfusion/models/compute/servers.rb b/lib/fog/vmfusion/models/compute/servers.rb index d8450ca88..fcd29fc89 100644 --- a/lib/fog/vmfusion/models/compute/servers.rb +++ b/lib/fog/vmfusion/models/compute/servers.rb @@ -4,13 +4,10 @@ require 'fog/vmfusion/models/compute/server' module Fog module Compute class Vmfusion - class Servers < Fog::Collection - model Fog::Compute::Vmfusion::Server def all(filter = nil) - data = [] states = ::Fission::VM.all_with_status.data @@ -28,13 +25,11 @@ module Fog end load(data) - end def get(name) self.all(:name => name).first end - end end end diff --git a/lib/fog/voxel/compute.rb b/lib/fog/voxel/compute.rb index d68f959f3..2224dc18b 100644 --- a/lib/fog/voxel/compute.rb +++ b/lib/fog/voxel/compute.rb @@ -3,7 +3,6 @@ require 'fog/voxel/core' module Fog module Compute class Voxel < Fog::Service - requires :voxel_api_key, :voxel_api_secret recognizes :host, :port, :scheme, :persistent @@ -65,7 +64,6 @@ module Fog def reset_data self.class.data.delete(@voxel_api_key) end - end class Real diff --git a/lib/fog/voxel/core.rb b/lib/fog/voxel/core.rb index f99d18e2f..b9960fccb 100644 --- a/lib/fog/voxel/core.rb +++ b/lib/fog/voxel/core.rb @@ -4,7 +4,6 @@ require 'digest/md5' module Fog module Voxel - extend Fog::Provider service(:compute, 'Compute') diff --git a/lib/fog/voxel/models/compute/image.rb b/lib/fog/voxel/models/compute/image.rb index a07024e94..b4b9d1016 100644 --- a/lib/fog/voxel/models/compute/image.rb +++ b/lib/fog/voxel/models/compute/image.rb @@ -4,11 +4,9 @@ module Fog module Compute class Voxel class Image < Fog::Model - identity :id attribute :summary - end end end diff --git a/lib/fog/voxel/models/compute/images.rb b/lib/fog/voxel/models/compute/images.rb index 8eaa3fad8..50d801455 100644 --- a/lib/fog/voxel/models/compute/images.rb +++ b/lib/fog/voxel/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/voxel/models/compute/image' module Fog module Compute class Voxel - class Images < Fog::Collection - model Fog::Compute::Voxel::Image def all @@ -24,7 +22,6 @@ module Fog end end end - end end end diff --git a/lib/fog/voxel/models/compute/server.rb b/lib/fog/voxel/models/compute/server.rb index c55d1e58b..fe460d78f 100644 --- a/lib/fog/voxel/models/compute/server.rb +++ b/lib/fog/voxel/models/compute/server.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class Voxel - class Server < Fog::Compute::Server - identity :id attribute :name @@ -69,10 +67,7 @@ module Fog true end - end - end - end end diff --git a/lib/fog/voxel/models/compute/servers.rb b/lib/fog/voxel/models/compute/servers.rb index f2cefa87a..cc619622a 100644 --- a/lib/fog/voxel/models/compute/servers.rb +++ b/lib/fog/voxel/models/compute/servers.rb @@ -5,7 +5,6 @@ module Fog module Compute class Voxel class Servers < Fog::Collection - model Fog::Compute::Voxel::Server def all @@ -24,9 +23,7 @@ module Fog raise error end end - end - end end end diff --git a/lib/fog/voxel/parsers/compute/basic.rb b/lib/fog/voxel/parsers/compute/basic.rb index 9bdbc479e..455cfb656 100644 --- a/lib/fog/voxel/parsers/compute/basic.rb +++ b/lib/fog/voxel/parsers/compute/basic.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module Voxel - class Basic < Fog::Parsers::Base - def reset @response = {} end @@ -22,9 +20,7 @@ module Fog @response['stat'] = attr_value('stat', attrs) end end - end - end end end diff --git a/lib/fog/voxel/parsers/compute/devices_list.rb b/lib/fog/voxel/parsers/compute/devices_list.rb index 4f45e8089..986e3032d 100644 --- a/lib/fog/voxel/parsers/compute/devices_list.rb +++ b/lib/fog/voxel/parsers/compute/devices_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module Voxel - class DevicesList < Fog::Parsers::Base - def reset @device = {} @response = { 'devices' => [] } @@ -102,9 +100,7 @@ module Fog @access_method[name] = value end end - end - end end end diff --git a/lib/fog/voxel/parsers/compute/images_list.rb b/lib/fog/voxel/parsers/compute/images_list.rb index 9501e78a6..7f95eb634 100644 --- a/lib/fog/voxel/parsers/compute/images_list.rb +++ b/lib/fog/voxel/parsers/compute/images_list.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module Voxel - class ImagesList < Fog::Parsers::Base - def reset @image = {} @response = { 'images' => [] } @@ -50,9 +48,7 @@ module Fog @image['filesystem'][name] = value end end - end - end end end diff --git a/lib/fog/voxel/parsers/compute/voxcloud_create.rb b/lib/fog/voxel/parsers/compute/voxcloud_create.rb index 12da26567..3f4579d03 100644 --- a/lib/fog/voxel/parsers/compute/voxcloud_create.rb +++ b/lib/fog/voxel/parsers/compute/voxcloud_create.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module Voxel - class VoxcloudCreate < Fog::Parsers::Base - def reset @response = { 'device' => {} } end @@ -31,9 +29,7 @@ module Fog @response['device'][name] = Time.at(value.to_i) end end - end - end end end diff --git a/lib/fog/voxel/parsers/compute/voxcloud_delete.rb b/lib/fog/voxel/parsers/compute/voxcloud_delete.rb index ad41dc68d..f3ceb1fdb 100644 --- a/lib/fog/voxel/parsers/compute/voxcloud_delete.rb +++ b/lib/fog/voxel/parsers/compute/voxcloud_delete.rb @@ -2,9 +2,7 @@ module Fog module Parsers module Compute module Voxel - class VoxcloudDelete < Fog::Parsers::Base - def reset @response = {} end @@ -22,9 +20,7 @@ module Fog } end end - end - end end end diff --git a/lib/fog/voxel/requests/compute/devices_list.rb b/lib/fog/voxel/requests/compute/devices_list.rb index 259d453aa..e27a6b678 100644 --- a/lib/fog/voxel/requests/compute/devices_list.rb +++ b/lib/fog/voxel/requests/compute/devices_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class Voxel class Real - require 'fog/voxel/parsers/compute/devices_list' def devices_list(device_id = nil) @@ -18,7 +17,6 @@ module Fog request("voxel.devices.list", options) end end - end end end diff --git a/lib/fog/voxel/requests/compute/devices_power.rb b/lib/fog/voxel/requests/compute/devices_power.rb index 8ea1aae35..00591c9c5 100644 --- a/lib/fog/voxel/requests/compute/devices_power.rb +++ b/lib/fog/voxel/requests/compute/devices_power.rb @@ -2,7 +2,6 @@ module Fog module Compute class Voxel class Real - require 'fog/voxel/parsers/compute/basic' def devices_power(device_id, power_action) @@ -16,7 +15,6 @@ module Fog request("voxel.devices.power", options) end end - end end end diff --git a/lib/fog/voxel/requests/compute/images_list.rb b/lib/fog/voxel/requests/compute/images_list.rb index 1bd644ffc..a596d9b98 100644 --- a/lib/fog/voxel/requests/compute/images_list.rb +++ b/lib/fog/voxel/requests/compute/images_list.rb @@ -2,7 +2,6 @@ module Fog module Compute class Voxel class Real - require 'fog/voxel/parsers/compute/images_list' def images_list(image_id = nil) @@ -25,7 +24,6 @@ module Fog end end end - end end end diff --git a/lib/fog/voxel/requests/compute/voxcloud_create.rb b/lib/fog/voxel/requests/compute/voxcloud_create.rb index b1e58d7fa..fe7cb810f 100644 --- a/lib/fog/voxel/requests/compute/voxcloud_create.rb +++ b/lib/fog/voxel/requests/compute/voxcloud_create.rb @@ -2,7 +2,6 @@ module Fog module Compute class Voxel class Real - require 'fog/voxel/parsers/compute/voxcloud_create' def voxcloud_create(options) @@ -16,7 +15,6 @@ module Fog request("voxel.voxcloud.create", options) end end - end end end diff --git a/lib/fog/voxel/requests/compute/voxcloud_delete.rb b/lib/fog/voxel/requests/compute/voxcloud_delete.rb index 58c94dd87..c3d49aa2a 100644 --- a/lib/fog/voxel/requests/compute/voxcloud_delete.rb +++ b/lib/fog/voxel/requests/compute/voxcloud_delete.rb @@ -2,7 +2,6 @@ module Fog module Compute class Voxel class Real - require 'fog/voxel/parsers/compute/voxcloud_delete' def voxcloud_delete(device_id) @@ -14,7 +13,6 @@ module Fog request("voxel.voxcloud.delete", options) end end - end end end diff --git a/lib/fog/voxel/requests/compute/voxcloud_status.rb b/lib/fog/voxel/requests/compute/voxcloud_status.rb index ecea33a39..a23cceef0 100644 --- a/lib/fog/voxel/requests/compute/voxcloud_status.rb +++ b/lib/fog/voxel/requests/compute/voxcloud_status.rb @@ -2,7 +2,6 @@ module Fog module Compute class Voxel class Real - require 'fog/voxel/parsers/compute/voxcloud_status' def voxcloud_status(device_id = nil) @@ -17,7 +16,6 @@ module Fog request("voxel.voxcloud.status", options) end - end end end diff --git a/lib/fog/vsphere/compute.rb b/lib/fog/vsphere/compute.rb index 9598cfc9f..907191359 100644 --- a/lib/fog/vsphere/compute.rb +++ b/lib/fog/vsphere/compute.rb @@ -4,7 +4,6 @@ require 'digest/sha2' module Fog module Compute class Vsphere < Fog::Service - requires :vsphere_username, :vsphere_password, :vsphere_server recognizes :vsphere_port, :vsphere_path, :vsphere_ns recognizes :vsphere_rev, :vsphere_ssl, :vsphere_expected_pubkey_hash @@ -84,7 +83,6 @@ module Fog request :set_vm_customvalue module Shared - attr_reader :vsphere_is_vcenter attr_reader :vsphere_rev attr_reader :vsphere_server @@ -186,11 +184,9 @@ module Fog def is_uuid?(id) !(id =~ /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/).nil? end - end class Mock - include Shared def self.data @@ -333,7 +329,6 @@ module Fog end class Real - include Shared def initialize(options={}) @@ -418,9 +413,7 @@ module Fog raise Fog::Vsphere::Errors::SecurityError, "The remote system presented a public key with hash #{pubkey_hash} but we're expecting a hash of #{expected_pubkey_hash || ''}. If you are sure the remote system is authentic set vsphere_expected_pubkey_hash: in ~/.fog" end end - end - end end end diff --git a/lib/fog/vsphere/core.rb b/lib/fog/vsphere/core.rb index 82c7b2a9c..cb718af5e 100644 --- a/lib/fog/vsphere/core.rb +++ b/lib/fog/vsphere/core.rb @@ -2,7 +2,6 @@ require 'fog/core' module Fog module Vsphere - extend Fog::Provider module Errors diff --git a/lib/fog/vsphere/models/compute/cluster.rb b/lib/fog/vsphere/models/compute/cluster.rb index d79d335fd..ed6a5684a 100644 --- a/lib/fog/vsphere/models/compute/cluster.rb +++ b/lib/fog/vsphere/models/compute/cluster.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Cluster < Fog::Model - identity :id attribute :name @@ -23,9 +21,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/vsphere/models/compute/clusters.rb b/lib/fog/vsphere/models/compute/clusters.rb index c78d94bdd..440b47a65 100644 --- a/lib/fog/vsphere/models/compute/clusters.rb +++ b/lib/fog/vsphere/models/compute/clusters.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/cluster' module Fog module Compute class Vsphere - class Clusters < Fog::Collection - model Fog::Compute::Vsphere::Cluster attr_accessor :datacenter @@ -19,7 +17,6 @@ module Fog requires :datacenter new service.get_cluster(id, datacenter) end - end end end diff --git a/lib/fog/vsphere/models/compute/customfield.rb b/lib/fog/vsphere/models/compute/customfield.rb index f757a0002..83bde1445 100644 --- a/lib/fog/vsphere/models/compute/customfield.rb +++ b/lib/fog/vsphere/models/compute/customfield.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Customfield < Fog::Model - identity :key attribute :name @@ -13,7 +11,6 @@ module Fog name end end - end end end diff --git a/lib/fog/vsphere/models/compute/customfields.rb b/lib/fog/vsphere/models/compute/customfields.rb index 22d88d7cb..f2341eade 100644 --- a/lib/fog/vsphere/models/compute/customfields.rb +++ b/lib/fog/vsphere/models/compute/customfields.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/customfield' module Fog module Compute class Vsphere - class Customfields < Fog::Collection - model Fog::Compute::Vsphere::Customfield attr_accessor :vm @@ -20,7 +18,6 @@ module Fog cv.key == ((key.is_a? String) ? key.to_i : key) end end - end end end diff --git a/lib/fog/vsphere/models/compute/customvalue.rb b/lib/fog/vsphere/models/compute/customvalue.rb index 1d8da4315..399c0c44a 100644 --- a/lib/fog/vsphere/models/compute/customvalue.rb +++ b/lib/fog/vsphere/models/compute/customvalue.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Customvalue < Fog::Model - attribute :value attribute :key @@ -11,7 +9,6 @@ module Fog value end end - end end end diff --git a/lib/fog/vsphere/models/compute/customvalues.rb b/lib/fog/vsphere/models/compute/customvalues.rb index b0de1aa31..fbec74173 100644 --- a/lib/fog/vsphere/models/compute/customvalues.rb +++ b/lib/fog/vsphere/models/compute/customvalues.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/customvalue' module Fog module Compute class Vsphere - class Customvalues < Fog::Collection - model Fog::Compute::Vsphere::Customvalue attr_accessor :vm @@ -30,7 +28,6 @@ module Fog raise 'customvalues should have vm' end.find { | cv | cv.key == key } end - end end end diff --git a/lib/fog/vsphere/models/compute/datacenter.rb b/lib/fog/vsphere/models/compute/datacenter.rb index 29d1ea03d..26b7d6cb7 100644 --- a/lib/fog/vsphere/models/compute/datacenter.rb +++ b/lib/fog/vsphere/models/compute/datacenter.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Datacenter < Fog::Model - identity :id attribute :name attribute :path @@ -40,9 +38,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/vsphere/models/compute/datacenters.rb b/lib/fog/vsphere/models/compute/datacenters.rb index 234fa82bf..c5812bc35 100644 --- a/lib/fog/vsphere/models/compute/datacenters.rb +++ b/lib/fog/vsphere/models/compute/datacenters.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/datacenter' module Fog module Compute class Vsphere - class Datacenters < Fog::Collection - model Fog::Compute::Vsphere::Datacenter def all(filters = {}) @@ -16,7 +14,6 @@ module Fog def get(name) new service.get_datacenter(name) end - end end end diff --git a/lib/fog/vsphere/models/compute/datastore.rb b/lib/fog/vsphere/models/compute/datastore.rb index 0735f41aa..6baa2210f 100644 --- a/lib/fog/vsphere/models/compute/datastore.rb +++ b/lib/fog/vsphere/models/compute/datastore.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Datastore < Fog::Model - identity :id attribute :name @@ -17,9 +15,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/vsphere/models/compute/datastores.rb b/lib/fog/vsphere/models/compute/datastores.rb index acec5a139..67bbcd003 100644 --- a/lib/fog/vsphere/models/compute/datastores.rb +++ b/lib/fog/vsphere/models/compute/datastores.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/datastore' module Fog module Compute class Vsphere - class Datastores < Fog::Collection - model Fog::Compute::Vsphere::Datastore attr_accessor :datacenter @@ -18,7 +16,6 @@ module Fog requires :datacenter new service.get_datastore(id, datacenter) end - end end end diff --git a/lib/fog/vsphere/models/compute/folder.rb b/lib/fog/vsphere/models/compute/folder.rb index abc0ff94a..7dea57e8a 100644 --- a/lib/fog/vsphere/models/compute/folder.rb +++ b/lib/fog/vsphere/models/compute/folder.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Folder < Fog::Model - identity :id attribute :name @@ -20,9 +18,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/vsphere/models/compute/folders.rb b/lib/fog/vsphere/models/compute/folders.rb index 43417303b..467bb78a0 100644 --- a/lib/fog/vsphere/models/compute/folders.rb +++ b/lib/fog/vsphere/models/compute/folders.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/folder' module Fog module Compute class Vsphere - class Folders < Fog::Collection - model Fog::Compute::Vsphere::Folder attr_accessor :datacenter, :type, :path @@ -20,7 +18,6 @@ module Fog requires :datacenter new service.get_folder(id, datacenter, type) end - end end end diff --git a/lib/fog/vsphere/models/compute/interface.rb b/lib/fog/vsphere/models/compute/interface.rb index e708a41df..e392b2b43 100644 --- a/lib/fog/vsphere/models/compute/interface.rb +++ b/lib/fog/vsphere/models/compute/interface.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Interface < Fog::Model - SAVE_MUTEX = Mutex.new identity :mac @@ -87,9 +85,7 @@ module Fog :type=> Fog::Vsphere.class_from_string(default_type, "RbVmomi::VIM"), } end - end - end end end diff --git a/lib/fog/vsphere/models/compute/interfaces.rb b/lib/fog/vsphere/models/compute/interfaces.rb index 93aac6bea..59499690a 100644 --- a/lib/fog/vsphere/models/compute/interfaces.rb +++ b/lib/fog/vsphere/models/compute/interfaces.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/interface' module Fog module Compute class Vsphere - class Interfaces < Fog::Collection - model Fog::Compute::Vsphere::Interface attribute :server diff --git a/lib/fog/vsphere/models/compute/interfacetype.rb b/lib/fog/vsphere/models/compute/interfacetype.rb index 68a2578a9..66f1b3fb8 100644 --- a/lib/fog/vsphere/models/compute/interfacetype.rb +++ b/lib/fog/vsphere/models/compute/interfacetype.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Interfacetype < Fog::Model - identity :id # attribute :class @@ -18,9 +16,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/vsphere/models/compute/interfacetypes.rb b/lib/fog/vsphere/models/compute/interfacetypes.rb index d090f4b20..2d5c21a0c 100644 --- a/lib/fog/vsphere/models/compute/interfacetypes.rb +++ b/lib/fog/vsphere/models/compute/interfacetypes.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/interfacetype' module Fog module Compute class Vsphere - class Interfacetypes < Fog::Collection - model Fog::Compute::Vsphere::Interfacetype attr_accessor :datacenter attr_accessor :servertype @@ -31,9 +29,7 @@ module Fog rescue Fog::Compute::Vsphere::NotFound nil end - end - end end end diff --git a/lib/fog/vsphere/models/compute/network.rb b/lib/fog/vsphere/models/compute/network.rb index 223c9578a..c053189b3 100644 --- a/lib/fog/vsphere/models/compute/network.rb +++ b/lib/fog/vsphere/models/compute/network.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Network < Fog::Model - identity :id attribute :name @@ -13,9 +11,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/vsphere/models/compute/networks.rb b/lib/fog/vsphere/models/compute/networks.rb index 56581edb3..c727cb9d0 100644 --- a/lib/fog/vsphere/models/compute/networks.rb +++ b/lib/fog/vsphere/models/compute/networks.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/network' module Fog module Compute class Vsphere - class Networks < Fog::Collection - model Fog::Compute::Vsphere::Network attr_accessor :datacenter diff --git a/lib/fog/vsphere/models/compute/resource_pool.rb b/lib/fog/vsphere/models/compute/resource_pool.rb index 47beb1e22..d5f1b9166 100644 --- a/lib/fog/vsphere/models/compute/resource_pool.rb +++ b/lib/fog/vsphere/models/compute/resource_pool.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class ResourcePool < Fog::Model - identity :id attribute :name @@ -15,9 +13,7 @@ module Fog def to_s name end - end - end end end diff --git a/lib/fog/vsphere/models/compute/resource_pools.rb b/lib/fog/vsphere/models/compute/resource_pools.rb index ef132aef4..4407eba3e 100644 --- a/lib/fog/vsphere/models/compute/resource_pools.rb +++ b/lib/fog/vsphere/models/compute/resource_pools.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/resource_pool' module Fog module Compute class Vsphere - class ResourcePools < Fog::Collection - model Fog::Compute::Vsphere::ResourcePool attr_accessor :datacenter, :cluster @@ -19,7 +17,6 @@ module Fog requires :cluster new service.get_resource_pool(id, cluster, datacenter) end - end end end diff --git a/lib/fog/vsphere/models/compute/scsicontroller.rb b/lib/fog/vsphere/models/compute/scsicontroller.rb index 0eecc33c9..6a7fed76d 100644 --- a/lib/fog/vsphere/models/compute/scsicontroller.rb +++ b/lib/fog/vsphere/models/compute/scsicontroller.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class SCSIController < Fog::Model - attribute :shared_bus attribute :type attribute :unit_number @@ -13,7 +11,6 @@ module Fog "#{type} ##{key}: shared: #{shared_bus}, unit_number: #{unit_number}" end end - end end end diff --git a/lib/fog/vsphere/models/compute/server.rb b/lib/fog/vsphere/models/compute/server.rb index d2ee7ebb7..485de2679 100644 --- a/lib/fog/vsphere/models/compute/server.rb +++ b/lib/fog/vsphere/models/compute/server.rb @@ -3,7 +3,6 @@ require 'fog/compute/models/server' module Fog module Compute class Vsphere - class Server < Fog::Compute::Server extend Fog::Deprecation deprecate(:ipaddress, :public_ip_address) @@ -66,7 +65,6 @@ module Fog end # End Lazy Loaded Attributes - def vm_reconfig_memory(options = {}) requires :instance_uuid, :memory service.vm_reconfig_memory('instance_uuid' => instance_uuid, 'memory' => memory_mb) @@ -283,9 +281,7 @@ module Fog Fog::Compute::Vsphere::SCSIController.new(self.attributes[:scsi_controller]) end end - end - end end end diff --git a/lib/fog/vsphere/models/compute/servers.rb b/lib/fog/vsphere/models/compute/servers.rb index 727b873f2..7c7b9f1ad 100644 --- a/lib/fog/vsphere/models/compute/servers.rb +++ b/lib/fog/vsphere/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/server' module Fog module Compute class Vsphere - class Servers < Fog::Collection - model Fog::Compute::Vsphere::Server attr_accessor :datacenter attr_accessor :network diff --git a/lib/fog/vsphere/models/compute/servertype.rb b/lib/fog/vsphere/models/compute/servertype.rb index ebfc1acd7..6bc0665f0 100644 --- a/lib/fog/vsphere/models/compute/servertype.rb +++ b/lib/fog/vsphere/models/compute/servertype.rb @@ -1,9 +1,7 @@ module Fog module Compute class Vsphere - class Servertype < Fog::Model - identity :id attribute :family @@ -33,7 +31,6 @@ module Fog } end end - end end end diff --git a/lib/fog/vsphere/models/compute/servertypes.rb b/lib/fog/vsphere/models/compute/servertypes.rb index 3dcdd2c58..6436aa02d 100644 --- a/lib/fog/vsphere/models/compute/servertypes.rb +++ b/lib/fog/vsphere/models/compute/servertypes.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/servertype' module Fog module Compute class Vsphere - class Servertypes < Fog::Collection - model Fog::Compute::Vsphere::Servertype attr_accessor :datacenter, :id, :fullname @@ -20,9 +18,7 @@ module Fog rescue Fog::Compute::Vsphere::NotFound nil end - end - end end end diff --git a/lib/fog/vsphere/models/compute/template.rb b/lib/fog/vsphere/models/compute/template.rb index 06e0e6004..76140a35c 100644 --- a/lib/fog/vsphere/models/compute/template.rb +++ b/lib/fog/vsphere/models/compute/template.rb @@ -1,15 +1,11 @@ module Fog module Compute class Vsphere - class Template < Fog::Model - identity :id attribute :name attribute :uuid - end - end end end diff --git a/lib/fog/vsphere/models/compute/templates.rb b/lib/fog/vsphere/models/compute/templates.rb index 1d559d821..bc76c851d 100644 --- a/lib/fog/vsphere/models/compute/templates.rb +++ b/lib/fog/vsphere/models/compute/templates.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/template' module Fog module Compute class Vsphere - class Templates < Fog::Collection - model Fog::Compute::Vsphere::Template def all(filters = {}) @@ -16,7 +14,6 @@ module Fog def get(id) new service.get_template(id) end - end end end diff --git a/lib/fog/vsphere/models/compute/volume.rb b/lib/fog/vsphere/models/compute/volume.rb index 141c40767..75f54d06d 100644 --- a/lib/fog/vsphere/models/compute/volume.rb +++ b/lib/fog/vsphere/models/compute/volume.rb @@ -1,7 +1,6 @@ module Fog module Compute class Vsphere - class Volume < Fog::Model DISK_SIZE_TO_GB = 1048576 identity :id diff --git a/lib/fog/vsphere/models/compute/volumes.rb b/lib/fog/vsphere/models/compute/volumes.rb index f3f3ae1e4..1c4d0599e 100644 --- a/lib/fog/vsphere/models/compute/volumes.rb +++ b/lib/fog/vsphere/models/compute/volumes.rb @@ -4,9 +4,7 @@ require 'fog/vsphere/models/compute/volume' module Fog module Compute class Vsphere - class Volumes < Fog::Collection - attribute :server model Fog::Compute::Vsphere::Volume @@ -41,7 +39,6 @@ module Fog super end end - end end end diff --git a/lib/fog/vsphere/requests/compute/create_vm.rb b/lib/fog/vsphere/requests/compute/create_vm.rb index e381c047a..267c518fc 100644 --- a/lib/fog/vsphere/requests/compute/create_vm.rb +++ b/lib/fog/vsphere/requests/compute/create_vm.rb @@ -149,13 +149,11 @@ module Fog } ] end - end class Mock def create_vm attributes = { } end - end end end diff --git a/lib/fog/vsphere/requests/compute/current_time.rb b/lib/fog/vsphere/requests/compute/current_time.rb index 96c066e89..78bd4fb12 100644 --- a/lib/fog/vsphere/requests/compute/current_time.rb +++ b/lib/fog/vsphere/requests/compute/current_time.rb @@ -2,20 +2,16 @@ module Fog module Compute class Vsphere class Real - def current_time current_time = @connection.serviceInstance.CurrentTime { 'current_time' => current_time } end - end class Mock - def current_time { 'current_time' => Time.now.utc } end - end end end diff --git a/lib/fog/vsphere/requests/compute/get_folder.rb b/lib/fog/vsphere/requests/compute/get_folder.rb index 0990ba5bb..c86999d57 100644 --- a/lib/fog/vsphere/requests/compute/get_folder.rb +++ b/lib/fog/vsphere/requests/compute/get_folder.rb @@ -69,7 +69,6 @@ module Fog def get_folder(path, filters = { }) end end - end end end diff --git a/lib/fog/vsphere/requests/compute/get_virtual_machine.rb b/lib/fog/vsphere/requests/compute/get_virtual_machine.rb index c73900cee..900901b73 100644 --- a/lib/fog/vsphere/requests/compute/get_virtual_machine.rb +++ b/lib/fog/vsphere/requests/compute/get_virtual_machine.rb @@ -38,9 +38,7 @@ module Fog end vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found") end - end - end end end diff --git a/lib/fog/vsphere/requests/compute/get_vm_first_scsi_controller.rb b/lib/fog/vsphere/requests/compute/get_vm_first_scsi_controller.rb index 60e6eef64..0b2d80e3a 100644 --- a/lib/fog/vsphere/requests/compute/get_vm_first_scsi_controller.rb +++ b/lib/fog/vsphere/requests/compute/get_vm_first_scsi_controller.rb @@ -6,6 +6,7 @@ module Fog def get_vm_first_scsi_controller(vm_id) Fog::Compute::Vsphere::SCSIController.new(get_vm_first_scsi_controller_raw(vm_id)) end + def get_vm_first_scsi_controller_raw(vm_id) ctrl=get_vm_ref(vm_id).config.hardware.device.grep(RbVmomi::VIM::VirtualSCSIController).select{ | ctrl | ctrl.key == 1000 }.first { @@ -15,7 +16,6 @@ module Fog :key => ctrl.key, } end - end class Mock def get_vm_first_scsi_controller(vm_id) diff --git a/lib/fog/vsphere/requests/compute/list_clusters.rb b/lib/fog/vsphere/requests/compute/list_clusters.rb index 209221384..96d113b3a 100644 --- a/lib/fog/vsphere/requests/compute/list_clusters.rb +++ b/lib/fog/vsphere/requests/compute/list_clusters.rb @@ -26,7 +26,6 @@ module Fog :datacenter => datacenter_name || parent_attribute(cluster.path, :datacenter)[1], } end - end class Mock def list_clusters(filters = { }) diff --git a/lib/fog/vsphere/requests/compute/list_customfields.rb b/lib/fog/vsphere/requests/compute/list_customfields.rb index d86e75c9b..1ea35e475 100644 --- a/lib/fog/vsphere/requests/compute/list_customfields.rb +++ b/lib/fog/vsphere/requests/compute/list_customfields.rb @@ -11,7 +11,6 @@ module Fog } end end - end class Mock def list_vm_customfields() diff --git a/lib/fog/vsphere/requests/compute/list_datacenters.rb b/lib/fog/vsphere/requests/compute/list_datacenters.rb index 60b5a5c19..8ec3a7413 100644 --- a/lib/fog/vsphere/requests/compute/list_datacenters.rb +++ b/lib/fog/vsphere/requests/compute/list_datacenters.rb @@ -2,7 +2,6 @@ module Fog module Compute class Vsphere class Real - def list_datacenters filters = {} raw_datacenters.map do |dc| { diff --git a/lib/fog/vsphere/requests/compute/list_datastores.rb b/lib/fog/vsphere/requests/compute/list_datastores.rb index 38c9e6364..037ffde39 100644 --- a/lib/fog/vsphere/requests/compute/list_datastores.rb +++ b/lib/fog/vsphere/requests/compute/list_datastores.rb @@ -29,7 +29,6 @@ module Fog :datacenter => datacenter, } end - end class Mock def list_datastores(datacenter_name) diff --git a/lib/fog/vsphere/requests/compute/list_folders.rb b/lib/fog/vsphere/requests/compute/list_folders.rb index 8335fb975..3f3403110 100644 --- a/lib/fog/vsphere/requests/compute/list_folders.rb +++ b/lib/fog/vsphere/requests/compute/list_folders.rb @@ -38,7 +38,6 @@ module Fog def child_folders folder [folder, folder.childEntity.grep(RbVmomi::VIM::Folder).map(&method(:child_folders)).flatten] end - end end end diff --git a/lib/fog/vsphere/requests/compute/list_interface_types.rb b/lib/fog/vsphere/requests/compute/list_interface_types.rb index afea5af6c..1afb232b9 100644 --- a/lib/fog/vsphere/requests/compute/list_interface_types.rb +++ b/lib/fog/vsphere/requests/compute/list_interface_types.rb @@ -10,6 +10,7 @@ module Fog interface_type_attributes(nictype, servertype_name, datacenter_name) end.compact end + def interface_type_attributes(nic, servertype, datacenter) { :id => nic, diff --git a/lib/fog/vsphere/requests/compute/list_networks.rb b/lib/fog/vsphere/requests/compute/list_networks.rb index a8460ec52..df8c8c2b6 100644 --- a/lib/fog/vsphere/requests/compute/list_networks.rb +++ b/lib/fog/vsphere/requests/compute/list_networks.rb @@ -26,7 +26,6 @@ module Fog :datacenter => datacenter, } end - end class Mock def list_networks(datacenter_name) diff --git a/lib/fog/vsphere/requests/compute/list_resource_pools.rb b/lib/fog/vsphere/requests/compute/list_resource_pools.rb index 8df280937..aedc4f467 100644 --- a/lib/fog/vsphere/requests/compute/list_resource_pools.rb +++ b/lib/fog/vsphere/requests/compute/list_resource_pools.rb @@ -28,7 +28,6 @@ module Fog :datacenter => datacenter } end - end class Mock def list_resource_pools(filters = { }) diff --git a/lib/fog/vsphere/requests/compute/list_server_types.rb b/lib/fog/vsphere/requests/compute/list_server_types.rb index 57e0e4f07..d22157709 100644 --- a/lib/fog/vsphere/requests/compute/list_server_types.rb +++ b/lib/fog/vsphere/requests/compute/list_server_types.rb @@ -49,7 +49,6 @@ module Fog :datacenter=>"Solutions"}] end end - end end end diff --git a/lib/fog/vsphere/requests/compute/list_templates.rb b/lib/fog/vsphere/requests/compute/list_templates.rb index 63d4da78b..52011aa6b 100644 --- a/lib/fog/vsphere/requests/compute/list_templates.rb +++ b/lib/fog/vsphere/requests/compute/list_templates.rb @@ -38,7 +38,6 @@ module Fog vms.map(&method(:convert_vm_mob_ref_to_attr_hash)) end - end class Mock def list_templates(filters = { }) diff --git a/lib/fog/vsphere/requests/compute/list_virtual_machines.rb b/lib/fog/vsphere/requests/compute/list_virtual_machines.rb index f9be389d0..0f7623e80 100644 --- a/lib/fog/vsphere/requests/compute/list_virtual_machines.rb +++ b/lib/fog/vsphere/requests/compute/list_virtual_machines.rb @@ -55,7 +55,6 @@ module Fog end class Mock - def get_folder_path(folder, root = nil) nil end diff --git a/lib/fog/vsphere/requests/compute/list_vm_customvalues.rb b/lib/fog/vsphere/requests/compute/list_vm_customvalues.rb index fab12c9c1..ba2078f35 100644 --- a/lib/fog/vsphere/requests/compute/list_vm_customvalues.rb +++ b/lib/fog/vsphere/requests/compute/list_vm_customvalues.rb @@ -9,9 +9,7 @@ module Fog :value => customvalue.value, } end - end - end class Mock def list_vm_customfields(vm_id) diff --git a/lib/fog/vsphere/requests/compute/list_vm_interfaces.rb b/lib/fog/vsphere/requests/compute/list_vm_interfaces.rb index 6ec9a2286..c57747170 100644 --- a/lib/fog/vsphere/requests/compute/list_vm_interfaces.rb +++ b/lib/fog/vsphere/requests/compute/list_vm_interfaces.rb @@ -40,7 +40,6 @@ module Fog :key => nic.key, } end - end def get_vm_interface(vm_id, options={}) @@ -54,7 +53,6 @@ module Fog end end end - end class Mock def list_vm_interfaces(vm_id) diff --git a/lib/fog/vsphere/requests/compute/list_vm_volumes.rb b/lib/fog/vsphere/requests/compute/list_vm_volumes.rb index 2f2097e86..e59b22e70 100644 --- a/lib/fog/vsphere/requests/compute/list_vm_volumes.rb +++ b/lib/fog/vsphere/requests/compute/list_vm_volumes.rb @@ -42,7 +42,6 @@ module Fog } end end - end class Mock def list_vm_volumes(vm_id) diff --git a/lib/fog/vsphere/requests/compute/modify_vm_interface.rb b/lib/fog/vsphere/requests/compute/modify_vm_interface.rb index 2a89181b2..2ef7721db 100644 --- a/lib/fog/vsphere/requests/compute/modify_vm_interface.rb +++ b/lib/fog/vsphere/requests/compute/modify_vm_interface.rb @@ -2,7 +2,6 @@ module Fog module Compute class Vsphere class Real - def add_vm_interface(vmid, options = {}) raise ArgumentError, "instance id is a required parameter" unless vmid @@ -40,7 +39,6 @@ module Fog raise ArgumentError, "interface is a required parameter or pass options with type and network" end end - end class Mock diff --git a/lib/fog/vsphere/requests/compute/modify_vm_volume.rb b/lib/fog/vsphere/requests/compute/modify_vm_volume.rb index 9a58291e2..dce86d1cf 100644 --- a/lib/fog/vsphere/requests/compute/modify_vm_volume.rb +++ b/lib/fog/vsphere/requests/compute/modify_vm_volume.rb @@ -2,7 +2,6 @@ module Fog module Compute class Vsphere class Real - def add_vm_volume(volume) vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, volume.unit_number, :add)]}) end diff --git a/lib/fog/vsphere/requests/compute/set_vm_customvalue.rb b/lib/fog/vsphere/requests/compute/set_vm_customvalue.rb index e65aa3e13..72244732d 100644 --- a/lib/fog/vsphere/requests/compute/set_vm_customvalue.rb +++ b/lib/fog/vsphere/requests/compute/set_vm_customvalue.rb @@ -6,7 +6,6 @@ module Fog vm_ref = get_vm_ref(vm_id) vm_ref.setCustomValue(:key => key, :value => value) end - end class Mock def set_vm_customvalue(vm_id, key, value) diff --git a/lib/fog/vsphere/requests/compute/vm_clone.rb b/lib/fog/vsphere/requests/compute/vm_clone.rb index 31e9d40d8..bb9f1ce0c 100644 --- a/lib/fog/vsphere/requests/compute/vm_clone.rb +++ b/lib/fog/vsphere/requests/compute/vm_clone.rb @@ -1,7 +1,6 @@ module Fog module Compute class Vsphere - module Shared private def vm_clone_check_options(options) @@ -272,7 +271,6 @@ module Fog 'task_ref' => task._ref } end - end class Mock @@ -301,7 +299,6 @@ module Fog 'task_ref' => "task-#{Fog::Mock.random_numbers(4)}", } end - end end end diff --git a/lib/fog/vsphere/requests/compute/vm_config_vnc.rb b/lib/fog/vsphere/requests/compute/vm_config_vnc.rb index 8be88395c..f3369ecfa 100644 --- a/lib/fog/vsphere/requests/compute/vm_config_vnc.rb +++ b/lib/fog/vsphere/requests/compute/vm_config_vnc.rb @@ -20,7 +20,6 @@ module Fog # return a hash of VNC attributes required to view the console def vm_get_vnc uuid - search_filter = { :uuid => uuid, 'vmSearch' => true, 'instanceUuid' => true } vm = @connection.searchIndex.FindAllByUuid(search_filter).first Hash[vm.config.extraConfig.map do |config| @@ -29,7 +28,6 @@ module Fog end end.compact] end - end class Mock diff --git a/lib/fog/vsphere/requests/compute/vm_destroy.rb b/lib/fog/vsphere/requests/compute/vm_destroy.rb index 9f3ada421..7ff1204fc 100644 --- a/lib/fog/vsphere/requests/compute/vm_destroy.rb +++ b/lib/fog/vsphere/requests/compute/vm_destroy.rb @@ -2,7 +2,6 @@ module Fog module Compute class Vsphere class Real - def vm_destroy(options = {}) raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' @@ -11,16 +10,13 @@ module Fog task.wait_for_completion { 'task_state' => task.info.state } end - end class Mock - def vm_destroy(options = {}) raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' { 'task_state' => 'success' } end - end end end diff --git a/lib/fog/vsphere/requests/compute/vm_migrate.rb b/lib/fog/vsphere/requests/compute/vm_migrate.rb index edc34b916..a07c7f49d 100644 --- a/lib/fog/vsphere/requests/compute/vm_migrate.rb +++ b/lib/fog/vsphere/requests/compute/vm_migrate.rb @@ -2,7 +2,6 @@ module Fog module Compute class Vsphere class Real - def vm_migrate(options = {}) #priority is the only required option, and it has a sane default option. priority = options['priority'].nil? ? 'defaultPriority' : options["priority"] @@ -20,17 +19,14 @@ module Fog task.wait_for_completion { 'task_state' => task.info.state } end - end class Mock - def vm_migrate(options = {}) priority = options['priority'].nil? ? 'defaultPriority' : options["priority"] raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' { 'task_state' => 'success' } end - end end end diff --git a/lib/fog/vsphere/requests/compute/vm_power_off.rb b/lib/fog/vsphere/requests/compute/vm_power_off.rb index 423e62352..22d87e698 100644 --- a/lib/fog/vsphere/requests/compute/vm_power_off.rb +++ b/lib/fog/vsphere/requests/compute/vm_power_off.rb @@ -2,7 +2,6 @@ module Fog module Compute class Vsphere class Real - def vm_power_off(options = {}) options = { 'force' => false }.merge(options) raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' @@ -22,11 +21,9 @@ module Fog } end end - end class Mock - def vm_power_off(options = {}) raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' vm = get_virtual_machine(options['instance_uuid']) @@ -36,7 +33,6 @@ module Fog 'power_off_type' => options['force'] ? 'cut_power' : 'shutdown_guest', } end - end end end diff --git a/lib/fog/vsphere/requests/compute/vm_power_on.rb b/lib/fog/vsphere/requests/compute/vm_power_on.rb index 035d268a2..58cb98c1a 100644 --- a/lib/fog/vsphere/requests/compute/vm_power_on.rb +++ b/lib/fog/vsphere/requests/compute/vm_power_on.rb @@ -2,7 +2,6 @@ module Fog module Compute class Vsphere class Real - def vm_power_on(options = {}) raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' @@ -14,16 +13,13 @@ module Fog # 'success', 'running', 'queued', 'error' { 'task_state' => task.info.state } end - end class Mock - def vm_power_on(options = {}) raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' { 'task_state' => 'success' } end - end end end diff --git a/lib/fog/vsphere/requests/compute/vm_reboot.rb b/lib/fog/vsphere/requests/compute/vm_reboot.rb index c506ece68..78d945525 100644 --- a/lib/fog/vsphere/requests/compute/vm_reboot.rb +++ b/lib/fog/vsphere/requests/compute/vm_reboot.rb @@ -2,7 +2,6 @@ module Fog module Compute class Vsphere class Real - def vm_reboot(options = {}) options = { 'force' => false }.merge(options) raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' @@ -19,16 +18,13 @@ module Fog { 'task_state' => "running", 'reboot_type' => 'reboot_guest' } end end - end class Mock - def vm_reboot(options = {}) raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid' { 'task_state' => "running", 'reboot_type' => options['force'] ? 'reset_power' : 'reboot_guest' } end - end end end diff --git a/lib/fog/xenserver/compute.rb b/lib/fog/xenserver/compute.rb index 0f5c5f290..91795c49a 100644 --- a/lib/fog/xenserver/compute.rb +++ b/lib/fog/xenserver/compute.rb @@ -3,7 +3,6 @@ require 'fog/xenserver/core' module Fog module Compute class XenServer < Fog::Service - require 'fog/xenserver/utilities' require 'fog/xenserver/parser' @@ -114,7 +113,6 @@ module Fog request :snapshot_revert class Real - def initialize(options={}) @host = options[:xenserver_url] @username = options[:xenserver_username] @@ -143,11 +141,9 @@ module Fog def default_network networks.find { |n| n.name == (@defaults[:network] || "Pool-wide network associated with eth0") } end - end class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = {} @@ -167,7 +163,6 @@ module Fog @connection = Fog::XML::Connection.new(@host) @connection.authenticate(@username, @password) end - end end end diff --git a/lib/fog/xenserver/core.rb b/lib/fog/xenserver/core.rb index 5df39cd43..9177e8027 100644 --- a/lib/fog/xenserver/core.rb +++ b/lib/fog/xenserver/core.rb @@ -3,7 +3,6 @@ require 'fog/xml' module Fog module XenServer - class InvalidLogin < Fog::Errors::Error; end class NotFound < Fog::Errors::Error; end class RequestFailed < Fog::Errors::Error; end @@ -55,7 +54,6 @@ module Fog end class NokogiriStreamParser < XMLRPC::XMLParser::AbstractStreamParser - def initialize require 'nokogiri/xml/sax/document' require 'nokogiri/xml/sax/parser' @@ -75,9 +73,7 @@ module Fog end end - end - end end diff --git a/lib/fog/xenserver/examples/networks-and-vlans.rb b/lib/fog/xenserver/examples/networks-and-vlans.rb index f87c8a740..948dea0c8 100644 --- a/lib/fog/xenserver/examples/networks-and-vlans.rb +++ b/lib/fog/xenserver/examples/networks-and-vlans.rb @@ -29,7 +29,6 @@ vlans = [ { "name" => "VLAN 55", "vlanid" => 55} ] - vlans.each do |vlan| # Do not create duplicated networks if xenserver.networks.find { |n| n.name == vlan['name'] } diff --git a/lib/fog/xenserver/models/compute/guest_metrics.rb b/lib/fog/xenserver/models/compute/guest_metrics.rb index 662c83c4e..a9769af82 100644 --- a/lib/fog/xenserver/models/compute/guest_metrics.rb +++ b/lib/fog/xenserver/models/compute/guest_metrics.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class GuestMetrics < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VM_guest_metrics @@ -21,9 +20,7 @@ module Fog attribute :other_config attribute :pv_drivers_up_to_date, :aliases => :PV_drivers_up_to_date attribute :pv_drivers_version, :aliases => :PV_drivers_version - end - end end end diff --git a/lib/fog/xenserver/models/compute/host.rb b/lib/fog/xenserver/models/compute/host.rb index 5dec0e848..fbfb7aa48 100644 --- a/lib/fog/xenserver/models/compute/host.rb +++ b/lib/fog/xenserver/models/compute/host.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class Host < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host @@ -151,9 +150,7 @@ module Fog # then reload manually #reload end - end - end end end diff --git a/lib/fog/xenserver/models/compute/host_cpu.rb b/lib/fog/xenserver/models/compute/host_cpu.rb index 4d96fb858..4807b1357 100644 --- a/lib/fog/xenserver/models/compute/host_cpu.rb +++ b/lib/fog/xenserver/models/compute/host_cpu.rb @@ -3,14 +3,12 @@ require 'fog/core/model' module Fog module Compute class XenServer - # # A physical CPU # # @see http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_cpu # class HostCpu < Fog::Model - identity :reference attribute :uuid @@ -30,9 +28,7 @@ module Fog def host service.hosts.get __host end - end - end end end diff --git a/lib/fog/xenserver/models/compute/host_metrics.rb b/lib/fog/xenserver/models/compute/host_metrics.rb index 7a4408d90..5c0c85d71 100644 --- a/lib/fog/xenserver/models/compute/host_metrics.rb +++ b/lib/fog/xenserver/models/compute/host_metrics.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class HostMetrics < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_metrics @@ -21,9 +20,7 @@ module Fog super self.last_updated = attributes[:last_updated].to_time end - end - end end end diff --git a/lib/fog/xenserver/models/compute/hosts.rb b/lib/fog/xenserver/models/compute/hosts.rb index 4342b0415..42df5cc41 100644 --- a/lib/fog/xenserver/models/compute/hosts.rb +++ b/lib/fog/xenserver/models/compute/hosts.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/host' module Fog module Compute class XenServer - class Hosts < Fog::Collection - model Fog::Compute::XenServer::Host def all(options={}) @@ -21,9 +19,7 @@ module Fog nil end end - end - end end end diff --git a/lib/fog/xenserver/models/compute/network.rb b/lib/fog/xenserver/models/compute/network.rb index 91b0f7c21..a0a63f05f 100644 --- a/lib/fog/xenserver/models/compute/network.rb +++ b/lib/fog/xenserver/models/compute/network.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class Network < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=network @@ -86,7 +85,6 @@ module Fog true end end - end end end diff --git a/lib/fog/xenserver/models/compute/networks.rb b/lib/fog/xenserver/models/compute/networks.rb index 0048991fe..87f1cfe1d 100644 --- a/lib/fog/xenserver/models/compute/networks.rb +++ b/lib/fog/xenserver/models/compute/networks.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/network' module Fog module Compute class XenServer - class Networks < Fog::Collection - model Fog::Compute::XenServer::Network def initialize(attributes) @@ -25,9 +23,7 @@ module Fog rescue Fog::XenServer::NotFound nil end - end - end end end diff --git a/lib/fog/xenserver/models/compute/pbd.rb b/lib/fog/xenserver/models/compute/pbd.rb index f7680daa6..f980a7cba 100644 --- a/lib/fog/xenserver/models/compute/pbd.rb +++ b/lib/fog/xenserver/models/compute/pbd.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class PBD < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=PBD @@ -32,9 +31,7 @@ module Fog def unplug service.unplug_pbd reference end - end - end end end diff --git a/lib/fog/xenserver/models/compute/pbds.rb b/lib/fog/xenserver/models/compute/pbds.rb index de765a341..dfd501466 100644 --- a/lib/fog/xenserver/models/compute/pbds.rb +++ b/lib/fog/xenserver/models/compute/pbds.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/pbd' module Fog module Compute class XenServer - class Pbds < Fog::Collection - model Fog::Compute::XenServer::PBD def initialize(attributes) @@ -25,9 +23,7 @@ module Fog nil end end - end - end end end diff --git a/lib/fog/xenserver/models/compute/pif.rb b/lib/fog/xenserver/models/compute/pif.rb index 07e5cfec2..d40164ead 100644 --- a/lib/fog/xenserver/models/compute/pif.rb +++ b/lib/fog/xenserver/models/compute/pif.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class PIF < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=PIF @@ -49,9 +48,7 @@ module Fog def host service.hosts.get __host end - end - end end end diff --git a/lib/fog/xenserver/models/compute/pifs.rb b/lib/fog/xenserver/models/compute/pifs.rb index f7e8ae4ed..2a2226ece 100644 --- a/lib/fog/xenserver/models/compute/pifs.rb +++ b/lib/fog/xenserver/models/compute/pifs.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/pif' module Fog module Compute class XenServer - class Pifs < Fog::Collection - model Fog::Compute::XenServer::PIF def initialize(attributes) @@ -25,9 +23,7 @@ module Fog rescue Fog::XenServer::NotFound nil end - end - end end end diff --git a/lib/fog/xenserver/models/compute/pool.rb b/lib/fog/xenserver/models/compute/pool.rb index 592e48a5e..fa059df22 100644 --- a/lib/fog/xenserver/models/compute/pool.rb +++ b/lib/fog/xenserver/models/compute/pool.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class Pool < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=pool @@ -38,7 +37,6 @@ module Fog attribute :wlb_username attribute :wlb_verify_cert - def default_sr service.storage_repositories.get __default_sr end @@ -71,9 +69,7 @@ module Fog # then reload manually #reload end - end - end end end diff --git a/lib/fog/xenserver/models/compute/pools.rb b/lib/fog/xenserver/models/compute/pools.rb index c39c0740c..c96019a39 100644 --- a/lib/fog/xenserver/models/compute/pools.rb +++ b/lib/fog/xenserver/models/compute/pools.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/pool' module Fog module Compute class XenServer - class Pools < Fog::Collection - model Fog::Compute::XenServer::Pool def initialize(attributes) @@ -25,9 +23,7 @@ module Fog nil end end - end - end end end diff --git a/lib/fog/xenserver/models/compute/server.rb b/lib/fog/xenserver/models/compute/server.rb index 6418cc0d6..55f155aed 100644 --- a/lib/fog/xenserver/models/compute/server.rb +++ b/lib/fog/xenserver/models/compute/server.rb @@ -3,7 +3,6 @@ require 'fog/compute/models/server' module Fog module Compute class XenServer - class Server < Fog::Compute::Server # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VM @@ -244,7 +243,6 @@ module Fog service.snapshot_revert(snapshot_ref) end end - end end end diff --git a/lib/fog/xenserver/models/compute/servers.rb b/lib/fog/xenserver/models/compute/servers.rb index a62af7e9b..3fe1f9c82 100644 --- a/lib/fog/xenserver/models/compute/servers.rb +++ b/lib/fog/xenserver/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/server' module Fog module Compute class XenServer - class Servers < Fog::Collection - model Fog::Compute::XenServer::Server def templates @@ -60,9 +58,7 @@ module Fog rescue Fog::XenServer::NotFound nil end - end - end end end diff --git a/lib/fog/xenserver/models/compute/storage_repositories.rb b/lib/fog/xenserver/models/compute/storage_repositories.rb index e3be7b940..59c73b9aa 100644 --- a/lib/fog/xenserver/models/compute/storage_repositories.rb +++ b/lib/fog/xenserver/models/compute/storage_repositories.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/storage_repository' module Fog module Compute class XenServer - class StorageRepositories < Fog::Collection - model Fog::Compute::XenServer::StorageRepository def all @@ -23,9 +21,7 @@ module Fog nil end end - end - end end end diff --git a/lib/fog/xenserver/models/compute/storage_repository.rb b/lib/fog/xenserver/models/compute/storage_repository.rb index d88236573..331081434 100644 --- a/lib/fog/xenserver/models/compute/storage_repository.rb +++ b/lib/fog/xenserver/models/compute/storage_repository.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class StorageRepository < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=SR @@ -85,9 +84,7 @@ module Fog # then reload manually #reload end - end - end end end diff --git a/lib/fog/xenserver/models/compute/vbd.rb b/lib/fog/xenserver/models/compute/vbd.rb index e79f6b7ad..637d5e31e 100644 --- a/lib/fog/xenserver/models/compute/vbd.rb +++ b/lib/fog/xenserver/models/compute/vbd.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class VBD < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VBD @@ -83,9 +82,7 @@ module Fog rec = service.get_record( __metrics, 'VBD_metrics' ) Fog::Compute::XenServer::VbdMetrics.new(rec) end - end - end end end diff --git a/lib/fog/xenserver/models/compute/vbd_metrics.rb b/lib/fog/xenserver/models/compute/vbd_metrics.rb index 53933d6a8..224d79e3f 100644 --- a/lib/fog/xenserver/models/compute/vbd_metrics.rb +++ b/lib/fog/xenserver/models/compute/vbd_metrics.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class VbdMetrics < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VBD_metrics @@ -21,7 +20,6 @@ module Fog self.last_updated = attributes[:last_updated].to_time end end - end end end diff --git a/lib/fog/xenserver/models/compute/vbds.rb b/lib/fog/xenserver/models/compute/vbds.rb index 0e9eb9505..5fb7282b8 100644 --- a/lib/fog/xenserver/models/compute/vbds.rb +++ b/lib/fog/xenserver/models/compute/vbds.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/vbd' module Fog module Compute class XenServer - class Vbds < Fog::Collection - model Fog::Compute::XenServer::VBD def initialize(attributes) @@ -25,9 +23,7 @@ module Fog rescue Fog::XenServer::NotFound nil end - end - end end end diff --git a/lib/fog/xenserver/models/compute/vdi.rb b/lib/fog/xenserver/models/compute/vdi.rb index 739e6133a..efd8d03a7 100644 --- a/lib/fog/xenserver/models/compute/vdi.rb +++ b/lib/fog/xenserver/models/compute/vdi.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class VDI < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VDI @@ -97,9 +96,7 @@ module Fog def sr storage_repository end - end - end end end diff --git a/lib/fog/xenserver/models/compute/vdis.rb b/lib/fog/xenserver/models/compute/vdis.rb index abe8f7317..18ba41ea4 100644 --- a/lib/fog/xenserver/models/compute/vdis.rb +++ b/lib/fog/xenserver/models/compute/vdis.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/vdi' module Fog module Compute class XenServer - class Vdis < Fog::Collection - model Fog::Compute::XenServer::VDI def all(options = {}) @@ -21,9 +19,7 @@ module Fog rescue Fog::XenServer::NotFound nil end - end - end end end diff --git a/lib/fog/xenserver/models/compute/vif.rb b/lib/fog/xenserver/models/compute/vif.rb index 7523a9d73..dc46cca77 100644 --- a/lib/fog/xenserver/models/compute/vif.rb +++ b/lib/fog/xenserver/models/compute/vif.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class VIF < Fog::Model # API Reference here: # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VIF @@ -32,7 +31,6 @@ module Fog attribute :status_detail attribute :__vm, :aliases => :VM - def destroy service.destroy_vif reference end @@ -52,9 +50,7 @@ module Fog ref = service.create_vif attributes[:server], attributes[:__network] merge_attributes service.vifs.get(ref).attributes end - end - end end end diff --git a/lib/fog/xenserver/models/compute/vifs.rb b/lib/fog/xenserver/models/compute/vifs.rb index 1b95551e5..59baae7b4 100644 --- a/lib/fog/xenserver/models/compute/vifs.rb +++ b/lib/fog/xenserver/models/compute/vifs.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/vif' module Fog module Compute class XenServer - class Vifs < Fog::Collection - model Fog::Compute::XenServer::VIF def all(options = {}) @@ -21,9 +19,7 @@ module Fog rescue Fog::XenServer::NotFound nil end - end - end end end diff --git a/lib/fog/xenserver/models/compute/vlan.rb b/lib/fog/xenserver/models/compute/vlan.rb index 80d6fcf13..e44e979c1 100644 --- a/lib/fog/xenserver/models/compute/vlan.rb +++ b/lib/fog/xenserver/models/compute/vlan.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module Compute class XenServer - class VLAN < Fog::Model # API Reference here: # @see http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VLAN @@ -73,9 +72,7 @@ module Fog service.destroy_vlan reference true end - end - end end end diff --git a/lib/fog/xenserver/models/compute/vlans.rb b/lib/fog/xenserver/models/compute/vlans.rb index fba9fbb1a..576250b85 100644 --- a/lib/fog/xenserver/models/compute/vlans.rb +++ b/lib/fog/xenserver/models/compute/vlans.rb @@ -4,9 +4,7 @@ require 'fog/xenserver/models/compute/vlan' module Fog module Compute class XenServer - class Vlans < Fog::Collection - model Fog::Compute::XenServer::VLAN # Return the list of VLANs available @@ -31,9 +29,7 @@ module Fog rescue Fog::XenServer::NotFound nil end - end - end end end diff --git a/lib/fog/xenserver/parser.rb b/lib/fog/xenserver/parser.rb index c5e09255e..414b7c2a9 100644 --- a/lib/fog/xenserver/parser.rb +++ b/lib/fog/xenserver/parser.rb @@ -2,7 +2,6 @@ module Fog module Parsers module XenServer class Base - attr_reader :response def initialize @@ -29,7 +28,6 @@ module Fog @response end - end end end diff --git a/lib/fog/xenserver/parsers/get_hosts.rb b/lib/fog/xenserver/parsers/get_hosts.rb index cea3bce80..78785e82c 100644 --- a/lib/fog/xenserver/parsers/get_hosts.rb +++ b/lib/fog/xenserver/parsers/get_hosts.rb @@ -2,7 +2,6 @@ module Fog module Parsers module XenServer class GetHosts < Fog::Parsers::XenServer::Base - def reset @response = [] end @@ -11,9 +10,7 @@ module Fog parser = Fog::Parsers::XenServer::Base.new data.each_pair {|reference, host_hash| @response << parser.parse( host_hash ).merge(:reference => reference) } end - end - end end end diff --git a/lib/fog/xenserver/parsers/get_networks.rb b/lib/fog/xenserver/parsers/get_networks.rb index 0c4a3201a..60e2fe236 100644 --- a/lib/fog/xenserver/parsers/get_networks.rb +++ b/lib/fog/xenserver/parsers/get_networks.rb @@ -2,7 +2,6 @@ module Fog module Parsers module XenServer class GetNetworks < Fog::Parsers::XenServer::Base - def reset @response = [] end @@ -11,9 +10,7 @@ module Fog parser = Fog::Parsers::XenServer::Base.new data.each_pair {|reference, network_hash| @response << parser.parse( network_hash ).merge(:reference => reference) } end - end - end end end diff --git a/lib/fog/xenserver/parsers/get_pools.rb b/lib/fog/xenserver/parsers/get_pools.rb index 3ff457356..5c39cd1f7 100644 --- a/lib/fog/xenserver/parsers/get_pools.rb +++ b/lib/fog/xenserver/parsers/get_pools.rb @@ -2,7 +2,6 @@ module Fog module Parsers module XenServer class GetPools < Fog::Parsers::XenServer::Base - def reset @response = [] end @@ -11,9 +10,7 @@ module Fog parser = Fog::Parsers::XenServer::Base.new data.each_pair {|reference, pool_hash| @response << parser.parse( pool_hash ).merge(:reference => reference) } end - end - end end end diff --git a/lib/fog/xenserver/parsers/get_records.rb b/lib/fog/xenserver/parsers/get_records.rb index 6ba187437..c8a34c722 100644 --- a/lib/fog/xenserver/parsers/get_records.rb +++ b/lib/fog/xenserver/parsers/get_records.rb @@ -2,7 +2,6 @@ module Fog module Parsers module XenServer class GetRecords < Fog::Parsers::XenServer::Base - def reset @response = [] end @@ -11,9 +10,7 @@ module Fog parser = Fog::Parsers::XenServer::Base.new data.each_pair {|reference, hash| @response << parser.parse( hash ).merge(:reference => reference) } end - end - end end end diff --git a/lib/fog/xenserver/parsers/get_storage_repositories.rb b/lib/fog/xenserver/parsers/get_storage_repositories.rb index d1b1a8af6..379f241eb 100644 --- a/lib/fog/xenserver/parsers/get_storage_repositories.rb +++ b/lib/fog/xenserver/parsers/get_storage_repositories.rb @@ -2,7 +2,6 @@ module Fog module Parsers module XenServer class GetStorageRepositories < Fog::Parsers::XenServer::Base - def reset @response = [] end @@ -11,9 +10,7 @@ module Fog parser = Fog::Parsers::XenServer::Base.new data.each_pair {|reference, sr_hash| @response << parser.parse( sr_hash ).merge(:reference => reference) } end - end - end end end diff --git a/lib/fog/xenserver/parsers/get_vbds.rb b/lib/fog/xenserver/parsers/get_vbds.rb index 7b5a59c98..d5e4ef9c4 100644 --- a/lib/fog/xenserver/parsers/get_vbds.rb +++ b/lib/fog/xenserver/parsers/get_vbds.rb @@ -2,7 +2,6 @@ module Fog module Parsers module XenServer class GetVBDs < Fog::Parsers::XenServer::Base - def reset @response = [] end @@ -11,9 +10,7 @@ module Fog parser = Fog::Parsers::XenServer::Base.new data.each_pair {|reference, hash| @response << parser.parse( hash ).merge(:reference => reference) } end - end - end end end diff --git a/lib/fog/xenserver/parsers/get_vifs.rb b/lib/fog/xenserver/parsers/get_vifs.rb index 6e83ad68a..bc6111753 100644 --- a/lib/fog/xenserver/parsers/get_vifs.rb +++ b/lib/fog/xenserver/parsers/get_vifs.rb @@ -2,7 +2,6 @@ module Fog module Parsers module XenServer class GetVIFs < Fog::Parsers::XenServer::Base - def reset @response = [] end @@ -11,9 +10,7 @@ module Fog parser = Fog::Parsers::XenServer::Base.new data.each_pair {|reference, vif_hash| @response << parser.parse( vif_hash ).merge(:reference => reference) } end - end - end end end diff --git a/lib/fog/xenserver/parsers/get_vms.rb b/lib/fog/xenserver/parsers/get_vms.rb index f91c48386..ce03579c5 100644 --- a/lib/fog/xenserver/parsers/get_vms.rb +++ b/lib/fog/xenserver/parsers/get_vms.rb @@ -1,9 +1,7 @@ module Fog module Parsers module XenServer - class GetVms < Fog::Parsers::XenServer::Base - def reset @response = [] end @@ -12,9 +10,7 @@ module Fog parser = Fog::Parsers::XenServer::Base.new data.each_pair {|reference, vm_hash| @response << parser.parse( vm_hash ).merge(:reference => reference) } end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/clone_server.rb b/lib/fog/xenserver/requests/compute/clone_server.rb index 0c926fe46..50a18ea3e 100644 --- a/lib/fog/xenserver/requests/compute/clone_server.rb +++ b/lib/fog/xenserver/requests/compute/clone_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class XenServer class Real - def clone_server( server_name, template_ref ) # Clone the VM template if template_ref.kind_of? Fog::Compute::XenServer::Server @@ -16,16 +15,13 @@ module Fog template_ref, server_name ) end - end class Mock - def clone_server( server_name, template_ref ) Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/xenserver/requests/compute/create_network.rb b/lib/fog/xenserver/requests/compute/create_network.rb index 265efde1d..3cfb844e7 100644 --- a/lib/fog/xenserver/requests/compute/create_network.rb +++ b/lib/fog/xenserver/requests/compute/create_network.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - # Create a Network # # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=network @@ -30,13 +28,10 @@ module Fog end class Mock - def create_network( name, description = '', config = {} ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/create_server.rb b/lib/fog/xenserver/requests/compute/create_server.rb index 2daadf2a9..349e676a9 100644 --- a/lib/fog/xenserver/requests/compute/create_server.rb +++ b/lib/fog/xenserver/requests/compute/create_server.rb @@ -2,7 +2,6 @@ module Fog module Compute class XenServer class Real - def get_vm_by_name(label) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.get_by_name_label' }, label) end @@ -110,11 +109,9 @@ module Fog ref end - end class Mock - def create_server( name_label, template = nil, network = nil, extra_args = {}) Fog::Mock.not_implemented end @@ -122,9 +119,7 @@ module Fog def create_server_raw(config = {}) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/create_sr.rb b/lib/fog/xenserver/requests/compute/create_sr.rb index 54530c646..788768569 100644 --- a/lib/fog/xenserver/requests/compute/create_sr.rb +++ b/lib/fog/xenserver/requests/compute/create_sr.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - # # Create a storage repository (SR) # @@ -48,11 +46,9 @@ module Fog sm_config || {} ) end - end class Mock - def create_sr( host_ref, name_label, type, @@ -64,9 +60,7 @@ module Fog sm_config = {} ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/create_vbd.rb b/lib/fog/xenserver/requests/compute/create_vbd.rb index e54a7335f..c7af83c06 100644 --- a/lib/fog/xenserver/requests/compute/create_vbd.rb +++ b/lib/fog/xenserver/requests/compute/create_vbd.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - def create_vbd( vm_ref, vdi_ref, config = {} ) raise ArgumentError.new('Invalid config') if config.nil? vm_ref = vm_ref.reference if vm_ref.kind_of? Fog::Compute::XenServer::Server @@ -28,13 +26,10 @@ module Fog end class Mock - def create_vbd( config ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/create_vdi.rb b/lib/fog/xenserver/requests/compute/create_vdi.rb index cf285418b..9e8c3b1d4 100644 --- a/lib/fog/xenserver/requests/compute/create_vdi.rb +++ b/lib/fog/xenserver/requests/compute/create_vdi.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - def create_vdi( config ) raise ArgumentError.new('Invalid config') if config.nil? raise ArgumentError.new('Missing virtual_size attribute') if config[:virtual_size].nil? @@ -21,13 +19,10 @@ module Fog end class Mock - def create_vdi( ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/create_vif.rb b/lib/fog/xenserver/requests/compute/create_vif.rb index b1d5d3983..9c8b0252c 100644 --- a/lib/fog/xenserver/requests/compute/create_vif.rb +++ b/lib/fog/xenserver/requests/compute/create_vif.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - def create_vif( vm_ref, network_ref, device = -1) raise ArgumentError.new('Invalid vm_ref') if vm_ref.nil? raise ArgumentError.new('Invalid network_ref') if network_ref.nil? @@ -45,13 +43,10 @@ module Fog end class Mock - def create_vif( vm_ref, network_ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/create_vlan.rb b/lib/fog/xenserver/requests/compute/create_vlan.rb index 19dfc1acf..2ab5c29ee 100644 --- a/lib/fog/xenserver/requests/compute/create_vlan.rb +++ b/lib/fog/xenserver/requests/compute/create_vlan.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - # # Create a VLAN # @@ -23,13 +21,10 @@ module Fog end class Mock - def create_vlan( pif_ref, vlan_id, network_ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/destroy_network.rb b/lib/fog/xenserver/requests/compute/destroy_network.rb index 87b38e51a..bc436335e 100644 --- a/lib/fog/xenserver/requests/compute/destroy_network.rb +++ b/lib/fog/xenserver/requests/compute/destroy_network.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - # # Destroy a Network # @@ -18,15 +16,12 @@ module Fog ref ) end - end class Mock - def destroy_network( ref ) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/destroy_server.rb b/lib/fog/xenserver/requests/compute/destroy_server.rb index 45c111165..909279b85 100644 --- a/lib/fog/xenserver/requests/compute/destroy_server.rb +++ b/lib/fog/xenserver/requests/compute/destroy_server.rb @@ -1,21 +1,16 @@ module Fog module Compute class XenServer - class Real - def destroy_server( vm_ref , extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.destroy'}, vm_ref) end - end class Mock - def destroy_server() Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/destroy_sr.rb b/lib/fog/xenserver/requests/compute/destroy_sr.rb index 67cc35a01..b17979cd4 100644 --- a/lib/fog/xenserver/requests/compute/destroy_sr.rb +++ b/lib/fog/xenserver/requests/compute/destroy_sr.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - # # Destroy a Storage Repository # @@ -15,15 +13,12 @@ module Fog sr_ref ) end - end class Mock - def destroy_sr( sr_ref ) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/destroy_vdi.rb b/lib/fog/xenserver/requests/compute/destroy_vdi.rb index ac4f428fb..82f66b854 100644 --- a/lib/fog/xenserver/requests/compute/destroy_vdi.rb +++ b/lib/fog/xenserver/requests/compute/destroy_vdi.rb @@ -1,21 +1,16 @@ module Fog module Compute class XenServer - class Real - def destroy_vdi( vdi_ref, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VDI.destroy'}, vdi_ref) end - end class Mock - def destroy_vdi() Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/destroy_vif.rb b/lib/fog/xenserver/requests/compute/destroy_vif.rb index d70920954..2861400d7 100644 --- a/lib/fog/xenserver/requests/compute/destroy_vif.rb +++ b/lib/fog/xenserver/requests/compute/destroy_vif.rb @@ -1,21 +1,16 @@ module Fog module Compute class XenServer - class Real - def destroy_vif( ref, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VIF.destroy'}, ref) end - end class Mock - def destroy_vif() Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/destroy_vlan.rb b/lib/fog/xenserver/requests/compute/destroy_vlan.rb index 809584eda..62d0df5e0 100644 --- a/lib/fog/xenserver/requests/compute/destroy_vlan.rb +++ b/lib/fog/xenserver/requests/compute/destroy_vlan.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - # Destroy a VLAN # # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=VLAN @@ -17,15 +15,12 @@ module Fog ref ) end - end class Mock - def destroy_vlan( ref ) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/disable_host.rb b/lib/fog/xenserver/requests/compute/disable_host.rb index 989a8f42b..80248e7e6 100644 --- a/lib/fog/xenserver/requests/compute/disable_host.rb +++ b/lib/fog/xenserver/requests/compute/disable_host.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - # # Puts the host into a state in which no new VMs can be started. # Currently active VMs on the host continue to execute. @@ -13,17 +11,13 @@ module Fog def disable_host( ref ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "host.disable"}, ref) end - end class Mock - def disable_host( ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/eject_vbd.rb b/lib/fog/xenserver/requests/compute/eject_vbd.rb index 5412da29f..f3be5f3be 100644 --- a/lib/fog/xenserver/requests/compute/eject_vbd.rb +++ b/lib/fog/xenserver/requests/compute/eject_vbd.rb @@ -1,21 +1,16 @@ module Fog module Compute class XenServer - class Real - def eject_vbd(ref, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VBD.eject'}, ref) end - end class Mock - def eject_vbd(ref, extra_args = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/enable_host.rb b/lib/fog/xenserver/requests/compute/enable_host.rb index d77b7cbc5..818f844ef 100644 --- a/lib/fog/xenserver/requests/compute/enable_host.rb +++ b/lib/fog/xenserver/requests/compute/enable_host.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - # # Puts the host into a state in which VMs can be started. # @@ -12,17 +10,13 @@ module Fog def enable_host( ref ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "host.enable"}, ref) end - end class Mock - def enable_host( ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/get_record.rb b/lib/fog/xenserver/requests/compute/get_record.rb index 2585b7342..254eabaf8 100644 --- a/lib/fog/xenserver/requests/compute/get_record.rb +++ b/lib/fog/xenserver/requests/compute/get_record.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - require 'fog/xenserver/parser' def get_record( ref, klass, options = {} ) @@ -13,17 +11,13 @@ module Fog def get_record_by_ref( ref, klass, options = {} ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "#{klass}.get_record"}, ref).merge(:reference => ref) end - end class Mock - def get_record_by_ref Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/get_records.rb b/lib/fog/xenserver/requests/compute/get_records.rb index 2d4ca7a0f..a8dc8ed8f 100644 --- a/lib/fog/xenserver/requests/compute/get_records.rb +++ b/lib/fog/xenserver/requests/compute/get_records.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - require 'fog/xenserver/parsers/get_records' def get_records( klass, options = {} ) @@ -14,17 +12,13 @@ module Fog [] end end - end class Mock - def get_vms Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/insert_vbd.rb b/lib/fog/xenserver/requests/compute/insert_vbd.rb index 383181b5d..a80ad47b6 100644 --- a/lib/fog/xenserver/requests/compute/insert_vbd.rb +++ b/lib/fog/xenserver/requests/compute/insert_vbd.rb @@ -1,21 +1,16 @@ module Fog module Compute class XenServer - class Real - def insert_vbd(ref, vdi_ref, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VBD.insert'}, ref, vdi_ref) end - end class Mock - def insert_vbd(ref, vdi_ref, extra_args = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/provision_server.rb b/lib/fog/xenserver/requests/compute/provision_server.rb index a8ab8a336..3d57f574f 100644 --- a/lib/fog/xenserver/requests/compute/provision_server.rb +++ b/lib/fog/xenserver/requests/compute/provision_server.rb @@ -2,20 +2,16 @@ module Fog module Compute class XenServer class Real - def provision_server( ref ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.provision'}, ref) end - end class Mock - def provision_server( ref ) Fog::Mock.not_implemented end end - end end end diff --git a/lib/fog/xenserver/requests/compute/reboot_host.rb b/lib/fog/xenserver/requests/compute/reboot_host.rb index 45ddf367a..394c27d40 100644 --- a/lib/fog/xenserver/requests/compute/reboot_host.rb +++ b/lib/fog/xenserver/requests/compute/reboot_host.rb @@ -1,23 +1,17 @@ module Fog module Compute class XenServer - class Real - def reboot_host( ref ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "host.reboot"}, ref) end - end class Mock - def reboot_host( ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/reboot_server.rb b/lib/fog/xenserver/requests/compute/reboot_server.rb index 7030e0615..e999bd356 100644 --- a/lib/fog/xenserver/requests/compute/reboot_server.rb +++ b/lib/fog/xenserver/requests/compute/reboot_server.rb @@ -1,23 +1,17 @@ module Fog module Compute class XenServer - class Real - def reboot_server( ref, stype = 'clean' ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "VM.#{stype}_reboot"}, ref) end - end class Mock - def reboot_server( ref, stype ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/scan_sr.rb b/lib/fog/xenserver/requests/compute/scan_sr.rb index 05db41de8..a6618735e 100644 --- a/lib/fog/xenserver/requests/compute/scan_sr.rb +++ b/lib/fog/xenserver/requests/compute/scan_sr.rb @@ -1,21 +1,16 @@ module Fog module Compute class XenServer - class Real - def scan_sr( ref, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'SR.scan'}, ref) end - end class Mock - def scan_sr(ref, extra_args = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/set_affinity.rb b/lib/fog/xenserver/requests/compute/set_affinity.rb index 0ce91a9b3..09e85859d 100644 --- a/lib/fog/xenserver/requests/compute/set_affinity.rb +++ b/lib/fog/xenserver/requests/compute/set_affinity.rb @@ -1,25 +1,19 @@ module Fog module Compute class XenServer - class Real - require 'fog/xenserver/parser' def set_affinity( host_ref ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.set_affinity'}, host_ref) end - end class Mock - def set_affinity( uuid ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/set_attribute.rb b/lib/fog/xenserver/requests/compute/set_attribute.rb index adaa1d703..42b157817 100644 --- a/lib/fog/xenserver/requests/compute/set_attribute.rb +++ b/lib/fog/xenserver/requests/compute/set_attribute.rb @@ -1,25 +1,19 @@ module Fog module Compute class XenServer - class Real - require 'fog/xenserver/parser' def set_attribute( klass, ref, attr_name, *value ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "#{klass}.set_#{attr_name.gsub('-','_')}"}, ref, *value) end - end class Mock - def set_attribute( klass, ref, attr_name, value ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/shutdown_host.rb b/lib/fog/xenserver/requests/compute/shutdown_host.rb index 4a1aef91b..115809f6f 100644 --- a/lib/fog/xenserver/requests/compute/shutdown_host.rb +++ b/lib/fog/xenserver/requests/compute/shutdown_host.rb @@ -1,23 +1,17 @@ module Fog module Compute class XenServer - class Real - def shutdown_host( ref ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "host.shutdown"}, ref) end - end class Mock - def shutdown_host( ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/shutdown_server.rb b/lib/fog/xenserver/requests/compute/shutdown_server.rb index 9aa806ef8..59123464b 100644 --- a/lib/fog/xenserver/requests/compute/shutdown_server.rb +++ b/lib/fog/xenserver/requests/compute/shutdown_server.rb @@ -1,23 +1,17 @@ module Fog module Compute class XenServer - class Real - def shutdown_server( vm_ref, stype = 'clean' ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "VM.#{stype}_shutdown"}, vm_ref) end - end class Mock - def shutdown_server( vm_ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/snapshot_revert.rb b/lib/fog/xenserver/requests/compute/snapshot_revert.rb index c6b7186d0..01aa6681a 100644 --- a/lib/fog/xenserver/requests/compute/snapshot_revert.rb +++ b/lib/fog/xenserver/requests/compute/snapshot_revert.rb @@ -1,21 +1,16 @@ module Fog module Compute class XenServer - class Real - def snapshot_revert( snapshot_ref, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.revert'}, snapshot_ref) end - end class Mock - def snapshot_revert() Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/snapshot_server.rb b/lib/fog/xenserver/requests/compute/snapshot_server.rb index 197ea095e..f2e801496 100644 --- a/lib/fog/xenserver/requests/compute/snapshot_server.rb +++ b/lib/fog/xenserver/requests/compute/snapshot_server.rb @@ -1,21 +1,16 @@ module Fog module Compute class XenServer - class Real - def snapshot_server( vm_ref , name, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.snapshot'}, vm_ref, name) end - end class Mock - def snapshot_server() Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/start_server.rb b/lib/fog/xenserver/requests/compute/start_server.rb index e756d99bb..93e934b58 100644 --- a/lib/fog/xenserver/requests/compute/start_server.rb +++ b/lib/fog/xenserver/requests/compute/start_server.rb @@ -1,23 +1,17 @@ module Fog module Compute - class XenServer class Real - def start_server( vm_ref ) start_vm( vm_ref ) end - end class Mock - def start_server( vm_ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/start_vm.rb b/lib/fog/xenserver/requests/compute/start_vm.rb index 4b2631582..09108128f 100644 --- a/lib/fog/xenserver/requests/compute/start_vm.rb +++ b/lib/fog/xenserver/requests/compute/start_vm.rb @@ -1,25 +1,19 @@ module Fog module Compute class XenServer - class Real - # http://bit.ly/8ZPyCN # VM.start( session, VM_ref, start_paused, force) def start_vm( vm_ref ) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.start'}, vm_ref, false, false) end - end class Mock - def start_vm( vm_ref ) Fog::Mock.not_implemented end - end - end end end diff --git a/lib/fog/xenserver/requests/compute/unplug_pbd.rb b/lib/fog/xenserver/requests/compute/unplug_pbd.rb index 94e8e5228..0bb2c6059 100644 --- a/lib/fog/xenserver/requests/compute/unplug_pbd.rb +++ b/lib/fog/xenserver/requests/compute/unplug_pbd.rb @@ -1,24 +1,19 @@ module Fog module Compute class XenServer - class Real - def unplug_pbd( ref ) @connection.request( {:parser => Fog::Parsers::XenServer::Base.new, :method => 'PBD.unplug'}, ref ) end - end class Mock - def unplug_pbd( ref ) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xenserver/requests/compute/unplug_vbd.rb b/lib/fog/xenserver/requests/compute/unplug_vbd.rb index 4bae72dc0..658392d90 100644 --- a/lib/fog/xenserver/requests/compute/unplug_vbd.rb +++ b/lib/fog/xenserver/requests/compute/unplug_vbd.rb @@ -1,9 +1,7 @@ module Fog module Compute class XenServer - class Real - def unplug_vbd( vbd_ref, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VBD.unplug'}, vbd_ref) end @@ -11,11 +9,9 @@ module Fog def unplug_force_vbd(ref, extra_args = {}) @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VBD.unplug_force'}, ref) end - end class Mock - def unplug_vbd(ref, extra_args = {}) Fog::Mock.not_implemented end @@ -23,7 +19,6 @@ module Fog def unplug_force_vbd(ref, extra_args = {}) Fog::Mock.not_implemented end - end end end diff --git a/lib/fog/xml.rb b/lib/fog/xml.rb index 13d3c88c3..e2aeab504 100644 --- a/lib/fog/xml.rb +++ b/lib/fog/xml.rb @@ -3,7 +3,6 @@ require "fog/core/parser" require "fog/xml/sax_parser_connection" module Fog - # @note Extracting XML components out of core is a work in progress. # # The {XML} module includes functionality that is common between APIs using diff --git a/lib/fog/xml/sax_parser_connection.rb b/lib/fog/xml/sax_parser_connection.rb index a5065bc3d..f80f98f5c 100644 --- a/lib/fog/xml/sax_parser_connection.rb +++ b/lib/fog/xml/sax_parser_connection.rb @@ -1,7 +1,6 @@ module Fog module XML class SAXParserConnection < Fog::Core::Connection - # Makes a request using the connection using Excon # # @param [Hash] params diff --git a/lib/fog/zerigo/core.rb b/lib/fog/zerigo/core.rb index 0b82845e1..b5e6f5358 100644 --- a/lib/fog/zerigo/core.rb +++ b/lib/fog/zerigo/core.rb @@ -3,10 +3,8 @@ require 'fog/xml' module Fog module Zerigo - extend Fog::Provider service(:dns, 'DNS') - end end diff --git a/lib/fog/zerigo/dns.rb b/lib/fog/zerigo/dns.rb index 960eda30c..eef46a389 100644 --- a/lib/fog/zerigo/dns.rb +++ b/lib/fog/zerigo/dns.rb @@ -3,7 +3,6 @@ require 'fog/zerigo/core' module Fog module DNS class Zerigo < Fog::Service - requires :zerigo_email, :zerigo_token recognizes :host, :persistent, :port, :scheme, :timeout @@ -30,7 +29,6 @@ module Fog request :update_zone class Mock - def self.data @data ||= Hash.new do |hash, key| hash[key] = key == :zones ? [] : {} @@ -68,7 +66,6 @@ module Fog end class Real - def initialize(options={}) require 'fog/core/parser' @@ -112,7 +109,6 @@ module Fog response end - end end end diff --git a/lib/fog/zerigo/models/dns/record.rb b/lib/fog/zerigo/models/dns/record.rb index 8223714db..ae22769cd 100644 --- a/lib/fog/zerigo/models/dns/record.rb +++ b/lib/fog/zerigo/models/dns/record.rb @@ -3,7 +3,6 @@ require 'fog/core/model' module Fog module DNS class Zerigo - class Record < Fog::Model extend Fog::Deprecation deprecate :ip, :value @@ -61,9 +60,7 @@ module Fog def zone=(new_zone) @zone = new_zone end - end - end end end diff --git a/lib/fog/zerigo/models/dns/records.rb b/lib/fog/zerigo/models/dns/records.rb index a43071c0a..4874fc17a 100644 --- a/lib/fog/zerigo/models/dns/records.rb +++ b/lib/fog/zerigo/models/dns/records.rb @@ -4,9 +4,7 @@ require 'fog/zerigo/models/dns/record' module Fog module DNS class Zerigo - class Records < Fog::Collection - attribute :zone model Fog::DNS::Zerigo::Record @@ -41,9 +39,7 @@ module Fog requires :zone super({ :zone => zone }.merge!(attributes)) end - end - end end end diff --git a/lib/fog/zerigo/models/dns/zone.rb b/lib/fog/zerigo/models/dns/zone.rb index d55c5c179..046f46fee 100644 --- a/lib/fog/zerigo/models/dns/zone.rb +++ b/lib/fog/zerigo/models/dns/zone.rb @@ -4,9 +4,7 @@ require 'fog/zerigo/models/dns/records' module Fog module DNS class Zerigo - class Zone < Fog::Model - identity :id attribute :created_at, :aliases => 'created-at' @@ -80,9 +78,7 @@ module Fog merge_attributes(data.body) true end - end - end end end diff --git a/lib/fog/zerigo/models/dns/zones.rb b/lib/fog/zerigo/models/dns/zones.rb index ab44de7c8..96c79ef89 100644 --- a/lib/fog/zerigo/models/dns/zones.rb +++ b/lib/fog/zerigo/models/dns/zones.rb @@ -4,9 +4,7 @@ require 'fog/zerigo/models/dns/zone' module Fog module DNS class Zerigo - class Zones < Fog::Collection - model Fog::DNS::Zerigo::Zone def all(options = {}) @@ -22,9 +20,7 @@ module Fog rescue Fog::Service::NotFound nil end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/count_hosts.rb b/lib/fog/zerigo/parsers/dns/count_hosts.rb index 95fc7ec5a..54873d0be 100644 --- a/lib/fog/zerigo/parsers/dns/count_hosts.rb +++ b/lib/fog/zerigo/parsers/dns/count_hosts.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class CountHosts < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = value.to_i end end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/count_zones.rb b/lib/fog/zerigo/parsers/dns/count_zones.rb index 3c58956e6..9ce14dd41 100644 --- a/lib/fog/zerigo/parsers/dns/count_zones.rb +++ b/lib/fog/zerigo/parsers/dns/count_zones.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class CountZones < Fog::Parsers::Base - def reset @response = {} end @@ -15,9 +13,7 @@ module Fog @response[name] = value.to_i end end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/create_host.rb b/lib/fog/zerigo/parsers/dns/create_host.rb index 2a93d7022..285cb8b2e 100644 --- a/lib/fog/zerigo/parsers/dns/create_host.rb +++ b/lib/fog/zerigo/parsers/dns/create_host.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class CreateHost < Fog::Parsers::Base - def reset @response = {} end @@ -19,9 +17,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/create_zone.rb b/lib/fog/zerigo/parsers/dns/create_zone.rb index 77bcb14d1..0667377a6 100644 --- a/lib/fog/zerigo/parsers/dns/create_zone.rb +++ b/lib/fog/zerigo/parsers/dns/create_zone.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class CreateZone < Fog::Parsers::Base - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/find_hosts.rb b/lib/fog/zerigo/parsers/dns/find_hosts.rb index 03ca76156..b4766139e 100644 --- a/lib/fog/zerigo/parsers/dns/find_hosts.rb +++ b/lib/fog/zerigo/parsers/dns/find_hosts.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class FindHosts < Fog::Parsers::Base - def reset @host = {} @response = { 'hosts' => [] } @@ -23,9 +21,7 @@ module Fog @host = {} end end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/get_host.rb b/lib/fog/zerigo/parsers/dns/get_host.rb index 74188d31e..d85c8b28a 100644 --- a/lib/fog/zerigo/parsers/dns/get_host.rb +++ b/lib/fog/zerigo/parsers/dns/get_host.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class GetHost < Fog::Parsers::Base - def reset @response = {} end @@ -19,9 +17,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/get_zone.rb b/lib/fog/zerigo/parsers/dns/get_zone.rb index c0fb4800f..82304540f 100644 --- a/lib/fog/zerigo/parsers/dns/get_zone.rb +++ b/lib/fog/zerigo/parsers/dns/get_zone.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class GetZone < Fog::Parsers::Base - def reset @host = {} @hosts = [] @@ -47,11 +45,8 @@ module Fog @response[name] = value end end - end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/get_zone_stats.rb b/lib/fog/zerigo/parsers/dns/get_zone_stats.rb index c542481db..2bda876d6 100644 --- a/lib/fog/zerigo/parsers/dns/get_zone_stats.rb +++ b/lib/fog/zerigo/parsers/dns/get_zone_stats.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class GetZoneStats < Fog::Parsers::Base - def reset @response = {} end @@ -17,9 +15,7 @@ module Fog @response[name] = value end end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/list_hosts.rb b/lib/fog/zerigo/parsers/dns/list_hosts.rb index 326935c4e..4d12a7b1e 100644 --- a/lib/fog/zerigo/parsers/dns/list_hosts.rb +++ b/lib/fog/zerigo/parsers/dns/list_hosts.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class ListHosts < Fog::Parsers::Base - def reset @host = {} @response = { 'hosts' => [] } @@ -23,9 +21,7 @@ module Fog @host = {} end end - end - end end end diff --git a/lib/fog/zerigo/parsers/dns/list_zones.rb b/lib/fog/zerigo/parsers/dns/list_zones.rb index 73359f89d..5fcec25f3 100644 --- a/lib/fog/zerigo/parsers/dns/list_zones.rb +++ b/lib/fog/zerigo/parsers/dns/list_zones.rb @@ -2,9 +2,7 @@ module Fog module Parsers module DNS module Zerigo - class ListZones < Fog::Parsers::Base - def reset @zone = {} @response = { 'zones' => [] } @@ -21,9 +19,7 @@ module Fog @zone = {} end end - end - end end end diff --git a/lib/fog/zerigo/requests/dns/count_hosts.rb b/lib/fog/zerigo/requests/dns/count_hosts.rb index 7b3c6424b..f8f051e63 100644 --- a/lib/fog/zerigo/requests/dns/count_hosts.rb +++ b/lib/fog/zerigo/requests/dns/count_hosts.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/count_hosts' # total number of hosts available for the specified zone. It is the same value as provided @@ -21,7 +20,6 @@ module Fog :path => "/api/1.1/zones/#{zone_id}/hosts/count.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/count_zones.rb b/lib/fog/zerigo/requests/dns/count_zones.rb index 76b83d7f5..7d5b6f370 100644 --- a/lib/fog/zerigo/requests/dns/count_zones.rb +++ b/lib/fog/zerigo/requests/dns/count_zones.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/count_zones' # Total number of zones hosted Zerigo for this account. It is the same value as provided @@ -21,7 +20,6 @@ module Fog :path => "/api/1.1/zones/count.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/create_host.rb b/lib/fog/zerigo/requests/dns/create_host.rb index 668b444c8..e6f87e3d4 100644 --- a/lib/fog/zerigo/requests/dns/create_host.rb +++ b/lib/fog/zerigo/requests/dns/create_host.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/create_host' # Create a new host in the specified zone @@ -32,7 +31,6 @@ module Fog # * 'zone-id'<~String> # * 'status'<~Integer> - 201 if successful def create_host(zone_id, host_type, data, options = {}) - optional_tags= '' options.each { |option, value| case option @@ -55,7 +53,6 @@ module Fog :path => "/api/1.1/zones/#{zone_id}/hosts.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/create_zone.rb b/lib/fog/zerigo/requests/dns/create_zone.rb index 67f288996..184920963 100644 --- a/lib/fog/zerigo/requests/dns/create_zone.rb +++ b/lib/fog/zerigo/requests/dns/create_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/create_zone' # Create a new zone for Zerigo's DNS servers to serve/host @@ -47,7 +46,6 @@ module Fog # * 'status'<~Integer> - 201 if successful def create_zone(domain, default_ttl, ns_type, options = {}) - optional_tags= '' options.each { |option, value| case option @@ -82,7 +80,6 @@ module Fog :path => '/api/1.1/zones.xml' ) end - end class Mock # :nodoc:all @@ -126,7 +123,6 @@ module Fog response end end - end end end diff --git a/lib/fog/zerigo/requests/dns/delete_host.rb b/lib/fog/zerigo/requests/dns/delete_host.rb index 5eed49ae8..8c374f383 100644 --- a/lib/fog/zerigo/requests/dns/delete_host.rb +++ b/lib/fog/zerigo/requests/dns/delete_host.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - # Delete a host record # # ==== Parameters @@ -17,7 +16,6 @@ module Fog :path => "/api/1.1/hosts/#{host_id}.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/delete_zone.rb b/lib/fog/zerigo/requests/dns/delete_zone.rb index 8a0a2d5d6..0eb3d32a2 100644 --- a/lib/fog/zerigo/requests/dns/delete_zone.rb +++ b/lib/fog/zerigo/requests/dns/delete_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - # Delete a zone from Zerigo # # ==== Parameters @@ -18,7 +17,6 @@ module Fog :path => "/api/1.1/zones/#{zone_id}.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/find_hosts.rb b/lib/fog/zerigo/requests/dns/find_hosts.rb index cd2f074e5..1f11a5348 100644 --- a/lib/fog/zerigo/requests/dns/find_hosts.rb +++ b/lib/fog/zerigo/requests/dns/find_hosts.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/find_hosts' # Get list of all the host records that match the FQDN. If desired, can limit @@ -48,7 +47,6 @@ module Fog ) end end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/get_host.rb b/lib/fog/zerigo/requests/dns/get_host.rb index 7e914d846..9e4f1fc83 100644 --- a/lib/fog/zerigo/requests/dns/get_host.rb +++ b/lib/fog/zerigo/requests/dns/get_host.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/get_host' # get details about a given host record @@ -32,7 +31,6 @@ module Fog :path => "/api/1.1/hosts/#{host_id}.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/get_zone.rb b/lib/fog/zerigo/requests/dns/get_zone.rb index 933aaa5c9..1f4d29805 100644 --- a/lib/fog/zerigo/requests/dns/get_zone.rb +++ b/lib/fog/zerigo/requests/dns/get_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/get_zone' # Get details of a DNS zone. The response is similar to list_zones, with the @@ -42,7 +41,6 @@ module Fog :path => "/api/1.1/zones/#{zone_id_or_domain}.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/get_zone_stats.rb b/lib/fog/zerigo/requests/dns/get_zone_stats.rb index f21fdb041..b9656a9f9 100644 --- a/lib/fog/zerigo/requests/dns/get_zone_stats.rb +++ b/lib/fog/zerigo/requests/dns/get_zone_stats.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/get_zone_stats' # returns current traffic statistics about this zone. Queries is measured from the @@ -29,7 +28,6 @@ module Fog :path => "/api/1.1/zones/#{zone_id}/stats.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/list_hosts.rb b/lib/fog/zerigo/requests/dns/list_hosts.rb index 1751f8b78..9fb85972d 100644 --- a/lib/fog/zerigo/requests/dns/list_hosts.rb +++ b/lib/fog/zerigo/requests/dns/list_hosts.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/list_hosts' # Get list of all DNS zones hosted on Slicehost (for this account) @@ -33,7 +32,6 @@ module Fog :path => "/api/1.1/zones/#{zone_id}/hosts.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/list_zones.rb b/lib/fog/zerigo/requests/dns/list_zones.rb index 3a4a34f6b..2d11a64ba 100644 --- a/lib/fog/zerigo/requests/dns/list_zones.rb +++ b/lib/fog/zerigo/requests/dns/list_zones.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - require 'fog/zerigo/parsers/dns/list_zones' # Get list of all DNS zones hosted on Slicehost (for this account) @@ -44,11 +43,9 @@ module Fog :path => '/api/1.1/zones.xml' ) end - end class Mock # :nodoc:all - def list_zones response = Excon::Response.new @@ -59,7 +56,6 @@ module Fog response end - end end end diff --git a/lib/fog/zerigo/requests/dns/update_host.rb b/lib/fog/zerigo/requests/dns/update_host.rb index 3f0b1e554..c0dc6f9a3 100644 --- a/lib/fog/zerigo/requests/dns/update_host.rb +++ b/lib/fog/zerigo/requests/dns/update_host.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - # Update a host record # # ==== Parameters @@ -19,7 +18,6 @@ module Fog # * 'status'<~Integer> - 200 for success # def update_host(host_id, options = {}) - optional_tags= '' options.each { |option, value| case option @@ -45,7 +43,6 @@ module Fog :path => "/api/1.1/hosts/#{host_id}.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/fog/zerigo/requests/dns/update_zone.rb b/lib/fog/zerigo/requests/dns/update_zone.rb index bfcf313d5..75aa91b23 100644 --- a/lib/fog/zerigo/requests/dns/update_zone.rb +++ b/lib/fog/zerigo/requests/dns/update_zone.rb @@ -2,7 +2,6 @@ module Fog module DNS class Zerigo class Real - # Update the parameters of a zone # ==== Parameters # @@ -25,7 +24,6 @@ module Fog # * response<~Excon::Response>: # * 'status'<~Integer> - 200 for success def update_zone(zone_id, options = {}) - optional_tags= '' options.each { |option, value| case option @@ -63,7 +61,6 @@ module Fog :path => "/api/1.1/zones/#{zone_id}.xml" ) end - end class Mock # :nodoc:all diff --git a/lib/tasks/changelog_task.rb b/lib/tasks/changelog_task.rb index 4ec317a45..bf66842d3 100644 --- a/lib/tasks/changelog_task.rb +++ b/lib/tasks/changelog_task.rb @@ -4,7 +4,6 @@ require "rake/tasklib" module Fog module Rake class ChangelogTask < ::Rake::TaskLib - def initialize desc "Update the changelog since the last release" task(:changelog) do @@ -206,7 +205,6 @@ Watchers | #{watchers} def timestamp @time ||= Time.now.utc.strftime('%m/%d/%Y') end - end end end diff --git a/lib/tasks/github_release_task.rb b/lib/tasks/github_release_task.rb index ee7ad79bd..1e2648778 100644 --- a/lib/tasks/github_release_task.rb +++ b/lib/tasks/github_release_task.rb @@ -6,7 +6,6 @@ require 'netrc' module Fog module Rake class GithubReleaseTask < ::Rake::TaskLib - def initialize desc "Update the changelog since the last release" task(:github_release) do diff --git a/providers/brightbox/lib/fog/brightbox/compute.rb b/providers/brightbox/lib/fog/brightbox/compute.rb index 027ac0ed3..e0a12a41c 100644 --- a/providers/brightbox/lib/fog/brightbox/compute.rb +++ b/providers/brightbox/lib/fog/brightbox/compute.rb @@ -5,7 +5,6 @@ require 'fog/brightbox/compute/image_selector' module Fog module Compute class Brightbox < Fog::Service - # Client credentials requires :brightbox_client_id, :brightbox_secret @@ -299,7 +298,6 @@ module Fog Fog::Brightbox::Compute::ImageSelector.new(list_images).latest_ubuntu end end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/compute/shared.rb b/providers/brightbox/lib/fog/brightbox/compute/shared.rb index 969a7fb84..0fe73480d 100644 --- a/providers/brightbox/lib/fog/brightbox/compute/shared.rb +++ b/providers/brightbox/lib/fog/brightbox/compute/shared.rb @@ -3,7 +3,6 @@ require "fog/brightbox/oauth2" module Fog module Brightbox module Compute - # The Shared module consists of code that was duplicated between the Real # and Mock implementations. # diff --git a/providers/brightbox/lib/fog/brightbox/core.rb b/providers/brightbox/lib/fog/brightbox/core.rb index afea8b7b5..09eac03c5 100644 --- a/providers/brightbox/lib/fog/brightbox/core.rb +++ b/providers/brightbox/lib/fog/brightbox/core.rb @@ -6,6 +6,5 @@ module Fog extend Fog::Provider service(:compute, 'Compute') - end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/account.rb b/providers/brightbox/lib/fog/brightbox/models/compute/account.rb index d0427234e..ef3cab91c 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/account.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/account.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class Account < Fog::Model - identity :id attribute :url attribute :resource_type @@ -61,9 +59,7 @@ module Fog merge_attributes(data) library_ftp_password end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/accounts.rb b/providers/brightbox/lib/fog/brightbox/models/compute/accounts.rb index 3690944fe..8b89b4773 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/accounts.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/accounts.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/account' module Fog module Compute class Brightbox - class Accounts < Fog::Collection - model Fog::Compute::Brightbox::Account def all @@ -21,9 +19,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/applications.rb b/providers/brightbox/lib/fog/brightbox/models/compute/applications.rb index ed2bfb67b..98f4e4fc6 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/applications.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/applications.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/application' module Fog module Compute class Brightbox - class Applications < Fog::Collection - model Fog::Compute::Brightbox::Application def all @@ -20,9 +18,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/cloud_ip.rb b/providers/brightbox/lib/fog/brightbox/models/compute/cloud_ip.rb index c6b70a40f..262c4d5c0 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/cloud_ip.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/cloud_ip.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class CloudIp < Fog::Model - identity :id attribute :url attribute :resource_type @@ -60,9 +58,7 @@ module Fog def destination_id server_id || load_balancer || server_group || database_server || interface_id end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/cloud_ips.rb b/providers/brightbox/lib/fog/brightbox/models/compute/cloud_ips.rb index 4d0308c38..6aa1f632b 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/cloud_ips.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/cloud_ips.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/cloud_ip' module Fog module Compute class Brightbox - class CloudIps < Fog::Collection - model Fog::Compute::Brightbox::CloudIp def all @@ -26,9 +24,7 @@ module Fog data = service.create_cloud_ip new(data) end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/database_servers.rb b/providers/brightbox/lib/fog/brightbox/models/compute/database_servers.rb index 18d2cf199..22f51569c 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/database_servers.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/database_servers.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/database_server' module Fog module Compute class Brightbox - class DatabaseServers < Fog::Collection - model Fog::Compute::Brightbox::DatabaseServer def all @@ -20,9 +18,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/database_types.rb b/providers/brightbox/lib/fog/brightbox/models/compute/database_types.rb index 236e6cc37..eddcdc1d4 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/database_types.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/database_types.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/database_type' module Fog module Compute class Brightbox - class DatabaseTypes < Fog::Collection - model Fog::Compute::Brightbox::DatabaseType def all diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/firewall_policies.rb b/providers/brightbox/lib/fog/brightbox/models/compute/firewall_policies.rb index d42ffbeee..2a7b2462b 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/firewall_policies.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/firewall_policies.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/firewall_policy' module Fog module Compute class Brightbox - class FirewallPolicies < Fog::Collection - model Fog::Compute::Brightbox::FirewallPolicy def all @@ -21,9 +19,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/firewall_policy.rb b/providers/brightbox/lib/fog/brightbox/models/compute/firewall_policy.rb index ef48ae392..3ed31a953 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/firewall_policy.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/firewall_policy.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class FirewallPolicy < Fog::Model - identity :id attribute :url attribute :resource_type diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/firewall_rule.rb b/providers/brightbox/lib/fog/brightbox/models/compute/firewall_rule.rb index b430af6ec..6a1c76773 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/firewall_rule.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/firewall_rule.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class FirewallRule < Fog::Model - identity :id attribute :url attribute :resource_type @@ -46,9 +44,7 @@ module Fog service.destroy_firewall_rule(identity) true end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/firewall_rules.rb b/providers/brightbox/lib/fog/brightbox/models/compute/firewall_rules.rb index f22026600..736912f19 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/firewall_rules.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/firewall_rules.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/firewall_rule' module Fog module Compute class Brightbox - class FirewallRules < Fog::Collection - model Fog::Compute::Brightbox::FirewallRule def get(identifier) @@ -16,9 +14,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/flavor.rb b/providers/brightbox/lib/fog/brightbox/models/compute/flavor.rb index 1613b29fe..01b8ceac1 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/flavor.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/flavor.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class Flavor < Fog::Model - identity :id attribute :url attribute :resource_type @@ -24,9 +22,7 @@ module Fog def bits 0 # This is actually based on the Image type used. 32bit or 64bit Images are supported end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/flavors.rb b/providers/brightbox/lib/fog/brightbox/models/compute/flavors.rb index 908dcb67b..9bac69fd1 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/flavors.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/flavors.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/flavor' module Fog module Compute class Brightbox - class Flavors < Fog::Collection - model Fog::Compute::Brightbox::Flavor def all @@ -20,9 +18,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/image.rb b/providers/brightbox/lib/fog/brightbox/models/compute/image.rb index fefc9c7fd..6bfd86af5 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/image.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/image.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class Image < Fog::Model - identity :id attribute :url attribute :resource_type diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/images.rb b/providers/brightbox/lib/fog/brightbox/models/compute/images.rb index e401ebffc..eee4a09a9 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/images.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/images.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/image' module Fog module Compute class Brightbox - class Images < Fog::Collection - model Fog::Compute::Brightbox::Image def all @@ -20,9 +18,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/load_balancer.rb b/providers/brightbox/lib/fog/brightbox/models/compute/load_balancer.rb index b0fce6d08..a4592d8d8 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/load_balancer.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/load_balancer.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class LoadBalancer < Fog::Model - identity :id attribute :url attribute :resource_type diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/load_balancers.rb b/providers/brightbox/lib/fog/brightbox/models/compute/load_balancers.rb index a88b2c166..56535dcab 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/load_balancers.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/load_balancers.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/load_balancer' module Fog module Compute class Brightbox - class LoadBalancers < Fog::Collection - model Fog::Compute::Brightbox::LoadBalancer def all @@ -20,9 +18,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/server.rb b/providers/brightbox/lib/fog/brightbox/models/compute/server.rb index 4bec0cd32..522e57600 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/server.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/server.rb @@ -3,9 +3,7 @@ require 'fog/compute/models/server' module Fog module Compute class Brightbox - class Server < Fog::Compute::Server - identity :id attribute :resource_type attribute :url @@ -211,7 +209,6 @@ module Fog end end end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/server_group.rb b/providers/brightbox/lib/fog/brightbox/models/compute/server_group.rb index 715d2c00f..1ba4e39ed 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/server_group.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/server_group.rb @@ -7,7 +7,6 @@ module Fog # # Certain actions can accept a server group and affect all members class ServerGroup < Fog::Model - identity :id attribute :url diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/server_groups.rb b/providers/brightbox/lib/fog/brightbox/models/compute/server_groups.rb index b2c85f48c..e2c777ab0 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/server_groups.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/server_groups.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/server_group' module Fog module Compute class Brightbox - class ServerGroups < Fog::Collection - model Fog::Compute::Brightbox::ServerGroup def all @@ -21,9 +19,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/servers.rb b/providers/brightbox/lib/fog/brightbox/models/compute/servers.rb index d921b5d68..8049f3ed0 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/servers.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/servers.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/server' module Fog module Compute class Brightbox - class Servers < Fog::Collection - model Fog::Compute::Brightbox::Server def all @@ -53,9 +51,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/user.rb b/providers/brightbox/lib/fog/brightbox/models/compute/user.rb index 9f1917813..f6df746a2 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/user.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/user.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class User < Fog::Model - identity :id attribute :resource_type attribute :url @@ -35,9 +33,7 @@ module Fog merge_attributes(data) true end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/user_collaboration.rb b/providers/brightbox/lib/fog/brightbox/models/compute/user_collaboration.rb index e35a5c01c..37c053589 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/user_collaboration.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/user_collaboration.rb @@ -37,7 +37,6 @@ module Fog merge_attributes(data) true end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/users.rb b/providers/brightbox/lib/fog/brightbox/models/compute/users.rb index 76d4409f0..0ca7a2505 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/users.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/users.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/user' module Fog module Compute class Brightbox - class Users < Fog::Collection - model Fog::Compute::Brightbox::User def all @@ -21,7 +19,6 @@ module Fog nil end end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/zone.rb b/providers/brightbox/lib/fog/brightbox/models/compute/zone.rb index 0993c157d..b11e23728 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/zone.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/zone.rb @@ -3,9 +3,7 @@ require 'fog/core/model' module Fog module Compute class Brightbox - class Zone < Fog::Model - identity :id attribute :url attribute :resource_type @@ -14,9 +12,7 @@ module Fog attribute :handle attribute :description - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/models/compute/zones.rb b/providers/brightbox/lib/fog/brightbox/models/compute/zones.rb index 60016a21f..4adcda0c3 100644 --- a/providers/brightbox/lib/fog/brightbox/models/compute/zones.rb +++ b/providers/brightbox/lib/fog/brightbox/models/compute/zones.rb @@ -4,9 +4,7 @@ require 'fog/brightbox/models/compute/zone' module Fog module Compute class Brightbox - class Zones < Fog::Collection - model Fog::Compute::Brightbox::Zone def all @@ -21,9 +19,7 @@ module Fog rescue Excon::Errors::NotFound nil end - end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/oauth2.rb b/providers/brightbox/lib/fog/brightbox/oauth2.rb index e2e07429c..ee4d44f97 100644 --- a/providers/brightbox/lib/fog/brightbox/oauth2.rb +++ b/providers/brightbox/lib/fog/brightbox/oauth2.rb @@ -4,7 +4,6 @@ # @see http://tools.ietf.org/html/draft-ietf-oauth-v2-10 # module Fog::Brightbox::OAuth2 - # This builds the simplest form of requesting an access token # based on the arguments passed in # diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/accept_user_collaboration.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/accept_user_collaboration.rb index d9f8a353e..ec837b964 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/accept_user_collaboration.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/accept_user_collaboration.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/user/collaborations/#{identifier}/accept", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/activate_console_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/activate_console_server.rb index c46005bc0..67d073332 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/activate_console_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/activate_console_server.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/servers/#{identifier}/activate_console", [202]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb index 73fc1d919..8ef872d93 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb @@ -17,7 +17,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/load_balancers/#{identifier}/add_listeners", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb index 986fba9c1..e53c48f0b 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb @@ -17,7 +17,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/load_balancers/#{identifier}/add_nodes", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/add_servers_server_group.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/add_servers_server_group.rb index 8c99c2c50..b92f63538 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/add_servers_server_group.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/add_servers_server_group.rb @@ -27,7 +27,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/server_groups/#{identifier}/add_servers", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/apply_to_firewall_policy.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/apply_to_firewall_policy.rb index 623326fb0..05e48b4d6 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/apply_to_firewall_policy.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/apply_to_firewall_policy.rb @@ -17,7 +17,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/firewall_policies/#{identifier}/apply_to", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_api_client.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_api_client.rb index 001b7c7f0..bf487e668 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_api_client.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_api_client.rb @@ -16,7 +16,6 @@ module Fog def create_api_client(options) wrapped_request("post", "/1.0/api_clients", [201], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_application.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_application.rb index f1aa0091a..dd0082772 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_application.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_application.rb @@ -16,7 +16,6 @@ module Fog def create_application(options) wrapped_request("post", "/1.0/applications", [201], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_cloud_ip.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_cloud_ip.rb index 6ccefb51e..7f07e4bd2 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_cloud_ip.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_cloud_ip.rb @@ -17,7 +17,6 @@ module Fog def create_cloud_ip(options = {}) wrapped_request("post", "/1.0/cloud_ips", [201], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_collaboration.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_collaboration.rb index 13088c36f..e26b26c82 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_collaboration.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_collaboration.rb @@ -16,7 +16,6 @@ module Fog def create_collaboration(options) wrapped_request("post", "/1.0/collaborations", [201], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_database_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_database_server.rb index 5b6378751..61b407f0f 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_database_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_database_server.rb @@ -18,7 +18,6 @@ module Fog def create_database_server(options) wrapped_request("post", "/1.0/database_servers", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_firewall_policy.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_firewall_policy.rb index bce1a66f4..3ef22c48b 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_firewall_policy.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_firewall_policy.rb @@ -19,7 +19,6 @@ module Fog def create_firewall_policy(options) wrapped_request("post", "/1.0/firewall_policies", [201], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_firewall_rule.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_firewall_rule.rb index f2875bb31..ab4505b65 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_firewall_rule.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_firewall_rule.rb @@ -22,7 +22,6 @@ module Fog def create_firewall_rule(options) wrapped_request("post", "/1.0/firewall_rules", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_image.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_image.rb index bae15a929..43e490083 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_image.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_image.rb @@ -23,7 +23,6 @@ module Fog def create_image(options) wrapped_request("post", "/1.0/images", [201], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_load_balancer.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_load_balancer.rb index a26caee8e..5181efc12 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_load_balancer.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_load_balancer.rb @@ -19,7 +19,6 @@ module Fog def create_load_balancer(options) wrapped_request("post", "/1.0/load_balancers", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_server.rb index 2f1ce317e..00f33a2c7 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_server.rb @@ -22,7 +22,6 @@ module Fog def create_server(options) wrapped_request("post", "/1.0/servers", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/create_server_group.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/create_server_group.rb index 61a0a9174..c1218ea0b 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/create_server_group.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/create_server_group.rb @@ -16,7 +16,6 @@ module Fog def create_server_group(options) wrapped_request("post", "/1.0/server_groups", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_account.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_account.rb index 63767b7fb..b07bb97e4 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_account.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_account.rb @@ -22,7 +22,6 @@ module Fog wrapped_request("get", "/1.0/accounts/#{identifier}", [200]) end end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_api_client.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_api_client.rb index 8bb57e1d5..3e7045389 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_api_client.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_api_client.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/api_clients/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_application.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_application.rb index a828c9c1c..3f2af137a 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_application.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_application.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/applications/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_authenticated_user.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_authenticated_user.rb index a73ffda3f..6c1c51727 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_authenticated_user.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_authenticated_user.rb @@ -9,7 +9,6 @@ module Fog def get_authenticated_user wrapped_request("get", "/1.0/user", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_cloud_ip.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_cloud_ip.rb index 149d67625..a285e0719 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_cloud_ip.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_cloud_ip.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/cloud_ips/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_collaboration.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_collaboration.rb index 27140ea30..d0b994dac 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_collaboration.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_collaboration.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/collaborations/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_server.rb index 77be0ab71..51d15c9e0 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_server.rb @@ -12,7 +12,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/database_servers/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_snapshot.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_snapshot.rb index cdbabd69c..b19033513 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_snapshot.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_snapshot.rb @@ -12,7 +12,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/database_snapshots/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_type.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_type.rb index 60708ba5b..009bfe495 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_type.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_database_type.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/database_types/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_firewall_policy.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_firewall_policy.rb index edacabfb0..2a15c3d87 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_firewall_policy.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_firewall_policy.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/firewall_policies/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_firewall_rule.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_firewall_rule.rb index 4bb9832dc..5c109b23b 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_firewall_rule.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_firewall_rule.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/firewall_rules/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_image.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_image.rb index 4843da31b..e60a24802 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_image.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_image.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/images/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_interface.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_interface.rb index 19c4bda57..04b33a177 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_interface.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_interface.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/interfaces/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_load_balancer.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_load_balancer.rb index f662a801d..49ea5cc62 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_load_balancer.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_load_balancer.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/load_balancers/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_scoped_account.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_scoped_account.rb index c38a203d0..121d24fc1 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_scoped_account.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_scoped_account.rb @@ -8,7 +8,6 @@ module Fog def get_scoped_account wrapped_request("get", "/1.0/account", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_server.rb index bfab74cdf..06337b767 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_server.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/servers/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_server_group.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_server_group.rb index c99de26cb..fdb1875eb 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_server_group.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_server_group.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/server_groups/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_server_type.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_server_type.rb index 7104baad5..896c46d6f 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_server_type.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_server_type.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/server_types/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_user.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_user.rb index 81d1f7a68..06b4102ea 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_user.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_user.rb @@ -22,7 +22,6 @@ module Fog wrapped_request("get", "/1.0/users/#{identifier}", [200]) end end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_user_collaboration.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_user_collaboration.rb index 4ff7c538b..d236c4b79 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_user_collaboration.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_user_collaboration.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/user/collaborations/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/get_zone.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/get_zone.rb index 8a29be409..bfc57059f 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/get_zone.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/get_zone.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("get", "/1.0/zones/#{identifier}", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_accounts.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_accounts.rb index e1793c3b7..13803a967 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_accounts.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_accounts.rb @@ -10,7 +10,6 @@ module Fog def list_accounts wrapped_request("get", "/1.0/accounts", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_api_clients.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_api_clients.rb index 6ca3a7f34..9ae3bfd97 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_api_clients.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_api_clients.rb @@ -12,7 +12,6 @@ module Fog def list_api_clients wrapped_request("get", "/1.0/api_clients", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_applications.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_applications.rb index 041a2b375..71859a0ef 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_applications.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_applications.rb @@ -12,7 +12,6 @@ module Fog def list_applications wrapped_request("get", "/1.0/applications", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_cloud_ips.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_cloud_ips.rb index 3be2a9f74..d0670cfcd 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_cloud_ips.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_cloud_ips.rb @@ -12,7 +12,6 @@ module Fog def list_cloud_ips wrapped_request("get", "/1.0/cloud_ips", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_collaborations.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_collaborations.rb index c57615672..1688747ca 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_collaborations.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_collaborations.rb @@ -12,7 +12,6 @@ module Fog def list_collaborations wrapped_request("get", "/1.0/collaborations", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_servers.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_servers.rb index eddb088d0..c8cc50d98 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_servers.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_servers.rb @@ -10,7 +10,6 @@ module Fog def list_database_servers wrapped_request("get", "/1.0/database_servers", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_snapshots.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_snapshots.rb index 6db13c570..7df1fc925 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_snapshots.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_snapshots.rb @@ -10,7 +10,6 @@ module Fog def list_database_snapshots wrapped_request("get", "/1.0/database_snapshots", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_types.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_types.rb index 8985517a4..8c0106785 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_types.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_database_types.rb @@ -12,7 +12,6 @@ module Fog def list_database_types wrapped_request("get", "/1.0/database_types", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_firewall_policies.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_firewall_policies.rb index 8f83f3bc1..7e80dfa8f 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_firewall_policies.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_firewall_policies.rb @@ -12,7 +12,6 @@ module Fog def list_firewall_policies wrapped_request("get", "/1.0/firewall_policies", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_images.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_images.rb index 71c26f65c..995128378 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_images.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_images.rb @@ -12,7 +12,6 @@ module Fog def list_images wrapped_request("get", "/1.0/images", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_load_balancers.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_load_balancers.rb index 733dc7362..9c61e78e4 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_load_balancers.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_load_balancers.rb @@ -12,7 +12,6 @@ module Fog def list_load_balancers wrapped_request("get", "/1.0/load_balancers", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_server_groups.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_server_groups.rb index e7aae4e1d..cac05ab9d 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_server_groups.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_server_groups.rb @@ -12,7 +12,6 @@ module Fog def list_server_groups wrapped_request("get", "/1.0/server_groups", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_server_types.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_server_types.rb index 4dc5257b5..00a180ac8 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_server_types.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_server_types.rb @@ -12,7 +12,6 @@ module Fog def list_server_types wrapped_request("get", "/1.0/server_types", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_servers.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_servers.rb index e662d7f89..57f114118 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_servers.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_servers.rb @@ -12,7 +12,6 @@ module Fog def list_servers wrapped_request("get", "/1.0/servers", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_user_collaborations.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_user_collaborations.rb index 0033fe240..1594e85bb 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_user_collaborations.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_user_collaborations.rb @@ -12,7 +12,6 @@ module Fog def list_user_collaborations wrapped_request("get", "/1.0/user/collaborations", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_users.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_users.rb index 93256851d..abccf2009 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_users.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_users.rb @@ -12,7 +12,6 @@ module Fog def list_users wrapped_request("get", "/1.0/users", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/list_zones.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/list_zones.rb index 7c6e9738b..919ac964b 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/list_zones.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/list_zones.rb @@ -12,7 +12,6 @@ module Fog def list_zones wrapped_request("get", "/1.0/zones", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/map_cloud_ip.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/map_cloud_ip.rb index 0e36038fa..43d56ba96 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/map_cloud_ip.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/map_cloud_ip.rb @@ -17,7 +17,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/cloud_ips/#{identifier}/map", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/move_servers_server_group.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/move_servers_server_group.rb index 06b44e87b..e034b02c4 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/move_servers_server_group.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/move_servers_server_group.rb @@ -29,7 +29,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/server_groups/#{identifier}/move_servers", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/reject_user_collaboration.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/reject_user_collaboration.rb index ff12cb48c..9c3a03cff 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/reject_user_collaboration.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/reject_user_collaboration.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/user/collaborations/#{identifier}/reject", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/remove_firewall_policy.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/remove_firewall_policy.rb index 1372cc8c7..0e45047f7 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/remove_firewall_policy.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/remove_firewall_policy.rb @@ -17,7 +17,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/firewall_policies/#{identifier}/remove", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb index 9681605a0..6fe8068cc 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb @@ -17,7 +17,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/load_balancers/#{identifier}/remove_listeners", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb index f514b87fa..d9d2f5380 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb @@ -17,7 +17,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/load_balancers/#{identifier}/remove_nodes", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/remove_servers_server_group.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/remove_servers_server_group.rb index 71abb3979..e5e2d5f7e 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/remove_servers_server_group.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/remove_servers_server_group.rb @@ -27,7 +27,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/server_groups/#{identifier}/remove_servers", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/resend_collaboration.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/resend_collaboration.rb index f003c58b8..9c907c417 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/resend_collaboration.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/resend_collaboration.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/collaborations/#{identifier}/resend", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb index 576e4419d..dbbac63be 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb @@ -2,7 +2,6 @@ module Fog module Compute class Brightbox class Real - # Reset the image library ftp password for the account. # # @note The response is the only time the new password is available in plaintext. @@ -25,7 +24,6 @@ module Fog wrapped_request("post", "/1.0/accounts/#{identifier}/reset_ftp_password", [200]) end end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_ftp_password_scoped_account.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_ftp_password_scoped_account.rb index 13e7a4c38..e1c59c239 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_ftp_password_scoped_account.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_ftp_password_scoped_account.rb @@ -12,7 +12,6 @@ module Fog wrapped_request("post", "/1.0/account/reset_ftp_password", [200]) end end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_password_database_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_password_database_server.rb index 46c208d28..8067ac130 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_password_database_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_password_database_server.rb @@ -12,7 +12,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/database_servers/#{identifier}/reset_password", [202]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_secret_api_client.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_secret_api_client.rb index 953fb51f8..748a6d1cd 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_secret_api_client.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_secret_api_client.rb @@ -18,7 +18,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/api_clients/#{identifier}/reset_secret", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_secret_application.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_secret_application.rb index d1d07632e..1413d749a 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/reset_secret_application.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/reset_secret_application.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/applications/#{identifier}/reset_secret", [200]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/shutdown_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/shutdown_server.rb index ba02f6ec1..1f2af3521 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/shutdown_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/shutdown_server.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/servers/#{identifier}/shutdown", [202]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/snapshot_database_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/snapshot_database_server.rb index 19049bdf0..65b7c7cc3 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/snapshot_database_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/snapshot_database_server.rb @@ -12,7 +12,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/database_servers/#{identifier}/snapshot", [202]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/snapshot_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/snapshot_server.rb index b85c401d7..0dd77e5f1 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/snapshot_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/snapshot_server.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/servers/#{identifier}/snapshot", [202]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/start_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/start_server.rb index cd4bd26fc..281f8e0be 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/start_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/start_server.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/servers/#{identifier}/start", [202]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/stop_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/stop_server.rb index 235c935cd..ce373ad2c 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/stop_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/stop_server.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/servers/#{identifier}/stop", [202]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb index 752b600bf..b1158dd09 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb @@ -14,7 +14,6 @@ module Fog return nil if identifier.nil? || identifier == "" wrapped_request("post", "/1.0/cloud_ips/#{identifier}/unmap", [202]) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_account.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_account.rb index b30d9c040..84d9e9842 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_account.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_account.rb @@ -54,7 +54,6 @@ module Fog wrapped_request("put", "/1.0/accounts/#{identifier}", [200], options) end end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_api_client.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_api_client.rb index 96fbeb661..0c75d7baa 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_api_client.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_api_client.rb @@ -19,7 +19,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/api_clients/#{identifier}", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_application.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_application.rb index de2d541c7..c0d8ede15 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_application.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_application.rb @@ -19,7 +19,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/applications/#{identifier}", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_cloud_ip.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_cloud_ip.rb index 3e25680bc..a401d9de3 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_cloud_ip.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_cloud_ip.rb @@ -20,7 +20,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/cloud_ips/#{identifier}", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_database_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_database_server.rb index 6e6481949..afdc694fc 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_database_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_database_server.rb @@ -18,7 +18,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/database_servers/#{identifier}", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_database_snapshot.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_database_snapshot.rb index f921741c2..b59d5006b 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_database_snapshot.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_database_snapshot.rb @@ -19,7 +19,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/database_snapshots/#{identifier}", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_firewall_policy.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_firewall_policy.rb index bdd3277ea..b59233b16 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_firewall_policy.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_firewall_policy.rb @@ -19,7 +19,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/firewall_policies/#{identifier}", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_firewall_rule.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_firewall_rule.rb index 0dd50d8cc..d537d07e9 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_firewall_rule.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_firewall_rule.rb @@ -24,7 +24,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/firewall_rules/#{identifier}", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_image.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_image.rb index cfc1e6855..8abdf686e 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_image.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_image.rb @@ -24,7 +24,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/images/#{identifier}", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_load_balancer.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_load_balancer.rb index 6452f5bd3..c1bf0cc9d 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_load_balancer.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_load_balancer.rb @@ -22,7 +22,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/load_balancers/#{identifier}", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_scoped_account.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_scoped_account.rb index ef5bfecab..18556e751 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_scoped_account.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_scoped_account.rb @@ -24,7 +24,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/account", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_server.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_server.rb index 34cbe4a55..b17cfdaec 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_server.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_server.rb @@ -21,7 +21,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/servers/#{identifier}", [200], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_server_group.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_server_group.rb index 5025e32ab..7674cea12 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_server_group.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_server_group.rb @@ -19,7 +19,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/server_groups/#{identifier}", [202], options) end - end end end diff --git a/providers/brightbox/lib/fog/brightbox/requests/compute/update_user.rb b/providers/brightbox/lib/fog/brightbox/requests/compute/update_user.rb index 4399f08da..3baacd83a 100644 --- a/providers/brightbox/lib/fog/brightbox/requests/compute/update_user.rb +++ b/providers/brightbox/lib/fog/brightbox/requests/compute/update_user.rb @@ -22,7 +22,6 @@ module Fog return nil if options.empty? || options.nil? wrapped_request("put", "/1.0/users/#{identifier}", [200], options) end - end end end diff --git a/tests/aws/credentials_tests.rb b/tests/aws/credentials_tests.rb index 225505dca..8be9aac19 100644 --- a/tests/aws/credentials_tests.rb +++ b/tests/aws/credentials_tests.rb @@ -17,7 +17,6 @@ Shindo.tests('AWS | credentials', ['aws']) do Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/arole"}, {:status => 200, :body => Fog::JSON.encode(credentials)}) - tests("#fetch_credentials") do returns({:aws_access_key_id => 'dummykey', :aws_secret_access_key => 'dummysecret', @@ -44,7 +43,6 @@ Shindo.tests('AWS | credentials', ['aws']) do end Fog::Time.now = Time.now - tests("#fetch_credentials when the url 404s") do Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 404, :body => 'not bound'}) returns(default_credentials) {Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true)} diff --git a/tests/aws/models/beanstalk/application_tests.rb b/tests/aws/models/beanstalk/application_tests.rb index 724c8ad86..980077bca 100644 --- a/tests/aws/models/beanstalk/application_tests.rb +++ b/tests/aws/models/beanstalk/application_tests.rb @@ -66,5 +66,4 @@ Shindo.tests("Fog::AWS[:beanstalk] | application", ['aws', 'beanstalk']) do end - end diff --git a/tests/aws/models/beanstalk/environment_tests.rb b/tests/aws/models/beanstalk/environment_tests.rb index 8f919ccb6..44caf3fb1 100644 --- a/tests/aws/models/beanstalk/environment_tests.rb +++ b/tests/aws/models/beanstalk/environment_tests.rb @@ -90,7 +90,6 @@ Shindo.tests("Fog::AWS[:beanstalk] | environment", ['aws', 'beanstalk']) do @instance.wait_for { ready? } end - test('#restart_app_server') do @instance.restart_app_server diff --git a/tests/aws/models/beanstalk/versions_tests.rb b/tests/aws/models/beanstalk/versions_tests.rb index f841a51c2..0e35b9894 100644 --- a/tests/aws/models/beanstalk/versions_tests.rb +++ b/tests/aws/models/beanstalk/versions_tests.rb @@ -55,7 +55,6 @@ Shindo.tests("Fog::AWS[:beanstalk] | versions", ['aws', 'beanstalk']) do end - # delete application @application.destroy end \ No newline at end of file diff --git a/tests/aws/models/compute/key_pair_tests.rb b/tests/aws/models/compute/key_pair_tests.rb index 9e4b28e60..1a4680624 100644 --- a/tests/aws/models/compute/key_pair_tests.rb +++ b/tests/aws/models/compute/key_pair_tests.rb @@ -23,5 +23,4 @@ Shindo.tests("Fog::Compute[:aws] | key_pair", ['aws']) do end end - end diff --git a/tests/aws/models/storage/file_tests.rb b/tests/aws/models/storage/file_tests.rb index 94623b5a7..73de7d87e 100644 --- a/tests/aws/models/storage/file_tests.rb +++ b/tests/aws/models/storage/file_tests.rb @@ -34,7 +34,6 @@ Shindo.tests("Storage[:aws] | file", ["aws"]) do end end - @directory.files.create(:key => @instance.key) @instance.destroy diff --git a/tests/aws/requests/auto_scaling/helper.rb b/tests/aws/requests/auto_scaling/helper.rb index 1487003e3..570dbd706 100644 --- a/tests/aws/requests/auto_scaling/helper.rb +++ b/tests/aws/requests/auto_scaling/helper.rb @@ -1,7 +1,6 @@ class AWS module AutoScaling module Formats - BASIC = { 'ResponseMetadata' => {'RequestId' => String} } @@ -224,7 +223,6 @@ class AWS 'Activity' => [ACTIVITY] } }) - end end end diff --git a/tests/aws/requests/compute/dhcp_options_tests.rb b/tests/aws/requests/compute/dhcp_options_tests.rb index c1ff8c6a7..f222e25bb 100644 --- a/tests/aws/requests/compute/dhcp_options_tests.rb +++ b/tests/aws/requests/compute/dhcp_options_tests.rb @@ -13,7 +13,6 @@ Shindo.tests('Fog::Compute[:aws] | dhcp_options requests', ['aws']) do @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24') @vpc_id = @vpc.id - tests('#create_dhcp_options').formats(@dhcp_options_format) do data = Fog::Compute[:aws].create_dhcp_options({'domain-name' => 'example.com', 'domain-name-servers' => '10.10.10.10'}).body @dopt_id = data['dhcpOptionsSet'].first['dhcpOptionsId'] diff --git a/tests/aws/requests/compute/helper.rb b/tests/aws/requests/compute/helper.rb index 1f072efbc..a6f49facc 100644 --- a/tests/aws/requests/compute/helper.rb +++ b/tests/aws/requests/compute/helper.rb @@ -1,16 +1,10 @@ class AWS - module Compute - module Formats - BASIC = { 'requestId' => String, 'return' => ::Fog::Boolean } - end - end - end diff --git a/tests/aws/requests/compute/instance_tests.rb b/tests/aws/requests/compute/instance_tests.rb index 2047593aa..a8d2d8802 100644 --- a/tests/aws/requests/compute/instance_tests.rb +++ b/tests/aws/requests/compute/instance_tests.rb @@ -80,7 +80,6 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do 'timestamp' => Time } - @terminate_instances_format = { 'instancesSet' => [{ 'currentState' => {'code' => Integer, 'name' => String}, diff --git a/tests/aws/requests/compute/internet_gateway_tests.rb b/tests/aws/requests/compute/internet_gateway_tests.rb index 6d1da2d5f..203a97486 100644 --- a/tests/aws/requests/compute/internet_gateway_tests.rb +++ b/tests/aws/requests/compute/internet_gateway_tests.rb @@ -17,7 +17,6 @@ Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do @subnet_id = @subnet.subnet_id @igw_id = nil - tests('#create_internet_gateway').formats(@internet_gateways_format) do data = Fog::Compute[:aws].create_internet_gateway().body @igw_id = data['internetGatewaySet'].first['internetGatewayId'] diff --git a/tests/aws/requests/data_pipeline/helper.rb b/tests/aws/requests/data_pipeline/helper.rb index d8ee6f58d..21a8cf7e7 100644 --- a/tests/aws/requests/data_pipeline/helper.rb +++ b/tests/aws/requests/data_pipeline/helper.rb @@ -1,7 +1,6 @@ class AWS module DataPipeline module Formats - BASIC = { 'pipelineId' => String, } @@ -68,7 +67,6 @@ class AWS } ] } - end end end diff --git a/tests/aws/requests/dns/dns_tests.rb b/tests/aws/requests/dns/dns_tests.rb index 34e693652..f4550a4b9 100644 --- a/tests/aws/requests/dns/dns_tests.rb +++ b/tests/aws/requests/dns/dns_tests.rb @@ -239,7 +239,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do end - tests('failure') do tests('create hosted zone using invalid domain name').raises(Excon::Errors::BadRequest) do pending if Fog.mocking? @@ -254,5 +253,4 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do end - end diff --git a/tests/aws/requests/elasticache/helper.rb b/tests/aws/requests/elasticache/helper.rb index b01f56e27..b5efa2284 100644 --- a/tests/aws/requests/elasticache/helper.rb +++ b/tests/aws/requests/elasticache/helper.rb @@ -1,7 +1,6 @@ class AWS module Elasticache module Formats - BASIC = { 'ResponseMetadata' => {'RequestId' => String} } diff --git a/tests/aws/requests/elb/helper.rb b/tests/aws/requests/elb/helper.rb index 1f9e113bb..46f430cef 100644 --- a/tests/aws/requests/elb/helper.rb +++ b/tests/aws/requests/elb/helper.rb @@ -1,7 +1,6 @@ class AWS module ELB module Formats - BASIC = { 'ResponseMetadata' => {'RequestId' => String} } @@ -87,7 +86,6 @@ class AWS DELETE_LOAD_BALANCER = BASIC.merge({ 'DeleteLoadBalancerResult' => NilClass }) - end end end diff --git a/tests/aws/requests/emr/helper.rb b/tests/aws/requests/emr/helper.rb index 8dfed64a7..1ce3e3d26 100644 --- a/tests/aws/requests/emr/helper.rb +++ b/tests/aws/requests/emr/helper.rb @@ -1,7 +1,5 @@ class AWS - module EMR - module Formats BASIC = { 'RequestId' => String @@ -165,8 +163,6 @@ class AWS } }] } - end end - end diff --git a/tests/aws/requests/glacier/multipart_upload_tests.rb b/tests/aws/requests/glacier/multipart_upload_tests.rb index 10699147b..1b45e0c03 100644 --- a/tests/aws/requests/glacier/multipart_upload_tests.rb +++ b/tests/aws/requests/glacier/multipart_upload_tests.rb @@ -10,7 +10,6 @@ Shindo.tests('AWS::Glacier | glacier archive tests', ['aws']) do returns(false){ Fog::AWS[:glacier].list_multipart_uploads('Fog-Test-Vault-upload').body['UploadsList'].collect {|item| item['MultipartUploadId']}.include?(id)} end - tests('do multipart upload') do hash = Fog::AWS::Glacier::TreeHash.new id = Fog::AWS[:glacier].initiate_multipart_upload('Fog-Test-Vault-upload', 1024*1024).headers['x-amz-multipart-upload-id'] diff --git a/tests/aws/requests/glacier/tree_hash_tests.rb b/tests/aws/requests/glacier/tree_hash_tests.rb index 292bcc35b..abcbc3db6 100644 --- a/tests/aws/requests/glacier/tree_hash_tests.rb +++ b/tests/aws/requests/glacier/tree_hash_tests.rb @@ -59,5 +59,4 @@ Shindo.tests('AWS::Glacier | glacier tree hash calcuation', ['aws']) do end - end \ No newline at end of file diff --git a/tests/aws/requests/iam/helper.rb b/tests/aws/requests/iam/helper.rb index a8943702c..f160cabcb 100644 --- a/tests/aws/requests/iam/helper.rb +++ b/tests/aws/requests/iam/helper.rb @@ -1,5 +1,4 @@ class AWS - module IAM # A self-signed test keypair. Generated using the command: # openssl req -new -newkey rsa:1024 -days 3650 -nodes -x509 -keyout server-private.key -out server-public.crt @@ -95,13 +94,9 @@ Xb9WSr07saxZQbxBPQyTlb0Q9Tu2djAq2/o/nYD1/50/fXUTuWMB } module Formats - BASIC = { 'RequestId' => String } - end - end - end diff --git a/tests/aws/requests/iam/login_profile_tests.rb b/tests/aws/requests/iam/login_profile_tests.rb index 5b0ed542f..f9ef40c93 100644 --- a/tests/aws/requests/iam/login_profile_tests.rb +++ b/tests/aws/requests/iam/login_profile_tests.rb @@ -4,7 +4,6 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do Fog::AWS[:iam].create_user('fog_user') end - tests('success') do @login_profile_format = { 'LoginProfile' => { @@ -57,7 +56,6 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do end end - unless Fog.mocking? Fog::AWS[:iam].delete_user('fog_user') end diff --git a/tests/aws/requests/iam/user_tests.rb b/tests/aws/requests/iam/user_tests.rb index c46dcc1df..700980886 100644 --- a/tests/aws/requests/iam/user_tests.rb +++ b/tests/aws/requests/iam/user_tests.rb @@ -66,7 +66,6 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do Fog::AWS[:iam].delete_user('fog_user').body end - end tests('failure') do diff --git a/tests/aws/requests/rds/helper.rb b/tests/aws/requests/rds/helper.rb index 78fed9873..33ac6cb6f 100644 --- a/tests/aws/requests/rds/helper.rb +++ b/tests/aws/requests/rds/helper.rb @@ -1,9 +1,6 @@ class AWS - module RDS - module Formats - BASIC = { 'ResponseMetadata' => { 'RequestId' => String } } @@ -272,9 +269,6 @@ class AWS 'TagList' => Fog::Nullable::Hash } } - end - end - end diff --git a/tests/aws/requests/rds/parameter_request_tests.rb b/tests/aws/requests/rds/parameter_request_tests.rb index 3801391c5..5edfbda37 100644 --- a/tests/aws/requests/rds/parameter_request_tests.rb +++ b/tests/aws/requests/rds/parameter_request_tests.rb @@ -18,7 +18,6 @@ Shindo.tests('AWS::RDS | parameter requests', ['aws', 'rds']) do Fog::AWS[:rds].describe_db_parameters('fog-group', :max_records => 20).body end - tests("#describe_db_parameters :source => 'user'")do body = Fog::AWS[:rds].describe_db_parameters('fog-group', :source => 'user').body returns(1){ body['DescribeDBParametersResult']['Parameters'].length} diff --git a/tests/aws/requests/redshift/cluster_parameter_group_tests.rb b/tests/aws/requests/redshift/cluster_parameter_group_tests.rb index d485db14e..977a40922 100644 --- a/tests/aws/requests/redshift/cluster_parameter_group_tests.rb +++ b/tests/aws/requests/redshift/cluster_parameter_group_tests.rb @@ -43,7 +43,6 @@ Shindo.tests('Fog::Redshift[:aws] | cluster parameter group requests', ['aws']) body end - tests("describe_cluster_parameter_groups").formats(@cluster_parameter_groups_format) do body = Fog::AWS[:redshift].describe_cluster_parameter_groups.body body diff --git a/tests/aws/requests/redshift/cluster_security_group_tests.rb b/tests/aws/requests/redshift/cluster_security_group_tests.rb index 946cdd3d0..42d7c5569 100644 --- a/tests/aws/requests/redshift/cluster_security_group_tests.rb +++ b/tests/aws/requests/redshift/cluster_security_group_tests.rb @@ -16,14 +16,12 @@ Shindo.tests('Fog::Redshift[:aws] | cluster security group requests', ['aws']) d "ClusterSecurityGroups" => [@cluster_security_group_format] } - tests('success') do tests("create_cluster_security_group").formats(@cluster_security_group_format) do body = Fog::AWS[:redshift].create_cluster_security_group(:cluster_security_group_name => identifier, :description => 'testing').body body end - tests("describe_cluster_security_groups").formats(@describe_cluster_security_groups_format) do body = Fog::AWS[:redshift].describe_cluster_security_groups.body body diff --git a/tests/aws/requests/redshift/cluster_snapshot_tests.rb b/tests/aws/requests/redshift/cluster_snapshot_tests.rb index f40ba78a4..de702e2d1 100644 --- a/tests/aws/requests/redshift/cluster_snapshot_tests.rb +++ b/tests/aws/requests/redshift/cluster_snapshot_tests.rb @@ -35,7 +35,6 @@ Shindo.tests('Fog::Redshift[:aws] | cluster snapshot requests', ['aws']) do "Snapshots" => [@cluster_snapshot_format] } - tests('success') do tests("create_cluster_snapshot").formats(@cluster_snapshot_format) do Fog::AWS[:redshift].create_cluster(:cluster_identifier => cluster, @@ -51,7 +50,6 @@ Shindo.tests('Fog::Redshift[:aws] | cluster snapshot requests', ['aws']) do body end - tests('describe_cluster_snaphots').formats(@describe_cluster_snapshots_format) do sleep 30 unless Fog.mocking? body = Fog::AWS[:redshift].describe_cluster_snapshots(:start_time=>start_time).body diff --git a/tests/aws/requests/redshift/cluster_tests.rb b/tests/aws/requests/redshift/cluster_tests.rb index 640461f34..cf13945a1 100644 --- a/tests/aws/requests/redshift/cluster_tests.rb +++ b/tests/aws/requests/redshift/cluster_tests.rb @@ -59,7 +59,6 @@ Shindo.tests('Fog::Redshift[:aws] | cluster requests', ['aws']) do body end - tests('reboot_cluster') do sleep 30 unless Fog.mocking? body = Fog::AWS[:redshift].reboot_cluster(:cluster_identifier=>identifier).body @@ -67,7 +66,6 @@ Shindo.tests('Fog::Redshift[:aws] | cluster requests', ['aws']) do body end - tests('delete_cluster') do Fog.wait_for do "available" == Fog::AWS[:redshift].describe_clusters(:cluster_identifier=>identifier).body['ClusterSet'].first['Cluster']['ClusterStatus'] diff --git a/tests/aws/requests/ses/helper.rb b/tests/aws/requests/ses/helper.rb index 8ebe6942c..b1bc5bac2 100644 --- a/tests/aws/requests/ses/helper.rb +++ b/tests/aws/requests/ses/helper.rb @@ -1,15 +1,9 @@ class AWS - module SES - module Formats - BASIC = { 'ResponseMetadata' => {'RequestId' => String} } - end - end - end diff --git a/tests/aws/requests/simpledb/helper.rb b/tests/aws/requests/simpledb/helper.rb index 8c5d71016..edb379939 100644 --- a/tests/aws/requests/simpledb/helper.rb +++ b/tests/aws/requests/simpledb/helper.rb @@ -1,16 +1,10 @@ class AWS - module SimpleDB - module Formats - BASIC = { 'BoxUsage' => Float, 'RequestId' => String } - end - end - end diff --git a/tests/aws/requests/sqs/helper.rb b/tests/aws/requests/sqs/helper.rb index 1e0d5d1b0..273e2732c 100644 --- a/tests/aws/requests/sqs/helper.rb +++ b/tests/aws/requests/sqs/helper.rb @@ -1,15 +1,9 @@ class AWS - module SQS - module Formats - BASIC = { 'ResponseMetadata' => {'RequestId' => String} } - end - end - end diff --git a/tests/bluebox/requests/compute/helper.rb b/tests/bluebox/requests/compute/helper.rb index 990929d38..452ca0461 100644 --- a/tests/bluebox/requests/compute/helper.rb +++ b/tests/bluebox/requests/compute/helper.rb @@ -1,9 +1,6 @@ class Bluebox - module Compute - module Formats - PRODUCT = { 'cost' => String, 'description' => String, @@ -14,9 +11,6 @@ class Bluebox 'id' => String, 'description' => String } - end - end - end diff --git a/tests/bluebox/requests/dns/dns_tests.rb b/tests/bluebox/requests/dns/dns_tests.rb index 7ef7c7cd0..5318eb1ba 100644 --- a/tests/bluebox/requests/dns/dns_tests.rb +++ b/tests/bluebox/requests/dns/dns_tests.rb @@ -244,7 +244,6 @@ Shindo.tests('Fog::DNS[:bluebox] | DNS requests', ['bluebox', 'dns']) do end - tests( 'failure') do #create a zone with invalid parameters diff --git a/tests/brightbox/compute/schema.rb b/tests/brightbox/compute/schema.rb index 27c1111cc..0d85e01a0 100644 --- a/tests/brightbox/compute/schema.rb +++ b/tests/brightbox/compute/schema.rb @@ -240,7 +240,6 @@ class Brightbox "email_address" => String } - COLLABORATION = { "id" => String, "resource_type" => String, diff --git a/tests/brightbox/requests/compute/cloud_ip_tests.rb b/tests/brightbox/requests/compute/cloud_ip_tests.rb index c0a274a62..2c8885fc4 100644 --- a/tests/brightbox/requests/compute/cloud_ip_tests.rb +++ b/tests/brightbox/requests/compute/cloud_ip_tests.rb @@ -82,5 +82,4 @@ Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do end - end diff --git a/tests/brightbox/requests/compute/collaboration_tests.rb b/tests/brightbox/requests/compute/collaboration_tests.rb index b38961574..bc60041e0 100644 --- a/tests/brightbox/requests/compute/collaboration_tests.rb +++ b/tests/brightbox/requests/compute/collaboration_tests.rb @@ -9,7 +9,6 @@ Shindo.tests('Fog::Compute[:brightbox] | collaboration requests', ['brightbox']) formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { collaboration } end - tests("#list_collaborations") do pending if Fog.mocking? result = Fog::Compute[:brightbox].list_collaborations @@ -23,7 +22,6 @@ Shindo.tests('Fog::Compute[:brightbox] | collaboration requests', ['brightbox']) formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result } end - tests("#destroy_collaboration") do pending if Fog.mocking? result = Fog::Compute[:brightbox].destroy_collaboration(@collaboration_id) diff --git a/tests/cloudsigma/requests/server_tests.rb b/tests/cloudsigma/requests/server_tests.rb index 7b803c098..6a99de036 100644 --- a/tests/cloudsigma/requests/server_tests.rb +++ b/tests/cloudsigma/requests/server_tests.rb @@ -50,22 +50,18 @@ Shindo.tests('Fog::Compute[:cloudsigma] | server requests', ['cloudsigma']) do response.body['result'] == "success" end - server = Fog::Compute[:cloudsigma].servers.get(@server_uuid) server.wait_for { status == 'running' } - tests("#stop_server(#@server_uuid)").succeeds do response = Fog::Compute[:cloudsigma].stop_server(@server_uuid) response.body['result'] == "success" end - server = Fog::Compute[:cloudsigma].servers.get(@server_uuid) server.wait_for { status == 'stopped' } - tests("#delete_server(#@server_uuid)").succeeds do resp = Fog::Compute[:cloudsigma].delete_server(@server_uuid) diff --git a/tests/cloudstack/compute/models/security_group_rule_tests.rb b/tests/cloudstack/compute/models/security_group_rule_tests.rb index 1e5e712ee..e715f161e 100644 --- a/tests/cloudstack/compute/models/security_group_rule_tests.rb +++ b/tests/cloudstack/compute/models/security_group_rule_tests.rb @@ -21,7 +21,6 @@ Shindo.tests("Fog::Compute[:#{provider}] | security_group_rules | ingress", [pro end - Shindo.tests("Fog::Compute[:#{provider}] | security_group_rules | egress", [provider.to_s]) do security_group_rule_tests(Fog::Compute[:cloudstack], config, "egress", config[:mocked]) diff --git a/tests/cloudstack/compute/models/security_groups_tests.rb b/tests/cloudstack/compute/models/security_groups_tests.rb index c8a9a67e3..132ea9bf3 100644 --- a/tests/cloudstack/compute/models/security_groups_tests.rb +++ b/tests/cloudstack/compute/models/security_groups_tests.rb @@ -10,7 +10,6 @@ def security_group_tests(provider, params, mocks_implemented = true) end end - provider, config = :cloudstack, compute_providers[:cloudstack] Shindo.tests("Fog::Compute[:#{provider}] | security_group", [provider.to_s]) do diff --git a/tests/cloudstack/compute/models/volumes_tests.rb b/tests/cloudstack/compute/models/volumes_tests.rb index c293214ed..7af3935b3 100644 --- a/tests/cloudstack/compute/models/volumes_tests.rb +++ b/tests/cloudstack/compute/models/volumes_tests.rb @@ -1,5 +1,4 @@ def volumes_tests(connection, params = {}, mocks_implemented = true) - collection_tests(connection.volumes, params, mocks_implemented) do if !Fog.mocking? || mocks_implemented @@ -7,7 +6,6 @@ def volumes_tests(connection, params = {}, mocks_implemented = true) end end - end config = compute_providers[:cloudstack] diff --git a/tests/core/parser_tests.rb b/tests/core/parser_tests.rb index ddb0767ad..e8a50162d 100644 --- a/tests/core/parser_tests.rb +++ b/tests/core/parser_tests.rb @@ -20,7 +20,6 @@ Shindo.tests('Fog::Parsers', 'core') do when 'id' @my_array << value.to_i end - end end diff --git a/tests/fogdocker/requests/compute/container_action_tests.rb b/tests/fogdocker/requests/compute/container_action_tests.rb index 5ffec3e17..86adecdd8 100644 --- a/tests/fogdocker/requests/compute/container_action_tests.rb +++ b/tests/fogdocker/requests/compute/container_action_tests.rb @@ -5,7 +5,6 @@ Shindo.tests("Fog::Compute[:fogdocker] | container_action request", 'fogdocker') response = compute.container_create(:name => name, 'image' => 'mattdm/fedora:f19','Cmd' => ['date'] ) id = response['id'] - tests("Start Container") do response = compute.container_action(:id => id, :action => 'start' ) test("should be a kind of Hash") { response.kind_of? Hash} diff --git a/tests/fogdocker/requests/compute/container_commit_tests.rb b/tests/fogdocker/requests/compute/container_commit_tests.rb index 19f249414..dcd440bff 100644 --- a/tests/fogdocker/requests/compute/container_commit_tests.rb +++ b/tests/fogdocker/requests/compute/container_commit_tests.rb @@ -15,5 +15,4 @@ Shindo.tests("Fog::Compute[:fogdocker] | container_create request", 'fogdocker') test("should have a deleted message") {result.include?('Deleted')} end - end diff --git a/tests/glesys/requests/compute/helper.rb b/tests/glesys/requests/compute/helper.rb index 0f37a1f11..1382e7136 100644 --- a/tests/glesys/requests/compute/helper.rb +++ b/tests/glesys/requests/compute/helper.rb @@ -2,7 +2,6 @@ class Glesys module Compute module Formats module Servers - LIST = { 'debug' => { 'input' => Array @@ -144,10 +143,8 @@ class Glesys 'text' => String } } - end module Ips - IPLIST = { 'debug' => { 'input' => [] @@ -229,10 +226,8 @@ class Glesys 'text' => String } } - end module Templates - LIST = { 'debug' => { 'input' => [] @@ -259,7 +254,6 @@ class Glesys 'text' => String } } - end end end diff --git a/tests/glesys/requests/compute/ip_tests.rb b/tests/glesys/requests/compute/ip_tests.rb index 5ecc50ba5..8c38a3275 100644 --- a/tests/glesys/requests/compute/ip_tests.rb +++ b/tests/glesys/requests/compute/ip_tests.rb @@ -63,5 +63,4 @@ Shindo.tests('Fog::Compute[:glesys] | ip requests', ['glesys']) do end - end diff --git a/tests/glesys/requests/compute/server_tests.rb b/tests/glesys/requests/compute/server_tests.rb index 808de3347..219b141ed 100644 --- a/tests/glesys/requests/compute/server_tests.rb +++ b/tests/glesys/requests/compute/server_tests.rb @@ -110,7 +110,6 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do Fog::Compute[:glesys].destroy(:serverid => @serverid).body['response'] end - end tests('failure') do diff --git a/tests/helpers/collection_helper.rb b/tests/helpers/collection_helper.rb index 4026d40fe..5c3733f4d 100644 --- a/tests/helpers/collection_helper.rb +++ b/tests/helpers/collection_helper.rb @@ -1,5 +1,4 @@ def collection_tests(collection, params = {}, mocks_implemented = true) - tests('success') do tests("#new(#{params.inspect})").succeeds do @@ -22,8 +21,6 @@ def collection_tests(collection, params = {}, mocks_implemented = true) collection.all end - - if !Fog.mocking? || mocks_implemented @identity = @instance.identity end @@ -73,7 +70,6 @@ def collection_tests(collection, params = {}, mocks_implemented = true) end - if block_given? yield end @@ -98,5 +94,4 @@ def collection_tests(collection, params = {}, mocks_implemented = true) end end - end diff --git a/tests/helpers/compute/flavors_helper.rb b/tests/helpers/compute/flavors_helper.rb index 11b98a3a6..b9170e816 100644 --- a/tests/helpers/compute/flavors_helper.rb +++ b/tests/helpers/compute/flavors_helper.rb @@ -1,5 +1,4 @@ def flavors_tests(connection, params = {}, mocks_implemented = true) - tests('success') do tests("#all").succeeds do @@ -30,5 +29,4 @@ def flavors_tests(connection, params = {}, mocks_implemented = true) end end - end diff --git a/tests/helpers/compute/server_helper.rb b/tests/helpers/compute/server_helper.rb index 3d37a965d..90a79fb12 100644 --- a/tests/helpers/compute/server_helper.rb +++ b/tests/helpers/compute/server_helper.rb @@ -1,5 +1,4 @@ def server_tests(connection, params = {}, mocks_implemented = true) - model_tests(connection.servers, params, mocks_implemented) do tests('#reload').returns(true) do @@ -23,5 +22,4 @@ def server_tests(connection, params = {}, mocks_implemented = true) end end - end diff --git a/tests/helpers/compute/servers_helper.rb b/tests/helpers/compute/servers_helper.rb index dfa6cadad..60a292211 100644 --- a/tests/helpers/compute/servers_helper.rb +++ b/tests/helpers/compute/servers_helper.rb @@ -1,5 +1,4 @@ def servers_tests(connection, params = {}, mocks_implemented = true) - collection_tests(connection.servers, params, mocks_implemented) do if !Fog.mocking? || mocks_implemented @@ -8,5 +7,4 @@ def servers_tests(connection, params = {}, mocks_implemented = true) end end - end diff --git a/tests/helpers/formats_helper.rb b/tests/helpers/formats_helper.rb index 3d5d39826..0053bb546 100644 --- a/tests/helpers/formats_helper.rb +++ b/tests/helpers/formats_helper.rb @@ -26,7 +26,6 @@ end module Shindo class Tests - # Generates a Shindo test that compares a hash schema to the result # of the passed in block returning true if they match. # diff --git a/tests/helpers/formats_helper_tests.rb b/tests/helpers/formats_helper_tests.rb index f62c79ed4..dba2386f0 100644 --- a/tests/helpers/formats_helper_tests.rb +++ b/tests/helpers/formats_helper_tests.rb @@ -107,5 +107,4 @@ Shindo.tests('test_helper', 'meta') do end - end diff --git a/tests/helpers/model_helper.rb b/tests/helpers/model_helper.rb index afbe7a692..404dffc01 100644 --- a/tests/helpers/model_helper.rb +++ b/tests/helpers/model_helper.rb @@ -1,5 +1,4 @@ def model_tests(collection, params = {}, mocks_implemented = true) - tests('success') do @instance = collection.new(params) @@ -19,7 +18,6 @@ def model_tests(collection, params = {}, mocks_implemented = true) end end - end # Generates a unique identifier with a random differentiator. diff --git a/tests/helpers/responds_to_helper.rb b/tests/helpers/responds_to_helper.rb index f1482df52..598270095 100644 --- a/tests/helpers/responds_to_helper.rb +++ b/tests/helpers/responds_to_helper.rb @@ -1,6 +1,5 @@ module Shindo class Tests - def responds_to(method_names) for method_name in [*method_names] tests("#respond_to?(:#{method_name})").returns(true) do @@ -8,6 +7,5 @@ module Shindo end end end - end end diff --git a/tests/helpers/succeeds_helper.rb b/tests/helpers/succeeds_helper.rb index fe6fb1b43..b54589e3a 100644 --- a/tests/helpers/succeeds_helper.rb +++ b/tests/helpers/succeeds_helper.rb @@ -1,11 +1,9 @@ module Shindo class Tests - def succeeds test('succeeds') do !!instance_eval(&Proc.new) end end - end end diff --git a/tests/hp/models/compute/key_pair_tests.rb b/tests/hp/models/compute/key_pair_tests.rb index 4b4c49fd3..edacef616 100644 --- a/tests/hp/models/compute/key_pair_tests.rb +++ b/tests/hp/models/compute/key_pair_tests.rb @@ -23,5 +23,4 @@ Shindo.tests("Fog::Compute[:hp] | key_pair", ['hp']) do end end - end diff --git a/tests/hp/models/compute_v2/availability_zone_tests.rb b/tests/hp/models/compute_v2/availability_zone_tests.rb index e0b5eed9a..2aab2cff6 100644 --- a/tests/hp/models/compute_v2/availability_zone_tests.rb +++ b/tests/hp/models/compute_v2/availability_zone_tests.rb @@ -8,6 +8,4 @@ Shindo.tests("Fog::Compute::HPV2 | availability zone model", ['hp', 'v2', 'compu @zones.first.respond_to?('available?') end - - end diff --git a/tests/hp/models/compute_v2/key_pair_tests.rb b/tests/hp/models/compute_v2/key_pair_tests.rb index 436869981..95e9f89ab 100644 --- a/tests/hp/models/compute_v2/key_pair_tests.rb +++ b/tests/hp/models/compute_v2/key_pair_tests.rb @@ -25,5 +25,4 @@ Shindo.tests("Fog::Compute::HPV2 | key_pair model", ['hp', 'v2', 'compute']) do end end - end diff --git a/tests/hp/models/storage/directory_tests.rb b/tests/hp/models/storage/directory_tests.rb index fcf20b577..cf7648f52 100644 --- a/tests/hp/models/storage/directory_tests.rb +++ b/tests/hp/models/storage/directory_tests.rb @@ -124,7 +124,6 @@ Shindo.tests("Fog::Storage[:hp] | directory", ['hp', 'storage']) do @instance.revoke('invalid-acl') end - end end diff --git a/tests/hp/requests/compute/security_group_tests.rb b/tests/hp/requests/compute/security_group_tests.rb index 0ca237d42..d93939d5a 100644 --- a/tests/hp/requests/compute/security_group_tests.rb +++ b/tests/hp/requests/compute/security_group_tests.rb @@ -34,7 +34,6 @@ Shindo.tests("Fog::Compute[:hp] | security group requests", ['hp']) do Fog::Compute[:hp].list_security_groups.body end - tests("#delete_security_group('#{@sec_group_id}')").succeeds do Fog::Compute[:hp].delete_security_group(@sec_group_id).body end diff --git a/tests/hp/requests/compute/server_volume_tests.rb b/tests/hp/requests/compute/server_volume_tests.rb index 81ba1fdaf..51b07a7f8 100644 --- a/tests/hp/requests/compute/server_volume_tests.rb +++ b/tests/hp/requests/compute/server_volume_tests.rb @@ -43,7 +43,6 @@ Shindo.tests("Fog::Compute[:hp] | volume requests", ['hp', 'compute', 'volumes'] end - tests('failure') do tests("#list_server_volumes(0)").raises(Fog::Compute::HP::NotFound) do diff --git a/tests/hp/requests/compute_v2/server_security_group_tests.rb b/tests/hp/requests/compute_v2/server_security_group_tests.rb index 2c0f06146..767dfd070 100644 --- a/tests/hp/requests/compute_v2/server_security_group_tests.rb +++ b/tests/hp/requests/compute_v2/server_security_group_tests.rb @@ -39,5 +39,4 @@ Shindo.tests("Fog::Compute::HPV2 | server security group requests", ['hp', 'v2', end - end diff --git a/tests/hp/requests/compute_v2/server_volume_tests.rb b/tests/hp/requests/compute_v2/server_volume_tests.rb index 3abe360b2..d3a84601d 100644 --- a/tests/hp/requests/compute_v2/server_volume_tests.rb +++ b/tests/hp/requests/compute_v2/server_volume_tests.rb @@ -48,7 +48,6 @@ Shindo.tests("Fog::Compute::HPV2 | volume requests", ['hp', 'v2', 'compute', 'vo end - tests('failure') do tests('#list_server_volumes(0)').raises(Fog::Compute::HPV2::NotFound) do diff --git a/tests/hp/requests/dns/records_tests.rb b/tests/hp/requests/dns/records_tests.rb index d4d9cd8f1..6134caef7 100644 --- a/tests/hp/requests/dns/records_tests.rb +++ b/tests/hp/requests/dns/records_tests.rb @@ -61,5 +61,4 @@ Shindo.tests("HP::DNS | record requests", ['hp', 'dns', 'record']) do end - end \ No newline at end of file diff --git a/tests/hp/requests/lb/algorithms_tests.rb b/tests/hp/requests/lb/algorithms_tests.rb index 314821897..bc8729c0b 100644 --- a/tests/hp/requests/lb/algorithms_tests.rb +++ b/tests/hp/requests/lb/algorithms_tests.rb @@ -11,5 +11,4 @@ Shindo.tests("HP::LB | algorithms", ['hp', 'lb', 'algorithms']) do end - end \ No newline at end of file diff --git a/tests/hp/requests/lb/limits_tests.rb b/tests/hp/requests/lb/limits_tests.rb index 6262beb83..cd119689b 100644 --- a/tests/hp/requests/lb/limits_tests.rb +++ b/tests/hp/requests/lb/limits_tests.rb @@ -6,7 +6,6 @@ Shindo.tests("HP::LB | limits requests", ['hp', 'lb', 'limits']) do 'maxVIPsPerLoadBalancer' => Integer, } - tests('success') do tests('#list_limits').formats({'limits' => [{'values' => @limits_format }]}) do @@ -14,5 +13,4 @@ Shindo.tests("HP::LB | limits requests", ['hp', 'lb', 'limits']) do end end - end \ No newline at end of file diff --git a/tests/hp/requests/lb/load_balancer_nodes_tests.rb b/tests/hp/requests/lb/load_balancer_nodes_tests.rb index b7efd473e..ba4621721 100644 --- a/tests/hp/requests/lb/load_balancer_nodes_tests.rb +++ b/tests/hp/requests/lb/load_balancer_nodes_tests.rb @@ -43,5 +43,4 @@ Shindo.tests('HP::LB | load balancer nodes', ['hp', 'lb', 'nodes']) do end end - end \ No newline at end of file diff --git a/tests/hp/requests/lb/protocols_tests.rb b/tests/hp/requests/lb/protocols_tests.rb index 2df7a19ea..016494246 100644 --- a/tests/hp/requests/lb/protocols_tests.rb +++ b/tests/hp/requests/lb/protocols_tests.rb @@ -11,5 +11,4 @@ Shindo.tests("HP::LB | protocols requests", ['hp', 'lb', 'protocols']) do end end - end \ No newline at end of file diff --git a/tests/hp/requests/lb/versions_tests.rb b/tests/hp/requests/lb/versions_tests.rb index f1054a6c5..7b9319f3b 100644 --- a/tests/hp/requests/lb/versions_tests.rb +++ b/tests/hp/requests/lb/versions_tests.rb @@ -13,5 +13,4 @@ Shindo.tests("HP::LB | versions requests", ['hp', 'lb', 'versions']) do end end - end \ No newline at end of file diff --git a/tests/internet_archive/models/storage/directory_tests.rb b/tests/internet_archive/models/storage/directory_tests.rb index 2faaeafab..d4b6dff5e 100644 --- a/tests/internet_archive/models/storage/directory_tests.rb +++ b/tests/internet_archive/models/storage/directory_tests.rb @@ -39,5 +39,4 @@ Shindo.tests("Storage[:internet_archive] | directory", ["internetarchive"]) do end end - end diff --git a/tests/joyent/requests/compute/machines_tests.rb b/tests/joyent/requests/compute/machines_tests.rb index 3d2325c52..3364411e7 100644 --- a/tests/joyent/requests/compute/machines_tests.rb +++ b/tests/joyent/requests/compute/machines_tests.rb @@ -34,7 +34,6 @@ Shindo.tests("Fog::Compute[:joyent] | machine requests", ["joyent"]) do @provider = Fog::Compute[:joyent] - # # https://us-west-1.api.joyentcloud.com/docs#ListMachines # diff --git a/tests/linode/requests/compute/helper.rb b/tests/linode/requests/compute/helper.rb index 321985398..3a2804b16 100644 --- a/tests/linode/requests/compute/helper.rb +++ b/tests/linode/requests/compute/helper.rb @@ -1,16 +1,10 @@ class Linode - module Compute - module Formats - BASIC = { 'ERRORARRAY' => [], 'ACTION' => String } - end - end - end diff --git a/tests/ninefold/requests/compute/helper.rb b/tests/ninefold/requests/compute/helper.rb index 71299552f..38260df85 100644 --- a/tests/ninefold/requests/compute/helper.rb +++ b/tests/ninefold/requests/compute/helper.rb @@ -22,7 +22,6 @@ class Ninefold Fog::Compute[:ninefold].query_async_job_result(:jobid => job) end module_function :wait_for_job - end module Formats module Lists diff --git a/tests/ninefold/requests/compute/nat_tests.rb b/tests/ninefold/requests/compute/nat_tests.rb index 2cba28c52..390e9c780 100644 --- a/tests/ninefold/requests/compute/nat_tests.rb +++ b/tests/ninefold/requests/compute/nat_tests.rb @@ -56,7 +56,6 @@ Shindo.tests('Fog::Compute[:ninefold] | nat requests', ['ninefold']) do Ninefold::Compute::TestSupport.wait_for_job(job)['jobresult'] end - tests("#disable_static_nat()").formats(Ninefold::Compute::Formats::Nat::DISABLE_NAT_RESPONSE) do pending if Fog.mocking? job = Fog::Compute[:ninefold].disable_static_nat(:ipaddressid => @ipid) diff --git a/tests/ninefold/requests/compute/virtual_machine_tests.rb b/tests/ninefold/requests/compute/virtual_machine_tests.rb index 818ec15df..0bc72c68f 100644 --- a/tests/ninefold/requests/compute/virtual_machine_tests.rb +++ b/tests/ninefold/requests/compute/virtual_machine_tests.rb @@ -2,7 +2,6 @@ Shindo.tests('Fog::Compute[:ninefold] | server requests', ['ninefold']) do tests('success') do - tests("#deploy_virtual_machine()").formats(Ninefold::Compute::Formats::VirtualMachines::VIRTUAL_MACHINE) do pending if Fog.mocking? networks = Fog::Compute[:ninefold].list_networks diff --git a/tests/openstack/models/network/floating_ip_tests.rb b/tests/openstack/models/network/floating_ip_tests.rb index a94ed8db1..5368ffa62 100644 --- a/tests/openstack/models/network/floating_ip_tests.rb +++ b/tests/openstack/models/network/floating_ip_tests.rb @@ -5,14 +5,6 @@ Shindo.tests("Fog::Network[:openstack] | floating_ip", ['openstack']) do tests('#create').succeeds do @instance = Fog::Network[:openstack].floating_ips.create(:floating_network_id => 'f0000000-0000-0000-0000-000000000000') - - - - - - - - !@instance.id.nil? end diff --git a/tests/openstack/models/network/floating_ips_tests.rb b/tests/openstack/models/network/floating_ips_tests.rb index 7e7814455..509585192 100644 --- a/tests/openstack/models/network/floating_ips_tests.rb +++ b/tests/openstack/models/network/floating_ips_tests.rb @@ -1,14 +1,6 @@ Shindo.tests("Fog::Network[:openstack] | floating_ips", ['openstack']) do @floating_ip = Fog::Network[:openstack].floating_ips.create(:floating_network_id => 'f0000000-0000-0000-0000-000000000000') - - - - - - - - @floating_ips = Fog::Network[:openstack].floating_ips tests('success') do diff --git a/tests/openstack/models/storage/file_tests.rb b/tests/openstack/models/storage/file_tests.rb index 5daf228f3..eaa271fa4 100644 --- a/tests/openstack/models/storage/file_tests.rb +++ b/tests/openstack/models/storage/file_tests.rb @@ -158,7 +158,6 @@ Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do end - model_tests(@directory.files, file_attributes, Fog.mocking?) do tests("#origin") do diff --git a/tests/openstack/requests/compute/helper.rb b/tests/openstack/requests/compute/helper.rb index ed240284c..2d0e0cc5d 100644 --- a/tests/openstack/requests/compute/helper.rb +++ b/tests/openstack/requests/compute/helper.rb @@ -1,19 +1,13 @@ class OpenStack - module Compute - module Formats - SUMMARY = { 'id' => String, 'name' => String, 'links' => Array } - end - end - end def get_flavor_ref diff --git a/tests/openstack/requests/identity/helper.rb b/tests/openstack/requests/identity/helper.rb index ad9bc74d8..bffc54385 100644 --- a/tests/openstack/requests/identity/helper.rb +++ b/tests/openstack/requests/identity/helper.rb @@ -1,7 +1,5 @@ class OpenStack - module Identity - def self.get_tenant_id identity = Fog::Identity[:openstack] ENV['OPENSTACK_TENANT_NAME'] || identity.list_tenants.body['tenants'].first['id'] @@ -11,7 +9,5 @@ class OpenStack identity = Fog::Identity[:openstack] ENV['OPENSTACK_USER_ID'] || identity.list_users.body['users'].first['id'] end - end - end diff --git a/tests/rackspace/auto_scale_tests.rb b/tests/rackspace/auto_scale_tests.rb index 6b41614a7..d9f63ef0e 100644 --- a/tests/rackspace/auto_scale_tests.rb +++ b/tests/rackspace/auto_scale_tests.rb @@ -23,7 +23,6 @@ Shindo.tests('Fog::Rackspace::AutoScale', ['rackspace']) do assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2 end - tests('current authentation') do pending if Fog.mocking? diff --git a/tests/rackspace/databases_tests.rb b/tests/rackspace/databases_tests.rb index ad955fb15..3bd6bcaa3 100644 --- a/tests/rackspace/databases_tests.rb +++ b/tests/rackspace/databases_tests.rb @@ -2,7 +2,6 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable| pending if Fog.mocking? - def assert_method(url, method) @service.instance_variable_set "@rackspace_auth_url", url returns(method) { @service.send :authentication_method } diff --git a/tests/rackspace/load_balancer_tests.rb b/tests/rackspace/load_balancer_tests.rb index f3b0f09c2..48237c107 100644 --- a/tests/rackspace/load_balancer_tests.rb +++ b/tests/rackspace/load_balancer_tests.rb @@ -101,7 +101,6 @@ Shindo.tests('Fog::Rackspace::LoadBalancers', ['rackspace']) do end end - tests('reauthentication') do pending if Fog.mocking? diff --git a/tests/rackspace/models/auto_scale/group_tests.rb b/tests/rackspace/models/auto_scale/group_tests.rb index 18f57b6b2..a926056cb 100644 --- a/tests/rackspace/models/auto_scale/group_tests.rb +++ b/tests/rackspace/models/auto_scale/group_tests.rb @@ -9,7 +9,6 @@ Shindo.tests('Fog::Rackspace::AutoScale | group', ['rackspace', 'rackspace_autos :group_config => GROUP_CONFIG_OPTIONS } - model_tests(service.groups, options, false) do pending if Fog.mocking? tests('#policies').succeeds do diff --git a/tests/rackspace/models/auto_scale/policies_tests.rb b/tests/rackspace/models/auto_scale/policies_tests.rb index 15931fff8..16003e61c 100644 --- a/tests/rackspace/models/auto_scale/policies_tests.rb +++ b/tests/rackspace/models/auto_scale/policies_tests.rb @@ -2,7 +2,6 @@ Shindo.tests('Fog::Rackspace::AutoScale | policies', ['rackspace', 'rackspace_au pending if Fog.mocking? service = Fog::Rackspace::AutoScale.new :rackspace_region => :ord - begin group = service.groups.create({ :policies => POLICIES_OPTIONS, diff --git a/tests/rackspace/models/compute_v2/image_tests.rb b/tests/rackspace/models/compute_v2/image_tests.rb index f3c437184..364122951 100644 --- a/tests/rackspace/models/compute_v2/image_tests.rb +++ b/tests/rackspace/models/compute_v2/image_tests.rb @@ -58,7 +58,6 @@ Shindo.tests('Fog::Compute::RackspaceV2 | image', ['rackspace']) do end end - tests("success") do begin server = service.servers.create(options) diff --git a/tests/rackspace/models/load_balancers/load_balancer_tests.rb b/tests/rackspace/models/load_balancers/load_balancer_tests.rb index bea275406..99db2e029 100644 --- a/tests/rackspace/models/load_balancers/load_balancer_tests.rb +++ b/tests/rackspace/models/load_balancers/load_balancer_tests.rb @@ -182,7 +182,6 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer', ['rackspace']) do @lb.destroy end - tests('failure') do @lb = @service.load_balancers.new LOAD_BALANCER_ATTRIBUTES tests('#usage => Requires ID').raises(ArgumentError) do diff --git a/tests/rackspace/models/monitoring/check_tests.rb b/tests/rackspace/models/monitoring/check_tests.rb index 1a5b3b41f..9a788b9c8 100644 --- a/tests/rackspace/models/monitoring/check_tests.rb +++ b/tests/rackspace/models/monitoring/check_tests.rb @@ -2,7 +2,6 @@ Shindo.tests('Fog::Rackspace::Monitoring | check', ['rackspace','rackspace_monit pending if Fog.mocking? service = Fog::Rackspace::Monitoring.new - tests('#entity=') do tests('should create new entity if object is a string') do check = Fog::Rackspace::Monitoring::Check.new diff --git a/tests/rackspace/models/storage/file_tests.rb b/tests/rackspace/models/storage/file_tests.rb index eee6a9fc5..e347205fe 100644 --- a/tests/rackspace/models/storage/file_tests.rb +++ b/tests/rackspace/models/storage/file_tests.rb @@ -281,7 +281,6 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do tests("#delete_at") do @delete_at_time = (Time.now + 300).to_i - tests("#delete_at should default to nil").returns(nil) do @instance.delete_at end @@ -334,7 +333,6 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do end end - model_tests(@directory.files, file_attributes, Fog.mocking?) do tests("#origin") do diff --git a/tests/rackspace/models/storage/files_tests.rb b/tests/rackspace/models/storage/files_tests.rb index 0124bbf4d..b0c9b1ac6 100644 --- a/tests/rackspace/models/storage/files_tests.rb +++ b/tests/rackspace/models/storage/files_tests.rb @@ -10,7 +10,6 @@ Shindo.tests("Fog::Rackspace::Storage | files", ['rackspace', 'storage']) do :public => true } - tests('success') do collection_tests(Fog::Storage[:rackspace].directories.create(directory_attributes).files, file_attributes, Fog.mocking?) @@ -37,5 +36,4 @@ Shindo.tests("Fog::Rackspace::Storage | files", ['rackspace', 'storage']) do @directory.destroy end - end \ No newline at end of file diff --git a/tests/rackspace/models/storage/metadata_tests.rb b/tests/rackspace/models/storage/metadata_tests.rb index 524bec73b..cf1334f59 100644 --- a/tests/rackspace/models/storage/metadata_tests.rb +++ b/tests/rackspace/models/storage/metadata_tests.rb @@ -3,7 +3,6 @@ require 'fog/rackspace/models/storage/directory' require 'fog/rackspace/models/storage/directories' require 'fog/rackspace/models/storage/file' - Shindo.tests('Fog::Rackspace::Storage | metadata', ['rackspace']) do def assert_directory(obj, assert_value) @@ -103,7 +102,6 @@ Shindo.tests('Fog::Rackspace::Storage | metadata', ['rackspace']) do end end - tests('File') do @file = Fog::Storage::Rackspace::File.new tests('#to_key') do diff --git a/tests/rackspace/monitoring_tests.rb b/tests/rackspace/monitoring_tests.rb index 95a69cbef..99e36bd67 100644 --- a/tests/rackspace/monitoring_tests.rb +++ b/tests/rackspace/monitoring_tests.rb @@ -23,7 +23,6 @@ Shindo.tests('Fog::Rackspace::Monitoring', ['rackspace','rackspace_monitoring']) assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2 end - tests('current authentation') do pending if Fog.mocking? diff --git a/tests/rackspace/requests/compute/helper.rb b/tests/rackspace/requests/compute/helper.rb index d1fae4f4a..6ef36c6ca 100644 --- a/tests/rackspace/requests/compute/helper.rb +++ b/tests/rackspace/requests/compute/helper.rb @@ -1,16 +1,10 @@ class Rackspace - module Compute - module Formats - SUMMARY = { 'id' => Integer, 'name' => String } - end - end - end diff --git a/tests/rackspace/requests/compute_v2/attachment_tests.rb b/tests/rackspace/requests/compute_v2/attachment_tests.rb index e5fd3af0f..1b2379f0c 100644 --- a/tests/rackspace/requests/compute_v2/attachment_tests.rb +++ b/tests/rackspace/requests/compute_v2/attachment_tests.rb @@ -24,7 +24,6 @@ Shindo.tests('Fog::Compute::RackspaceV2 | attachment_tests', ['rackspace']) do volume_id = block_storage_service.create_volume(100).body['volume']['id'] device_id = '/dev/xvde' - tests('success') do wait_for_request("Waiting for server to become ready") do compute_service.get_server(server_id).body['server']['status'] == 'ACTIVE' diff --git a/tests/rackspace/requests/monitoring/agent_tests.rb b/tests/rackspace/requests/monitoring/agent_tests.rb index f0f2505a5..c991229ec 100644 --- a/tests/rackspace/requests/monitoring/agent_tests.rb +++ b/tests/rackspace/requests/monitoring/agent_tests.rb @@ -21,7 +21,6 @@ Shindo.tests('Fog::Rackspace::Monitoring | agent_tests', ['rackspace','rackspace data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_agent("agent_id").body } end - tests('#get agent token').formats(LIST_HEADERS_FORMAT) do account.get_agent_token(agent_token).data[:headers] end diff --git a/tests/rackspace/requests/monitoring/helper.rb b/tests/rackspace/requests/monitoring/helper.rb index c28fbbd65..47d39e63e 100644 --- a/tests/rackspace/requests/monitoring/helper.rb +++ b/tests/rackspace/requests/monitoring/helper.rb @@ -56,7 +56,6 @@ GET_MONITORING_ZONE = { "source_ips" => [String] } - # {"values"=> # [{"id"=>"ch4GimHQsQ", # "label"=>nil, @@ -84,7 +83,6 @@ GET_MONITORING_ZONE = { # "next_marker"=>nil, # "next_href"=>nil}} - # {"values"=> # [{"id"=>String, # "label"=>String, @@ -97,7 +95,6 @@ GET_MONITORING_ZONE = { # "next_marker"=>nil, # "next_href"=>nil}} - CHECK_CREATE_OPTIONS = { :details => { :url => 'http://www.rackspace.com', diff --git a/tests/rackspace/requests/monitoring/list_tests.rb b/tests/rackspace/requests/monitoring/list_tests.rb index 7079fd602..4991ecd62 100644 --- a/tests/rackspace/requests/monitoring/list_tests.rb +++ b/tests/rackspace/requests/monitoring/list_tests.rb @@ -26,7 +26,6 @@ Shindo.tests('Fog::Rackspace::Monitoring | list_tests', ['rackspace','rackspace_ account.get_monitoring_zone('mzdfw').body end - tests('#get list of checks').formats(LIST_HEADERS_FORMAT) do account.list_checks(entity_id).data[:headers] end diff --git a/tests/rackspace/requests/storage/account_tests.rb b/tests/rackspace/requests/storage/account_tests.rb index 3925107bc..1a932bd5f 100644 --- a/tests/rackspace/requests/storage/account_tests.rb +++ b/tests/rackspace/requests/storage/account_tests.rb @@ -12,5 +12,4 @@ Shindo.tests('Fog::Storage[:rackspace] | account requests', ["rackspace"]) do end - end diff --git a/tests/rage4/requests/dns/dns_tests.rb b/tests/rage4/requests/dns/dns_tests.rb index 2d121530f..7d8f717e6 100644 --- a/tests/rage4/requests/dns/dns_tests.rb +++ b/tests/rage4/requests/dns/dns_tests.rb @@ -24,7 +24,6 @@ Shindo.tests('Fog::DNS[:rage4] | DNS requests', ['rage4', 'dns']) do response.status == 200 end - test("create domain") do pending if Fog.mocking? @@ -108,7 +107,6 @@ Shindo.tests('Fog::DNS[:rage4] | DNS requests', ['rage4', 'dns']) do end - test("show_current_usage") do pending if Fog.mocking? @@ -256,7 +254,6 @@ Shindo.tests('Fog::DNS[:rage4] | DNS requests', ['rage4', 'dns']) do @created_domain_list.each do |domain_id| response = Fog::DNS[:rage4].delete_domain(domain_id) - returns(true) {response.body['status']} returns(domain_id) {response.body['id']} returns("") {response.body['error'] } diff --git a/tests/vcloud/models/compute/helper.rb b/tests/vcloud/models/compute/helper.rb index eb1aebde2..ecab09f5e 100644 --- a/tests/vcloud/models/compute/helper.rb +++ b/tests/vcloud/models/compute/helper.rb @@ -1,7 +1,6 @@ class Vcloud module Compute module TestSupport - if Fog.mocking? def self.template 'mock_template' @@ -15,11 +14,9 @@ class Vcloud template_res.href end end - end module Formats end - end end diff --git a/tests/vcloud_director/requests/compute/edge_gateway_tests.rb b/tests/vcloud_director/requests/compute/edge_gateway_tests.rb index faf000f18..64c808e72 100644 --- a/tests/vcloud_director/requests/compute/edge_gateway_tests.rb +++ b/tests/vcloud_director/requests/compute/edge_gateway_tests.rb @@ -30,7 +30,6 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector } } - @service = Fog::Compute::VcloudDirector.new @org = VcloudDirector::Compute::Helper.current_org(@service) @@ -68,7 +67,6 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector @original_gateway_conf = @service.get_edge_gateway(@edge_gateway_id).body end - tests('#configure_edge_gateway_services') do rule = @original_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService][:FirewallRule].find { |rule| rule[:Id] == FIREWALL_RULE_ID } diff --git a/tests/vcloud_director/requests/compute/helper.rb b/tests/vcloud_director/requests/compute/helper.rb index 6a9bd483a..8ff1c11a2 100644 --- a/tests/vcloud_director/requests/compute/helper.rb +++ b/tests/vcloud_director/requests/compute/helper.rb @@ -1,7 +1,6 @@ class VcloudDirector module Compute module Helper - def self.test_name @test_name ||= 'fog-test-%x' % Time.now.to_i end @@ -28,7 +27,6 @@ class VcloudDirector end link[:href].split('/').last end - end end end diff --git a/tests/vcloud_director/requests/compute/schema_helper.rb b/tests/vcloud_director/requests/compute/schema_helper.rb index f16139561..f6f81762d 100644 --- a/tests/vcloud_director/requests/compute/schema_helper.rb +++ b/tests/vcloud_director/requests/compute/schema_helper.rb @@ -1,7 +1,6 @@ class VcloudDirector module Compute module Schema - # Mapping of a content media type to a xsd complex type. MEDIA_TYPE_MAPPING_TYPE = { :MediaType => String, @@ -382,7 +381,6 @@ class VcloudDirector :Other => Fog::Nullable::String } - # Represents a firewall rule. FIREWALL_RULE_TYPE = { :Id => String, diff --git a/tests/vsphere/compute_tests.rb b/tests/vsphere/compute_tests.rb index 5b6207bb6..8cbbecf5b 100644 --- a/tests/vsphere/compute_tests.rb +++ b/tests/vsphere/compute_tests.rb @@ -5,7 +5,6 @@ Shindo.tests('Fog::Compute[:vsphere]', ['vsphere']) do tests("| convert_vm_mob_ref_to_attr_hash") do # Mock the RbVmomi::VIM::ManagedObject class class MockManagedObject - attr_reader :parent, :_ref def initialize diff --git a/tests/xenserver/models/compute/host_tests.rb b/tests/xenserver/models/compute/host_tests.rb index 5ab1659b8..cde827d20 100644 --- a/tests/xenserver/models/compute/host_tests.rb +++ b/tests/xenserver/models/compute/host_tests.rb @@ -95,5 +95,4 @@ Shindo.tests('Fog::Compute[:xenserver] | host model', ['xenserver']) do end - end