fog 1.38.0 → 1.39.0

data/lib/fog/cloudsigma/models/volume.rb

@@ -1,4 +1,5 @@
 require 'fog/cloudsigma/nested_model'
+require 'fog/cloudsigma/models/snapshot'
 
 module Fog
   module Compute
@@ -19,6 +20,7 @@ module Fog
         attribute :affinities, :type => :array
         attribute :size, :type => :integer
         attribute :resource_uri, :type => :string
+        model_attribute_array :snapshots, Snapshot
 
         def save
           if persisted?
@@ -63,6 +65,19 @@ module Fog
 
           self.class.new(response.body['objects'].first)
         end
+        
+        def create_snapshot(snapshot_params={})
+          requires :identity
+          snapshot_params[:drive] = identity
+          response = service.create_snapshot(snapshot_params)
+
+          Snapshot.new(response.body['objects'].first)
+        end
+        
+        def available?
+          status == 'unmounted'
+        end
+        
       end
     end
   end

data/lib/fog/cloudsigma/requests/clone_snapshot.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class CloudSigma
+      class Real
+        def clone_snapshot(snap_id, clone_params={})
+          request(:path => "snapshots/#{snap_id}/action/",
+                  :method => 'POST',
+                  :query => {:do => :clone},
+                  :body => clone_params,
+                  :expects => [200, 202])
+        end
+      end
+
+      class Mock
+        def clone_snapshot(snap_id, clone_params={})
+          snapshot = self.data[:snapshots][snap_id].dup
+          uuid = self.class.random_uuid
+          snapshot['uuid'] = uuid
+
+          self.data[:snapshots][uuid] = snapshot
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = snapshot
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/cloudsigma/requests/create_snapshot.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class CloudSigma
+      class Real
+        def create_snapshot(data)
+          create_request("snapshots/", data)
+        end
+      end
+
+      class Mock
+        def create_snapshot(data)
+          uuid = self.class.random_uuid
+
+          defaults = {'uuid' => uuid,
+                      'timestamp' => Time.now.strftime("%Y-%m-%d %H:%M:%S.%6N%z"),
+                      'status' => 'creating',
+                      'tags' => [],
+                      'grantees' => [],
+                      'allocated_size' => 0
+          }
+
+          mock_create(:snapshots, 201, data, uuid, defaults)
+        end
+      end
+    end
+  end
+end

data/lib/fog/cloudsigma/requests/delete_snapshot.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class CloudSigma
+      class Real
+        def delete_snapshot(snap_id)
+          delete_request("snapshots/#{snap_id}/")
+        end
+      end
+
+      class Mock
+        def delete_snapshot(snap_id)
+          mock_delete(:snapshots, 204, snap_id)
+        end
+      end
+    end
+  end
+end

data/lib/fog/cloudsigma/requests/get_snapshot.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class CloudSigma
+      class Real
+        def get_snapshot(snap_id)
+          get_request("snapshots/#{snap_id}/")
+        end
+      end
+
+      class Mock
+        def get_snapshot(snap_id)
+          mock_get(:snapshots, 200, snap_id)
+        end
+      end
+    end
+  end
+end

data/lib/fog/cloudsigma/requests/list_snapshots.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class CloudSigma
+      class Real
+        def list_snapshots
+          list_request('snapshots/detail/')
+        end
+      end
+
+      class Mock
+        def list_snapshots
+          mock_list(:snapshots, 200)
+        end
+      end
+    end
+  end
+end

data/lib/fog/cloudsigma/requests/stop_server.rb

@@ -2,23 +2,24 @@ module Fog
   module Compute
     class CloudSigma
       class Real
-        def stop_server(server_id)
+        def stop_server(server_id, graceful_acpi = false)
+          action = graceful_acpi ? :shutdown : :stop
           request(:path => "servers/#{server_id}/action/",
                   :method => 'POST',
-                  :query => {:do => :stop},
+                  :query => {:do => action},
                   :expects => [200, 202])
         end
       end
 
       class Mock
