fog 0.5.3 → 0.6.0

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

@@ -0,0 +1,55 @@
+require 'fog/compute/models/ecloud/server'
+
+module Fog
+  module Ecloud
+    class Compute
+
+      class Servers < Fog::Ecloud::Collection
+
+        undef_method :create
+
+        model Fog::Ecloud::Compute::Server
+
+        attribute :href, :aliases => :Href
+
+        def all
+          check_href!(:parent => "Vdc")
+          load(_vapps)
+        end
+
+        def get(uri)
+          if data = connection.get_vapp(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def create( catalog_item_uri, options )
+          options[:vdc_uri] = href
+          options[:cpus] ||= 1
+          options[:memory] ||= 512
+          data = connection.instantiate_vapp_template( catalog_item_uri, options ).body
+          object = new(data)
+          object
+        end
+
+        private
+
+        def _resource_entities
+          connection.get_vdc(href).body[:ResourceEntities][:ResourceEntity]
+        end
+
+        def _vapps
+          resource_entities = _resource_entities
+          if resource_entities.nil?
+            []
+          else
+            resource_entities
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Fog
+  module Ecloud
+    class Compute
+      class Task < Fog::Ecloud::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/ecloud/tasks.rb

@@ -0,0 +1,31 @@
+require 'fog/compute/models/ecloud/task'
+
+module Fog
+  module Ecloud
+    class Compute
+
+      class Tasks < Fog::Ecloud::Collection
+
+        model Fog::Ecloud::Compute::Task
+
+        attribute :href, :aliases => :Href
+
+        def all
+          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/ecloud/vdc.rb

@@ -0,0 +1,81 @@
+module Fog
+  module Ecloud
+    class Compute
+      class Vdc < Fog::Ecloud::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 public_ips
+          @public_ips ||= collection_based_on_type("application/vnd.tmrk.ecloud.publicIpsList+xml")
+        end
+
+        def internet_services
+          @internet_services ||= collection_based_on_type("application/vnd.tmrk.ecloud.internetServicesList+xml")
+        end
+
+        def backup_internet_services
+          @backup_internet_services ||= collection_based_on_type("application/vnd.tmrk.ecloud.internetServicesList+xml", BackupInternetServices)
+        end
+
+        def networks
+          @networks ||= Fog::Ecloud::Compute::Networks.
+            new( :connection => connection,
+                 :href => href )
+        end
+
+        def servers
+          @servers ||= Fog::Ecloud::Compute::Servers.
+            new( :connection => connection,
+                 :href => href )
+        end
+
+        def tasks
+          @tasks ||= Fog::Ecloud::Compute::Tasks.
+            new( :connection => connection,
+                 :href => href + "/tasksList" )
+        end
+
+        def catalog
+          @catalog ||= collection_based_on_type("application/vnd.vmware.vcloud.catalog+xml")
+        end
+
+        def firewall_acls
+          @firewall_acls ||= collection_based_on_type("application/vnd.tmrk.ecloud.firewallAclsList+xml")
+        end
+
+        private
+
+        def collection_based_on_type(type, klass = nil)
+          load_unless_loaded!
+          if link = other_links.detect { |link| link[:type] == type }
+            case type
+            when "application/vnd.tmrk.ecloud.publicIpsList+xml"
+              Fog::Ecloud::Compute::PublicIps
+            when "application/vnd.tmrk.ecloud.internetServicesList+xml"
+              klass || Fog::Ecloud::Compute::InternetServices
+            when "application/vnd.vmware.vcloud.catalog+xml"
+              Fog::Ecloud::Compute::Catalog
+            when "application/vnd.tmrk.ecloud.firewallAclsList+xml"
+              Fog::Ecloud::Compute::FirewallAcls
+            end.new( :connection => connection, :href => link[:href] )
+          else
+            [ ]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require 'fog/compute/models/ecloud/vdc'
+
+module Fog
+  module Ecloud
+    class Compute
+
+      class Vdcs < Collection
+
+        model Fog::Ecloud::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
+          @organizatio_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/go_grid/server.rb

@@ -7,12 +7,14 @@ module Fog
       class BlockInstantiationError < StandardError; end
 
       class Server < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:ip, :public_ip_address)
 
         identity :id
 
         attribute :name
         attribute :image_id     # id or name
-        attribute :ip
+        attribute :public_ip_address, :aliases => 'ip'
         attribute :memory       # server.ram
         attribute :state
         attribute :description  # Optional
@@ -33,6 +35,10 @@ module Fog
           connection.grid_image_get(:image => image_id)
         end
 
+        def private_ip_address
+          nil
+        end
+
         def ready?
           @state && @state["name"] == 'On'
         end
@@ -71,6 +77,14 @@ module Fog
           Fog::SSH.new(ip['ip'], username, options).run(commands)
         end
 
