fog-maestrodev 1.14.0.20130806165225 → 1.15.0.20130829165835

data/lib/fog/rackspace/models/load_balancers/load_balancer.rb

@@ -91,19 +91,19 @@ module Fog
 
         def enable_content_caching
           requires :identity
-          connection.set_content_caching identity, true
+          service.set_content_caching identity, true
           true
         end
 
         def disable_content_caching
           requires :identity
-          connection.set_content_caching identity, false
+          service.set_content_caching identity, false
           true
         end
 
         def content_caching
           requires :identity
-          connection.get_content_caching(identity).body['contentCaching']['enabled']
+          service.get_content_caching(identity).body['contentCaching']['enabled']
         end
 
         def enable_connection_logging
@@ -196,6 +196,11 @@ module Fog
           service.get_load_balancer_usage(identity, options).body
         end
 
+        def stats
+          requires :identity
+          service.get_stats(identity).body
+        end
+
         def error_page
           requires :identity
           service.get_error_page(identity).body['errorpage']['content']

data/lib/fog/rackspace/models/monitoring/alarm.rb

@@ -7,15 +7,22 @@ module Fog
       class Alarm < Fog::Rackspace::Monitoring::Base
 
         identity :id
-        attribute :entity
-        attribute :entity_id
+        attribute :entity, :aliases => 'entity_id'
+        attribute :check, :aliases => 'check_id'
 
         attribute :label
         attribute :criteria
         attribute :check_type
-        attribute :check_id
         attribute :notification_plan_id
 
+        def entity=(obj)
+         attributes[:entity] = obj.is_a?(String) ? Entity.new(:id => obj) : obj
+        end
+
+        def check=(obj)
+          attributes[:check] = obj.is_a?(String) ? Check.new(:id => obj) : obj
+        end
+
         def params(options={})
           h = {
             'label'                => label,
@@ -27,13 +34,14 @@ module Fog
 
         def save
           requires :notification_plan_id
-          requires :entity_id
+          requires :entity
+          requires :check
 
           if identity
-            data = service.update_alarm(entity_id, identity, params)
+            data = service.update_alarm(entity.id, identity, params)
           else
-            options = params('check_type' => check_type, 'check_id' => check_id)
-            data = service.create_alarm(entity_id, options)
+            options = params('check_type' => check_type, 'check_id' => check.id)
+            data = service.create_alarm(entity.id, options)
             self.id = data.headers['X-Object-ID']
           end
           true
@@ -41,7 +49,7 @@ module Fog
 
         def destroy
           requires :id
-          service.delete_alarm(entity.id,id)
+          service.delete_alarm(entity.id, id)
         end
 
       end

data/lib/fog/rackspace/models/monitoring/base.rb

@@ -19,17 +19,11 @@ module Fog
         end
 
         def compare?(b)
-          a_o = prep
-          b_o = b.prep
+          a_o = params
+          b_o = b.params
           remain = a_o.reject {|key, value| b_o[key] === value}
           remain.empty?
         end
-
-        def entity_id
-          raise(ArgumentError, "entity with id is required for this operation") unless entity && entity.identity
-          entity.identity
-        end
-
       end
     end
   end

data/lib/fog/rackspace/monitoring.rb

@@ -77,6 +77,10 @@ module Fog
 
 
       class Mock < Fog::Rackspace::Service
+
+        def initialize(options={})
+        end
+
         def request(params)
           Fog::Mock.not_implemented
         end
@@ -112,22 +116,26 @@ module Fog
           @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_monitoring_url)
         end
 
+        def request_id_header
+         "X-Response-Id"
+        end
+
         private
 
         def request(params, parse_json = true, &block)
           super(params, parse_json, &block)
           rescue Excon::Errors::BadRequest => error
-            raise BadRequest.slurp error
+            raise BadRequest.slurp(error, self)
           rescue Excon::Errors::Conflict => error
-            raise Conflict.slurp error
+            raise Conflict.slurp(error, self)
           rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp(error, region)
+            raise NotFound.slurp(error, self)
           rescue Excon::Errors::ServiceUnavailable => error
-            raise ServiceUnavailable.slurp error
+            raise ServiceUnavailable.slurp(error, self)
           rescue Excon::Errors::InternalServerError => error
