fog 1.11.1 → 1.12.0

data/lib/fog/brightbox/requests/compute/move_servers_server_group.rb

@@ -6,15 +6,24 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         # @param [Hash] options
-        # @option options [Array<Hash>] :servers Array of Hashes containing `{"server" => server_id}` for each server to remove
+        # @option options [Array<Hash>] :servers Array of Hashes containing
+        #   +{"server" => server_id}+ for each server to remove
         # @option options [String] :destination ServerGroup to move servers to
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_group_move_servers_server_group
         #
         # @example
-        #    Compute[:brightbox].remove_servers_server_group "grp-12345", :destination => "grp-67890", :servers => [{"server" => "srv-abcde"}, {"server" => "srv-fghij"}]
+        #   options = {
+        #     :destination => "grp-67890",
+        #     :servers => [
+        #       {"server" => "srv-abcde"},
+        #       {"server" => "srv-fghij"}
+        #     ]
+        #   }
+        #   Compute[:brightbox].remove_servers_server_group "grp-12345", options
         #
         def move_servers_server_group(identifier, options)
           return nil if identifier.nil? || identifier == ""

data/lib/fog/brightbox/requests/compute/remove_firewall_policy.rb

@@ -8,7 +8,8 @@ module Fog
         # @param [Hash] options
         # @option options [String] :server_group Server Group to remove
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#firewall_policy_remove_firewall_policy
         #

data/lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb

@@ -8,7 +8,8 @@ module Fog
         # @param [Hash] options
         # @option options [Array] :listeners Array of Listener parameters
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#load_balancer_remove_listeners_load_balancer
         #

data/lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb

@@ -8,7 +8,8 @@ module Fog
         # @param [Hash] options
         # @option options [Array] :nodes Array of Node parameters
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#load_balancer_remove_nodes_load_balancer
         #

data/lib/fog/brightbox/requests/compute/remove_servers_server_group.rb

@@ -6,14 +6,22 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         # @param [Hash] options
-        # @option options [Array<Hash>] :servers Array of Hashes containing {"server" => server_id} for each server
+        # @option options [Array<Hash>] :servers Array of Hashes containing
+        #   +{"server" => server_id}+ for each server
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_group_remove_servers_server_group
         #
         # @example
-        #    Compute[:brightbox].remove_servers_server_group "grp-12345", :servers => [{"server" => "srv-abcde"}, {"server" => "srv-fghij"}]
+        #   options = {
+        #     :servers => [
+        #       {"server" => "srv-abcde"},
+        #       {"server" => "srv-fghij"}
+        #     ]
+        #   }
+        #   Compute[:brightbox].remove_servers_server_group "grp-12345", options
         #
         def remove_servers_server_group(identifier, options)
           return nil if identifier.nil? || identifier == ""

data/lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb

@@ -11,9 +11,9 @@ module Fog
         #   @param [String] identifier Unique reference to identify the resource
         #
         # @overload reset_ftp_password_account()
-        #   @deprecated Use {Fog::Compute::Brightbox::Real#get_scoped_account} instead
+        #   @deprecated Use {Fog::Compute::Brightbox::Real#reset_ftp_password_scoped_account} instead
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#account_reset_ftp_password_account
         #

data/lib/fog/brightbox/requests/compute/reset_secret_api_client.rb

@@ -2,7 +2,6 @@ module Fog
   module Compute
     class Brightbox
       class Real
-
         # Resets the secret used by the API client to a new generated value.
         #
         # The response is the only time the new secret is available in plaintext.
@@ -11,7 +10,7 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#api_client_reset_secret_api_client
         #

data/lib/fog/brightbox/requests/compute/reset_secret_application.rb

@@ -6,7 +6,7 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#application_reset_secret_application
         #

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

@@ -6,7 +6,7 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_shutdown_server
         #

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

@@ -6,7 +6,7 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_snapshot_server
         #

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

@@ -6,7 +6,7 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_start_server
         #

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

@@ -6,7 +6,7 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_stop_server
         #

data/lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb

@@ -6,7 +6,7 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#cloud_ip_unmap_cloud_ip
         #

data/lib/fog/brightbox/requests/compute/update_account.rb

@@ -31,7 +31,8 @@ module Fog
         #   @option options [String] :vat_registration_number Must be a valid EU VAT number or `nil`
         #   @option options [String] :telephone_number Valid International telephone number in E.164 format prefixed with `+`
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#account_update_account
         #

