fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -14,7 +14,7 @@ module Fog
         attribute :domain
 
         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
@@ -22,7 +22,7 @@ module Fog
         def destroy
           requires :public_ip
 
-          connection.release_address(allocation_id || public_ip)
+          service.release_address(allocation_id || public_ip)
           true
         end
 
@@ -35,12 +35,12 @@ module Fog
         end
 
         def server
-          connection.servers.get(server_id)
+          service.servers.get(server_id)
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          data = connection.allocate_address(domain).body
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          data = service.allocate_address(domain).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           if @server
@@ -52,20 +52,20 @@ module Fog
         private
 
         def associate(new_server)
-          if new_record?
+          unless persisted?
             @server = new_server
           else
             @server = nil
             self.server_id = new_server.id
-            connection.associate_address(server_id, public_ip, network_interface_id, allocation_id)
+            service.associate_address(server_id, public_ip, network_interface_id, allocation_id)
           end
         end
 
         def disassociate
           @server = nil
           self.server_id = nil
-          unless new_record?
-            connection.disassociate_address(public_ip)
+          if persisted?
+            service.disassociate_address(public_ip)
           end
         end
 

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

@@ -60,7 +60,7 @@ module Fog
             filters = {'public-ip' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_addresses(filters).body
+          data = service.describe_addresses(filters).body
           load(
             data['addressesSet'].map do |address|
               address.reject {|key, value| value.nil? || value.empty? }
@@ -81,7 +81,7 @@ module Fog
 
         def get(public_ip)
           if public_ip
-            self.class.new(:connection => connection).all('public-ip' => public_ip).first
+            self.class.new(:service => service).all('public-ip' => public_ip).first
           end
         end
 

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

@@ -24,7 +24,7 @@ module Fog
         #
         def associate(vpc_id)
           requires :id
-          connection.attach_dhcp_option(id, vpc_id)
+          service.attach_dhcp_option(id, vpc_id)
           #reload
         end
 
@@ -39,7 +39,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_dhcp_options(id)
+          service.delete_dhcp_options(id)
           true
         end
 
@@ -55,7 +55,7 @@ module Fog
 
         def save
           requires :dhcp_configuration_set
-          data = connection.create_dhcp_options(dhcp_configuration_set).body['dhcpOptionsSet'].first
+          data = service.create_dhcp_options(dhcp_configuration_set).body['dhcpOptionsSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

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

@@ -59,7 +59,7 @@ module Fog
             filters = {'dhcp-options-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_dhcp_options(filters).body
+          data = service.describe_dhcp_options(filters).body
           load(data['dhcpOptionsSet'])
         end
 
@@ -80,7 +80,7 @@ module Fog
 
         def get(dhcp_options_id)
           if dhcp_options_id
-            self.class.new(:connection => connection).all('dhcp-options-id' => dhcp_options_id).first
+            self.class.new(:service => service).all('dhcp-options-id' => dhcp_options_id).first
           end
         end
 

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

@@ -177,7 +177,7 @@ module Fog
         #
 
         def get(flavor_id)
-          self.class.new(:connection => connection).all.detect {|flavor| flavor.id == flavor_id}
+          self.class.new(:service => service).all.detect {|flavor| flavor.id == flavor_id}
         end
 
       end

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

@@ -27,11 +27,11 @@ module Fog
         attribute :name
 
         def deregister(delete_snapshot = false)
-          connection.deregister_image(id)
+          service.deregister_image(id)
 
           if(delete_snapshot && root_device_type == "ebs")
             block_device = block_device_mapping.detect {|block_device| block_device['deviceName'] == root_device_name}
-            @connection.snapshots.new(:id => block_device['snapshotId']).destroy
+            service.snapshots.new(:id => block_device['snapshotId']).destroy
           else
             true
           end

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

@@ -10,7 +10,7 @@ module Fog
         attribute :filters
 
         model Fog::Compute::AWS::Image
-        
+
         # Creates a new Amazon machine image
         #
         # AWS.images.new
@@ -38,7 +38,7 @@ module Fog
         #    tags=nil
         #  >
         #
-        
+
         def initialize(attributes)
           self.filters ||= {}
           super
@@ -46,13 +46,13 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_images(filters).body
+          data = service.describe_images(filters).body
           load(data['imagesSet'])
         end
-        
+
         def get(image_id)
           if image_id
-            self.class.new(:connection => connection).all('image-id' => image_id).first
+            self.class.new(:service => service).all('image-id' => image_id).first
           end
         end
       end

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

@@ -24,7 +24,7 @@ module Fog
         #
         def attach(vpc_id)
           requires :id
-          connection.attach_internet_gateway(id, vpc_id)
+          service.attach_internet_gateway(id, vpc_id)
           reload
         end
 
@@ -38,7 +38,7 @@ module Fog
         #
         def detach(vpc_id)
           requires :id
-          connection.detach_internet_gateway(id, vpc_id)
+          service.detach_internet_gateway(id, vpc_id)
           reload
         end
 
@@ -54,7 +54,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_internet_gateway(id)
+          service.delete_internet_gateway(id)
           true
         end
 
@@ -68,7 +68,7 @@ module Fog
         # requestId and a internetGateway object
         #
         def save
-          data = connection.create_internet_gateway.body['internetGatewaySet'].first
+          data = service.create_internet_gateway.body['internetGatewaySet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

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

@@ -59,7 +59,7 @@ module Fog
             filters = {'internet-gateway-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_internet_gateways(filters).body
+          data = service.describe_internet_gateways(filters).body
           load(data['internetGatewaySet'])
         end
 
@@ -80,7 +80,7 @@ module Fog
 
         def get(internet_gateway_id)
           if internet_gateway_id
-            self.class.new(:connection => connection).all('internet-gateway-id' => internet_gateway_id).first
+            self.class.new(:service => service).all('internet-gateway-id' => internet_gateway_id).first
           end
         end
 

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

@@ -16,7 +16,7 @@ module Fog
         def destroy
           requires :name
 
-          connection.delete_key_pair(name)
+          service.delete_key_pair(name)
           true
         end
 
@@ -24,9 +24,9 @@ module Fog
           requires :name
 
           data = if public_key
-            connection.import_key_pair(name, public_key).body
+            service.import_key_pair(name, public_key).body
           else
-            connection.create_key_pair(name).body
+            service.create_key_pair(name).body
           end
           new_attributes = data.reject {|key,value| !['keyFingerprint', 'keyMaterial', 'keyName'].include?(key)}
           merge_attributes(new_attributes)
@@ -35,7 +35,7 @@ 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|

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

@@ -55,7 +55,7 @@ module Fog
             filters = {'key-name' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_key_pairs(filters).body
+          data = service.describe_key_pairs(filters).body
           load(data['keySet'])
         end
 
@@ -77,7 +77,7 @@ module Fog
 
         def get(key_name)
           if key_name
-            self.class.new(:connection => connection).all('key-name' => key_name).first
+            self.class.new(:service => service).all('key-name' => key_name).first
           end
         end
 

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

@@ -7,7 +7,7 @@ module Fog
       class NetworkInterface < Fog::Model
 
         identity  :network_interface_id,        :aliases => 'networkInterfaceId'
-        attribute :state     
+        attribute :state
         attribute :request_id,                  :aliases => 'requestId'
         attribute :network_interface_id,        :aliases => 'networkInterfaceId'
         attribute :subnet_id,                   :aliases => 'subnetId'
@@ -40,7 +40,7 @@ module Fog
         def destroy
           requires :network_interface_id
 
-          connection.delete_network_interface(network_interface_id)
+          service.delete_network_interface(network_interface_id)
           true
         end
 
@@ -58,7 +58,7 @@ module Fog
 
         def save
           requires :subnet_id
-          data = connection.create_network_interface(subnet_id).body['networkInterface']
+          data = service.create_network_interface(subnet_id).body['networkInterface']
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

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

@@ -88,7 +88,7 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_network_interfaces(filters).body
+          data = service.describe_network_interfaces(filters).body
           load(data['networkInterfaceSet'])
         end
 
@@ -126,7 +126,7 @@ module Fog
 
         def get(nic_id)
           if nic_id
-            self.class.new(:connection => connection).all('network-interface-id' => nic_id).first
+            self.class.new(:service => service).all('network-interface-id' => nic_id).first
           end
         end
       end

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

@@ -45,7 +45,7 @@ module Fog
 
           requires_one :name, :group_id
 
-          connection.authorize_security_group_ingress(
+          service.authorize_security_group_ingress(
             name,
             'GroupId'                    => group_id,
             'SourceSecurityGroupName'    => group,
@@ -101,7 +101,7 @@ module Fog
             ]
           end
 
-          connection.authorize_security_group_ingress(
+          service.authorize_security_group_ingress(
             name,
             'GroupId'       => group_id,
             'IpPermissions' => [ ip_permission ]
@@ -121,9 +121,9 @@ module Fog
           requires_one :name, :group_id
 
           if group_id.nil?
-            connection.delete_security_group(name)
+            service.delete_security_group(name)
           else
-            connection.delete_security_group(nil, group_id)
+            service.delete_security_group(nil, group_id)
           end
           true
         end
@@ -159,7 +159,7 @@ module Fog
 
           requires_one :name, :group_id
 
-          connection.revoke_security_group_ingress(
+          service.revoke_security_group_ingress(
             name,
             'GroupId'                    => group_id,
             'SourceSecurityGroupName'    => group,
@@ -215,7 +215,7 @@ module Fog
             ]
           end
 
-          connection.revoke_security_group_ingress(
+          service.revoke_security_group_ingress(
             name,
             'GroupId'       => group_id,
             'IpPermissions' => [ ip_permission ]
@@ -235,7 +235,7 @@ module Fog
 
         def save
           requires :description, :name
-          data = connection.create_security_group(name, description, vpc_id).body
+          data = service.create_security_group(name, description, vpc_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

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

@@ -63,7 +63,7 @@ module Fog
             filters = {'group-name' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_security_groups(filters).body
+          data = service.describe_security_groups(filters).body
           load(data['securityGroupInfo'])
         end
 
@@ -87,7 +87,7 @@ module Fog
 
         def get(group_name)
           if group_name
-            self.class.new(:connection => connection).all('group-name' => group_name).first
+            self.class.new(:service => service).all('group-name' => group_name).first
           end
         end
 
@@ -110,7 +110,7 @@ module Fog
 
         def get_by_id(group_id)
           if group_id
-            self.class.new(:connection => connection).all('group-id' => group_id).first
+            self.class.new(:service => service).all('group-id' => group_id).first
           end
         end
       end

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

@@ -53,13 +53,19 @@ module Fog
         def initialize(attributes={})
           self.groups     ||= ["default"] unless (attributes[:subnet_id] || attributes[:security_group_ids])
           self.flavor_id  ||= 't1.micro'
+
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+
           self.image_id   ||= begin
             self.username = 'ubuntu'
-            case attributes[:connection].instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
+            case @service.instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
             when 'ap-northeast-1'
               'ami-5e0fa45f'
             when 'ap-southeast-1'
               'ami-f092eca2'
+            when 'ap-southeast-2'
+              'ami-fb8611c1' # Ubuntu 12.04 LTS 64bit (EBS)
             when 'eu-west-1'
               'ami-3d1f2b49'
             when 'sa-east-1'
@@ -78,19 +84,19 @@ module Fog
         def addresses
           requires :id
 
-          connection.addresses(:server => self)
+          service.addresses(:server => self)
         end
 
         def console_output
           requires :id
 
-          connection.get_console_output(id)
+          service.get_console_output(id)
         end
 
         def destroy
           requires :id
 
-          connection.terminate_instances(id)
+          service.terminate_instances(id)
           true
         end
 
@@ -104,13 +110,13 @@ module Fog
         end
 
         def flavor
-          @flavor ||= connection.flavors.all.detect {|flavor| flavor.id == flavor_id}
+          @flavor ||= service.flavors.all.detect {|flavor| flavor.id == flavor_id}
         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)
@@ -123,12 +129,12 @@ module Fog
 
         def reboot
           requires :id
-          connection.reboot_instances(id)
+          service.reboot_instances(id)
           true
         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 :image_id
 
           options = {
@@ -164,14 +170,14 @@ module Fog
             options.delete('SubnetId')
           end
 
-          data = connection.run_instances(image_id, 1, 1, options)
+          data = service.run_instances(image_id, 1, 1, options)
           merge_attributes(data.body['instancesSet'].first)
 
           if tags = self.tags
             # 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
@@ -203,31 +209,31 @@ module Fog
 
         def start
           requires :id
-          connection.start_instances(id)
+          service.start_instances(id)
           true
         end
 
         def stop(force = false)
           requires :id
-          connection.stop_instances(id, force)
+          service.stop_instances(id, force)
           true
         end
 
         def volumes
           requires :id
-          connection.volumes(:server => self)
+          service.volumes(:server => self)
         end
 
         #I tried to call it monitoring= and be smart with attributes[]
         #but in #save a merge_attribute is called after run_instance
         #thus making an un-necessary request. Use this until finding a clever solution
         def monitor=(new_monitor)
-          if identity
+          if persisted?
             case new_monitor
             when true
-              response = connection.monitor_instances(identity)
+              response = service.monitor_instances(identity)
             when false
-              response = connection.unmonitor_instances(identity)
+              response = service.unmonitor_instances(identity)
             else
               raise ArgumentError.new("only Boolean allowed here")
             end