-            raise InternalServerError.slurp error
+            raise InternalServerError.slurp(error, self)
           rescue Excon::Errors::HTTPStatusError => error
-            raise ServiceError.slurp error
+            raise ServiceError.slurp(error, self)
         end
 
         def authenticate

data/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb

@@ -0,0 +1,39 @@
+module Fog
+  module Compute
+    class RackspaceV2
+      class Real
+
+        # Retrieves a list of flavors
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * flavors [Array]:
+        #       * [Hash]:
+        #         * id [String] - flavor id
+        #         * links [Array] - flavor links
+        #         * name [String] - flavor name
+        #         * ram [Fixnum] - flavor ram
+        #         * disk [Fixnum] - flavor disk
+        #         * vcpus [Fixnum] - flavor vcpus
+        # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::RackspaceV2::ServiceError]
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Flavors-d1e4188.html
+        def list_flavors_detail
+          request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => 'flavors/detail'
+          )
+        end
+      end
+
+      class Mock
+        def list_flavors_detail
+          flavors = self.data[:flavors].values.map { |f| Fog::Rackspace::MockData.keep(f, 'id', 'name', 'links') }
+          response(:body => {"flavors" => flavors})
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/compute_v2/list_images.rb

@@ -4,29 +4,39 @@ module Fog
       class Real
         
         # Retrieves a list of images
+        # ==== Parameters
+        # * options<~String>:
+        #   * 'name'<~String> - Filters the list of images by image name
+        #   * 'limit'<~String> - Maximum number of objects to return
+        #   * 'marker'<~String> - Only return objects whose name is greater than marker
+        #   * 'status'<~String> - Filters the list of images by status
+        #   * 'type'<~String> - Filters base Rackspace images or anyn custom server images that have been created
+        #
         # @return [Excon::Response] response:
         #   * body [Hash]:
         #     * images [Array]:
         #       * [Hash]:
-        #         * id [String] - flavor id
+        #         * id [String] - image id
         #         * links [Array] - image links
         #         * name [String] - image name
         # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Flavors-d1e4188.html        
-        def list_images
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Images-d1e4435.html
+        def list_images(options = {})
+          options = options.reject {|key, value| value.nil?}
           request(
             :expects => [200, 203],
             :method => 'GET',
-            :path => 'images'
+            :path => 'images',
+            :query => {'format' => 'json'}.merge!(options)
           )
         end
       end
 
       class Mock
-        def list_images
+        def list_images(options = {})
           images = self.data[:images].values
           response(:body => {"images" => images})
         end

data/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb

@@ -0,0 +1,53 @@
+module Fog
+  module Compute
+    class RackspaceV2
+      class Real
+        
+        # Retrieves a list of images
+        # ==== Parameters
+        # * options<~String>:
+        #   * 'name'<~String> - Filters the list of images by image name
+        #   * 'limit'<~String> - Maximum number of objects to return
+        #   * 'marker'<~String> - Only return objects whose name is greater than marker
+        #   * 'status'<~String> - Filters the list of images by status
+        #   * 'type'<~String> - Filters base Rackspace images or anyn custom server images that have been created
+        #
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * images [Array]:
+        #       * [Hash]:
+        #         * id [String] - image id
+        #         * links [Array] - image links
+        #         * name [String] - image name
+        #         * minDisk [Fixnum] - image minimum disk required
+        #         * minRam [Fixnum] - image minimum ram required
+        #         * created [String] - image creation date (ISO 8601 format)
+        #         * updated [String] - date of most recent image update
+        #         * state [String] - image status (e.g. ACTIVE, SAVING, ERROR)
+        #         * progress [Fixnum] - image saving progress
+        #
+        # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::RackspaceV2::ServiceError]
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Images-d1e4435.html
+        def list_images_detail(options = {})
+          options = options.reject {|key, value| value.nil?}
+          request(
+            :expects => [200, 203],
+            :method => 'GET',
+            :path => 'images/detail',
+            :query => {'format' => 'json'}.merge!(options)
+          )
+        end
+      end
+
+      class Mock
+        def list_images_detail(options = {})
+          images = self.data[:images].values
+          response(:body => {"images" => images})
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/identity/create_token.rb

@@ -12,7 +12,7 @@ module Fog
             }
           }
 