data/lib/fog/brightbox/requests/compute/update_api_client.rb

@@ -9,7 +9,8 @@ module Fog
         # @option options [String] :name
         # @option options [String] :description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#api_client_update_api_client
         #

data/lib/fog/brightbox/requests/compute/update_application.rb

@@ -9,7 +9,8 @@ module Fog
         # @option options [String] :name
         # @option options [String] :description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#application_update_application
         #

data/lib/fog/brightbox/requests/compute/update_cloud_ip.rb

@@ -10,7 +10,8 @@ module Fog
         # @option options [String] :name Name for Cloud IP
         # @option options [Array] :port_translators Port on which external clients connect and port on which your service is listening.
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#cloud_ip_update_cloud_ip
         #

data/lib/fog/brightbox/requests/compute/update_firewall_policy.rb

@@ -9,7 +9,8 @@ module Fog
         # @option options [String] :name Editable label
         # @option options [String] :description Longer editable description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#firewall_policy_update_firewall_policy
         #

data/lib/fog/brightbox/requests/compute/update_firewall_rule.rb

@@ -14,7 +14,8 @@ module Fog
         # @option options [String] :icmp_type_name
         # @option options [String] :description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#firewall_rule_update_firewall_rule
         #

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

@@ -14,7 +14,8 @@ module Fog
         # @option options [Boolean] :compatibility_mode
         # @option options [String] :description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#image_update_image
         #

data/lib/fog/brightbox/requests/compute/update_load_balancer.rb

@@ -12,7 +12,8 @@ module Fog
         # @option options [Array] :listeners What port to listen on, port to pass through to and protocol (tcp, http or http+ws) of listener. Timeout is optional and specified in milliseconds (default is 50000).
         # @option options [String] :healthcheck Healthcheck options - only "port" and "type" required
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#load_balancer_update_load_balancer
         #

data/lib/fog/brightbox/requests/compute/update_scoped_account.rb

@@ -15,7 +15,8 @@ module Fog
         # @option options [String] :vat_registration_number Must be a valid EU VAT number or `nil`
         # @option options [String] :telephone_number Valid International telephone number in E.164 format prefixed with `+`
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#account_update_account
         #

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

@@ -10,7 +10,8 @@ module Fog
         # @option options [String] :user_data User defined metadata
         # @option options [Boolean] :compatibility_mode Server needs to be shutdown and restarted for changes to this to take effect
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_update_server
         #

data/lib/fog/brightbox/requests/compute/update_server_group.rb

@@ -9,7 +9,8 @@ module Fog
         # @option options [String] :name Editable user label
         # @option options [String] :description Editable user description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_group_update_server_group
         #

data/lib/fog/brightbox/requests/compute/update_user.rb

@@ -12,7 +12,8 @@ module Fog
         # @option options [String] :password A password string that conforms to the minimum requirements
         # @option options [String] :password_confirmation A password string that conforms to the minimum requirements
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#user_update_user
         #

data/lib/fog/cloudsigma.rb

@@ -0,0 +1,9 @@
+require 'fog/core'
+
+module Fog
+  module CloudSigma
+    extend Fog::Provider
+
+    service(:compute, 'cloudsigma/compute', 'Compute')
+  end
+end

data/lib/fog/cloudsigma/compute.rb