-        def stop_server(server_id)
+        def stop_server(server_id, graceful_acpi = false)
           server = self.data[:servers][server_id]
           server['status'] = 'stopped'
 
           response = Excon::Response.new
           response.status = 200
           response.body = {
-              'action' => 'stop',
+              'action' => graceful_acpi ? 'shutdown' : 'stop',
               'result' => 'success',
               'uuid' => server_id
           }

data/lib/fog/cloudsigma/requests/update_snapshot.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class CloudSigma
+      class Real
+        def update_snapshot(snap_id, data)
+          update_request("snapshots/#{snap_id}/", data)
+        end
+      end
+
+      class Mock
+        def update_snapshot(snap_id, data)
+          mock_update(data, :snapshots, 200,  snap_id)
+        end
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/core.rb

@@ -13,6 +13,8 @@ module Fog
     def self.escape(string)
       string = CGI::escape(string)
       string = string.gsub("+","%20")
+      # Escaped asterisk will cause malformed request
+      string = string.gsub("%2A","*")
       string
     end
 

data/lib/fog/joyent/compute.rb

@@ -6,7 +6,6 @@ module Fog
     class Joyent < Fog::Service
       requires :joyent_username
 
-      recognizes :joyent_password
       recognizes :joyent_url
 
       recognizes :joyent_keyname
@@ -15,7 +14,7 @@ module Fog
       recognizes :joyent_keyphrase
       recognizes :joyent_version
 
-      secrets :joyent_password, :joyent_keydata, :joyent_keyphrase
+      secrets :joyent_keydata, :joyent_keyphrase
 
       model_path 'fog/joyent/models/compute'
       request_path 'fog/joyent/requests/compute'
@@ -100,7 +99,6 @@ module Fog
 
         def initialize(options = {})
           @joyent_username = options[:joyent_username]
-          @joyent_password = options[:joyent_password]
         end
 
         def request(opts)
@@ -117,7 +115,7 @@ module Fog
           @persistent = options[:persistent] || false
 
           @joyent_url = options[:joyent_url] || 'https://us-sw-1.api.joyentcloud.com'
-          @joyent_version = options[:joyent_version] || '~6.5'
+          @joyent_version = options[:joyent_version] || '~7'
           @joyent_username = options[:joyent_username]
 
           unless @joyent_username
@@ -137,7 +135,6 @@ module Fog
                 :keys_only => true,
                 :passphrase => @joyent_keyphrase
             })
-            @header_method = method(:header_for_signature_auth)
 
             if options[:joyent_keyfile]
               if File.exist?(options[:joyent_keyfile])
@@ -154,11 +151,8 @@ module Fog
                 @key_manager.add_key_data(@joyent_keydata)
               end
             end
-          elsif options[:joyent_password]
-            @joyent_password = options[:joyent_password]
-            @header_method = method(:header_for_basic_auth)
           else
-            raise ArgumentError, "Must provide either a joyent_password or joyent_keyname and joyent_keyfile pair"
+            raise ArgumentError, "Must provide a joyent_keyname and joyent_keyfile pair"
           end
 
           @connection = Fog::XML::Connection.new(
@@ -173,7 +167,7 @@ module Fog
             "X-Api-Version" => @joyent_version,
             "Content-Type" => "application/json",
             "Accept" => "application/json"
-          }.merge(opts[:headers] || {}).merge(@header_method.call)
+          }.merge(opts[:headers] || {}).merge(header_for_signature_auth)
 
           if opts[:body]
             opts[:body] = Fog::JSON.encode(opts[:body])
@@ -199,12 +193,6 @@ module Fog
           decode_time_attrs(parsed)
         end
 
-        def header_for_basic_auth
-          {
-            "Authorization" => "Basic #{Base64.encode64("#{@joyent_username}:#{@joyent_password}").delete("\r\n")}"
-          }
-        end
-
         def header_for_signature_auth
           date = Time.now.utc.httpdate
 

data/lib/fog/opennebula/compute.rb

@@ -1,8 +1,8 @@
 require 'fog/opennebula/core'
 
 module Fog
