fog 1.11.1 → 1.12.0

data/lib/fog/openvz/requests/compute/quotaoff_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def quotaooff_server(id, options = {})
+          vzctl("quotaoff",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def quotaooff_server(id, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/quotaon_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def quotaon_server(id, options = {})
+          vzctl("quotaon",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def quotaon_server(id, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/restart_server.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def restart_server(id, options = {})
+          vzctl("restart",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def restart_server(id, options = {})
+          server = self.data[:servers].find { |s| s['ctid'] == id.to_s }
+          unless server.nil?
+            server['status'] = 'running'
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/resume_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def resume_server(id, options = {})
+          vzctl("resume",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def resume_server(id, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/runscript_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def runscript_server(id,args = [])
+          vzctl("runscript",{:ctid => id},args)
+        end
+
+      end
+
+      class Mock
+
+        def runscript_server(id,args = [])
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/set_server.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def set_server(id,options = {})
+          vzctl("set",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def set_server(id, options = {})
+          server = self.data[:servers].find { |s| s['ctid'].to_s == id.to_s }
+          unless server.nil?
+            options.each do |k,v|
+              server[k] = v
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/snapshot_delete_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def snapshot_delete_server(id,options = {})
+          vzctl("snapshot-delete",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_delete_server(id,options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/snapshot_list_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def snapshot_list_server(id,options = {})
+          vzctl("snapshot-list",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_list_server(id, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/snapshot_mount_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def snapshot_mount_server(id,options = {})
+          vzctl("snapshot-mount",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_mount_server(id,options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/snapshot_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def snapshot_server(id,options = {})
+          vzctl("snapshot",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_server(id,options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/snapshot_switch_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def snapshot_switch_server(id,options = {})
+          vzctl("snapshot-switch",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_switch_server(id,options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/snapshot_umount_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def snapshot_umount_server(id,options = {})
+          vzctl("snapshot-umount",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_umount_server(id,options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/start_server.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def start_server(id,options={})
+          vzctl("start",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def start_server(id,options={})
+          server = self.data[:servers].find { |s| s['ctid'].to_s == id.to_s }
+          unless server.nil?
+            server['status'] = 'running'
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/status_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def status_server(id, options = {})
+          vzctl("status",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def status_server(id, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/stop_server.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def stop_server(id, options = {})
+          vzctl("stop",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def stop_server(id, options = {})
+           server = self.data[:servers].find { |s| s['ctid'].to_s == id.to_s }
+            unless server.nil?
+                 server['status'] = 'stopped'
+            end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/suspend_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def suspend_server(id, options = {})
+          vzctl("suspend",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def suspend_server(id, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openvz/requests/compute/umount_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Openvz
+      class Real
+
+        def umount_server(id, options = {})
+          vzctl("umount",{:ctid => id}.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def umount_server(id, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'core')
+require 'fog/core'
 require 'fog/rackspace/mock_data'
 require 'fog/rackspace/service'
 require 'fog/rackspace/errors'

data/lib/fog/rackspace/block_storage.rb

@@ -117,7 +117,8 @@ module Fog
           options = {
             :rackspace_api_key => @rackspace_api_key,
             :rackspace_username => @rackspace_username,
-            :rackspace_auth_url => @rackspace_auth_url
+            :rackspace_auth_url => @rackspace_auth_url,
+            :connection_options => @connection_options
           }
           super(options)
         end

data/lib/fog/rackspace/compute.rb

@@ -244,7 +244,8 @@ module Fog
              options = {
                :rackspace_api_key  => @rackspace_api_key,
                :rackspace_username => @rackspace_username,
-               :rackspace_auth_url => @rackspace_auth_url
+               :rackspace_auth_url => @rackspace_auth_url,
+               :connection_options => @connection_options
              }
              super(options)
            else

data/lib/fog/rackspace/compute_v2.rb

@@ -98,7 +98,7 @@ module Fog
       request :delete_network
 
       class Mock < Fog::Rackspace::Service
-        include Fog::Rackspace::MockData      
+        include Fog::Rackspace::MockData
 
         def initialize(options)
           @rackspace_api_key = options[:rackspace_api_key]
@@ -122,7 +122,7 @@ module Fog
       end
 
       class Real < Fog::Rackspace::Service
-        
+
         def initialize(options = {})
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
@@ -134,7 +134,7 @@ module Fog
           authenticate
 
           deprecation_warnings(options)
-          
+
           @persistent = options[:persistent] || false
           @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
         end
@@ -163,18 +163,19 @@ module Fog
           unless response.body.empty?
             begin
               response.body = Fog::JSON.decode(response.body)
-            rescue Fog::JSON::LoadError
+            rescue MultiJson::DecodeError => e
               response.body = {}
             end
           end
           response
         end
-        
+
         def authenticate
           options = {
             :rackspace_api_key => @rackspace_api_key,
             :rackspace_username => @rackspace_username,
-            :rackspace_auth_url => @rackspace_auth_url
+            :rackspace_auth_url => @rackspace_auth_url,
+            :connection_options => @connection_options
           }
           super(options)
         end
@@ -228,7 +229,7 @@ module Fog
 
         def append_tenant_v1(credentials)
           account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
-          
+
           endpoint = @rackspace_endpoint || credentials['X-Server-Management-Url'] || DFW_ENDPOINT
           @uri = URI.parse(endpoint)
           @uri.path = "#{@uri.path}/#{account_id}"