fog-xenserver 0.0.1.beta1 → 0.0.1.beta2

data/lib/fog/compute/xen_server/mock.rb

@@ -21,6 +21,10 @@ module Fog
           @connection  = Fog::XML::Connection.new(@host)
           @connection.authenticate(@username, @password)
         end
+
+        def method_missing(method_name, *args)
+          Fog::Mock.not_implemented
+        end
       end
     end
   end

data/lib/fog/compute/xen_server/models.rb

@@ -6,6 +6,8 @@ module Fog
         autoload :Blobs, 'fog/compute/xen_server/models/blobs'
         autoload :Bond, 'fog/compute/xen_server/models/bond'
         autoload :Bonds, 'fog/compute/xen_server/models/bonds'
+        autoload :ClassMethods, 'fog/compute/xen_server/models/class_methods'
+        autoload :Collection, 'fog/compute/xen_server/models/collection'
         autoload :Console, 'fog/compute/xen_server/models/console'
         autoload :Consoles, 'fog/compute/xen_server/models/consoles'
         autoload :CrashDump, 'fog/compute/xen_server/models/crash_dump'
@@ -15,6 +17,7 @@ module Fog
         autoload :GpuGroup, 'fog/compute/xen_server/models/gpu_group'
         autoload :GpuGroups, 'fog/compute/xen_server/models/gpu_groups'
         autoload :GuestMetrics, 'fog/compute/xen_server/models/guest_metrics'
+        autoload :GuestsMetrics, 'fog/compute/xen_server/models/guests_metrics'
         autoload :Host, 'fog/compute/xen_server/models/host'
         autoload :HostCpu, 'fog/compute/xen_server/models/host_cpu'
         autoload :HostCpus, 'fog/compute/xen_server/models/host_cpus'
@@ -25,6 +28,7 @@ module Fog
         autoload :HostPatchs, 'fog/compute/xen_server/models/host_patchs'
         autoload :Hosts, 'fog/compute/xen_server/models/hosts'
         autoload :HostsMetrics, 'fog/compute/xen_server/models/hosts_metrics'
+        autoload :InstanceMethods, 'fog/compute/xen_server/models/instance_methods'
         autoload :Model, 'fog/compute/xen_server/models/model'
         autoload :Network, 'fog/compute/xen_server/models/network'
         autoload :Networks, 'fog/compute/xen_server/models/networks'

data/lib/fog/compute/xen_server/models/blob.rb

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Blob < Fog::Model
+        class Blob < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=blob
 
           provider_class :blob
+          collection_name :blobs
 
           identity :reference
 

data/lib/fog/compute/xen_server/models/blobs.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Blobs < Fog::Collection
+        class Blobs < Collection
           model Fog::Compute::XenServer::Models::Blob
         end
       end

data/lib/fog/compute/xen_server/models/bond.rb

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Bond < Fog::Model
+        class Bond < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=Bond
 
           provider_class :Bond
+          collection_name :bonds
 
           identity :reference
 
@@ -16,9 +17,9 @@ module Fog
           attribute :properties
           attribute :uuid
 
-          has_one  :master,          :pifs
-          has_one  :primary_slave,   :pifs
-          has_many :slaves,          :pifs
+          has_one_identity    :master,          :pifs
+          has_one_identity    :primary_slave,   :pifs
+          has_many_identities :slaves,          :pifs
         end
       end
     end

data/lib/fog/compute/xen_server/models/bonds.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Bonds < Fog::Collection
+        class Bonds < Collection
           model Fog::Compute::XenServer::Models::Bond
         end
       end

data/lib/fog/compute/xen_server/models/class_methods.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class XenServer
+      module Models
+        module ClassMethods
+          def provider_class(provider_class = nil)
+            return @provider_class if provider_class.nil?
+            @provider_class = provider_class.to_s
+          end
+
+          def collection_name(collection_name = nil)
+            return @collection_name if collection_name.nil?
+            @collection_name = collection_name
+          end
+
+          def require_before_save(*args)
+            return @require_before_save || [] if args.empty?
+            @require_before_save = args
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/xen_server/models/collection.rb

@@ -0,0 +1,45 @@
+module Fog
+  module Compute
+    class XenServer
+      module Models
+        class Collection < Fog::Collection
+          def all(_options = {})
+            data = service.get_records model.provider_class
+            load(data)
+          end
+
+          def get(ref)
+            data = service.get_record(ref, model.provider_class)
+            new(data)
+          rescue Fog::XenServer::NotFound, Fog::XenServer::RequestFailed
+            nil
+          end
+
+          def get_by_name(name)
+            ref = service.get_by_name(name, model.provider_class)
+            return nil if ref.nil?
+            get(ref)
+          rescue Fog::XenServer::NotFound, Fog::XenServer::RequestFailed
+            nil
+          end
+
+          alias_method :find_by_name, :get_by_name
+
+          def get_by_uuid(uuid)
+            ref = service.get_by_uuid(uuid, model.provider_class)
+            return nil if ref.nil?
+            get(ref)
+          rescue Fog::XenServer::NotFound, Fog::XenServer::RequestFailed
+            nil
+          end
+
+          alias_method :find_by_uuid, :get_by_uuid
+
+          def get_by_reference_or_name_or_uuid(query)
+            get(query) || get_by_name(query) || get_by_uuid(query)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/xen_server/models/console.rb

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Console < Fog::Model
+        class Console < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=console
 
           provider_class :console
