fog 1.3.1 → 1.4.0

data/lib/fog/glesys/compute.rb

@@ -21,6 +21,7 @@ module Fog
       request :server_details
       request :server_status
       request :start
+      request :reboot
       request :stop
       # Templates
       request :template_list
@@ -65,7 +66,6 @@ module Fog
       class Real
 
         def initialize(options)
-          require 'multi_json'
           require 'base64'
 
           @api_url            = options[:glesys_api_url] || Fog.credentials[:glesys_api_url] || API_URL
@@ -94,7 +94,7 @@ module Fog
               }
             )
 
-            data.body = MultiJson.decode(data.body)
+            data.body = Fog::JSON.decode(data.body)
 
             response_code =  data.body['response']['status']['code']
 

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

@@ -40,6 +40,11 @@ module Fog
           connection.stop(:serverid => identity)
         end
 
+        def reboot
+          requires :identity
+          connection.reboot(:serverid => identity)
+        end
+
         def destroy
           requires :identity
           connection.destroy(:serverid => identity, :keepip => keepip)

data/lib/fog/glesys/models/compute/servers.rb

@@ -16,14 +16,20 @@ module Fog
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          details = connection.server_details(identifier).body['response']
-          status  = connection.server_status(identifier).body['response']
-          if details.empty? || status.empty?
-            nil
-          else
-            status['server'].merge!({ :serverid => identifier})
-            details['server'].merge!(status['server'])
-            new(details['server'])
+
+          begin
+            details = connection.server_details(identifier).body['response']
+            status  = connection.server_status(identifier).body['response']
+
+            if details.empty? || status.empty?
+              nil
+            else
+              status['server'].merge!({ :serverid => identifier})
+              details['server'].merge!(status['server'])
+              new(details['server'])
+            end
+          rescue
+            return nil
           end
         end
 

data/lib/fog/glesys/requests/compute/reboot.rb

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Glesys
+      class Real
+
+        def reboot(param)
+          request("/server/reboot", param)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fog/go_grid.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module GoGrid

data/lib/fog/go_grid/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'go_grid'))
+require 'fog/go_grid'
 require 'fog/compute'
 
 module Fog
@@ -61,7 +61,6 @@ module Fog
 
         def initialize(options={})
           require 'digest/md5'
-          require 'multi_json'
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
           @connection_options = options[:connection_options] || {}
@@ -105,7 +104,7 @@ module Fog
           end
 
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
 
           response

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

@@ -76,8 +76,8 @@ module Fog
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l root},
-            %{echo "#{MultiJson.encode(attributes)}" >> ~/attributes.json},
-            %{echo "#{MultiJson.encode(metadata)}" >> ~/metadata.json}
+            %{echo "#{Fog::JSON.encode(attributes)}" >> ~/attributes.json},
+            %{echo "#{Fog::JSON.encode(metadata)}" >> ~/metadata.json}
           ])
         rescue Errno::ECONNREFUSED
           sleep(1)

data/lib/fog/google.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module Google

data/lib/fog/google/storage.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'google'))
+require 'fog/google'
 require 'fog/storage'
 
 module Fog
@@ -192,7 +192,7 @@ module Fog
           @connection_options = options[:connection_options] || {}
           @hmac = Fog::HMAC.new('sha1', @google_storage_secret_access_key)
           @host = options[:host] || 'commondatastorage.googleapis.com'
-          @persistent = options[:persistent]  || true
+          @persistent = options.fetch(:persistent, true)
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@@ -251,7 +251,7 @@ DATA
           string_to_sign << "#{canonical_resource}"
 
           signed_string = @hmac.sign(string_to_sign)
-          signature = Base64.encode64(signed_string).chomp!
+          Base64.encode64(signed_string).chomp!
         end
 
 

data/lib/fog/hp.rb