@@ -0,0 +1,221 @@
+require 'fog/compute'
+require 'fog/cloudsigma/connection'
+
+
+module Fog
+  module Compute
+    class CloudSigma < Fog::Service
+      requires :cloudsigma_password, :cloudsigma_username
+      recognizes :cloudsigma_password, :cloudsigma_username, :cloudsigma_host
+
+      model_path 'fog/cloudsigma/models'
+      request_path 'fog/cloudsigma/requests'
+
+      model :volume
+      collection :volumes
+      request :create_volume
+      request :get_volume
+      request :list_volumes
+      request :update_volume
+      request :delete_volume
+      request :clone_volume
+
+      model :lib_volume
+      collection :lib_volumes
+      request :get_lib_volume
+      request :list_lib_volumes
+
+      model :ipconf
+      model :nic
+      model :mountpoint
+      model :server
+      collection :servers
+      request :create_server
+      request :get_server
+      request :list_servers
+      request :update_server
+      request :delete_server
+      request :start_server
+      request :stop_server
+      request :open_vnc
+      request :close_vnc
+      request :clone_server
+
+      model :ip
+      collection :ips
+      request :list_ips
+      request :get_ip
+
+      model :vlan
+      collection :vlans
+      request :list_vlans
+      request :get_vlan
+      request :update_vlan
+
+      model :subscription
+      collection :subscriptions
+      request :list_subscriptions
+      request :get_subscription
+      request :create_subscription
+      request :extend_subscription
+
+      model :price_calculation
+      request :calculate_subscription_price
+
+      model :profile
+      request :get_profile
+      request :update_profile
+
+      model :balance
+      request :get_balance
+
+      model :current_usage
+      request :get_current_usage
+
+      model :pricing
+      request :get_pricing
+
+
+      module CommonMockAndReal
+        def initialize(options={})
+          @init_options = options
+
+          setup_connection(options)
+        end
+
+        def profile
+          response = get_profile
+          Profile.new(response.body)
+        end
+
+        def balance
+          response = get_balance
+
+          Balance.new(response.body)
+        end
+
+        def current_usage
+          response = get_current_usage
+
+          CurrentUsage.new(response.body['usage'])
+        end
+
+        def currency
+          # Cache since currency does not change
+          @currency ||= profile.currency
+
+        end
+
+        def pricing
+          resp = get_princing(currency)
+
+          resp.body['objects']
+        end
+
+        def current_pricing_levels
+          resp = get_pricing(currency)
+
+          resp.body['current']
+        end
+
+        def next_pricing_levels
+          resp = get_pricing(currency)
+
+          resp.body['next']
+        end
+
+        def subscription_pricing
+          resp = get_pricing(currency, true)
+
+          current_levels = resp.body['current']
+          current_prices = resp.body['objects']
+
+          current_pricing_pairs = current_levels.map do |resource, level|
+            price_for_resource_and_level = current_prices.detect do |price|
+              price['resource'] == resource
+            end
+            price_for_resource_and_level ||= {}
+
+            [resource, price_for_resource_and_level]
+          end
+
+          Pricing.new(Hash[current_pricing_pairs])
+        end
+
+        def current_pricing
+          resp = get_pricing(currency)
+
+          current_levels = resp.body['current']
+          current_prices = resp.body['objects']
+
+          current_pricing_pairs = current_levels.map do |resource, level|
+            price_for_resource_and_level = current_prices.detect do |price|
+              price['level'] == level && price['resource'] == resource
+            end
+            price_for_resource_and_level ||= {}
+
+            [resource, price_for_resource_and_level]
+          end
+
+          Pricing.new(Hash[current_pricing_pairs])
+        end
+
+        def next_pricing
+          resp = get_pricing(currency)
+
+          current_levels = resp.body['next']
+          current_prices = resp.body['objects']
+
+          current_pricing_pairs = current_levels.map do |resource, level|
+            price_for_resource_and_level = current_prices.detect do |price|
+              price['level'] == level && price['resource'] == resource
+            end
+            price_for_resource_and_level ||= {}
+
+            [resource, price_for_resource_and_level]
+          end
+
+          Pricing.new(Hash[current_pricing_pairs])
+        end
+
+      end
+
+      class Mock
+        include Collections
+        include CommonMockAndReal
+        include Fog::CloudSigma::CloudSigmaConnection::Mock
+        require 'fog/cloudsigma/mock_data'
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = mock_data
+          end
+        end
+
+        def self.random_uuid
+          # Insert '4' at 13th position and 'a' at 17th as per uuid4 spec
+          hex = Fog::Mock.random_hex(30).insert(12,'4').insert(16, 'a')
+          # Add dashes
+          "#{hex[0...8]}-#{hex[8...12]}-#{hex[12...16]}-#{hex[16...20]}-#{hex[20..32]}"
+        end
+
+        def self.random_mac
+          (0..5).map{Fog::Mock.random_hex(2)}.join(':')
+        end
+
+        def data
+          self.class.data[:test]
+        end
+      end
+
+      class Real
+        include Collections
+        include CommonMockAndReal
+        include Fog::CloudSigma::CloudSigmaConnection::Real
+
+      end
+
+    end
+  end
+
+end