fog 1.17.0 → 1.18.0

data/lib/fog/hp/CHANGELOG.hp

@@ -1,3 +1,36 @@
+0.0.22 10/16/2013
+=================
+- add support for new LoadBalancer provider
+  - add load balancer model and request layer with mocking support
+  - add node model and request layer with mocking support
+  - add virtual_ip, protocol and algorithm models and request layer with mocking support
+- add support for new DNS provider
+  - add domain model and request layer with mocking support
+  - add record model and request layer with mocking support
+
+0.0.21 06/11/2013
+=================
+- add support for new Networking (Neutron) provider (Grizzly release)
+  - add network model and request layer with mocking support
+  - add router model and request layer with mocking support
+  - add subnet model and request layer with mocking support
+  - add port model and request layer with mocking support
+  - add floating ip model and request layer with mocking support
+  - add security group/rule model and request layer with mocking support
+- add support for new Compute V2 provider (Grizzly release)
+  - remove support for security group/rule model and request layer
+  - revise support for server, flavor, image, keypair, floating ip, metadata models and request layers
+  - add support for availability zone model and request layer
+  - add support for volume attachment model and request layer
+- add support for new BlockStorage V2 (Cinder) provider (Grizzly release)
+  - add volume model and request layer with mocking support
+  - add snapshot model and request layer with mocking support
+  - add volume backups model and request layer with mocking support
+  - remove bootable volume model as it now accessible via volume model
+- add support for caching auth credentials
+- add filter query support to all new V2 collections
+- add side by side support for both Compute and BlockStorage, V1/V2 providers
+
 0.0.20 03/13/2013
 =================
 - add Accept header with application/json for all requests

data/lib/fog/hp/block_storage.rb

@@ -5,7 +5,7 @@ module Fog
     class BlockStorage < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri, :hp_service_type
+      recognizes  :hp_auth_uri, :credentials, :hp_service_type
       recognizes  :persistent, :connection_options
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -43,6 +43,7 @@ module Fog
             :hp_auth_uri    => @hp_auth_uri,
             :hp_tenant_id   => @hp_tenant_id,
             :hp_avl_zone    => @hp_avl_zone,
+            :credentials    => @credentials,
             :connection_options => @connection_options
           )
         end
@@ -89,6 +90,7 @@ module Fog
 
       class Real
         include Utils
+        attr_reader :credentials
 
         def initialize(options={})
           # deprecate hp_account_id
@@ -119,6 +121,7 @@ module Fog
             credentials = Fog::HP.authenticate_v2(options, @connection_options)
             # the CS service catalog returns the block storage endpoint
             @hp_block_uri = credentials[:endpoint_url]
+            @credentials = credentials
           else
             # Call the legacy v1.0/v1.1 authentication
             credentials = Fog::HP.authenticate_v1(options, @connection_options)
@@ -150,8 +153,7 @@ module Fog
                 'Accept'       => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}",
+              :path     => "#{@path}/#{params[:path]}"
             }), &block)
           rescue Excon::Errors::HTTPStatusError => error
             raise case error

data/lib/fog/hp/block_storage_v2.rb