-          request(
+          request_without_retry(
             :body => Fog::JSON.encode(data),
             :expects => [200, 203],
             :method => 'POST',

data/lib/fog/rackspace/requests/load_balancers/create_load_balancer.rb

@@ -24,6 +24,18 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def create_load_balancer(name, protocol, port, virtual_ips, nodes, options = {})
+          data = {"loadBalancer"=>{"name"=>name, "id"=>uniq_id, "protocol"=>protocol, "port"=>port, "algorithm"=>"RANDOM", "status"=>"BUILD",
+                                   "cluster"=>{"name"=>"ztm-n13.dfw1.lbaas.rackspace.net"}, "timeout"=>30, "created"=>{"time"=>"2013-08-20T20:52:44Z"},
+                                   "updated"=>{"time"=>"2013-08-20T20:52:44Z"}, "halfClosed"=>false, "connectionLogging"=>{"enabled"=>false}, "contentCaching"=>{"enabled"=>false}}}
+          data["virtual_ips"] = virtual_ips.collect {|n| {"virtualIps"=>[{"address"=>"192.237.192.152", "id"=>uniq_id, "type"=>n[:type], "ipVersion"=>"IPV4"}, {"address"=>"2001:4800:7901:0000:ba81:a6a5:0000:0002", "id"=>9153169, "type"=>"PUBLIC", "ipVersion"=>"IPV6"}], "sourceAddresses"=>{"ipv6Public"=>"2001:4800:7901::13/64", "ipv4Servicenet"=>"10.189.254.5", "ipv4Public"=>"166.78.44.5"}}
+          data["nodes"] = nodes.collect {|n| {"address"=>n[:address], "id"=>uniq_id, "type"=>"PRIMARY", "port"=>n[:port], "status"=>"ONLINE", "condition"=>"ENABLED", "weight"=>1}}
+          data = Excon::Response.new(:body => data, :status => 202)
+          }
+        end
+      end
     end
   end
 end

data/lib/fog/rackspace/requests/load_balancers/get_stats.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def get_stats(load_balancer_id)
+
+          request(
+              :expects => 200,
+              :path => "loadbalancers/#{load_balancer_id}/stats",
+              :method => 'GET'
+          )
+        end
+      end
+
+      class Mock
+        def get_stats(load_balancer_id)
+          mock_data = {
+              'connectTimeOut' => 0,
+              'connectError' => 1,
+              'connectFailure' => 2,
+              'dataTimedOut' => 3,
+              'keepAliveTimedOut' => 4,
+              'maxConn' => 5
+          }
+
+          Excon::Response.new(:body => mock_data, :status => 200)
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/monitoring/get_entity.rb

@@ -12,6 +12,39 @@ module Fog
         end
 
       end
+
+      class Mock
+        def get_entity(entity_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "id" => entity_id,
+            "label"=>"mocked_fog_entitiy",
+            "ip_addresses"=>{
+              "private0_v4"=>"10.0.0.1"
+            },
+            "metadata"=>nil,
+            "managed"=>false,
+            "uri"=>"https://ord.servers.api.rackspacecloud.com/5555/servers/23kj2q4hk234",
+            "agent_id"=>nil,
+            "created_at"=> Time.now.to_i - 5000,
+            "updated_at"=> Time.now.to_i
+          }
+          response.headers = {
+            "Date"=> Time.now.utc.to_s,
+            "Content-Type"=>"application/json; charset=UTF-8",
+            "X-RateLimit-Limit"=>"50000",
+            "X-RateLimit-Remaining"=>"49627",
+            "X-RateLimit-Window"=>"24 hours",
+            "X-RateLimit-Type"=>"global",
+            "X-Response-Id"=>"j23jlk234jl2j34j",
+            "X-LB"=>"dfw1-maas-prod-api0",
+            "Vary"=>"Accept-Encoding",
+            "Transfer-Encoding"=>"chunked"
+          }
+          response
+        end
+      end
     end
   end
 end

data/lib/fog/rackspace/service.rb

@@ -30,6 +30,13 @@ module Fog
          self.send authentication_method, options
       end
 
+      def request_without_retry(params, parse_json = true, &block)
+        response = @connection.request(request_params(params), &block)
+
+        process_response(response) if parse_json
+        response
+      end
+
       def request(params, parse_json = true, &block)
         first_attempt = true
         begin

data/lib/fog/rackspace/storage.rb

@@ -74,9 +74,9 @@ module Fog
         end
 
         def initialize(options={})
-          require 'mime/types'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
+          @rackspace_cdn_ssl = options[:rackspace_cdn_ssl]
         end
 
         def data
@@ -95,6 +95,10 @@ module Fog
           @rackspace_region
         end
 
+        def ssl?
+          !!@rackspace_cdn_ssl
+        end
+
       end
 
       class Real < Fog::Rackspace::Service
@@ -103,7 +107,6 @@ module Fog
         attr_reader :rackspace_cdn_ssl
 
         def initialize(options={})
-          require 'mime/types'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_cdn_ssl = options[:rackspace_cdn_ssl]
@@ -134,7 +137,7 @@ module Fog
         # @return [Boolean] return true if service is returning SSL-Secured URLs in public_url methods
         # @see Directory#public_url
         def ssl?
-          !rackspace_cdn_ssl.nil?
+          !!rackspace_cdn_ssl
         end
 
         # Resets presistent service connections

data/lib/fog/rackspace.rb

@@ -19,7 +19,7 @@ module Fog
           "[#{status} | #{transaction_id}] #{super}"
         end
 
-        def self.slurp(error)
+        def self.slurp(error, service=nil)
           data = nil
           message = nil
           status_code = nil
@@ -45,8 +45,6 @@ module Fog
           new_error
         end
 
-        private
-
         def set_transaction_id(error, service)
           return unless service && service.respond_to?(:request_id_header) && error.response
           @transaction_id = error.response.headers[service.request_id_header]
@@ -69,14 +67,16 @@ module Fog
         #TODO - Need to find a better way to print out these validation errors when they are thrown
         attr_reader :validation_errors
 
-        def self.slurp(error)
+        def self.slurp(error, service=nil)
           new_error = super(error)
           unless new_error.response_data.nil? or new_error.response_data['badRequest'].nil?
             new_error.instance_variable_set(:@validation_errors, new_error.response_data['badRequest']['validationErrors'])
           end
 
+          status_code = error.response ? error.response.status : nil
           new_error.instance_variable_set(:@status_code, status_code)
           new_error.set_transaction_id(error, service)
+          new_error
         end
       end
     end
@@ -130,7 +130,10 @@ module Fog
 
     # 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
+      # '-' is a special character inside a regex class so it must be first or last.
+      # Add extra excludes before the final '-' so it always remains trailing, otherwise
+      # an unwanted range is created by mistake.
+      str.gsub(/([^a-zA-Z0-9_.#{extra_exclude_chars}-]+)/) do
         '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
       end
     end

data/lib/fog/riakcs/provisioning.rb

@@ -47,7 +47,6 @@ module Fog
         include Utils
 
         def initialize(options = {})
-          require 'mime/types'
           require 'multi_json'
 
           configure_uri_options(options)

data/lib/fog/riakcs/usage.rb

@@ -15,7 +15,7 @@ module Fog
         include Utils
 
         def self.data
-          @data ||= Hash.new do |hash, key| 
+          @data ||= Hash.new do |hash, key|
             hash[key] = {}
           end
         end
@@ -24,7 +24,7 @@ module Fog
           @data = nil
         end
 
-        def initialize(options = {}) 
+        def initialize(options = {})
           configure_uri_options(options)
         end
 
@@ -41,7 +41,6 @@ module Fog
         include Utils
 
         def initialize(options = {})
-          require 'mime/types'
           require 'multi_json'
 
           configure_uri_options(options)

data/lib/fog/storage.rb

@@ -1,3 +1,5 @@
+require 'mime/types'
+
 module Fog
   module Storage
 

data/lib/fog/vcloud/examples/README.md

@@ -0,0 +1,54 @@
+# Using vCloud API via fog
+_contributor @singhgarima_
+
+For more information about fog [README](/README.md), or visit their website
+[fog.io](www.fog.io).
+
+## Vcloud API
+
+Some useful links to get started on the vCloud API:
+
+- [http://www.vmware.com/pdf/vcd_15_api_guide.pdf](http://www.vmware.com/pdf/vcd_15_api_guide.pdf)
+- [vCloud API Programming Guide](http://pubs.vmware.com/vcd-51/index.jsp?topic=%2Fcom.vmware.vcloud.api.doc_51%2FGUID-86CA32C2-3753-49B2-A471-1CE460109ADB.html)
+
+## Terminology
+
+- Organization: An Organization is the fundamental vCloud Director grouping
+  that contains users, the vApps that they create, and the resources the vApps
+  use. It is a top-level container in a cloud that contains one or more
+  Organization Virtual Data Centers (Org vDCs) and Catalog entities. It owns
+  all the virtual resources for a cloud instance and can have many Org vDCs.[1]
+
+- vApp: VMware vApp is a format for packaging and managing applications. A vApp
+  can contain multiple virtual machines.[2]
+
+- VM: A virtualized personal computer environment in which a guest
+  operating system and associated application software can run. Multiple virtual
+  machines can operate on the same managed host machine concurrently.[3]
+
+- Catalogs & Catalog-Items: Catalog is used in organizations for storing content.
+  Example: base images. Each item stored in catalog is referred as catalog item.
+
+- vDC: Virtual Data Center. These are of two kinds provider vDCs (accessible to
+  multiple organizations), and organization vDCs (accessible only by a given
+  organization). In fog we refer to organization vDCs.
+
+- Networks: You can setup various internal networks and assign various internal
+  ip ranges to them
+
+## What is the difference between a virtual appliance and a virtual machine?
+
+A  virtual machine is a tightly isolated software container created to run on
+virtualized platforms. It has four key virtualized resources (CPU, RAM,
+Storage, and Networking); but requires the installation of an Operating System
+and runs on one or more applications. A virtual appliance functions very much
+like a virtual machine, possessing the four key characteristics of
+compatibility, isolation, encapsulation, and hardware independence. However, a
+virtual appliance contains a pre-installed, pre-configured Operating System
+and an application stack optimized to provide a specific set of services.[3]
+
+**References**
+
+- [1] http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1026316
+- [2] http://www.vmware.com/pdf/vsphere4/r40/vsp_40_admin_guide.pdf
+- [3] http://www.vmware.com/technical-resources/virtualization-topics/virtual-appliances/faqs

data/lib/fog/vcloud/examples/creating_a_connection.md

@@ -0,0 +1,20 @@
+# Creating a connection
+
+      connection = Fog::Compute.new(
+        :provider           => :vcloud,
+        :vcloud_username    => "username@org-name",
+        :vcloud_password    => password,
+        :vcloud_host        => vendor-api-endpoint-host,
+        :vcloud_default_vdc => default_vdc_uri,
+        :connection_options => {
+          :ssl_verify_peer   => false,
+          :omit_default_port => true
+        }
+      )
+
+- Refer to links in [vcloud/examples/README.md](/lib/fog/vcloud/examples/REAME.md)
+  for find various different uris
+- connection_options are passed down to `excon`, which is used by fog to make
+  http requests.
+    - We using `omit_default_port`, as currently excon adds port to host entry
+      in headers, which might not be compatible with various vendors.

data/lib/fog/vcloud/examples/creating_a_vapp.md

@@ -0,0 +1,17 @@
+# Creating a vApp
+
+      connection.servers.create(
+        :vdc_uri            => vdc-uuid,
+        :catalog_item_uri   => catalog-uuid,
+        :name               => vApp-name,
+        :network_uri        => network-uri,
+        :network_name       => network-name,
+        :connection_options => {
+          :ssl_verify_peer   => false,
+          :omit_default_port => true
+        }
+      )
+
+- Not most of the uris can be found by understanding the vcloud api
+  eg various network information can be retrieved by
+  `connection.servers.service.networks`

data/lib/fog/vcloud/examples/get_network_information.md

@@ -0,0 +1,10 @@
+# Get network information
+
+- To see all networks list
+
+        connection.servers.service.networks
+
+- To see details of a particular network
+
+        selected_nw = connection.servers.service.networks.detect { |n| n.name == 'Default' }
+        connection.servers.service.get_network(selected_nw.href)

data/lib/fog/vcloud/examples/get_vapp_information.md

@@ -0,0 +1,10 @@
+# Get network information
+
+- To see all vApps list
+
+        connection.servers.service.vapps
+
+- To see details of a particular vApp
+
+        selected_vapp = connection.servers.service.vapps.detect { |n| n.name == 'vapp-name' }
+        connection.servers.service.get_vapp(selected_vapp.href)