fog 0.8.2 → 0.9.0

data/lib/fog/compute/parsers/slicehost/get_flavor.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Slicehost
-      module Compute
+    module Compute
+      module Slicehost
 
         class GetFlavor < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/slicehost/get_flavors.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Slicehost
-      module Compute
+    module Compute
+      module Slicehost
 
         class GetFlavors < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/slicehost/get_image.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Slicehost
-      module Compute
+    module Compute
+      module Slicehost
 
         class GetImage < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/slicehost/get_images.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Slicehost
-      module Compute
+    module Compute
+      module Slicehost
 
         class GetImages < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/slicehost/get_slice.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Slicehost
-      module Compute
+    module Compute
+      module Slicehost
 
         class GetSlice < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/slicehost/get_slices.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Slicehost
-      module Compute
+    module Compute
+      module Slicehost
 
         class GetSlices < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/voxel/basic.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Voxel
-      module Compute
+    module Compute
+      module Voxel
 
         class Basic < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/voxel/devices_list.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Voxel
-      module Compute
+    module Compute
+      module Voxel
 
         class DevicesList < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/voxel/images_list.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Voxel
-      module Compute
+    module Compute
+      module Voxel
 
         class ImagesList < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/voxel/voxcloud_create.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Voxel
-      module Compute
+    module Compute
+      module Voxel
 
         class VoxcloudCreate < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/voxel/voxcloud_delete.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Voxel
-      module Compute
+    module Compute
+      module Voxel
 
         class VoxcloudDelete < Fog::Parsers::Base
 

data/lib/fog/compute/parsers/voxel/voxcloud_status.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Voxel
-      module Compute
+    module Compute
+      module Voxel
         class VoxcloudStatus < Fog::Parsers::Base
           def reset
             @response = { 'devices' => [] }

data/lib/fog/compute/rackspace.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Rackspace
-    class Compute < Fog::Service
+  module Compute
+    class Rackspace < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
-      recognizes :provider # remove post deprecation
+      recognizes :rackspace_auth_token, :rackspace_management_url
 
       model_path 'fog/compute/models/rackspace'
       model       :flavor
@@ -58,13 +58,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Rackspace::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Rackspace') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           @rackspace_username = options[:rackspace_username]
         end
 
@@ -81,18 +74,14 @@ module Fog
       class Real
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Rackspace::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Rackspace') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'json'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_auth_url = options[:rackspace_auth_url]
           @rackspace_servicenet = options[:rackspace_servicenet]
+          @rackspace_auth_token = options[:rackspace_auth_token]
+          @rackspace_management_url = options[:rackspace_management_url]
+          @rackspace_must_reauthenticate = false
           authenticate
           Excon.ssl_verify_peer = false if options[:rackspace_servicenet] == true
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
@@ -115,6 +104,7 @@ module Fog
             }))
           rescue Excon::Errors::Unauthorized => error
             if JSON.parse(response.body)['unauthorized']['message'] == 'Invalid authentication token.  Please renew.'
+              @rackspace_must_reauthenticate = true
               authenticate
               retry
             else
@@ -123,7 +113,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::Rackspace::Compute::NotFound.slurp(error)
+              Fog::Compute::Rackspace::NotFound.slurp(error)
             else
               error
             end
@@ -137,14 +127,19 @@ module Fog
         private
 
         def authenticate
-          options = {
-            :rackspace_api_key  => @rackspace_api_key,
-            :rackspace_username => @rackspace_username,
-            :rackspace_auth_url => @rackspace_auth_url
-          }
-          credentials = Fog::Rackspace.authenticate(options)
-          @auth_token = credentials['X-Auth-Token']
-          uri = URI.parse(credentials['X-Server-Management-Url'])
+          if @rackspace_must_reauthenticate || @rackspace_auth_token.nil?
+            options = {
+              :rackspace_api_key  => @rackspace_api_key,
+              :rackspace_username => @rackspace_username,
+              :rackspace_auth_url => @rackspace_auth_url
+            }
+            credentials = Fog::Rackspace.authenticate(options)
+            @auth_token = credentials['X-Auth-Token']
+            uri = URI.parse(credentials['X-Server-Management-Url'])
+          else
+            @auth_token = @rackspace_auth_token
+            uri = URI.parse(@rackspace_management_url)
+          end
           @host   = @rackspace_servicenet == true ? "snet-#{uri.host}" : uri.host
           @path   = uri.path
           @port   = uri.port

data/lib/fog/compute/requests/aws/allocate_address.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/allocate_address'
@@ -17,7 +17,7 @@ module Fog
         def allocate_address
           request(
             'Action'  => 'AllocateAddress',
-            :parser   => Fog::Parsers::AWS::Compute::AllocateAddress.new
+            :parser   => Fog::Parsers::Compute::AWS::AllocateAddress.new
           )
         end
 