@@ -0,0 +1,164 @@
+require 'fog/hp'
+
+module Fog
+  module HP
+    class BlockStorageV2 < Fog::Service
+
+      requires    :hp_access_key, :hp_secret_key, :hp_tenant_id, :hp_avl_zone
+      recognizes  :hp_auth_uri, :credentials, :hp_service_type
+      recognizes  :persistent, :connection_options
+      recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
+
+      secrets     :hp_secret_key
+
+      model_path  'fog/hp/models/block_storage_v2'
+      model       :volume
+      collection  :volumes
+      model       :volume_backup
+      collection  :volume_backups
+      model       :snapshot
+      collection  :snapshots
+
+      request_path 'fog/hp/requests/block_storage_v2'
+      request :create_volume
+      request :delete_volume
+      request :get_volume_details
+      request :list_volumes
+      request :list_volumes_detail
+      request :update_volume
+      request :create_snapshot
+      request :delete_snapshot
+      request :get_snapshot_details
+      request :list_snapshots
+      request :list_snapshots_detail
+      request :update_snapshot
+      request :create_volume_backup
+      request :delete_volume_backup
+      request :get_volume_backup_details
+      request :list_volume_backups
+      request :list_volume_backups_detail
+      request :restore_volume_backup
+
+      module Utils
+
+        def compute
+          @compute ||= Fog::Compute.new(
+            :provider       => 'HP',
+            :version        => :v2,
+            :hp_access_key  => @hp_access_key,
+            :hp_secret_key  => @hp_secret_key,
+            :hp_auth_uri    => @hp_auth_uri,
+            :hp_tenant_id   => @hp_tenant_id,
+            :hp_avl_zone    => @hp_avl_zone,
+            :credentials    => @credentials,
+            :connection_options => @connection_options
+          )
+        end
+
+      end
+
+      class Mock
+        include Utils
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :volumes => {},
+              :snapshots => {},
+              :volume_backups => {}
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @hp_access_key = options[:hp_access_key]
+        end
+
+        def data
+          self.class.data[@hp_access_key]
+        end
+
+        def reset_data
+          self.class.data.delete(@hp_access_key)
+        end
+
+      end
+
+      class Real
+        include Utils
+        attr_reader :credentials
+
+        def initialize(options={})
+          @hp_access_key = options[:hp_access_key]
+          @hp_secret_key = options[:hp_secret_key]
+          @hp_auth_uri   = options[:hp_auth_uri]
+          @connection_options = options[:connection_options] || {}
+          ### Set an option to use the style of authentication desired; :v1 or :v2 (default)
+          auth_version = options[:hp_auth_version] || :v2
+          ### Pass the service name for block storage to the authentication call
+          options[:hp_service_type] ||= "Block Storage"
+          @hp_tenant_id = options[:hp_tenant_id]
+          @hp_avl_zone  = options[:hp_avl_zone]
+
+          ### Make the authentication call
+          if (auth_version == :v2)
+            # Call the control services authentication
+            credentials = Fog::HP.authenticate_v2(options, @connection_options)
+            # the CS service catalog returns the block storage endpoint
+            @hp_block_uri = credentials[:endpoint_url]
+            @credentials = credentials
+          else
+            # Call the legacy v1.0/v1.1 authentication
+            credentials = Fog::HP.authenticate_v1(options, @connection_options)
+            # the user sends in the block storage endpoint
+            @hp_block_uri = options[:hp_auth_uri]
+          end
+
+          @auth_token = credentials[:auth_token]
+          @persistent = options[:persistent] || false
+
+          uri = URI.parse(@hp_block_uri)
+          @host   = uri.host
+          @path   = uri.path
+          @port   = uri.port
+          @scheme = uri.scheme
+
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params, parse_json = true, &block)
+          begin
+            response = @connection.request(params.merge!({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'Accept'       => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }.merge!(params[:headers] || {}),
+              :path     => "#{@path}/#{params[:path]}"
+            }), &block)
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+            when Excon::Errors::NotFound
+              Fog::HP::BlockStorageV2::NotFound.slurp(error)
+            else
+              error
+            end
+          end
+          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
+            response.body = Fog::JSON.decode(response.body)
+          end
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/hp/cdn.rb

@@ -6,7 +6,7 @@ module Fog
     class HP < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri, :hp_cdn_uri, :hp_service_type
+      recognizes  :hp_auth_uri, :hp_cdn_uri, :credentials, :hp_service_type
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :persistent, :connection_options
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -65,6 +65,7 @@ module Fog
 
       class Real
         include Utils
+        attr_reader :credentials
 
         def initialize(options={})
           # deprecate hp_account_id
@@ -94,6 +95,7 @@ module Fog
             ### When using the v2 CS authentication, the CDN Mgmt comes from the service catalog
             @hp_cdn_uri = credentials[:endpoint_url]
             cdn_mgmt_url = @hp_cdn_uri
+            @credentials = credentials
           else
             # Call the legacy v1.0/v1.1 authentication
             credentials = Fog::HP.authenticate_v1(options, @connection_options)
@@ -134,7 +136,6 @@ module Fog
                 'Accept'       => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/#{params[:path]}",
             }), &block)
           rescue Excon::Errors::HTTPStatusError => error

data/lib/fog/hp/compute.rb

@@ -6,7 +6,7 @@ module Fog
     class HP < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri, :hp_service_type
+      recognizes  :hp_auth_uri, :credentials, :hp_service_type
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :persistent, :connection_options
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -57,6 +57,7 @@ module Fog
       request :get_windows_password
       request :get_security_group
       request :get_server_details
+      request :get_vnc_console
       request :list_addresses
       request :list_flavors
       request :list_flavors_detail
@@ -174,6 +175,7 @@ module Fog
 
       class Real
         include Utils
+        attr_reader :credentials
 
         def initialize(options={})
           # deprecate hp_account_id
@@ -202,6 +204,7 @@ module Fog
             credentials = Fog::HP.authenticate_v2(options, @connection_options)
             # the CS service catalog returns the cdn endpoint
             @hp_compute_uri = credentials[:endpoint_url]
