fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -61,7 +61,7 @@ module Fog
             filters = {'instance-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_instances(filters).body
+          data = service.describe_instances(filters).body
           load(
             data['reservationSet'].map do |reservation|
               reservation['instancesSet'].map do |instance|
@@ -72,13 +72,13 @@ module Fog
         end
 
         def bootstrap(new_attributes = {})
-          server = connection.servers.new(new_attributes)
+          server = service.servers.new(new_attributes)
 
           unless new_attributes[:key_name]
             # first or create fog_#{credential} keypair
             name = Fog.respond_to?(:credential) && Fog.credential || :default
-            unless server.key_pair = connection.key_pairs.get("fog_#{name}")
-              server.key_pair = connection.key_pairs.create(
+            unless server.key_pair = service.key_pairs.get("fog_#{name}")
+              server.key_pair = service.key_pairs.create(
                 :name => "fog_#{name}",
                 :public_key => server.public_key
               )
@@ -86,7 +86,7 @@ module Fog
           end
 
           # make sure port 22 is open in the first security group
-          security_group = connection.security_groups.get(server.groups.first)
+          security_group = service.security_groups.get(server.groups.first)
           authorized = security_group.ip_permissions.detect do |ip_permission|
             ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
             ip_permission['fromPort'] == 22 &&
@@ -145,7 +145,7 @@ module Fog
 
         def get(server_id)
           if server_id
-            self.class.new(:connection => connection).all('instance-id' => server_id).first
+            self.class.new(:service => service).all('instance-id' => server_id).first
           end
         rescue Fog::Errors::NotFound
           nil

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

@@ -20,7 +20,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_snapshot(id)
+          service.delete_snapshot(id)
           true
         end
 
@@ -29,10 +29,10 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :volume_id
 
-          data = connection.create_snapshot(volume_id, description).body
+          data = service.create_snapshot(volume_id, description).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
@@ -40,7 +40,7 @@ module Fog
 
         def volume
           requires :id
-          connection.describe_volumes(volume_id)
+          service.describe_volumes(volume_id)
         end
 
         private

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

@@ -23,17 +23,17 @@ module Fog
             filters = {'snapshot-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_snapshots(filters.merge!(options)).body
+          data = service.describe_snapshots(filters.merge!(options)).body
           load(data['snapshotSet'])
           if volume
             self.replace(self.select {|snapshot| snapshot.volume_id == volume.id})
           end
           self
         end
-        
+
         def get(snapshot_id)
           if snapshot_id
-            self.class.new(:connection => connection).all('snapshot-id' => snapshot_id).first
+            self.class.new(:service => service).all('snapshot-id' => snapshot_id).first
           end
         end
 

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

@@ -3,7 +3,7 @@ require 'fog/compute/models/server'
 module Fog
   module Compute
     class AWS
-      
+
       class SpotRequest < Fog::Compute::Server
 
         identity :id,                          :aliases => 'spotInstanceRequestId'
@@ -29,16 +29,24 @@ module Fog
         attribute :monitoring,                 :aliases => 'LaunchSpecification.Monitoring'
         attribute :block_device_mapping,       :aliases => 'LaunchSpecification.BlockDeviceMapping'
         attribute :subnet_id,                  :aliases => 'LaunchSpecification.SubnetId'
+        attribute :iam_instance_profile,       :aliases => 'LaunchSpecification.IamInstanceProfile'
+
         attribute :tags,                       :aliases => 'tagSet'
         attribute :fault,                      :squash  => 'message'
         attribute :user_data
-        
+
+        attr_writer   :iam_instance_profile_name, :iam_instance_profile_arn
+
         def initialize(attributes={})
           self.groups ||= ["default"]
           self.flavor_id ||= 't1.micro'
           self.image_id   ||= begin
             self.username = 'ubuntu'
-            case attributes[:connection].instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
+
+            # Old 'connection' is renamed as service and should be used instead
+            prepare_service_value(attributes)
+
+            case @service.instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
             when 'ap-northeast-1'
               'ami-5e0fa45f'
             when 'ap-southeast-1'
@@ -57,14 +65,14 @@ module Fog
         def destroy
           requires :id
 
-          connection.cancel_spot_instance_requests(id)
+          service.cancel_spot_instance_requests(id)
           true
         end
 
         def key_pair
           requires :key_name
 
-          connection.key_pairs.all(key_name).first
+          service.key_pairs.all(key_name).first
         end
 
         def key_pair=(new_keypair)
@@ -89,11 +97,13 @@ module Fog
             'LaunchSpecification.SecurityGroup'              => groups,
             'LaunchSpecification.UserData'                   => user_data,
             'LaunchSpecification.SubnetId'                   => subnet_id,
+            'LaunchSpecification.IamInstanceProfile.Arn'     => @iam_instance_profile_arn,
+            'LaunchSpecification.IamInstanceProfile.Name'    => @iam_instance_profile_name,
             'Type'                                           => request_type,
             'ValidFrom'                                      => valid_from,
             'ValidUntil'                                     => valid_until }
           options.delete_if {|key, value| value.nil?}
-          
+
           # If subnet is defined then this is a Virtual Private Cloud.
           # subnet & security group cannot co-exist. Attempting to specify
           # both subnet and groups will cause an error.  Instead please make
@@ -104,7 +114,7 @@ module Fog
             options.delete('LaunchSpecification.SubnetId')
           end
 
-          data = connection.request_spot_instances(image_id, flavor_id, price, options).body
+          data = service.request_spot_instances(image_id, flavor_id, price, options).body
           spot_instance_request = data['spotInstanceRequestSet'].first
           spot_instance_request['launchSpecification'].each do |name,value|
             spot_instance_request['LaunchSpecification.' + name[0,1].upcase + name[1..-1]] = value
@@ -117,4 +127,4 @@ module Fog
       end
     end
   end
-end     
+end

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

@@ -5,9 +5,9 @@ module Fog
   module Compute
     class AWS
       class SpotRequests < Fog::Collection
-      
+
         attribute :filters
-        
+
         model Fog::Compute::AWS::SpotRequest
 
         def initialize(attributes)
@@ -21,7 +21,7 @@ module Fog
             filters = {'spot-instance-request-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_spot_instance_requests(filters).body
+          data = service.describe_spot_instance_requests(filters).body
           load(
             data['spotInstanceRequestSet'].map do |spot_instance_request|
               spot_instance_request['LaunchSpecification.Placement.AvailabilityZone'] = spot_instance_request['launchedAvailabilityZone']
@@ -29,19 +29,19 @@ module Fog
                 spot_instance_request['LaunchSpecification.' + name[0,1].upcase + name[1..-1]] = value
               end
               spot_instance_request.merge(:groups => spot_instance_request['LaunchSpecification.GroupSet'])
-              spot_instance_request 
+              spot_instance_request
             end.flatten
           )
         end
 
         def bootstrap(new_attributes = {})
-          spot_request = connection.spot_requests.new(new_attributes)
+          spot_request = service.spot_requests.new(new_attributes)
 
           unless new_attributes[:key_name]
             # first or create fog_#{credential} keypair
             name = Fog.respond_to?(:credential) && Fog.credential || :default
-            unless spot_request.key_pair = connection.key_pairs.get("fog_#{name}")
-              spot_request.key_pair = connection.key_pairs.create(
+            unless spot_request.key_pair = service.key_pairs.get("fog_#{name}")
+              spot_request.key_pair = service.key_pairs.create(
                 :name => "fog_#{name}",
                 :public_key => spot_request.public_key
               )
@@ -49,7 +49,7 @@ module Fog
           end
 
           # make sure port 22 is open in the first security group
-          security_group = connection.security_groups.get(spot_request.groups.first)
+          security_group = service.security_groups.get(spot_request.groups.first)
           authorized = security_group.ip_permissions.detect do |ip_permission|
             ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
             ip_permission['fromPort'] == 22 &&
@@ -62,10 +62,10 @@ module Fog
 
           spot_request.save
           Fog.wait_for { spot_request.reload.ready? rescue nil }
-          server = connection.servers.get(spot_request.instance_id)
+          server = service.servers.get(spot_request.instance_id)
           if spot_request.tags
             for key, value in spot_request.tags
-              connection.tags.create(
+              service.tags.create(
                 :key          => key,
                 :resource_id  => spot_request.instance_id,
                 :value        => value
@@ -79,7 +79,7 @@ module Fog
 
         def get(spot_request_id)
           if spot_request_id
-            self.class.new(:connection => connection).all('spot-instance-request-id' => spot_request_id).first
+            self.class.new(:service => service).all('spot-instance-request-id' => spot_request_id).first
           end
         rescue Fog::Errors::NotFound
           nil

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

@@ -7,7 +7,7 @@ module Fog
       class Subnet < Fog::Model
 
         identity  :subnet_id,                   :aliases => 'subnetId'
-        attribute :state     
+        attribute :state
         attribute :vpc_id,                      :aliases => 'vpcId'
         attribute :cidr_block,                  :aliases => 'cidrBlock'
         attribute :available_ip_address_count,  :aliases => 'availableIpAddressCount'
@@ -27,7 +27,7 @@ module Fog
         def destroy
           requires :subnet_id
 
-          connection.delete_subnet(subnet_id)
+          service.delete_subnet(subnet_id)
           true
         end
 
@@ -43,7 +43,7 @@ module Fog
 
         def save
           requires :vpc_id, :cidr_block
-          data = connection.create_subnet(vpc_id, cidr_block).body['subnetSet'].first
+          data = service.create_subnet(vpc_id, cidr_block).body['subnetSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

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

@@ -63,7 +63,7 @@ module Fog
             filters = {'subnet-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_subnets(filters).body
+          data = service.describe_subnets(filters).body
           load(data['subnetSet'])
         end
 
@@ -88,7 +88,7 @@ module Fog
 
         def get(subnet_id)
           if subnet_id
-            self.class.new(:connection => connection).all('subnet-id' => subnet_id).first
+            self.class.new(:service => service).all('subnet-id' => subnet_id).first
           end
         end
 

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

@@ -18,13 +18,13 @@ module Fog
 
         def destroy
           requires :key, :resource_id
-          connection.delete_tags(resource_id, key => value)
+          service.delete_tags(resource_id, key => value)
           true
         end
 
         def save
           requires :key, :resource_id
-          connection.create_tags(resource_id, key => value)
+          service.create_tags(resource_id, key => value)
           true
         end
 

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

@@ -18,13 +18,13 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_tags(filters).body
+          data = service.describe_tags(filters).body
           load(data['tagSet'])
         end
-        
+
         def get(key)
           if key
-            self.class.new(:connection => connection).all('key' => key)
+            self.class.new(:service => service).all('key' => key)
           end
         end
       end

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

@@ -22,7 +22,7 @@ module Fog
         attribute :type,                  :aliases => 'volumeType'
 
         def initialize(attributes = {})
-          # assign server first to prevent race condition with new_record?
+          # assign server first to prevent race condition with persisted?
           self.server = attributes.delete(:server)
           super
         end
@@ -30,7 +30,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_volume(id)
+          service.delete_volume(id)
           true
         end
 
@@ -39,7 +39,7 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :availability_zone
           requires_one :size, :snapshot_id
 
@@ -47,7 +47,7 @@ module Fog
             requires :iops
           end
 
-          data = connection.create_volume(availability_zone, size, 'SnapshotId' => snapshot_id, 'VolumeType' => type, 'Iops' => iops).body
+          data = service.create_volume(availability_zone, size, 'SnapshotId' => snapshot_id, 'VolumeType' => type, 'Iops' => iops).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
 
@@ -55,7 +55,7 @@ module Fog
             # expect eventual consistency
             Fog.wait_for { self.reload rescue nil }
             for key, value in (self.tags = tags)
-              connection.tags.create(
+              service.tags.create(
                 :key          => key,
                 :resource_id  => self.identity,
                 :value        => value
@@ -71,7 +71,7 @@ module Fog
 
         def server
           requires :server_id
-          connection.servers('instance-id' => server_id)
+          service.servers('instance-id' => server_id)
         end
 
         def server=(new_server)
@@ -84,12 +84,12 @@ module Fog
 
         def snapshots
           requires :id
-          connection.snapshots(:volume => self)
+          service.snapshots(:volume => self)
         end
 
         def snapshot(description)
           requires :id
-          connection.create_snapshot(id, description)
+          service.create_snapshot(id, description)
         end
 
         def force_detach
@@ -103,14 +103,14 @@ module Fog
         end
 
         def attach(new_server)
-          if new_record?
+          if !persisted?
             @server = new_server
             self.availability_zone = new_server.availability_zone
           elsif new_server
             requires :device
             @server = nil
             self.server_id = new_server.id
-            connection.attach_volume(server_id, id, device)
+            service.attach_volume(server_id, id, device)
             reload
           end
         end
@@ -118,14 +118,13 @@ module Fog
         def detach(force = false)
           @server = nil
           self.server_id = nil
-          unless new_record?
-            connection.detach_volume(id, 'Force' => force)
+          if persisted?
+            service.detach_volume(id, 'Force' => force)
             reload
           end
         end
 
       end
-
     end
   end
 end

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

@@ -68,7 +68,7 @@ module Fog
             filters = {'volume-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_volumes(filters).body
+          data = service.describe_volumes(filters).body
           load(data['volumeSet'])
           if server
             self.replace(self.select {|volume| volume.server_id == server.id})
@@ -102,7 +102,7 @@ module Fog
 
         def get(volume_id)
           if volume_id
-            self.class.new(:connection => connection).all('volume-id' => volume_id).first
+            self.class.new(:service => service).all('volume-id' => volume_id).first
           end
         end