@@ -0,0 +1,234 @@
+require 'fog/core'
+
+module Fog
+  module HP
+    extend Fog::Provider
+
+    module Errors
+      class ServiceError < Fog::Errors::Error
+        attr_reader :response_data
+
+        def self.slurp(error)
+          if error.response.body.empty?
+            data = nil
+            message = nil
+          else
+            data = Fog::JSON.decode(error.response.body)
+            message = data['message']
+          end
+
+          new_error = super(error, message)
+          new_error.instance_variable_set(:@response_data, data)
+          new_error
+        end
+      end
+
+      class InternalServerError < ServiceError; end
+      class Conflict < ServiceError; end
+      class NotFound < ServiceError; end
+      class ServiceUnavailable < ServiceError; end
+
+      class BadRequest < ServiceError
+        attr_reader :validation_errors
+
+        def self.slurp(error)
+          new_error = super(error)
+          unless new_error.response_data.nil?
+            new_error.instance_variable_set(:@validation_errors, new_error.response_data['validationErrors'])
+          end
+          new_error
+        end
+      end
+    end
+
+    service(:cdn,     'hp/cdn',     'CDN')
+    service(:compute, 'hp/compute', 'Compute')
+    service(:storage, 'hp/storage', 'Storage')
+
+    # legacy swauth 1.0/1.1 style authentication
+    def self.authenticate_v1(options, connection_options = {})
+      hp_auth_uri = options[:hp_auth_uri] || "https://region-a.geo-1.objects.hpcloudsvc.com/auth/v1.0/"
+      endpoint = URI.parse(hp_auth_uri)
+      @scheme = endpoint.scheme || "http"
+      @host = endpoint.host || "region-a.geo-1.objects.hpcloudsvc.com"
+      @port = endpoint.port.to_s || "80"
+      if (endpoint.path)
+        @auth_path = endpoint.path.slice(1, endpoint.path.length)  # remove the leading slash
+      else
+        @auth_path = "auth/v1.0"
+      end
+      service_url = "#{@scheme}://#{@host}:#{@port}"
+      connection = Fog::Connection.new(service_url, false, connection_options)
+      @hp_account_id = options[:hp_account_id]
+      @hp_secret_key  = options[:hp_secret_key]
+      response = connection.request({
+        :expects  => [200, 204],
+        :headers  => {
+          'X-Auth-Key'  => @hp_secret_key,
+          'X-Auth-User' => @hp_account_id
+        },
+        :host     => @host,
+        :port     => @port,
+        :method   => 'GET',
+        :path     => @auth_path
+      })
+      response.headers.reject do |key, value|
+        !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key)
+      end
+
+      return {
+        :auth_token => response.headers['X-Auth-Token'],
+        :endpoint_url => nil,
+        :cdn_endpoint_url => response.headers['X-Storage-Url']
+      }
+    end
+
+    # keystone based control services style authentication
+    def self.authenticate_v2(options, connection_options = {})
+      hp_auth_uri = options[:hp_auth_uri] || "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/tokens"
+      # append /tokens if missing from auth uri
+      @hp_auth_uri = hp_auth_uri.include?('tokens')? hp_auth_uri : hp_auth_uri + "tokens"
+      endpoint = URI.parse(@hp_auth_uri)
+      @scheme = endpoint.scheme || "https"
+      @host = endpoint.host || "region-a.geo-1.identity.hpcloudsvc.com"
+      @port = endpoint.port.to_s || "35357"
+      if (endpoint.path)
+        @auth_path = endpoint.path.slice(1, endpoint.path.length)  # remove the leading slash
+      else
+        @auth_path = "v2.0/tokens"
+      end
+      service_url = "#{@scheme}://#{@host}:#{@port}"
+      connection = Fog::Connection.new(service_url, false, connection_options)
+
+      ### Implement HP Control Services Authentication services ###
+      # Get the style of auth credentials passed, defaults to access/secret key style
+      @hp_use_upass_auth_style = options[:hp_use_upass_auth_style] || false
+      @hp_account_id = options[:hp_account_id]
+      @hp_secret_key = options[:hp_secret_key]
+      @hp_tenant_id  = options[:hp_tenant_id]
+      @hp_service_type  = options[:hp_service_type]
+      @hp_avl_zone   = options[:hp_avl_zone] || :az1
+
+      ### Decide which auth style to use
+      unless (@hp_use_upass_auth_style)
+        # If Access Key style credentials are provided, use that
+        request_body = {
+            'auth' => {
+                'apiAccessKeyCredentials' => {
+                    'accessKey' => "#{@hp_account_id}",
+                    'secretKey' => "#{@hp_secret_key}"
+                }
+            }
+        }
+      else
+        # Otherwise use the Username/Password style
+        request_body = {
+            'auth' => {
+                'passwordCredentials' => {
+                    'username' => "#{@hp_account_id}",
+                    'password' => "#{@hp_secret_key}"
+                }
+            }
+        }
+      end
+      # add tenant_id if specified
+      request_body['auth']['tenantId'] = "#{@hp_tenant_id}" if @hp_tenant_id
+
+      ### Make the call to CS to get auth token and service catalog
+      response = connection.request(
+        {
+          :expects => 200,
+          :headers => {
+              'Content-Type' => 'application/json'
+          },
+          :host => @host,
+          :port => @port,
+          :method => 'POST',
+          :body => Fog::JSON.encode(request_body),
+          :path => @auth_path
+        }
+      )
+
+      body = Fog::JSON.decode(response.body)
+
+      ### fish out auth_token and endpoint for the service
+      auth_token = body['access']['token']['id']
+      endpoint_url = get_endpoint_from_catalog(body['access']['serviceCatalog'], @hp_service_type, @hp_avl_zone)
+      # If service is Storage, then get the CDN endpoint as well
+      if @hp_service_type == "object-store"
+        cdn_endpoint_url = get_endpoint_from_catalog(body['access']['serviceCatalog'], "hpext:cdn", @hp_avl_zone)
+      end
+
+      return {
+        :auth_token => auth_token,
+        :endpoint_url => endpoint_url,
+        :cdn_endpoint_url => cdn_endpoint_url
+      }
+
+    end
+
+    # CGI.escape, but without special treatment on spaces
+    def self.escape(str,extra_exclude_chars = '')
+      str.gsub(/([^a-zA-Z0-9_.-#{extra_exclude_chars}]+)/) do
+        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+      end
+    end
+
+    private
+
+    def self.get_endpoint_from_catalog(service_catalog, service_type, avl_zone)
+      if service_catalog
+        service_item = service_catalog.select {|s| s["type"] == service_type}.first
+        if service_item and service_item['endpoints'] and
+          if avl_zone == :az1
+            endpoint_url = service_item['endpoints'][0]['publicURL'] if service_item['endpoints'][0]
+          elsif avl_zone == :az2
+            endpoint_url = service_item['endpoints'][1]['publicURL'] if service_item['endpoints'][1]
+          end
+          raise "Unable to retrieve endpoint service url from service catalog." if endpoint_url.nil?
+          return endpoint_url
+        end
+      else
+        raise "Unable to parse service catalog."
+      end
+    end
+
+    class Mock
+      def self.etag
+        Fog::Mock.random_hex(32)
+      end
+
+      def self.key_fingerprint
+        fingerprint = []
+        20.times do
+          fingerprint << Fog::Mock.random_hex(2)
+        end
+        fingerprint.join(':')
+      end
+
+      def self.key_material
+        private_key = OpenSSL::PKey::RSA.generate(1024)
+        public_key = private_key.public_key
+        return private_key.to_s, public_key.to_s
+      end
+
+      def self.user_id
+        "dev_" + Fog::Mock.random_numbers(14)
+      end
+
+      def self.instance_id
+        Fog::Mock.random_numbers(6)
+      end
+
+      def self.ip_address
+        ip = []
+        4.times do
+          ip << Fog::Mock.random_numbers(rand(3) + 1).to_i.to_s # remove leading 0
+        end
+        ip.join('.')
+      end
+
+    end
+
+  end
+end

data/lib/fog/hp/README_HP.rdoc

@@ -0,0 +1,60 @@
+= HP Cloud Extensions to Ruby Fog Library
+
+HP contributed to the native Ruby library Fog, through an HP Cloud developed extension to Fog via
+the Object Storage, Compute and CDN providers. By using the HP Cloud Extensions to Fog, developers
+can write applications using Ruby that interacts with the HP Cloud Services without having to deal
+with the underlying REST API or JSON/XML document formats.
+
+== Background
+
+This library is an extension of Fog[https://github.com/fog/fog], a Ruby open-source cloud
+computing library. The code in this library, contains all HP-specific support and is being
+contributed back to the primary open-source library.
+
+The HP Cloud Ruby library currently supports HP Cloud Object Storage, Compute, CDN, and
+support for other services will be added as available.
+
+== Installation
+
+  sudo gem install fog
+
+That's it! Try out the usage examples explained below to confirm your installation.
+
+If you should ever need to remove the library:
+
+  sudo gem uninstall fog
+
+== Usage
+
+The Ruby Fog library is well documented on the community web site at {fog.io}[http://fog.io], but for specific examples
+using HP's extensions, see:
+
+* {HP Cloud Fog library - Object Storage Examples}[https://build.hpcloud.com/bindings/fog/object-storage]
+* {HP Cloud Fog library - Compute Examples}[https://build.hpcloud.com/bindings/fog/compute]
+* {HP Cloud Fog library - CDN Examples}[https://build.hpcloud.com/bindings/fog/cdn]
+
+Having trouble? {Get help over at the Forums}[https://connect.hpcloud.com]
+
+== Notice
+
+The following notice applies to files included in the /lib/fog/hp directory and its sub-directories.
+
+Copyright (c) 2011 Hewlett-Packard Development Company, L.P.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+