- module Compute
-  class OpenNebula < Fog::Service
+  module Compute
+    class OpenNebula < Fog::Service
       requires   :opennebula_endpoint
       recognizes :opennebula_username, :opennebula_password
 
@@ -26,35 +26,106 @@ module Fog
       request :vm_destroy
       request :get_vnc_console
       request :vm_resume
+      request :vm_suspend
       request :vm_stop
       request :template_pool
       request :vm_disk_snapshot
       request :vm_shutdown
       request :image_pool
 
-    class Mock
-      include Collections
-      def initialize(options={})
-        require 'opennebula'
-      end
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              "vms" => [
+                {
+                  "onevm_object" => "",
+                  "status" => "RUNNING",
+                  "state" => "3",
+                  "id" => 4,
+                  "uuid" => "5",
+                  "gid" => "5",
+                  "name" => "MockVM",
+                  "user" => "MockUser",
+                  "group" => "MockGroup",
+                  "cpu" => "2",
+                  "memory" => "1024",
+                  "mac" => "00:01:02:03:04:05",
+                  "ip" => "1.1.1.1"
+                }
+              ],
+              "image_pool" => [
+                {}
+              ],
+              "template_pool" => [
+                {
+                  "content" => %Q{
+                    NAME = mock-vm
+                    MEMORY = 512
+                    VCPU = 1
+                    CPU = 1
+                  },
+                  "id" => 1,
+                  "name" => 'mock',
+                  "cpu" => 1,
+                  "vcpu" => 1,
+                  "memory" => 512,
+                  "sched_requirements" => 'CPUSPEED > 1000',
+                  "sched_rank" => 'FREECPU',
+                  "sched_ds_requirements" => "NAME=mock",
+                  "sched_ds_rank" => "FREE_MB",
+                  "disk" => {},
+                  "nic" => {},
+                  "os" => {
+                    'ARCH' => 'x86_64'
+                  },
+                  "graphics" => {},
+                  "raw" => %|["DATA"=>"<cpu match='exact'><model fallback='allow'>core2duo</model></cpu>", "TYPE"=>"kvm"]|,
+                  "context" => {},
+                  "user_variables" => {}
+                }
+              ]
+            }
+          end
+        end
 
-      def client
-        return @client
-      end
-    end
+        def self.reset
+          @data = nil
+        end
+
+        include Collections
+        def initialize(options={})
+          @opennebula_endpoint = options[:opennebula_endpoint]
+          @opennebula_username = options[:opennebula_username]
+          @opennebula_password = options[:opennebula_password]
+          require 'opennebula'
+        end
 
-    class Real
-      include Collections
+        def client
+          return @client
+        end
 
-      def client
-        return @client
+        def data
+          self.class.data[@opennebula_endpoint]
+        end
+
+        def reset_data
+          self.class.data.delete(@opennebula_endpoint)
+        end
       end
 
-      def initialize(options={})
-        require 'opennebula'
-        @client = ::OpenNebula::Client.new("#{options[:opennebula_username]}:#{options[:opennebula_password]}", options[:opennebula_endpoint])
+      class Real
+        include Collections
+
+        def client
+          return @client
+        end
+
+        def initialize(options={})
+          require 'opennebula'
+          @client = ::OpenNebula::Client.new("#{options[:opennebula_username]}:#{options[:opennebula_password]}", options[:opennebula_endpoint])
+        end
       end
     end
   end
- end
 end

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

@@ -60,13 +60,21 @@ module Fog
             service.vm_resume(id)
           end
           true
-        end	
+        end
 
         def stop
           Fog::Logger.warning("stop VM: ID:#{id}")
           service.vm_stop(id)
         end
 
+        def suspend
+          service.vm_suspend(id)
+        end
+
+        def resume
+          service.vm_resume(id)
+        end
+
         def destroy
           service.vm_destroy(id)
         end

data/lib/fog/opennebula/requests/compute/image_pool.rb

@@ -18,7 +18,6 @@ module Fog
               end
             end
           end
-          images.delete nil
           images
         end #def image_pool
       end #class Real