+        def scp(local_path, remote_path)
+          requires :ip, :username
+
+          options = {}
+          options[:key_data] = [private_key] if private_key
+          Fog::SCP.new(ip['ip'], username, options).upload(local_path, remote_path)
+        end
+
         def setup(credentials = {})
           requires :ip, :identity, :public_key, :username
           Fog::SSH.new(ip['ip'], username, credentials).run([

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

@@ -47,6 +47,10 @@ module Fog
           connection.images(:server => self)
         end
 
+        def private_ip_address
+          nil
+        end
+
         def private_key_path
           @private_key_path ||= Fog.credentials[:private_key_path]
           @private_key_path &&= File.expand_path(@private_key_path)
@@ -56,6 +60,10 @@ module Fog
           @private_key ||= private_key_path && File.read(private_key_path)
         end
 
+        def public_ip_address
+          addresses.first
+        end
+
         def public_key_path
           @public_key_path ||= Fog.credentials[:public_key_path]
           @public_key_path &&= File.expand_path(@public_key_path)
@@ -111,6 +119,14 @@ module Fog
           Fog::SSH.new(addresses['public'].first, username, options).run(commands)
         end
 
+        def scp(local_path, remote_path)
+          requires :addresses, :username
+
+          options = {}
+          options[:key_data] = [private_key] if private_key
+          Fog::SCP.new(addresses['public'].first, username, options).upload(local_path, remote_path)
+        end
+
         def username
           @username ||= 'root'
         end

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

@@ -43,6 +43,10 @@ module Fog
           connection.images.get(image_id)
         end
 
+        def private_ip_address
+          nil
+        end
+
         def private_key_path
           @private_key_path ||= Fog.credentials[:private_key_path]
           @private_key_path &&= File.expand_path(@private_key_path)
@@ -52,6 +56,10 @@ module Fog
           @private_key ||= private_key_path && File.read(private_key_path)
         end
 
+        def public_ip_address
+          addresses.first
+        end
+
         def public_key_path
           @public_key_path ||= Fog.credentials[:public_key_path]
           @public_key_path &&= File.expand_path(@public_key_path)
@@ -101,6 +109,14 @@ module Fog
           Fog::SSH.new(addresses.first, username, options).run(commands)
         end
 
+        def scp(local_path, remote_path)
+          requires :addresses, :username
+
+          options = {}
+          options[:key_data] = [private_key] if private_key
+          Fog::SCP.new(addresses.first, username, options).upload(local_path, remote_path)
+        end
+
         def username
           @username ||= 'root'
         end

data/lib/fog/compute/models/voxel/image.rb

@@ -0,0 +1,12 @@
+require 'fog/core/model'
+
+module Fog
+  module Voxel
+    class Compute
+      class Image < Fog::Model
+        identity :id
+        attribute :name
+      end
+    end
+  end
+end

data/lib/fog/compute/models/voxel/images.rb

@@ -0,0 +1,30 @@
+require 'fog/core/collection'
+require 'fog/compute/models/voxel/image'
+
+module Fog
+  module Voxel
+    class Compute
+
+      class Images < Fog::Collection
+
+        model Fog::Voxel::Compute::Image
+
+        def all
+          data = connection.images_list.body['images']
+          load(data)
+        end
+
+        def get(image_id)
+          data = connection.images_list(image_id).body['images']
+
+          if data.empty?
+            nil
+          else
+            new(data.first)
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+require 'fog/core/model'
+
+module Fog
+  module Voxel
+    class Compute
+
+      class Server < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :processing_cores
+        attribute :image_id
+        attribute :facility
+        attribute :disk_size
+        attribute :ip_assignments, :aliases => 'ipassignments'
+
+        def initialize(attributes={})
+          super
+        end
+
+        def destroy
+          requires :id
+          connection.voxcloud_delete(id)
+          true
+        end
+
+        def image
+          requires :image_id
+          connection.images.get(image_id)
+        end
+
+        def ready?
+          status == 'SUCCEEDED'
+        end
+
+        def private_ip_address
+          ip_assignments.select {|ip_assignment| ip_assignment['type'] == 'internal'}.first
+        end
+
+        def public_ip_address
+          ip_assignments.select {|ip_assignment| ip_assignment['type'] == 'external'}.first
+        end
+
+        def reboot
+          requires :id
+          connection.devices_power(id, :reboot)
+          true
+        end
+
+        def status
+          @status ||= connection.voxcloud_status(id).body['devices'].first['status']
+        end
+
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          requires :name, :image_id, :processing_cores, :facility, :disk_size
+
+          data = connection.voxcloud_create({
+            :disk_size => disk_size,
+            :facility => facility,
+            :hostname => name,
+            :image_id => image_id,
+            :processing_cores => processing_cores
+          }).body
+
+          merge_attributes(data['device'])
+
+          true
+        end
+
+      end
+
+    end
+
+  end
+end