fog 0.9.0 → 0.10.0

data/lib/fog/compute/models/aws/spot_requests.rb

@@ -0,0 +1,48 @@
+require 'fog/core/collection'
+require 'fog/compute/models/aws/spot_request'
+
+module Fog
+  module Compute
+    class AWS
+      class SpotRequests < Fog::Collection
+      
+        attribute :filters
+        
+        model Fog::Compute::AWS::SpotRequest
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = self.filters)
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('spot-instance-request-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'spot-instance-request-id' => [*filters]}
+          end
+          self.filters = filters
+          data = connection.describe_spot_instance_requests(filters).body
+          load(
+            data['spotInstanceRequestSet'].map do |spot_instance_request|
+              spot_instance_request['LaunchSpecification.Placement.AvailabilityZone'] = spot_instance_request['launchedAvailabilityZone']
+              spot_instance_request['launchSpecification'].each do |name,value|
+                spot_instance_request['LaunchSpecification.' + name[0,1].upcase + name[1..-1]] = value
+              end
+              spot_instance_request.merge(:groups => spot_instance_request['LaunchSpecification.GroupSet'])
+              spot_instance_request 
+            end.flatten
+          )
+        end
+
+        def get(spot_request_id)
+          if spot_request_id
+            self.class.new(:connection => connection).all('spot-instance-request-id' => spot_request_id).first
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/models/aws/volume.rb

@@ -38,7 +38,8 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          requires :availability_zone, :size
+          requires :availability_zone
+          requires_one :size, :snapshot_id
 
           data = connection.create_volume(availability_zone, size, snapshot_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
@@ -49,6 +50,11 @@ module Fog
           true
         end
 
+        def server
+          requires :server_id
+          connection.servers('instance-id' => server_id)
+        end
+
         def server=(new_server)
           if new_server
             attach(new_server)
@@ -62,6 +68,10 @@ module Fog
           connection.snapshots(:volume => self)
         end
 
+        def force_detach
+          detach(true)
+        end
+
         private
 
         def attachmentSet=(new_attachment_set)
@@ -81,25 +91,15 @@ module Fog
           end
         end
 
-        def detach
-          @server = nil
-          self.server_id = nil
-          unless new_record?
-            connection.detach_volume(id)
-            reload
-          end
-        end
-
-        def force_detach
+        def detach(force = false)
           @server = nil
           self.server_id = nil
           unless new_record?
-            connection.detach_volume(id, 'Force' => true)
+            connection.detach_volume(id, 'Force' => force)
             reload
           end
         end
 
-
       end
 
     end

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

@@ -109,11 +109,11 @@ module Fog
 
         def setup(credentials = {})
           requires :identity, :ips, :public_key, :username
-          Fog::SSH.new(ips.first['address'], username, credentials).run([
+          Fog::SSH.new(public_ip_address, username, credentials).run([
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l #{username}},
-            %{echo "#{attributes.to_json}" >> ~/attributes.json}
+            %{echo "#{MultiJson.encode(attributes)}" >> ~/attributes.json}
           ])
         rescue Errno::ECONNREFUSED
           sleep(1)
@@ -125,7 +125,7 @@ module Fog
 
           options = {}
           options[:key_data] = [private_key] if private_key
-          Fog::SSH.new(ips.first['address'], username, options).run(commands)
+          Fog::SSH.new(public_ip_address, username, options).run(commands)
         end
 
         def scp(local_path, remote_path, upload_options = {})
@@ -133,7 +133,7 @@ module Fog
 
           scp_options = {}
           scp_options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(ips.first['address'], username, scp_options).upload(local_path, remote_path, upload_options)
+          Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
         end
 
         def username

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

@@ -92,8 +92,8 @@ module Fog
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l root},
-            %{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/models/ninefold/server.rb

@@ -5,6 +5,9 @@ module Fog
     class Ninefold
 
       class Server < Fog::Model
+        extend Fog::Deprecation
+        deprecate :serviceofferingid, :flavor_id
+        deprecate :templateid,        :image_id
 
         identity  :id
 
@@ -13,10 +16,11 @@ module Fog
         attribute :cpuspeed
 
         attribute :cpuused
-        attribute :created, :type => :time
+        attribute :created,             :type => :time
         attribute :displayname
         attribute :domain
         attribute :domainid
+        attribute :flavor_id,           :aliases => :serviceofferingid
         attribute :forvirtualnetwork
         attribute :group
         attribute :groupid
@@ -25,6 +29,7 @@ module Fog
         attribute :hostid
         attribute :hostname
         attribute :hypervisor
+        attribute :image_id,            :aliases => :templateid
         #attribute :ipaddress
         attribute :isodisplaytext
         attribute :isoid
@@ -35,20 +40,18 @@ module Fog
         attribute :name
         attribute :networkkbsread
         attribute :networkkbswrite
+        attribute :nic
         attribute :password
         attribute :passwordenabled
         attribute :rootdeviceid
         attribute :rootdevicetype
-        attribute :serviceofferingid
+        attribute :securitygroup
         attribute :serviceofferingname
         attribute :state
         attribute :templatedisplaytext
-        attribute :templateid
         attribute :templatename
         attribute :zoneid
         attribute :zonename
-        attribute :nic
-        attribute :securitygroup
 
         # used for creation only.
         attribute :networkids
@@ -65,6 +68,9 @@ module Fog
 
 
         def initialize(attributes={})
+          merge_attributes({
+            :flavor_id => 105 # '1CPU, 384MB, 80GB HDD'
+          })
           super
         end
 
@@ -99,13 +105,13 @@ module Fog
         end
 
         def flavor
-          requires :serviceofferingid
-          connection.flavors.get(serviceofferingid)
+          requires :flavor_id
+          connection.flavors.get(flavor_id)
         end
 
         def image
-          requires :templateid
-          connection.images.get(templateid)
+          requires :image_id
+          connection.images.get(image_id)
         end
 
         def ready?
@@ -127,9 +133,7 @@ module Fog
 
         def save
           raise "Operation not supported" if self.identity
-          requires :serviceofferingid
-          requires :templateid
-          requires :zoneid
+          requires :flavor_id, :image_id, :zoneid
 
           unless networkids
             # No network specified, use first in this zone.
@@ -143,8 +147,8 @@ module Fog
           end
 
           options = {
-            :serviceofferingid => serviceofferingid,
-            :templateid => templateid,
+            :serviceofferingid => flavor_id,
+            :templateid => image_id,
             :name => name,
             :zoneid => zoneid,
             :networkids => networkids,

data/lib/fog/compute/models/rackspace/flavor.rb

@@ -17,8 +17,9 @@ module Fog
         end
 
         def cores
-          # 2 quad-cores >= 2Ghz = 8 cores
-          8 * case ram
+          # Each server is assigned 4 virtual cores and
+	  # given a percentage of CPU cycles based on size
+          4 * case ram
           when 256
             1/64.0
           when 512

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

@@ -104,8 +104,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/models/slicehost/server.rb

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

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

@@ -0,0 +1,22 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Catalog < Fog::Vcloud::Model
+
+        identity :href, :aliases => :Href
+
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
+
+        attribute :type
+        attribute :name
+
+        def catalog_items
+          @catalog_items ||= Fog::Vcloud::Compute::CatalogItems.
+            new( :connection => connection,
+                 :href => href )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Vcloud
+    class Compute
+      class CatalogItem < Fog::Vcloud::Model
+
+        identity :href, :aliases => :Href
+
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
+
+        attribute :type
+        attribute :name
+        attribute :entity, :aliases => :Entity
+        attribute :link, :aliases => :Link
+        attribute :property, :aliases => :Property
+
+        def customization_options
+          load_unless_loaded!
+          if data = connection.get_customization_options( link[:href] ).body
+            data.delete_if { |key, value| [:xmlns_i, :xmlns].include?(key) }
+            data
+          else
+            nil
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Fog
+  module Vcloud
+    class Compute
+      class CatalogItems < Fog::Vcloud::Collection
+
+        undef_method :create
+
+        model Fog::Vcloud::Compute::CatalogItem
+
+        attribute :href, :aliases => :Href
+
+        def all
+          data = connection.get_catalog(href).body[:CatalogItems][:CatalogItem]
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_catalog_item(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def organization_uri
+          @organization_uri ||= connection.default_organization_uri
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Catalogs < Fog::Vcloud::Collection
+
+        model Fog::Vcloud::Compute::Catalog
+
+        def all
+          data = connection.get_organization(organization_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_catalog(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def organization_uri
+          @organization_uri ||= connection.default_organization_uri
+        end
+
+        def item_by_name(name)
+          res = nil
+          items = all.collect { |catalog| catalog.catalog_items }
+          items.each do |i|
+            i.collect do |ii|
+              res = ii if ii.name == name
+            end
+          end
+          res
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Ip < Fog::Vcloud::Model
+
+        ignore_attributes :xmlns_i, :xmlns
+
+        identity :href, :aliases => :Href
+
+        attribute :name, :aliases => :Name
+        attribute :status, :aliases => :Status
+        attribute :server, :aliases => :Server
+        attribute :id, :aliases => :Id, :type => :integer
+
+        def save
+          if @changed
+            connection.configure_network_ip( href, _compose_network_ip_data )
+          end
+          true
+        end
+
+        def reload
+          super
+          @changed = false
+          self
+        end
+
+        private
+        def _compose_network_ip_data
+          {
+            :id => id,
+            :href => href,
+            :name => name,
+            :status => status,
+            :server => server
+          }
+        end
+
+      end
+    end
+  end
+end