fog 0.8.1 → 0.8.2

data/lib/fog/compute/requests/linode/linode_config_list.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_config_list(linode_id, config_id=nil, options={})
+          if config_id
+            options.merge!(:configid => config_id)
+          end
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => { :api_action => 'linode.config.list', :linodeId => linode_id }.merge!(options)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_create.rb

@@ -5,16 +5,16 @@ module Fog
 
         # Creates a linode and assigns you full privileges
         #
-        # ==== Parameters
+        # ==== Parameters 	
         # * datacenter_id<~Integer>: id of datacenter to place new linode in
+        # * plan_id<~Integer>: id of plan to boot new linode with        
         # * payment_term<~Integer>: Subscription term in months, in [1, 12, 24]
-        # * plan_id<~Integer>: id of plan to boot new linode with
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Array>:
         # TODO: docs
-        def linode_create(datacenter_id, payment_term, plan_id)
+        def linode_create(datacenter_id, plan_id, payment_term)
           request(
             :expects  => 200,
             :method   => 'GET',
@@ -26,7 +26,6 @@ module Fog
             }
           )
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/linode_delete.rb

@@ -21,7 +21,6 @@ module Fog
             :query    => { :api_action => 'linode.delete', :linodeId => linode_id }.merge!(options)
           )
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/linode_disk_create.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_disk_create(linode_id, name, type, size)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => {
+              :api_action => 'linode.disk.create',
+              :linodeId => linode_id,
+              :label => name,
+              :type => type,
+              :size => size
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_disk_createfromdistribution.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_disk_createfromdistribution(linode_id, distro_id, name, size, password)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => {
+              :api_action => 'linode.disk.createfromdistribution',
+              :linodeId => linode_id,
+              :distributionId => distro_id,
+              :label => name,
+              :size => size,
+              :rootPass => password
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_disk_createfromstackscript.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_disk_createfromstackscript(linode_id, script_id, distro_id, name, size, password, options={})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => {
+              :api_action => 'linode.disk.createfromstackscript',
+              :linodeId => linode_id,
+              :stackScriptID => script_id,
+              :distributionId => distro_id,
+              :label => name,
+              :size => size,
+              :rootPass => password,
+              :stackScriptUDFResponses => options.to_json
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_disk_delete.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_disk_delete(linode_id, disk_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => {
+              :api_action => 'linode.disk.delete',
+              :linodeId => linode_id,
+              :diskId => disk_id
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_disk_list.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_disk_list(linode_id, disk_id=nil)
+          options = {}
+          if disk_id
+            options.merge!(:diskId => disk_id)
+          end          
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => { :api_action => 'linode.disk.list', :linodeId => linode_id }.merge!(options)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_ip_addprivate.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_ip_addprivate(linode_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => { :api_action => 'linode.ip.addprivate', :linodeId => linode_id }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_ip_list.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_ip_list(linode_id, ip_id=nil)
+          options = {}
+          if ip_id
+            options.merge!(:ipaddressId => ip_id)
+          end
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => { :api_action => 'linode.ip.list', :linodeId => linode_id }.merge!(options)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_list.rb

@@ -23,7 +23,6 @@ module Fog
             :query    => { :api_action => 'linode.list' }.merge!(options)
           )
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/linode_reboot.rb

@@ -13,7 +13,7 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Array>:
-        # TODO: docs
+        # TODO: docs        
         def linode_reboot(linode_id, options={})
           request(
             :expects  => 200,
@@ -21,7 +21,6 @@ module Fog
             :query    => { :api_action => 'linode.reboot', :linodeId => linode_id }.merge!(options)
           )
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/linode_shutdown.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_shutdown(linode_id)
+          request(
+            :expects => 200,
+            :method => 'GET',
+            :query => { :api_action => 'linode.shutdown', :linodeId => linode_id }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_update.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_update(linode_id, options={})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => { :api_action => 'linode.update', :linodeId => linode_id }.merge!(options)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/stackscript_list.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+
+        # Get available stack scripts
+        #
+        # ==== Parameters
+        # * scriptId<~Integer>: id to limit results to
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        # TODO: docs        
+        def stackscript_list(script_id=nil)
+          options = {}
+          if script_id
+            options.merge!(:stackScriptID => script_id)
+          end          
+          result = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => { :api_action => 'stackscript.list' }.merge!(options)
+          )
+          result.body['DATA'].each { |r| r['DISTRIBUTIONIDLIST'] = r['DISTRIBUTIONIDLIST'].to_s }
+          result
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/rackspace/confirm_resized_server.rb

@@ -21,9 +21,9 @@ module Fog
           response = Excon::Response.new
           response.status = 204
 
-          @data[:servers][server_id].delete('old_flavorId')
-          @data[:last_modified][:servers][server_id] = Time.now
-          @data[:servers][server_id]['status'] = 'ACTIVE'
+          self.data[:servers][server_id].delete('old_flavorId')
+          self.data[:last_modified][:servers][server_id] = Time.now
+          self.data[:servers][server_id]['status'] = 'ACTIVE'
 
           response
         end

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

@@ -50,8 +50,8 @@ module Fog
             'updated'   => now.to_s,
           }
 
-          @data[:last_modified][:images][data['id']] = now
-          @data[:images][data['id']] = data
+          self.data[:last_modified][:images][data['id']] = now
+          self.data[:images][data['id']] = data
           response.body = { 'image' => data.reject {|key, value| !['id', 'name', 'serverId', 'status', 'updated'].include?(key)} }
           response
         end

data/lib/fog/compute/requests/rackspace/create_server.rb

@@ -82,8 +82,8 @@ module Fog
             'progress'  => 0,
             'status'    => 'BUILD'
           }
-          @data[:last_modified][:servers][data['id']] = Time.now
-          @data[:servers][data['id']] = data
+          self.data[:last_modified][:servers][data['id']] = Time.now
+          self.data[:servers][data['id']] = data
           response.body = { 'server' => data.merge({'adminPass' => 'password'}) }
           response
         end

data/lib/fog/compute/requests/rackspace/delete_image.rb

@@ -27,8 +27,8 @@ module Fog
               response.status = 409
               raise(Excon::Errors.status_error({:expects => 202}, response))
             else
-              @data[:last_modified][:images].delete(image_id)
-              @data[:images].delete(image_id)
+              self.data[:last_modified][:images].delete(image_id)
+              self.data[:images].delete(image_id)
               response.status = 202
             end
             response

data/lib/fog/compute/requests/rackspace/delete_server.rb

@@ -27,8 +27,8 @@ module Fog
               response.status = 409
               raise(Excon::Errors.status_error({:expects => 202}, response))
             else
-              @data[:last_modified][:servers].delete(server_id)
-              @data[:servers].delete(server_id)
+              self.data[:last_modified][:servers].delete(server_id)
+              self.data[:servers].delete(server_id)
               response.status = 202
             end
             response

data/lib/fog/compute/requests/rackspace/list_images_detail.rb

@@ -28,11 +28,11 @@ module Fog
         def list_images_detail
           response = Excon::Response.new
 
-          images = @data[:images].values
+          images = self.data[:images].values
           for image in images
             case image['status']
             when 'SAVING'
-              if Time.now - @data[:last_modified][:images][image['id']] > Fog::Mock.delay
+              if Time.now - self.data[:last_modified][:images][image['id']] >= Fog::Mock.delay
                 image['status'] = 'ACTIVE'
               end
             end

data/lib/fog/compute/requests/rackspace/list_servers_detail.rb

@@ -35,11 +35,11 @@ module Fog
         def list_servers_detail
           response = Excon::Response.new
 
-          servers = @data[:servers].values
+          servers = self.data[:servers].values
           for server in servers
             case server['status']
             when 'BUILD'
-              if Time.now - @data[:last_modified][:servers][server['id']] > 2
+              if Time.now - self.data[:last_modified][:servers][server['id']] > Fog::Mock.delay * 2
                 server['status'] = 'ACTIVE'
               end
             end

data/lib/fog/compute/requests/rackspace/resize_server.rb

@@ -24,11 +24,11 @@ module Fog
           response.status = 202
 
           # keep track of this for reverts
-          @data[:servers][server_id]['old_flavorId'] = @data[:servers][server_id]['flavorId']
+          self.data[:servers][server_id]['old_flavorId'] = self.data[:servers][server_id]['flavorId']
 
-          @data[:servers][server_id]['flavorId'] = flavor_id
-          @data[:last_modified][:servers][server_id] = Time.now
-          @data[:servers][server_id]['status'] = 'VERIFY_RESIZE'
+          self.data[:servers][server_id]['flavorId'] = flavor_id
+          self.data[:last_modified][:servers][server_id] = Time.now
+          self.data[:servers][server_id]['status'] = 'VERIFY_RESIZE'
 
           response
         end

data/lib/fog/compute/requests/rackspace/revert_resized_server.rb

@@ -21,10 +21,10 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          @data[:servers][server_id]['flavorId'] = @data[:servers][server_id]['old_flavorId']
-          @data[:servers][server_id].delete('old_flavorId')
-          @data[:last_modified][:servers][server_id] = Time.now
-          @data[:servers][server_id]['status'] = 'ACTIVE'
+          self.data[:servers][server_id]['flavorId'] = self.data[:servers][server_id]['old_flavorId']
+          self.data[:servers][server_id].delete('old_flavorId')
+          self.data[:last_modified][:servers][server_id] = Time.now
+          self.data[:servers][server_id]['status'] = 'ACTIVE'
 
           response
         end

data/lib/fog/compute/slicehost.rb

@@ -34,6 +34,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -43,12 +47,14 @@ module Fog
           end
 
           @slicehost_password = options[:slicehost_password]
-          @data = self.class.data[@slicehost_password]
+        end
+
+        def data
+          self.class.data[@slicehost_password]
         end
 
         def reset_data
           self.class.data.delete(@slicehost_password)
-          @data = self.class.data[@slicehost_password]
         end
 
       end