fog 1.18.0 → 1.19.0

data/lib/fog/rackspace/requests/queues/create_message.rb

@@ -2,6 +2,21 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation posts the specified message or messages.
+        # @note You can submit up to 10 messages in a single request.
+        #
+        # @param [String] client_id UUID for the client instance.
+        # @param [String] queue_name Specifies the name of the queue.
+        # @param [String, Hash, Array] body The body attribute specifies an arbitrary document that constitutes the body of the message being sent.
+        #   The size of this body is limited to 256 KB, excluding whitespace. The document must be valid JSON.
+        # @param [Integer] ttl The ttl attribute specifies how long the server waits before releasing the claim. The ttl value must be between 60 and 43200 seconds (12 hours).
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/POST_postMessage__version__queues__queue_name__messages_message-operations-dle001.html
         def create_message(client_id, queue_name, body, ttl)
           data = [{
             :ttl => ttl,

data/lib/fog/rackspace/requests/queues/create_queue.rb

@@ -2,6 +2,17 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation creates a new queue.
+        # The body of the request is empty.
+        #
+        # @param [String] queue_name Specifies the name of the queue.
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/PUT_createQueue__version__queues__queue_name__queue-operations-dle001.html
         def create_queue(queue_name)
           request(
             :body => Fog::JSON.encode({}),

data/lib/fog/rackspace/requests/queues/delete_claim.rb

@@ -2,6 +2,18 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation immediately releases a claim, making any remaining, undeleted) messages that are associated with the claim available to other workers.
+        # Claims with malformed IDs or claims that are not found by ID are ignored.
+        #
+        # @param [String] queue_name Specifies the name of the queue.
+        # @param [String] claim_id Specifies the claim ID.
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/DELETE_deleteClaim__version__queues__queue_name__claims__claimId__claims-operations-dle001.html
         def delete_claim(queue_name, claim_id)
           request(
             :expects => 204,

data/lib/fog/rackspace/requests/queues/delete_message.rb

@@ -2,6 +2,20 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation immediately deletes the specified message.
+        # @note If you do not specify claim_id, but the message is claimed, the operation fails. You can only delete claimed messages by providing an appropriate claim_id.
+        #
+        # @param [String] queue_name Specifies the name of the queue.
+        # @param [String] message_id Specifies the message ID.
+        # @param [Hash] options
+        # @option options [Integer] :claim_id - Identifies the claim.
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/DELETE_deleteMessage__version__queues__queue_name__messages__messageId__message-operations-dle001.html
         def delete_message(queue_name, message_id, options = {})
           query = {}
           query[:claim_id] = options[:claim_id] if options.has_key? :claim_id

data/lib/fog/rackspace/requests/queues/delete_queue.rb

@@ -2,6 +2,16 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation immediately deletes a queue and all of its existing messages.
+        #
+        # @param [String] queue_name Specifies the name of the queue.
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/DELETE_deleteQueue__version__queues__queue_name__queue-operations-dle001.html
         def delete_queue(queue_name)
           request(
             :expects => 204,

data/lib/fog/rackspace/requests/queues/get_claim.rb

@@ -2,6 +2,17 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation queries the specified claim for the specified queue. Claims with malformed IDs or claims that are not found by ID are ignored.
+        #
+        # @param [String] queue_name Specifies the name of the queue.
+        # @param [Integer] claim_id Specifies the claim ID.
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/GET_queryClaim__version__queues__queue_name__claims__claimId__claims-operations-dle001.html
         def get_claim(queue_name, claim_id)
           request(
             :expects => 200,

data/lib/fog/rackspace/requests/queues/get_message.rb

@@ -2,6 +2,18 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation gets the specified message from the specified queue.
+        #
+        # @param [String] client_id UUID for the client instance.
+        # @param [String] queue_name Specifies the name of the queue.
+        # @param [Integer] message_id Specifies the message ID.
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see  http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/GET_getSpecificMessage__version__queues__queue_name__messages__messageId__message-operations-dle001.html
         def get_message(client_id, queue_name, message_id)
           request(
             :expects => 200,

data/lib/fog/rackspace/requests/queues/get_queue.rb

@@ -2,6 +2,16 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation verifies whether the specified queue exists.
+        #
+        # @param [String] queue_name Specifies the name of the queue.
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/GET_checkQueueExists__version__queues__queue_name__queue-operations-dle001.html
         def get_queue(queue_name)
           request(
             :expects => [200, 204],

data/lib/fog/rackspace/requests/queues/get_queue_stats.rb

@@ -2,6 +2,16 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation returns queue statistics, including how many messages are in the queue, categorized by status.
+        #
+        # @param [String] queue_name Specifies the name of the queue.
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/GET_getQueueStats__version__queues__queue_name__stats_queue-operations-dle001.html
         def get_queue_stats(queue_name)
           request(
             :expects => 200,

data/lib/fog/rackspace/requests/queues/list_messages.rb

@@ -2,6 +2,32 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation gets the message or messages in the specified queue.
+        #
+        # A request to list messages when the queue is not found or when messages are not found returns 204, instead of 200, because there was no information to send back.
+        # Messages with malformed IDs or messages that are not found by ID are ignored.
+        #
+        # @param [String] client_id UUID for the client instance.
+        # @param [String] queue_name Specifies the name of the queue.
+        # @param [Hash] options
+        # @option options [String] :marker - Specifies an opaque string that the client can use to request the next batch of messages. The marker parameter communicates to the
+        #   server which messages the client has already received. If you do not specify a value, the API returns all messages at the head of the queue (up to the limit).
+        # @option options [Integer] :limit - When more messages are available than can be returned in a single request, the client can pick up the next batch of messages
+        #   by simply using the URI template parameters returned from the previous call in the "next" field. Specifies up to 10 messages (the default value) to return.
+        #   If you do not specify a value for the limit parameter, the default value of 10 is used.
+        # @option options [String] :echo - Determines whether the API returns a client's own messages. The echo parameter is a Boolean value (true or false) that determines
+        #   whether the API returns a client's own messages, as determined by the uuid portion of the User-Agent header. If you do not specify a value, echo uses the default
+        #   value of false. If you are experimenting with the API, you might want to set echo=true in order to see the messages that you posted.
+        # @option options [String] :include_claimed - Determines whether the API returns claimed messages and unclaimed messages. The include_claimed parameter is a Boolean
+        #   value (true or false) that determines whether the API returns claimed messages and unclaimed messages. If you do not specify a value, include_claimed uses the
+        #   default value of false (only unclaimed messages are returned).
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/GET_getMessages__version__queues__queue_name__messages_message-operations-dle001.html
         def list_messages(client_id, queue_name, options = {})
           request(
             :expects => [200, 204],

data/lib/fog/rackspace/requests/queues/list_queues.rb

@@ -2,11 +2,26 @@ module Fog
   module Rackspace
     class Queues
       class Real
-        def list_queues
+
+        # This operation lists queues for the project. The queues are sorted alphabetically by name.
+        # @note A request to list queues when you have no queues in your account returns 204, instead of 200, because there was no information to send back.
+        #
+        # @param [Hash] options
+        # @option options [String] :marker - Specifies the name of the last queue received in a previous request, or none to get the first page of results.
+        # @option options [Integer] :limit - Specifies the name of the last queue received in a previous request, or none to get the first page of results.
+        # @option options [Boolean] :detailed - Determines whether queue metadata is included in the response. The default value for this parameter is false, which excludes t
+        # @return [Excon::Response] response
+        # @raise [Fog::Rackspace::Queues::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Queues::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Queues::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Queues::ServiceError]
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/GET_listQueues__version__queues_.html
+        def list_queues(options={})
           request(
             :expects => [200, 204],
             :method => 'GET',
-            :path => 'queues'
+            :path => 'queues',
+            :query => options
           )
         end
       end

data/lib/fog/rackspace/requests/queues/update_claim.rb

@@ -2,6 +2,13 @@ module Fog
   module Rackspace
     class Queues
       class Real
+
+        # This operation posts the specified message or messages.
+        # @note You can submit up to 10 messages in a single request.
+        #
+        # @param [String] queue_name Specifies the name of the queue.
+        # @param [Integer] ttl The ttl attribute specifies how long the server waits before releasing the claim. The ttl value must be between 60 and 43200 seconds (12 hours).
+        # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/PATCH_updateClaim__version__queues__queue_name__claims__claimId__claims-operations-dle001.html
         def update_claim(queue_name, claim_id, ttl)
           body = {
             :ttl => ttl

data/lib/fog/rackspace/service.rb

@@ -52,6 +52,10 @@ module Fog
         response
       end
 
+      def service_net?
+        false
+      end
+
       private
 
       def process_response(response)
@@ -62,7 +66,7 @@ module Fog
            Fog::Rackspace.json_response?(response)
           begin
             response.body = Fog::JSON.decode(response.body)
-          rescue MultiJson::DecodeError => e
+          rescue Fog::JSON::DecodeError => e
             Fog::Logger.warning("Error Parsing response json - #{e}")
             response.body = {}
           end
@@ -118,7 +122,7 @@ module Fog
       end
 
       def endpoint_uri_v2
-        @uri = @identity_service.service_catalog.get_endpoint(service_name, region)
+        @uri = @identity_service.service_catalog.get_endpoint(service_name, region, service_net?)
       end
 
       def auth_token

data/lib/fog/rackspace/storage.rb

@@ -191,10 +191,7 @@ module Fog
 
         def endpoint_uri(service_endpoint_url=nil)
           return @uri if @uri
-
-          @uri = super(@rackspace_storage_url || service_endpoint_url, :rackspace_storage_url)
-          @uri.host = "snet-#{@uri.host}" if service_net?
-          @uri
+          super(@rackspace_storage_url || service_endpoint_url, :rackspace_storage_url)
         end
 
         private

data/lib/fog/riakcs.rb

@@ -71,9 +71,9 @@ module Fog
 
     module UserUtils
       def update_riakcs_user(key_id, user)
-        response = @s3_connection.put_object('riak-cs', "user/#{key_id}", MultiJson.encode(user), { 'Content-Type' => 'application/json' })
+        response = @s3_connection.put_object('riak-cs', "user/#{key_id}", Fog::JSON.encode(user), { 'Content-Type' => 'application/json' })
         if !response.body.empty?
-          response.body = MultiJson.decode(response.body)
+          response.body = Fog::JSON.decode(response.body)
         end
         response
       end

data/lib/fog/riakcs/provisioning.rb

@@ -47,8 +47,6 @@ module Fog
         include Utils
 
         def initialize(options = {})
-          require 'multi_json'
-
           configure_uri_options(options)
           @riakcs_access_key_id     = options[:riakcs_access_key_id]
           @riakcs_secret_access_key = options[:riakcs_secret_access_key]
@@ -89,7 +87,7 @@ module Fog
             end
           end
           if !response.body.empty? && parse_response
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/riakcs/requests/provisioning/create_user.rb

@@ -3,7 +3,7 @@ module Fog
     class Provisioning
       class Real
         def create_user(email, name, options = {})
-          payload = MultiJson.encode({ :email => email, :name => name })
+          payload = Fog::JSON.encode({ :email => email, :name => name })
           headers = { 'Content-Type' => 'application/json' }
 
           if(options[:anonymous])
@@ -20,7 +20,7 @@ module Fog
               if !response.body.empty?
                 case response.headers['Content-Type']
                 when 'application/json'
-                  response.body = MultiJson.decode(response.body)
+                  response.body = Fog::JSON.decode(response.body)
                 end
               end
               response

data/lib/fog/riakcs/requests/provisioning/get_user.rb

@@ -7,7 +7,7 @@ module Fog
 
         def get_user(key_id)
           response = @s3_connection.get_object('riak-cs', "user/#{key_id}", { 'Accept' => 'application/json' })
-          response.body = MultiJson.decode(response.body)
+          response.body = Fog::JSON.decode(response.body)
           response
         end
       end

data/lib/fog/riakcs/requests/provisioning/list_users.rb

@@ -10,7 +10,7 @@ module Fog
 
           boundary      = extract_boundary(response.headers['Content-Type'])
           parts         = parse(response.body, boundary)
-          decoded       = parts.map { |part| MultiJson.decode(part[:body]) }
+          decoded       = parts.map { |part| Fog::JSON.decode(part[:body]) }
 
           response.body = decoded.flatten
 

data/lib/fog/riakcs/requests/usage/get_usage.rb

@@ -37,7 +37,7 @@ module Fog
           response = @connection.get_object('riak-cs', ["usage", request_uri(access_key_id, options)].join("/"))
 
           if !response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/riakcs/usage.rb

@@ -41,8 +41,6 @@ module Fog
         include Utils
 
         def initialize(options = {})
-          require 'multi_json'
-
           configure_uri_options(options)
           @riakcs_access_key_id     = options[:riakcs_access_key_id]
           @riakcs_secret_access_key = options[:riakcs_secret_access_key]

data/lib/fog/vcloud_director/README.md

@@ -386,6 +386,8 @@ vm.customization
     change_sid=false,
     join_domain_enabled=false,
     use_org_settings=false,
+    admin_password_auto=false,
+    admin_password='',
     admin_password_enabled=false,
     reset_password_required=false,
     virtual_machine_id="2ddeea36-ac71-470f-abc5-c6e3c2aca192",

data/lib/fog/vcloud_director/compute.rb

@@ -84,6 +84,7 @@ module Fog
       request :delete_logout
       request :delete_media
       request :delete_media_metadata_item_metadata
+      request :delete_network
       request :delete_shadow_vm
       request :delete_vapp
       request :delete_vapp_metadata_item_metadata
@@ -202,6 +203,7 @@ module Fog
       request :post_configure_edge_gateway_services
       request :post_consolidate_vm_vapp
       request :post_consolidate_vm_vapp_template
+      request :post_create_org_vdc_network
       request :post_deploy_vapp
       request :post_detach_disk
       request :post_disable_nested_hv
@@ -244,7 +246,9 @@ module Fog
       request :put_metadata_value # deprecated
       request :put_network_connection_system_section_vapp
       request :put_vapp_metadata_item_metadata
+      request :put_vapp_name_and_description
       request :put_vapp_template_metadata_item_metadata
+      request :put_vm
       request :put_vm_capabilities
 
       class Model < Fog::Model
@@ -467,9 +471,12 @@ module Fog
         def data
           @@data ||= Hash.new do |hash, key|
 
-            vdc_uuid = uuid
+            vdc1_uuid = uuid
+            vdc2_uuid = uuid
             default_network_uuid = uuid
-            uplink_network_uuid = uuid
+            uplink_network_uuid  = uuid
+            isolated_vdc1_network_uuid = uuid
+            isolated_vdc2_network_uuid = uuid
 
             hash[key] = {
               :catalogs => {
@@ -488,7 +495,7 @@ module Fog
                 uuid => {
                   :name => 'MockEdgeGateway',
                   :networks => [uplink_network_uuid, default_network_uuid],
-                  :vdc => vdc_uuid,
+                  :vdc => vdc1_uuid,
                   :Configuration => {
                     :GatewayBackingConfig => "compact",
                     :GatewayInterfaces => {
@@ -506,9 +513,15 @@ module Fog
                   }
                 }
               },
+
               :medias => {},
+
               :networks => {
+
                 default_network_uuid => {
+                  :IsShared => true,
+                  :vdc => vdc1_uuid,
+                  :FenceMode => 'natRouted',
                   :ApplyRateLimit => "false",
                   :Description => 'Org Network for mocking',
                   :Dns1 => '8.8.8.8',
@@ -530,8 +543,61 @@ module Fog
                   },
                   :UseForDefaultRoute => "false"
                 },
+
+                isolated_vdc1_network_uuid => {
+                  :IsShared => false,
+                  :vdc => vdc1_uuid,
+                  :ApplyRateLimit => "false",
+                  :FenceMode => 'isolated',
+                  :Description => 'Org Network for mocking',
+                  :Dns1 => '8.8.8.8',
+                  :Dns2 => '8.8.4.4',
+                  :DnsSuffix => 'example.com',
+                  :InterfaceType => "internal",
+                  :IpRanges => [{
+                    :StartAddress=>'10.1.0.100',
+                    :EndAddress=>'10.1.0.200'
+                  }],
+                  :IsInherited => false,
+                  :Netmask => '255.255.255.0',
+                  :name => 'vDC1 backend network',
+                  :SubnetParticipation => {
+                      :Gateway => "192.168.1.0",
+                      :Netmask => "255.255.0.0",
+                      :IpAddress => "192.168.1.0"
+                  },
+                  :UseForDefaultRoute => "false"
+                },
+
+                isolated_vdc2_network_uuid => {
+                  :IsShared => false,
+                  :vdc => vdc2_uuid,
+                  :ApplyRateLimit => "false",
+                  :Description => 'Org Network for mocking',
+                  :Dns1 => '8.8.8.8',
+                  :Dns2 => '8.8.4.4',
+                  :DnsSuffix => 'example.com',
+                  :InterfaceType => "internal",
+                  :IpRanges => [{
+                    :StartAddress=>'10.2.0.100',
+                    :EndAddress=>'10.2.0.200'
+                  }],
+                  :IsInherited => false,
+                  :Netmask => '255.255.255.0',
+                  :name => 'vDC2 backend network',
+                  :SubnetParticipation => {
+                      :Gateway => "192.168.1.0",
+                      :Netmask => "255.255.0.0",
+                      :IpAddress => "192.168.1.0"
+                  },
+                  :UseForDefaultRoute => "false"
+                },
+
                 uplink_network_uuid => {
+                  :IsShared => false,
+                  :vdc => vdc1_uuid,
                   :ApplyRateLimit => "false",
+                  :FenceMode => 'bridged',
                   :Description => 'Uplink Network for mocking',
                   :Dns1 => '8.8.8.8',
                   :Dns2 => '8.8.4.4',
@@ -558,6 +624,7 @@ module Fog
                   },
                   :UseForDefaultRoute => "true"
                 }
+
               },
               :org => {
                 :description => 'Organization for mocking',
@@ -573,14 +640,18 @@ module Fog
                   :limit => 2 * 1024 * 1024,
                   :name => 'DefaultMockStorageClass',
                   :units => 'MB',
-                  :vdc => vdc_uuid,
+                  :vdc => vdc1_uuid,
                 }
               },
               :vdcs => {
-                vdc_uuid => {
-                  :description => 'vDC for mocking',
-                  :name => 'MockVDC'
-                }
+                vdc1_uuid => {
+                  :description => 'vDC1 for mocking',
+                  :name => 'MockVDC 1'
+                },
+                vdc2_uuid => {
+                  :description => 'vDC2 for mocking',
+                  :name => 'MockVDC 2'
+                },
               }
             }
           end[@vcloud_director_username]