fog 1.20.0 → 1.21.0

data/lib/fog/sakuracloud/requests/volume/list_plans.rb

@@ -0,0 +1,40 @@
+# coding: utf-8
+
+module Fog
+  module Volume
+    class SakuraCloud
+      class Real
+        def list_plans(options = {})
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :method => 'GET',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/product/disk"
+          )
+        end
+      end
+
+      class Mock
+        def list_plans(options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+          "DiskPlans" =>
+            [
+            {"Index"=>0,
+              "ID"=>4,
+              "Name"=>"SSDプラン",
+              "Availability"=>"available"},
+            {"Index"=>1,
+              "ID"=>2,
+              "Name"=>"標準プラン",
+              "Availability"=>"available"}
+            ]
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/volume.rb

@@ -0,0 +1,92 @@
+require 'fog/sakuracloud'
+require 'fog/volume'
+
+module Fog
+  module Volume
+    class SakuraCloud < Fog::Service
+
+      requires     :sakuracloud_api_token
+      requires     :sakuracloud_api_token_secret
+
+      recognizes   :sakuracloud_api_url
+
+      model_path 'fog/sakuracloud/models/volume'
+      model      :archive
+      collection :archives
+      model      :plan
+      collection :plans
+      model      :disk
+      collection :disks
+
+      request_path 'fog/sakuracloud/requests/volume'
+      request      :list_disks
+      request      :list_plans
+      request      :create_disk
+      request      :configure_disk
+      request      :attach_disk
+      request      :delete_disk
+      request      :list_archives
+
+      class Real
+        def initialize(options = {})
+          @auth_encord = Base64.strict_encode64([
+            options[:sakuracloud_api_token],
+            options[:sakuracloud_api_token_secret]
+          ].join(':'))
+          Fog.credentials[:sakuracloud_api_token]        = options[:sakuracloud_api_token]
+          Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
+
+          @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+
+          @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
+        end
+
+        def request(params)
+          response = parse @connection.request(params)
+          response
+        end
+
+        private
+        def parse(response)
+          return response if response.body.empty?
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+      end
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :disks => [],
+              :plans => [],
+              :archives => []
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @sakuracloud_api_token        = options[:sakuracloud_api_token]
+          @sakuracloud_api_token_secret = options[:sakuracloud_api_token_secret]
+        end
+
+        def data
+          self.class.data[@sakuracloud_api_token]
+          self.class.data[@sakuracloud_api_token_secret]
+        end
+
+        def reset_data
+          self.class.data.delete(@sakuracloud_api_token)
+          self.class.data.delete(@sakuracloud_api_token_secret)
+        end
+
+      end
+
+    end #SakuraCloud
+  end #Volume
+end

data/lib/fog/serverlove/compute.rb

@@ -59,7 +59,7 @@ module Fog
           @api_key = options[:serverlove_api_key] || Fog.credentials[:serverlove_api_key]
           @api_host = options[:serverlove_api_url] || Fog.credentials[:serverlove_api_url] || API_HOST
 
-          @connection = Fog::Connection.new("https://#{@api_uuid}:#{@api_key}@#{@api_host}")
+          @connection = Fog::XML::Connection.new("https://#{@api_uuid}:#{@api_key}@#{@api_host}")
         end
 
         def request(params)

data/lib/fog/serverlove/core.rb

@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Serverlove

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

@@ -9,7 +9,7 @@ module Fog
         end
 
       end
-      
+
       class Mock
 
         def create_image(options = {})

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

@@ -9,7 +9,7 @@ module Fog
         end
 
       end
-      
+
       class Mock
 
         def create_server(options = {})

data/lib/fog/serverlove/requests/compute/destroy_image.rb

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/serverlove/requests/compute/destroy_server.rb

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/serverlove/requests/compute/get_image.rb

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/serverlove/requests/compute/get_images.rb

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/serverlove/requests/compute/get_server.rb

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/serverlove/requests/compute/get_servers.rb

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/serverlove/requests/compute/load_standard_image.rb

@@ -4,7 +4,7 @@ module Fog
       class Real
 
         def load_standard_image(destination_image, source_image)
-          request(:method => "post", :path => "/drives/#{destination_image}/image/#{source_image}/gunzip", :expects => 204) 
+          request(:method => "post", :path => "/drives/#{destination_image}/image/#{source_image}/gunzip", :expects => 204)
         end
 
       end

data/lib/fog/serverlove/requests/compute/reset_server.rb

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/serverlove/requests/compute/shutdown_server.rb

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -10,4 +10,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/serverlove/requests/compute/update_image.rb

@@ -6,7 +6,7 @@ module Fog
         def update_image(identifier, options)
           return nil if identifier.nil? || identifier == ""
           return nil if options.empty? || options.nil?
-          request(:method => "post", :path => "/drives/#{identifier}/set", :expects => 200, :options => options) 
+          request(:method => "post", :path => "/drives/#{identifier}/set", :expects => 200, :options => options)
         end
 
       end

data/lib/fog/serverlove/requests/compute/update_server.rb

@@ -6,7 +6,7 @@ module Fog
         def update_server(identifier, options)
           return nil if identifier.nil? || identifier == ""
           return nil if options.empty? || options.nil?
-          request(:method => "post", :path => "/servers/#{identifier}/set", :expects => 200, :options => options) 
+          request(:method => "post", :path => "/servers/#{identifier}/set", :expects => 200, :options => options)
         end
 
       end

data/lib/fog/serverlove/util/compute/password_generator.rb

@@ -8,4 +8,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/storm_on_demand/README.md

@@ -7,7 +7,7 @@ This storm_on_demand directory provides code for all storm on demand cloud APIs.
 Before using APIs of a service, you need to create a service object first. Take Compute for instance:
 
 		c = Fog::Compute.new :provider => :stormondemand,
-							 :storm_on_demand_username => 'username', 
+							 :storm_on_demand_username => 'username',
 							 :storm_on_demand_password => 'password'
 Now, you can call API methods for Compute service. For instance:
 
@@ -36,7 +36,7 @@ All APIs' parameters are the same with the [Storm On Demand API Doc](https://www
 If you want to use a token instead of password for API calls, instead of creating a new service like Compute, you should create a new Account first and get the token. Then create a new Compute/Network/Storage with the token.
 
 		account = Fog::Account.new :provider => :stormondemand,
-								   :storm_on_demand_username => 'username', 
+								   :storm_on_demand_username => 'username',
 							       :storm_on_demand_password => 'password'
 		# create a new token
 		token = account.tokens.create

data/lib/fog/storm_on_demand/account.rb

@@ -1,6 +1,5 @@
 require 'fog/storm_on_demand/core'
 require 'fog/storm_on_demand/shared'
-require 'fog/account'
 
 module Fog
   module Account

data/lib/fog/storm_on_demand/billing.rb

@@ -1,5 +1,4 @@
 require 'fog/storm_on_demand/core'
-require 'fog/billing'
 require 'fog/storm_on_demand/shared'
 
 module Fog
@@ -58,4 +57,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/storm_on_demand/compute.rb

@@ -1,5 +1,4 @@
 require 'fog/storm_on_demand/core'
-require 'fog/compute'
 require 'fog/storm_on_demand/shared'
 
 module Fog
@@ -61,7 +60,7 @@ module Fog
       request :current_notifications
       request :get_notification
       request :resolve_notification
-      
+
       class Mock
 
         def self.data

data/lib/fog/storm_on_demand/core.rb

@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module StormOnDemand
@@ -14,7 +15,7 @@ module Fog
     service(:support, 'Support')
     service(:account, 'Account')
     service(:vpn, 'VPN')
-    
+
   end
 end
 

data/lib/fog/storm_on_demand/dns.rb

@@ -1,5 +1,4 @@
 require 'fog/storm_on_demand/core'
-require 'fog/dns'
 require 'fog/storm_on_demand/shared'
 
 module Fog
@@ -44,7 +43,7 @@ module Fog
       request :get_zone
       request :list_zones
       request :update_zone
-      
+
       class Mock
 
         def self.data
@@ -82,4 +81,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/storm_on_demand/models/account/token.rb

@@ -15,7 +15,7 @@ module Fog
         def expire
           service.expire_token.body['expired'].to_i == 1 ? true : false
         end
-        
+
       end
 
     end

data/lib/fog/storm_on_demand/models/billing/payment.rb

@@ -9,9 +9,9 @@ module Fog
         def initialize(attributes={})
           super
         end
-        
+
       end
-      
+
     end
   end
 end

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

@@ -33,7 +33,7 @@ module Fog
           service.restore_image({:id => identity}.merge!(options))
           true
         end
-        
+
       end
 
     end

data/lib/fog/storm_on_demand/models/compute/notification.rb

@@ -26,7 +26,7 @@ module Fog
           requires :identity
           service.resolve_notification(:id => identity).body
         end
-        
+
       end
 
     end

data/lib/fog/storm_on_demand/models/compute/notifications.rb

@@ -22,7 +22,7 @@ module Fog
           data = service.get_notification(options).body
           new(data)
         end
-        
+
       end
 
     end

data/lib/fog/storm_on_demand/models/compute/templates.rb

@@ -18,7 +18,7 @@ module Fog
           tpl = service.get_template_details(:id => template_id).body
           new(tpl)
         end
-        
+
       end
 
     end

data/lib/fog/storm_on_demand/models/dns/zone.rb

@@ -33,7 +33,7 @@ module Fog
           requires :identity
           service.update_zone({:id => identity}.merge!(options))
         end
-        
+
       end
     end
   end

data/lib/fog/storm_on_demand/models/network/firewalls.rb

@@ -3,7 +3,7 @@ require 'fog/storm_on_demand/models/network/firewall'
 
 module Fog
   module Network
-    class StormOnDemand 
+    class StormOnDemand
       class Firewalls < Fog::Collection
         model Fog::Network::StormOnDemand::Firewall
 
@@ -25,7 +25,7 @@ module Fog
           service.update_firewall(options)
           true
         end
-        
+
       end
     end
   end