data/lib/fog/compute/requests/aws/associate_address.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -24,7 +24,7 @@ module Fog
             'InstanceId'  => instance_id,
             'PublicIp'    => public_ip,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::Compute::Basic.new
+            :parser       => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 
@@ -40,6 +40,10 @@ module Fog
           if instance && address
             address['instanceId'] = instance_id
             instance['originalIpAddress'] = instance['ipAddress']
+            # detach other address (if any)
+            if self.data[:addresses][instance['originalIpAddress']]
+              self.data[:addresses][instance['originalIpAddress']]['instanceId'] = nil
+            end
             instance['ipAddress'] = public_ip
             instance['dnsName'] = Fog::AWS::Mock.dns_name_for(public_ip)
             response.status = 200
@@ -49,9 +53,9 @@ module Fog
             }
             response
           elsif !instance
-            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
           elsif !address
-            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
 

data/lib/fog/compute/requests/aws/attach_volume.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/attach_volume'
@@ -30,7 +30,7 @@ module Fog
             'InstanceId'  => instance_id,
             'Device'      => device,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::Compute::AttachVolume.new
+            :parser       => Fog::Parsers::Compute::AWS::AttachVolume.new
           )
         end
 
@@ -46,7 +46,7 @@ module Fog
             volume = self.data[:volumes][volume_id]
             if instance && volume
               unless volume['status'] == 'available'
-                raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable")
+                raise Fog::Compute::AWS::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable")
               end
 
               data = {
@@ -64,9 +64,9 @@ module Fog
               }.merge!(data)
               response
             elsif !instance
-              raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist.")
+              raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist.")
             elsif !volume
-              raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
+              raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
             end
           else
             message = 'MissingParameter => '
@@ -77,7 +77,7 @@ module Fog
             else
               message << 'The request must contain the parameter device'
             end
-            raise Fog::AWS::Compute::Error.new(message)
+            raise Fog::Compute::AWS::Error.new(message)
           end
         end
 

data/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -39,7 +39,7 @@ module Fog
             'Action'    => 'AuthorizeSecurityGroupIngress',
             'GroupName' => group_name,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::Basic.new
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(options))
         end
 
@@ -98,7 +98,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist")
+            raise Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist")
           end
         end
 

data/lib/fog/compute/requests/aws/create_image.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/create_image'
@@ -27,7 +27,7 @@ module Fog
             'Name'              => name,
             'Description'       => description,
             'NoReboot'          => no_reboot.to_s,
-            :parser             => Fog::Parsers::AWS::Compute::CreateImage.new
+            :parser             => Fog::Parsers::Compute::AWS::CreateImage.new
           )
         end
       end

data/lib/fog/compute/requests/aws/create_key_pair.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/create_key_pair'
@@ -23,7 +23,7 @@ module Fog
           request(
             'Action'  => 'CreateKeyPair',
             'KeyName' => key_name,
-            :parser   => Fog::Parsers::AWS::Compute::CreateKeyPair.new
+            :parser   => Fog::Parsers::Compute::AWS::CreateKeyPair.new
           )
         end
 
@@ -46,7 +46,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+            raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
           end
         end
 

data/lib/fog/compute/requests/aws/create_security_group.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -23,7 +23,7 @@ module Fog
             'Action'            => 'CreateSecurityGroup',
             'GroupName'         => name,
             'GroupDescription'  => description,
-            :parser             => Fog::Parsers::AWS::Compute::Basic.new
+            :parser             => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 
@@ -47,7 +47,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::Error.new("InvalidGroup.Duplicate => The security group '#{name}' already exists")
+            raise Fog::Compute::AWS::Error.new("InvalidGroup.Duplicate => The security group '#{name}' already exists")
           end
         end
 

data/lib/fog/compute/requests/aws/create_snapshot.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/create_snapshot'
@@ -26,7 +26,7 @@ module Fog
             'Action'      => 'CreateSnapshot',
             'Description' => description,
             'VolumeId'    => volume_id,
-            :parser       => Fog::Parsers::AWS::Compute::CreateSnapshot.new
+            :parser       => Fog::Parsers::Compute::AWS::CreateSnapshot.new
           )
         end
 

data/lib/fog/compute/requests/aws/create_tags.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -26,12 +26,12 @@ module Fog
             end
           end
           params = {}
-          params.merge!(AWS.indexed_param('ResourceId', resources))
-          params.merge!(AWS.indexed_param('Tag.%d.Key', tags.keys))
-          params.merge!(AWS.indexed_param('Tag.%d.Value', tags.values))
+          params.merge!(Fog::AWS.indexed_param('ResourceId', resources))
+          params.merge!(Fog::AWS.indexed_param('Tag.%d.Key', tags.keys))
+          params.merge!(Fog::AWS.indexed_param('Tag.%d.Value', tags.values))
           request({
             'Action'            => 'CreateTags',
-            :parser             => Fog::Parsers::AWS::Compute::Basic.new
+            :parser             => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(params))
         end