+            @credentials = credentials
           else
             # Call the legacy v1.0/v1.1 authentication
             credentials = Fog::HP.authenticate_v1(options, @connection_options)
@@ -233,9 +236,7 @@ module Fog
                 'Accept'       => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}",
-              :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
+              :path     => "#{@path}/#{params[:path]}"
             }), &block)
           rescue Excon::Errors::HTTPStatusError => error
             raise case error

data/lib/fog/hp/compute_v2.rb

@@ -0,0 +1,312 @@
+require 'fog/hp'
+require 'fog/compute'
+
+module Fog
+  module Compute
+    class HPV2 < Fog::Service
+
+      requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
+      recognizes  :hp_auth_uri, :credentials, :hp_service_type
+      recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
+      recognizes  :persistent, :connection_options
+      recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
+
+      secrets     :hp_secret_key
+
+      model_path 'fog/hp/models/compute_v2'
+      model       :address
+      collection  :addresses
+      model       :availability_zone
+      collection  :availability_zones
+      model       :flavor
+      collection  :flavors
+      model       :image
+      collection  :images
+      model       :key_pair
+      collection  :key_pairs
+      model       :meta
+      collection  :metadata
+      model       :server
+      collection  :servers
+      model       :volume_attachment
+      collection  :volume_attachments
+
+      request_path 'fog/hp/requests/compute_v2'
+      request :add_security_group
+      request :allocate_address
+      request :associate_address
+      request :attach_volume
+      #request :confirm_resized_server
+      request :create_image
+      request :create_key_pair
+      request :create_server
+      request :create_persistent_server
+      request :delete_image
+      request :delete_key_pair
+      request :delete_meta
+      request :delete_server
+      request :detach_volume
+      request :disassociate_address
+      request :get_address
+      request :get_console_output
+      request :get_flavor_details
+      request :get_image_details
+      request :get_key_pair
+      request :get_meta
+      request :get_windows_password
+      request :get_server_details
+      request :get_server_volume_details
+      request :get_vnc_console
+      request :list_addresses
+      request :list_availability_zones
+      request :list_flavors
+      request :list_flavors_detail
+      request :list_images
+      request :list_images_detail
+      request :list_key_pairs
+      request :list_limits
+      request :list_metadata
+      request :list_server_addresses
+      request :list_server_addresses_by_network
+      request :list_server_volumes
+      request :list_servers
+      request :list_servers_detail
+      request :reboot_server
+      request :rebuild_server
+      request :release_address
+      request :remove_security_group
+      #request :resize_server
+      #request :revert_resized_server
+      request :server_action
+      request :set_metadata
+      request :update_meta
+      request :update_metadata
+      request :update_server
+
+      module Utils
+
+        # extract windows password from log
+        def extract_password_from_log(log_text)
+          encrypted_text = ""
+          section        = []
+          return if log_text.nil?
+          log_text.each_line do |line|
+            case line
+              when /^-----BEGIN (\w+)/
+                section.push $1
+                next
+              when /^-----END (\w+)/
+                section.pop
+                next
+            end
+
+            case section
+              when ["BASE64"]
+                encrypted_text << line
+            end
+          end
+          # return the encrypted portion only
+          encrypted_text
+        end
+
+        def encrypt_using_public_key(text, public_key_data)
+          return if (text.nil? || public_key_data.nil?)
+          public_key = OpenSSL::PKey::RSA.new(public_key_data)
+          encrypted_text = public_key.public_encrypt(text).strip
+          Base64.encode64(encrypted_text)
+        end
+
+        def decrypt_using_private_key(encrypted_text, private_key_data)
+          return if (encrypted_text.nil? || private_key_data.nil?)
+          private_key = OpenSSL::PKey::RSA.new(private_key_data)
+          from_base64 = Base64.decode64(encrypted_text)
+          private_key.private_decrypt(from_base64).strip
+        end
+
+      end
+
+      class Mock
+        include Utils
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :last_modified => {
+                :images  => {},
+                :key_pairs => {},
+                :servers => {},
+                :addresses => {},
+                :volume_attachments => {},
+              },
+              :images  => {},
+              :key_pairs => {},
+              :servers => {},
+              :addresses => {},
+              :volume_attachments => {},
+              :limits => {
+                  "absolute" => {
+                    "maxImageMeta"            => 50,
+                    "maxPersonality"          => 5,
+                    "maxPersonalitySize"      => 10240,
+                    "maxSecurityGroupRules"   => 20,
+                    "maxSecurityGroups"       => 10,
+                    "maxTotalKeypairs"        => 100,
+                    "maxServerMeta"           => 50,
+                    "maxTotalInstances"       => 20,
+                    "maxTotalRAMSize"         => 102400,
+                    "maxTotalCores"           => -1,
+                    "maxTotalFloatingIps"     => 10,
+                    "totalRAMUsed"            => 12288,
+                    "totalInstancesUsed"      => 3,
+                    "totalFloatingIpsUsed"    => 0,
+                    "totalSecurityGroupsUsed" => 0,
+                    "totalCoresUsed"          => 8,
+                  },
+                  "rate" => [
+                    {
+                      "limit" => [
+                        {
+                          "next-available" => "2012-10-05T03 =>47 =>15Z",
+                          "remaining" => 199,
+                          "unit" => "MINUTE",
+                          "value" => 200,
+                          "verb" => "GET"
+                        },
+                        {
+                          "next-available" => "2012-10-05T03 =>47 =>15Z",
+                          "remaining" => 9,
+                          "unit" => "MINUTE",
+                          "value" => 10,
+                          "verb" => "PUT"
+                        },
+                        {
+                          "next-available" => "2012-10-05T03 =>47 =>15Z",
+                          "remaining" => 9,
+                          "unit" => "MINUTE",
+                          "value" => 10,
+                          "verb" => "POST"
+                        },
+                        {
+                          "next-available" => "2012-10-05T03 =>47 =>15Z",
+                          "remaining" => 99,
+                          "unit" => "MINUTE",
+                          "value" => 100,
+                          "verb" => "DELETE"
+                        }
+                      ],
+                      "regex" => ".*",
+                      "uri" => "*"
+                    }
+                  ]
+              }
+              
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          # deprecate hp_account_id
+          if options[:hp_account_id]
+            Fog::Logger.deprecation(":hp_account_id is deprecated, please use :hp_access_key instead.")
+            @hp_access_key = options.delete(:hp_account_id)
+          end
+          @hp_access_key = options[:hp_access_key]
+          unless @hp_access_key
+            raise ArgumentError.new("Missing required arguments: hp_access_key. :hp_account_id is deprecated, please use :hp_access_key instead.")
+          end
+        end
+
+        def data
+          self.class.data[@hp_access_key]
+        end
+
+        def reset_data
+          self.class.data.delete(@hp_access_key)
+        end
+
+      end
+
+      class Real
+        include Utils
+        attr_reader :credentials
+
+        def initialize(options={})
+          # deprecate hp_account_id
+          if options[:hp_account_id]
+            Fog::Logger.deprecation(":hp_account_id is deprecated, please use :hp_access_key instead.")
+            options[:hp_access_key] = options.delete(:hp_account_id)
+          end
+          @hp_access_key = options[:hp_access_key]
+          unless @hp_access_key
+            raise ArgumentError.new("Missing required arguments: hp_access_key. :hp_account_id is deprecated, please use :hp_access_key instead.")
+          end
+          @hp_secret_key = options[:hp_secret_key]
+          @connection_options = options[:connection_options] || {}
+          ### Set an option to use the style of authentication desired; :v1 or :v2 (default)
+          auth_version = options[:hp_auth_version] || :v2
+          ### Pass the service name for compute via the options hash
+          options[:hp_service_type] ||= "Compute"
+          @hp_tenant_id = options[:hp_tenant_id]
+
+          ### Make the authentication call
+          if (auth_version == :v2)
+            # Call the control services authentication
+            credentials = Fog::HP.authenticate_v2(options, @connection_options)
+            # the CS service catalog returns the cdn endpoint
+            @hp_compute_uri = credentials[:endpoint_url]
+            @credentials = credentials
+          else
+            # Call the legacy v1.0/v1.1 authentication
+            credentials = Fog::HP.authenticate_v1(options, @connection_options)
+            # the user sends in the cdn endpoint
+            @hp_compute_uri = options[:hp_auth_uri]
+          end
+
+          @auth_token = credentials[:auth_token]
+
+          uri = URI.parse(@hp_compute_uri)
+          @host   = uri.host
+          @path   = uri.path
+          @persistent = options[:persistent] || false
+          @port   = uri.port
+          @scheme = uri.scheme
+
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params, parse_json = true, &block)
+          begin
+            response = @connection.request(params.merge!({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'Accept'       => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }.merge!(params[:headers] || {}),
+              :path     => "#{@path}/#{params[:path]}"
+            }), &block)
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+            when Excon::Errors::NotFound
+              Fog::Compute::HPV2::NotFound.slurp(error)
+            else
+              error
+            end
+          end
+          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
+            response.body = Fog::JSON.decode(response.body)
+          end
+          response
+        end
+
+      end
+    end
+  end
+end