fog 0.9.0 → 0.10.0

data/lib/fog/compute/models/vcloud/task.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Task < Fog::Vcloud::Model
+
+        identity :href, :aliases => :Href
+
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
+
+        attribute :status
+        attribute :type
+        attribute :result, :aliases => :Result
+        attribute :owner, :aliases => :Owner
+        attribute :start_time, :aliases => :startTime, :type => :time
+        attribute :end_time, :aliases => :endTime, :type => :time
+        attribute :error, :aliases => :Error
+
+      end
+    end
+  end
+end

data/lib/fog/compute/models/vcloud/tasks.rb

@@ -0,0 +1,32 @@
+require 'fog/compute/models/vcloud/task'
+
+module Fog
+  module Vcloud
+    class Compute
+
+      class Tasks < Fog::Vcloud::Collection
+
+        model Fog::Vcloud::Compute::Task
+
+        attribute :href, :aliases => :Href
+
+        def all
+          self.href = connection.default_vdc_href unless self.href
+          check_href!
+          if data = connection.get_task_list(href).body[:Task]
+            load(data)
+          end
+        end
+
+        def get(uri)
+          if data = connection.get_task(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/models/vcloud/vdc.rb

@@ -0,0 +1,56 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Vdc < Fog::Vcloud::Model
+
+        identity :href
+
+        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd
+
+        attribute :name
+        attribute :type
+        attribute :description, :aliases => :Description
+        attribute :other_links, :aliases => :Link
+        attribute :compute_capacity, :aliases => :ComputeCapacity
+        attribute :storage_capacity, :aliases => :StorageCapacity
+        attribute :available_networks, :aliases => :AvailableNetworks, :squash => :Network
+        attribute :resource_entities, :aliases => :ResourceEntities, :squash => :ResourceEntity
+        attribute :deployed_vm_quota
+        attribute :instantiated_vm_quota
+
+        def networks
+          @networks ||= Fog::Vcloud::Compute::Networks.
+            new( :connection => connection,
+                 :href => href )
+        end
+
+        def servers
+          @servers ||= Fog::Vcloud::Compute::Servers.
+            new( :connection => connection,
+                 :href => href )
+        end
+
+        def tasks
+          @tasks ||= Fog::Vcloud::Compute::Tasks.
+            new( :connection => connection,
+                 :href => href + "/tasksList" )
+        end
+
+        private
+
+        def collection_based_on_type(type, klass = nil)
+          load_unless_loaded!
+          test_links = other_links.kind_of?(Array) ? other_links : [other_links]
+          if link = test_links.detect { |link| link[:type] == type }
+            case type
+            when "application/vnd.vmware.vcloud.catalog+xml"
+              Fog::Vcloud::Compute::Catalog
+            end.new( :connection => connection, :href => link[:href] )
+          else
+            [ ]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/models/vcloud/vdcs.rb

@@ -0,0 +1,40 @@
+require 'fog/compute/models/vcloud/vdc'
+
+module Fog
+  module Vcloud
+    class Compute
+
+      class Vdcs < Collection
+
+        model Fog::Vcloud::Compute::Vdc
+
+        undef_method :create
+
+        def all
+          data = connection.get_organization(organization_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
+          data.each { |link| link.delete_if { |key, value| [:rel].include?(key) } }
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_vdc(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def organization_uri
+          @organization_uri ||= connection.default_organization_uri
+        end
+
+        private
+
+        def organization_uri=(new_organization_uri)
+          @organization_uri = new_organization_uri
+        end
+
+      end
+    end
+  end
+end

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

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

data/lib/fog/compute/ninefold.rb

@@ -60,7 +60,7 @@ module Fog
       class Mock
 
         def initialize(options)
-          require "json"
+          require 'multi_json'
 
           @api_url = options[:ninefold_api_url] || Fog.credentials[:ninefold_api_url] || API_URL
           @ninefold_compute_key = options[:ninefold_compute_key] || Fog.credentials[:ninefold_compute_key]
@@ -76,7 +76,7 @@ module Fog
       class Real
 
         def initialize(options)
-          require "json"
+          require 'multi_json'
 
           @api_url = options[:ninefold_api_url] || Fog.credentials[:ninefold_api_url] || API_URL
           @ninefold_compute_key = options[:ninefold_compute_key] || Fog.credentials[:ninefold_compute_key]
@@ -104,7 +104,7 @@ module Fog
             # Because the response is some weird xml-json thing, we need to try and mung
             # the values out with a prefix, and if there is an empty data entry return an
             # empty version of the expected type (if provided)
-            response = JSON.parse(response.body)
+            response = MultiJson.decode(response.body)
             if options.has_key? :response_prefix
               keys = options[:response_prefix].split('/')
               keys.each do |k|

data/lib/fog/compute/parsers/aws/cancel_spot_instance_requests.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class CancelSpotInstanceRequests < Fog::Parsers::Base
+
+          def reset
+            @spot_instance_request = {}
+            @response = { 'spotInstanceRequestSet' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'item'
+              @response['spotInstanceRequestSet'] << @spot_instance_request
+              @spot_instance_request = {}
+            when 'requestId'
+              @response[name] = value
+            when 'spotInstanceRequestId', 'state'
+              @spot_instance_request[name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/aws/describe_instances.rb

@@ -8,7 +8,7 @@ module Fog
           def reset
             @block_device_mapping = {}
             @context = []
-            @contexts = ['blockDeviceMapping', 'groupSet', 'instancesSet', 'instanceState', 'productCodes', 'stateReason', 'tagSet']
+            @contexts = ['blockDeviceMapping', 'groupSet', 'instancesSet', 'instanceState', 'placement', 'productCodes', 'stateReason', 'tagSet']
             @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
             @reservation = { 'groupSet' => [], 'instancesSet' => [] }
             @response = { 'reservationSet' => [] }
@@ -26,7 +26,7 @@ module Fog
             case name
             when 'amiLaunchIndex'
               @instance[name] = value.to_i
-            when 'availabilityZone'
+            when 'availabilityZone', 'tenancy'
               @instance['placement'][name] = value
             when 'architecture', 'clientToken', 'dnsName', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId',
@@ -43,8 +43,13 @@ module Fog
               @block_device_mapping[name] = (value == 'true')
             when 'deviceName', 'status', 'volumeId'
               @block_device_mapping[name] = value
-            when 'groupName'
-              @reservation['groupSet'] << value
+            when 'groupId', 'groupName'
+              case @context.last
+              when 'groupSet'
+                @reservation['groupSet'] << value
+              when 'placement'
+                @instance['placement'][name] = value
+              end
             when 'item'
               case @context.last
               when 'blockDeviceMapping'

data/lib/fog/compute/parsers/aws/describe_placement_groups.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class DescribePlacementGroups < Fog::Parsers::Base
+
+          def reset
+            @placement_group = {}
+            @response = { 'placementGroupSet' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'item'
+              @response['placementGroupSet'] << @placement_group
+              @placement_group = {}
+            when 'groupName', 'state', 'strategy'
+              @placement_group[name] = value
+            when 'requestId'
+              @response[name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/aws/describe_reserved_instances.rb

@@ -24,7 +24,7 @@ module Fog
             when 'requestId'
               @response[name] = value
             when 'start'
-              @response[name] = Time.parse(value)
+              @reserved_instance[name] = Time.parse(value)
             end
           end
 

data/lib/fog/compute/parsers/aws/describe_reserved_instances_offerings.rb

@@ -12,7 +12,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesOfferingId'
+            when 'availabilityZone', 'currencyCode', 'instanceType', 'instanceTenancy', 'productDescription', 'reservedInstancesOfferingId'
               @reserved_instances_offering[name] = value
             when 'duration'
               @reserved_instances_offering[name] = value.to_i
@@ -31,4 +31,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/compute/parsers/aws/describe_spot_price_history.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class DescribeSpotPriceHistory < Fog::Parsers::Base
+
+          def reset
+            @spot_price = {}
+            @response = { 'spotPriceHistorySet' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'availabilityZone', 'instanceType', 'productDescription'
+              @spot_price[name] = value
+            when 'item'
+              @response['spotPriceHistorySet'] << @spot_price
+              @spot_price = {}
+            when 'requestId'
+              @response[name] = value
+            when 'spotPrice'
+              @spot_price[name] = value.to_f
+            when 'timestamp'
+              @spot_price[name] = Time.parse(value)
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/aws/purchase_reserved_instances_offering.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class PurchaseReservedInstancesOffering < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'reservedInstancesId', 'requestId'
+              @response[name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/aws/run_instances.rb

@@ -7,19 +7,16 @@ module Fog
 
           def reset
             @block_device_mapping = {}
+            @context = []
+            @contexts = ['blockDeviceMapping', 'groupSet', 'placement', 'productCodes']
             @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
             @response = { 'groupSet' => [], 'instancesSet' => [] }
           end
 
           def start_element(name, attrs = [])
             super
-            case name
-            when 'blockDeviceMapping'
-              @in_block_device_mapping = true
-            when 'groupSet'
-              @in_group_set = true
-            when 'productCodes'
-              @in_product_codes = true
+            if @contexts.include?(name)
+              @context.push(name)
             end
           end
 
@@ -32,12 +29,12 @@ module Fog
                   'keyName', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
                   'reason', 'rootDeviceType'
               @instance[name] = value
-            when 'availabilityZone'
+            when 'availabilityZone', 'tenancy'
               @instance['placement'][name] = value
             when 'attachTime'
               @block_device_mapping[name] = Time.parse(value)
-            when 'blockDeviceMapping'
-              @in_block_device_mapping = false
+            when *@contexts
+              @context.pop
             when 'code'
               @instance['instanceState'][name] = value.to_i
             when 'deleteOnTermination'
@@ -46,13 +43,19 @@ module Fog
               @block_device_mapping[name] = value
             when 'groupId'
               @response['groupSet'] << value
-            when 'groupSet'
-              @in_group_set = false
+            when 'groupName'
+              case @context.last
+              when 'groupSet'
+                @response['groupSet'] << value
+              when 'placement'
+                @instance['placement'][name] = value
+              end
             when 'item'
-              if @in_block_device_mapping
+              case @context.last
+              when 'blockDeviceMapping'
                 @instance['blockDeviceMapping'] << @block_device_mapping
                 @block_device_mapping = {}
-              elsif !@in_group_set && !@in_product_codes
+              when nil
                 @response['instancesSet'] << @instance
                 @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
               end
@@ -64,8 +67,6 @@ module Fog
               @response[name] = value
             when 'product_code'
               @instance['productCodes'] << value
-            when 'productCodes'
-              @in_product_codes = false
             when 'state'
               @instance['monitoring'][name] = (value == 'true')
             when 'subnetId'