+          collection_name :consoles
 
           identity :reference
 
@@ -15,7 +16,7 @@ module Fog
           attribute :protocol
           attribute :uuid
 
-          has_one :vm,          :servers,     :aliases => :VM
+          has_one_identity :vm,          :servers,     :aliases => :VM,   :as => :VM
         end
       end
     end

data/lib/fog/compute/xen_server/models/consoles.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Consoles < Fog::Collection
+        class Consoles < Collection
           model Fog::Compute::XenServer::Models::Console
         end
       end

data/lib/fog/compute/xen_server/models/crash_dump.rb

@@ -2,19 +2,20 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class CrashDump < Fog::Model
+        class CrashDump < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=crashdump
 
           provider_class :crashdump
+          collection_name :crash_dumps
 
           identity :reference
 
           attribute :other_config
           attribute :uuid
 
-          has_one :vdi,           :vdis,        :aliases => :VDI
-          has_one :vm,            :servers,     :aliases => :VM
+          has_one_identity :vdi,           :vdis,        :aliases => :VDI,    :as => :VDI
+          has_one_identity :vm,            :servers,     :aliases => :VM,     :as => :VM
         end
       end
     end

data/lib/fog/compute/xen_server/models/crash_dumps.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class CrashDumps < Fog::Collection
+        class CrashDumps < Collection
           model Fog::Compute::XenServer::Models::CrashDump
         end
       end

data/lib/fog/compute/xen_server/models/dr_task.rb

@@ -2,17 +2,18 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class DrTask < Fog::Model
+        class DrTask < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=DR_task
 
           provider_class :DR_task
+          collection_name :dr_tasks
 
           identity :reference
 
           attribute :uuid
 
-          has_many :introduced_srs,       :storage_repositories,     :aliases => :introduced_SRs
+          has_many_identities :introduced_srs,  :storage_repositories,  :aliases => :introduced_SRs, :as => :introduced_SRs
         end
       end
     end

data/lib/fog/compute/xen_server/models/dr_tasks.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class DrTasks < Fog::Collection
+        class DrTasks < Collection
           model Fog::Compute::XenServer::Models::DrTask
         end
       end

data/lib/fog/compute/xen_server/models/gpu_group.rb

@@ -2,22 +2,23 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class GpuGroup < Fog::Model
+        class GpuGroup < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=GPU_group
 
           provider_class :GPU_group
+          collection_name :gpu_groups
 
           identity :reference
 
           attribute :description,         :aliases => :name_description
-          attribute :gpu_types,           :aliases => :GPU_types
+          attribute :gpu_types,           :aliases => :GPU_types,       :as => :GPU_types
           attribute :name,                :aliases => :name_label
           attribute :other_config
           attribute :uuid
 
-          has_many :pgpus,    :pgpus,     :aliases => :PGPUs
-          has_many :vgpus,    :vgpus,     :aliases => :VGPUs
+          has_many_identities :pgpus,    :pgpus,     :aliases => :PGPUs,  :as => :PGPUs
+          has_many_identities :vgpus,    :vgpus,     :aliases => :VGPUs,  :as => :VGPUs
         end
       end
     end

data/lib/fog/compute/xen_server/models/gpu_groups.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class GpuGroups < Fog::Collection
+        class GpuGroups < Collection
           model Fog::Compute::XenServer::Models::GpuGroup
         end
       end

data/lib/fog/compute/xen_server/models/guest_metrics.rb

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class GuestMetrics < Fog::Model
+        class GuestMetrics < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VM_guest_metrics
 
           provider_class :VM_guest_metrics
+          collection_name :guests_metrics
 
           identity :reference
 
@@ -18,8 +19,8 @@ module Fog
           attribute :os_version
           attribute :other
           attribute :other_config
-          attribute :pv_drivers_up_to_date,    :aliases => :PV_drivers_up_to_date
-          attribute :pv_drivers_version,       :aliases => :PV_drivers_version
+          attribute :pv_drivers_up_to_date,    :aliases => :PV_drivers_up_to_date,  :as => :PV_drivers_up_to_date
+          attribute :pv_drivers_version,       :aliases => :PV_drivers_version,     :as => :PV_drivers_version
           attribute :uuid
         end
       end

data/lib/fog/compute/xen_server/models/guests_metrics.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class GuestsMetrics < Fog::Collection
+        class GuestsMetrics < Collection
           model Fog::Compute::XenServer::Models::GuestMetrics
         end
       end

