fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/aws/models/compute/vpc.rb

@@ -32,7 +32,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_vpc(id)
+          service.delete_vpc(id)
           true
         end
 
@@ -50,7 +50,7 @@ module Fog
         def save
           requires :cidr_block
 
-          data = connection.create_vpc(cidr_block).body['vpcSet'].first
+          data = service.create_vpc(cidr_block).body['vpcSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

data/lib/fog/aws/models/compute/vpcs.rb

@@ -61,7 +61,7 @@ module Fog
             filters = {'vpc-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_vpcs(filters).body
+          data = service.describe_vpcs(filters).body
           load(data['vpcSet'])
         end
 
@@ -82,7 +82,7 @@ module Fog
 
         def get(vpc_id)
           if vpc_id
-            self.class.new(:connection => connection).all('vpc-id' => vpc_id).first
+            self.class.new(:service => service).all('vpc-id' => vpc_id).first
           end
         end
 

data/lib/fog/aws/models/dns/record.rb

@@ -29,7 +29,7 @@ module Fog
 
         def destroy
           options = attributes_to_options('DELETE')
-          connection.change_resource_record_sets(zone.id, [options])
+          service.change_resource_record_sets(zone.id, [options])
           true
         end
 
@@ -39,7 +39,7 @@ module Fog
 
         def save
           options = attributes_to_options('CREATE')
-          data = connection.change_resource_record_sets(zone.id, [options]).body
+          data = service.change_resource_record_sets(zone.id, [options]).body
           merge_attributes(data)
           true
         end
@@ -54,7 +54,7 @@ module Fog
           merge_attributes(new_attributes)
           options << attributes_to_options('CREATE')
 
-          data = connection.change_resource_record_sets(zone.id, options).body
+          data = service.change_resource_record_sets(zone.id, options).body
           merge_attributes(data)
           true
         end
@@ -69,7 +69,7 @@ module Fog
         def reload
           # If we have a change_id (newly created or modified), then reload performs a get_change to update status.
           if change_id
-            data = connection.get_change(change_id).body
+            data = service.get_change(change_id).body
             merge_attributes(data)
             self
           else

data/lib/fog/aws/models/dns/records.rb

@@ -28,7 +28,7 @@ module Fog
           options[:identifier] ||= identifier
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.list_resource_record_sets(zone.id, options).body
+          data = service.list_resource_record_sets(zone.id, options).body
           # NextRecordIdentifier is completely absent instead of nil, so set to nil, or iteration breaks.
           data['NextRecordIdentifier'] = nil unless data.has_key?('NextRecordIdentifier')
 
@@ -57,7 +57,7 @@ module Fog
             }
             options.delete_if {|key, value| value.nil?}
 
-            batch = connection.list_resource_record_sets(zone.id, options).body
+            batch = service.list_resource_record_sets(zone.id, options).body
             # NextRecordIdentifier is completely absent instead of nil, so set to nil, or iteration breaks.
             batch['NextRecordIdentifier'] = nil unless batch.has_key?('NextRecordIdentifier')
 
@@ -92,7 +92,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.list_resource_record_sets(zone.id, options).body
+          data = service.list_resource_record_sets(zone.id, options).body
           # Get first record
           data = data['ResourceRecordSets'].shift
 

data/lib/fog/aws/models/dns/zone.rb

@@ -17,7 +17,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_hosted_zone(identity)
+          service.delete_hosted_zone(identity)
           true
         end
 
@@ -25,7 +25,7 @@ module Fog
           @records ||= begin
             Fog::DNS::AWS::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -35,7 +35,7 @@ module Fog
           options = {}
           options[:caller_ref]  = caller_reference if caller_reference
           options[:comment]     = description if description
-          data = connection.create_hosted_zone(domain, options).body
+          data = service.create_hosted_zone(domain, options).body
           merge_attributes(data)
           true
         end

data/lib/fog/aws/models/dns/zones.rb

@@ -15,12 +15,12 @@ module Fog
         def all(options = {})
           options['marker']   ||= marker
           options['maxitems'] ||= max_items
-          data = connection.list_hosted_zones(options).body['HostedZones']
+          data = service.list_hosted_zones(options).body['HostedZones']
           load(data)
         end
 
         def get(zone_id)
-          data = connection.get_hosted_zone(zone_id).body
+          data = service.get_hosted_zone(zone_id).body
           new(data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/aws/models/elasticache/cluster.rb

@@ -35,7 +35,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_cache_cluster(id)
+          service.delete_cache_cluster(id)
           true
         end
 
@@ -45,7 +45,7 @@ module Fog
           parameter_group     ||= Hash.new
           notification_config ||= Hash.new
 
-          connection.create_cache_cluster(
+          service.create_cache_cluster(
             id, {
               :node_type                    => node_type,
               :security_group_names         => security_groups,

data/lib/fog/aws/models/elasticache/clusters.rb

@@ -10,7 +10,7 @@ module Fog
 
         def all
           load(
-            connection.describe_cache_clusters(
+            service.describe_cache_clusters(
               nil, :show_node_info => true
             ).body['CacheClusters']
           )
@@ -18,7 +18,7 @@ module Fog
 
         def get(identity, show_node_info = true)
           new(
-            connection.describe_cache_clusters(
+            service.describe_cache_clusters(
               identity, :show_node_info => show_node_info
             ).body['CacheClusters'].first
           )

data/lib/fog/aws/models/elasticache/parameter_group.rb

@@ -12,13 +12,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_cache_parameter_group(id)
+          service.delete_cache_parameter_group(id)
           true
         end
 
         def save
           requires :id
-          connection.create_cache_parameter_group(
+          service.create_cache_parameter_group(
             id,
             description = id,
             family      = 'memcached1.4'

data/lib/fog/aws/models/elasticache/parameter_groups.rb

@@ -10,13 +10,13 @@ module Fog
 
         def all
           load(
-            connection.describe_cache_parameter_groups.body['CacheParameterGroups']
+            service.describe_cache_parameter_groups.body['CacheParameterGroups']
           )
         end
 
         def get(identity)
           new(
-            connection.describe_cache_parameter_groups(
+            service.describe_cache_parameter_groups(
               identity
             ).body['CacheParameterGroups'].first
           )

data/lib/fog/aws/models/elasticache/security_group.rb

@@ -17,20 +17,20 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_cache_security_group(id)
+          service.delete_cache_security_group(id)
           true
         end
 
         def save
           requires :id
           requires :description
-          connection.create_cache_security_group(id, description)
+          service.create_cache_security_group(id, description)
         end
 
         def authorize_ec2_group(group_name, group_owner_id=owner_id)
           requires :id
           requires :owner_id if group_owner_id.nil?
-          data = connection.authorize_cache_security_group_ingress(
+          data = service.authorize_cache_security_group_ingress(
             id, group_name, group_owner_id
           )
           merge_attributes(data.body['CacheSecurityGroup'])
@@ -39,7 +39,7 @@ module Fog
         def revoke_ec2_group(group_name, group_owner_id=owner_id)
           requires :id
           requires :owner_id if group_owner_id.nil?
-          data = connection.revoke_cache_security_group_ingress(
+          data = service.revoke_cache_security_group_ingress(
             id, group_name, group_owner_id
           )
           merge_attributes(data.body['CacheSecurityGroup'])

data/lib/fog/aws/models/elasticache/security_groups.rb

@@ -10,13 +10,13 @@ module Fog
 
         def all
           load(
-            connection.describe_cache_security_groups.body['CacheSecurityGroups']
+            service.describe_cache_security_groups.body['CacheSecurityGroups']
           )
         end
 
         def get(identity)
           new(
-            connection.describe_cache_security_groups(
+            service.describe_cache_security_groups(
               identity
             ).body['CacheSecurityGroups'].first
           )

data/lib/fog/aws/models/elb/listener.rb

@@ -19,13 +19,13 @@ module Fog
 
         def save
           requires :load_balancer, :instance_port, :lb_port, :protocol, :instance_protocol
-          connection.create_load_balancer_listeners(load_balancer.id, [to_params])
+          service.create_load_balancer_listeners(load_balancer.id, [to_params])
           reload
         end
 
         def destroy
           requires :load_balancer, :lb_port
-          connection.delete_load_balancer_listeners(load_balancer.id, [lb_port])
+          service.delete_load_balancer_listeners(load_balancer.id, [lb_port])
           reload
         end
 

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -21,7 +21,7 @@ module Fog
 
         def initialize(attributes={})
           if attributes[:subnet_ids] ||= attributes['Subnets']
-            attributes[:availability_zones] ||= attributes['AvailabilityZones'] 
+            attributes[:availability_zones] ||= attributes['AvailabilityZones']
           else
             attributes[:availability_zones] ||= attributes['AvailabilityZones']  || %w(us-east-1a us-east-1b us-east-1c us-east-1d)
           end
@@ -38,51 +38,51 @@ module Fog
 
         def register_instances(instances)
           requires :id
-          data = connection.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']
+          data = service.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']
           data['Instances'].map!{|h| h['InstanceId']}
           merge_attributes(data)
         end
 
         def deregister_instances(instances)
           requires :id
-          data = connection.deregister_instances_from_load_balancer(instances, id).body['DeregisterInstancesFromLoadBalancerResult']
+          data = service.deregister_instances_from_load_balancer(instances, id).body['DeregisterInstancesFromLoadBalancerResult']
           data['Instances'].map!{|h| h['InstanceId']}
           merge_attributes(data)
         end
 
         def enable_availability_zones(zones)
           requires :id
-          data = connection.enable_availability_zones_for_load_balancer(zones, id).body['EnableAvailabilityZonesForLoadBalancerResult']
+          data = service.enable_availability_zones_for_load_balancer(zones, id).body['EnableAvailabilityZonesForLoadBalancerResult']
           merge_attributes(data)
         end
 
         def disable_availability_zones(zones)
           requires :id
-          data = connection.disable_availability_zones_for_load_balancer(zones, id).body['DisableAvailabilityZonesForLoadBalancerResult']
+          data = service.disable_availability_zones_for_load_balancer(zones, id).body['DisableAvailabilityZonesForLoadBalancerResult']
           merge_attributes(data)
         end
-        
+
         def attach_subnets(subnet_ids)
           requires :id
-          data = connection.attach_load_balancer_to_subnets(subnet_ids, id).body['AttachLoadBalancerToSubnetsResult']
+          data = service.attach_load_balancer_to_subnets(subnet_ids, id).body['AttachLoadBalancerToSubnetsResult']
           merge_attributes(data)
         end
 
         def detach_subnets(subnet_ids)
           requires :id
-          data = connection.detach_load_balancer_from_subnets(subnet_ids, id).body['DetachLoadBalancerFromSubnetsResult']
+          data = service.detach_load_balancer_from_subnets(subnet_ids, id).body['DetachLoadBalancerFromSubnetsResult']
           merge_attributes(data)
         end
-        
+
         def apply_security_groups(security_groups)
           requires :id
-          data = connection.apply_security_groups_to_load_balancer(security_groups, id).body['ApplySecurityGroupsToLoadBalancerResult']
+          data = service.apply_security_groups_to_load_balancer(security_groups, id).body['ApplySecurityGroupsToLoadBalancerResult']
           merge_attributes(data)
         end
 
         def instance_health
           requires :id
-          @instance_health ||= connection.describe_instance_health(id).body['DescribeInstanceHealthResult']['InstanceStates']
+          @instance_health ||= service.describe_instance_health(id).body['DescribeInstanceHealthResult']['InstanceStates']
         end
 
         def instances_in_service
@@ -95,14 +95,14 @@ module Fog
 
         def configure_health_check(health_check)
           requires :id
-          data = connection.configure_health_check(id, health_check).body['ConfigureHealthCheckResult']['HealthCheck']
+          data = service.configure_health_check(id, health_check).body['ConfigureHealthCheckResult']['HealthCheck']
           merge_attributes(:health_check => data)
         end
 
         def listeners
           Fog::AWS::ELB::Listeners.new({
             :data => attributes['ListenerDescriptions'],
-            :connection => connection,
+            :service => service,
             :load_balancer => self
           })
         end
@@ -110,7 +110,7 @@ module Fog
         def policies
           Fog::AWS::ELB::Policies.new({
             :data => attributes['Policies'],
-            :connection => connection,
+            :service => service,
             :load_balancer => self
           })
         end
@@ -118,13 +118,13 @@ module Fog
         def set_listener_policy(port, policy_name)
           requires :id
           policy_name = [policy_name].flatten
-          connection.set_load_balancer_policies_of_listener(id, port, policy_name)
+          service.set_load_balancer_policies_of_listener(id, port, policy_name)
           reload
         end
 
         def set_listener_ssl_certificate(port, ssl_certificate_id)
           requires :id
-          connection.set_load_balancer_listener_ssl_certificate(id, port, ssl_certificate_id)
+          service.set_load_balancer_listener_ssl_certificate(id, port, ssl_certificate_id)
           reload
         end
 
@@ -144,8 +144,8 @@ module Fog
           # if both are specified, the availability zones have preference
           #requires :availability_zones
           if (availability_zones || subnet_ids)
-            connection.create_load_balancer(availability_zones, id, listeners.map{|l| l.to_params}) if availability_zones
-            connection.create_load_balancer(nil, id, listeners.map{|l| l.to_params}, {:subnet_ids => subnet_ids, :security_groups => security_groups, :scheme => scheme}) if subnet_ids && !availability_zones
+            service.create_load_balancer(availability_zones, id, listeners.map{|l| l.to_params}) if availability_zones
+            service.create_load_balancer(nil, id, listeners.map{|l| l.to_params}, {:subnet_ids => subnet_ids, :security_groups => security_groups, :scheme => scheme}) if subnet_ids && !availability_zones
           else
             throw Fog::Errors::Error.new("No availability zones or subnet ids specified")
           end
@@ -164,7 +164,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_load_balancer(id)
+          service.delete_load_balancer(id)
         end
 
       end

data/lib/fog/aws/models/elb/load_balancers.rb

@@ -15,7 +15,7 @@ module Fog
           marker = nil
           finished = false
           while !finished
-            data = connection.describe_load_balancers('Marker' => marker).body
+            data = service.describe_load_balancers('Marker' => marker).body
             result.concat(data['DescribeLoadBalancersResult']['LoadBalancerDescriptions'])
             marker = data['DescribeLoadBalancersResult']['NextMarker']
             finished = marker.nil?
@@ -25,7 +25,7 @@ module Fog
 
         def get(identity)
           if identity
-            data = connection.describe_load_balancers('LoadBalancerNames' => identity).body['DescribeLoadBalancersResult']['LoadBalancerDescriptions'].first
+            data = service.describe_load_balancers('LoadBalancerNames' => identity).body['DescribeLoadBalancersResult']['LoadBalancerDescriptions'].first
             new(data)
           end
         rescue Fog::AWS::ELB::NotFound

data/lib/fog/aws/models/elb/policy.rb

@@ -13,7 +13,7 @@ module Fog
 
         def save
           requires :id, :load_balancer, :cookie_stickiness
-          connection_method = nil
+          service_method = nil
           args = [load_balancer.id, id]
           case cookie_stickiness
           when :app
@@ -27,13 +27,13 @@ module Fog
             raise ArgumentError.new('cookie_stickiness must be :app or :lb')
           end
 
-          connection.send(method, *args)
+          service.send(method, *args)
           reload
         end
 
         def destroy
           requires :id, :load_balancer
-          connection.delete_load_balancer_policy(load_balancer.id, id)
+          service.delete_load_balancer_policy(load_balancer.id, id)
           reload
         end