data/lib/fog/compute/xen_server/models/host.rb

@@ -2,20 +2,21 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Host < Fog::Model
+        class Host < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host
 
           provider_class :host
+          collection_name :hosts
 
           identity :reference
 
           attribute :address
           attribute :allowed_operations
-          attribute :api_version_major,                   :aliases => :API_version_major
-          attribute :api_version_minor,                   :aliases => :API_version_minor
-          attribute :api_version_vendor,                  :aliases => :API_version_vendor
-          attribute :api_version_vendor_implementation,   :aliases => :API_version_vendor_implementation
+          attribute :api_version_major,                   :aliases => :API_version_major,                 :as => :API_version_major
+          attribute :api_version_minor,                   :aliases => :API_version_minor,                 :as => :API_version_minor
+          attribute :api_version_vendor,                  :aliases => :API_version_vendor,                :as => :API_version_vendor
+          attribute :api_version_vendor_implementation,   :aliases => :API_version_vendor_implementation, :as => :API_version_vendor_implementation
           attribute :bios_strings
           attribute :blobs
           attribute :capabilities
@@ -29,7 +30,7 @@ module Fog
           attribute :external_auth_configuration
           attribute :external_auth_service_name
           attribute :external_auth_type
-          attribute :guest_vcpus_params,                  :aliases => :guest_VCPUs_params
+          attribute :guest_vcpus_params,                  :aliases => :guest_VCPUs_params,                :as => :guest_VCPUs_params
           attribute :ha_network_peers
           attribute :ha_statefiles
           attribute :hostname
@@ -49,71 +50,28 @@ module Fog
           attribute :tags
           attribute :uuid
 
-          has_many :crashdumps,    :crash_dumps
-          has_one  :crash_dump_sr, :storage_repositories
-          has_many :host_cpus,     :host_cpus,            :aliases => :host_CPUs
-          has_one  :local_cache_sr,:storage_repositories
-          has_one  :metrics,       :hosts_metrics
-          has_many :pbds,          :pbds,                 :aliases => :PBDs
-          has_many :pcis,          :pcis,                 :aliases => :PCIs
-          has_many :pgpus,         :pgpus,                :aliases => :PGPUs
-          has_many :pifs,          :pifs,                 :aliases => :PIFs
-          has_many :resident_vms,  :servers,              :aliases => :resident_VMs
+          has_many_identities :crashdumps,    :crash_dumps
+          has_one_identity    :crash_dump_sr, :storage_repositories
+          has_many_identities :host_cpus,     :host_cpus,            :aliases => :host_CPUs,    :as => :host_CPUs
+          has_one_identity    :local_cache_sr,:storage_repositories
+          has_one_identity    :metrics,       :hosts_metrics
+          has_many_identities :pbds,          :pbds,                 :aliases => :PBDs,         :as => :PBDs
+          has_many_identities :pcis,          :pcis,                 :aliases => :PCIs,         :as => :PCIs
+          has_many_identities :pgpus,         :pgpus,                :aliases => :PGPUs,        :as => :PGPUs
+          has_many_identities :pifs,          :pifs,                 :aliases => :PIFs,         :as => :PIFs
+          has_many_identities :resident_vms,  :servers,              :aliases => :resident_VMs, :as => :resident_VMs
 
           alias_method :resident_servers, :resident_vms
 
-          #
-          # Reboot the host disabling it first unless auto_disable is
-          # set to false
-          #
-          # This function can only be called if there are no currently running
-          # VMs on the host and it is disabled. If there are running VMs, it will
-          # raise an exception.
-          #
-          # @param [Boolean] auto_disable disable the host first
-          #
-          # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=host
-          #
-          def reboot(auto_disable = true)
-            disable if auto_disable
-            service.reboot_host(reference)
-          end
-
-          #
-          # Puts the host into a state in which no new VMs can be started.
-          # Currently active VMs on the host continue to execute.
-          #
-          # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=host
-          #
-          def disable
-            service.disable_host(reference)
-          end
-
-          #
-          # Puts the host into a state in which new VMs can be started.
-          #
-          # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=host
-          #
-          def enable
-            service.enable_host(reference)
-          end
-
-          #
-          # Shutdown the host disabling it first unless auto_disable is
-          # set to false.
-          #
-          # This function can only be called if there are no currently running
-          # VMs on the host and it is disabled. If there are running VMs, it will
-          # raise an exception.
-          #
-          # @param [Boolean] auto_disable disable the host first
-          #
-          # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=host
-          #
           def shutdown(auto_disable = true)
-            disable if auto_disable
+            service.disable_host(reference) if auto_disable
             service.shutdown_host(reference)
           end
+
+          def reboot(auto_disable = true)
+            service.disable_host(reference) if auto_disable
+            service.reboot_host(reference)
+          end
         end
       end
     end