fog-xenserver 0.0.1.beta1 → 0.0.1.beta2

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class HostCpu < Fog::Model
+        class HostCpu < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_cpu
 
           provider_class :host_cpu
+          collection_name :host_cpus
 
           identity :reference
 
@@ -14,7 +15,7 @@ module Fog
           attribute :features
           attribute :flags
           attribute :model
-          attribute :model_name,      :aliases => :modelname
+          attribute :model_name,      :aliases => :modelname,   :as => :modelname
           attribute :number
           attribute :other_config
           attribute :speed
@@ -23,7 +24,7 @@ module Fog
           attribute :uuid
           attribute :vendor
 
-          has_one   :host,       :hosts
+          has_one_identity   :host,       :hosts
         end
       end
     end

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

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

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class HostCrashDump < Fog::Model
+        class HostCrashDump < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_crashdump
 
           provider_class :host_crashdump
+          collection_name :host_crash_dumps
 
           identity :reference
 
@@ -15,7 +16,7 @@ module Fog
           attribute :timestamp
           attribute :uuid
 
-          has_one   :host,       :hosts
+          has_one_identity   :host,       :hosts
         end
       end
     end

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

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

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

@@ -2,25 +2,21 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class HostMetrics < Fog::Model
+        class HostMetrics < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_metrics
 
           provider_class :host_metrics
+          collection_name :hosts_metrics
 
           identity :reference
 
-          attribute :last_updated
+          attribute :last_updated,  :type => :time
           attribute :live
           attribute :memory_free
           attribute :memory_total
           attribute :other_config
           attribute :uuid
-
-          def initialize(attributes = {})
-            super
-            self.last_updated = attributes[:last_updated].to_time
-          end
         end
       end
     end

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class HostPatch < Fog::Model
+        class HostPatch < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_patch
 
           provider_class :host_patch
+          collection_name :host_patchs
 
           identity :reference
 
@@ -19,8 +20,8 @@ module Fog
           attribute :uuid
           attribute :version
 
-          has_one   :host,       :hosts
-          has_one   :pool_patch, :pool_patchs
+          has_one_identity   :host,       :hosts
+          has_one_identity   :pool_patch, :pool_patchs
         end
       end
     end

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

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

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

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

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

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

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

@@ -0,0 +1,54 @@
+module Fog
+  module Compute
+    class XenServer
+      module Models
+        module InstanceMethods
+          def provider_class
+            self.class.provider_class
+          end
+
+          def collection
+            service.send(self.class.collection_name)
+          end
+
+          def require_creation_attributes
+            requires *self.class.instance_variable_get('@require_before_save')
+          end
+
+          def set_attribute(name, *val)
+            service.set_attribute(provider_class, reference, name, *val)
+          end
+
+          def save(extra_params = {})
+            require_creation_attributes
+            attrs = all_associations_and_attributes.reject { |_key, value| value.nil? }
+            ref = service.send("create_#{provider_class.downcase}", attrs, extra_params)
+            merge_attributes collection.get(ref).attributes
+            true
+          end
+
+          def destroy
+            requires :reference
+            service.send(:destroy_record, reference, provider_class.downcase)
+            true
+          end
+
+          def method_missing(method_name, *args)
+            if service.respond_to?("#{method_name}_#{provider_class.downcase}")
+              result = service.send("#{method_name}_#{provider_class.downcase}", reference, *args)
+              reload
+              result
+            else
+              super
+            end
+          end
+
+          def respond_to?(method_name, include_private = false)
+            return true if service.respond_to?("#{method_name}_#{provider_class.downcase}")
+            super
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Fog
+  module Compute
+    class XenServer
+      module Models
+        class Model < Fog::Model
+          extend ClassMethods
+          include InstanceMethods
+        end
+      end
+    end
+  end
+end

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Network < Fog::Model
+        class Network < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=network
 
           provider_class :network
+          collection_name :networks
 
           identity :reference
 
@@ -15,49 +16,17 @@ module Fog
           attribute :bridge
           attribute :current_operations
           attribute :default_locking_mode
-          attribute :description,         :aliases => :name_description
-          attribute :mtu,                 :aliases => :MTU
-          attribute :name,                :aliases => :name_label
-          attribute :other_config
+          attribute :description,         :aliases => :name_description,  :default => '',  :as => :name_description
+          attribute :mtu,                 :aliases => :MTU,                                :as => :MTU
+          attribute :name,                :aliases => :name_label,        :default => '',  :as => :name_label
+          attribute :other_config,                                        :default => {}
           attribute :tags
           attribute :uuid
 
-          has_many :pifs,  :pifs,         :aliases => :PIFs
-          has_many :vifs,  :vifs,         :aliases => :VIFs
+          has_many_identities :pifs,  :pifs,         :aliases => :PIFs,   :as => :PIFs
+          has_many_identities :vifs,  :vifs,         :aliases => :VIFs,   :as => :VIFs
 
-          # Creates a new network
-          #
-          #     service = Fog::Compute[:xenserver]
-          #
-          #     # create network 'foonet'
-          #     net = service.networks.create :name => 'foonet',
-          #                                   :description => 'test network'
-          #
-          # @return [Boolean]
-          #
-          def save
-            requires :name
-            ref = service.create_network name, attributes
-            data = service.get_record ref, 'network'
-            merge_attributes data
-            true
-          end
-
-          # Destroys a network
-          #
-          #     service = Fog::Compute[:xenserver]
-          #
-          #     # find network 'foonet' and destroy it
-          #     net = service.networks.find { |net| net.name == 'foonet' }
-          #     net.destroy
-          #
-          # @return [Boolean]
-          #
-          def destroy
-            requires :reference
-            service.destroy_network reference
-            true
-          end
+          require_before_save :name
         end
       end
     end

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

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

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Pbd < Fog::Model
+        class Pbd < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=PBD
 
           provider_class :PBD
+          collection_name :pbds
 
           identity :reference
 
@@ -15,14 +16,10 @@ module Fog
           attribute :other_config
           attribute :uuid
 
-          has_one :host,  :hosts
-          has_one :sr,    :storage_repositories,    :aliases => :SR
+          has_one_identity :host,  :hosts
+          has_one_identity :sr,    :storage_repositories,    :aliases => :SR,   :as => :SR
 
           alias_method :storage_repository, :sr
-
-          def unplug
-            service.unplug_pbd reference
-          end
         end
       end
     end

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

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

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Pci < Fog::Model
+        class Pci < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=PCI
 
           provider_class :PCI
+          collection_name :pcis
 
           identity :reference
 
@@ -16,8 +17,8 @@ module Fog
           attribute :uuid
           attribute :vendor_name
 
-          has_many  :dependencies,  :pcis
-          has_one   :host,          :hosts
+          has_many_identities   :dependencies,  :pcis
+          has_one_identity      :host,          :hosts
         end
       end
     end

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

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

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

@@ -2,20 +2,21 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Pgpu < Fog::Model
+        class Pgpu < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=PGPU
 
           provider_class :PGPU
+          collection_name :pgpus
 
           identity :reference
 
           attribute :other_config
           attribute :uuid
 
-          has_one   :gpu_group,     :gpu_groups,  :aliases => :GPU_group
-          has_one   :host,          :hosts
-          has_one   :pci,           :pcis,        :aliases => :PCI
+          has_one_identity   :gpu_group,     :gpu_groups,  :aliases => :GPU_group,  :as => :GPU_group
+          has_one_identity   :host,          :hosts
+          has_one_identity   :pci,           :pcis,        :aliases => :PCI,        :as => :PCI
         end
       end
     end

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

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

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Pif < Fog::Model
+        class Pif < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=PIF
 
           provider_class :PIF
+          collection_name :pifs
 
           identity :reference
 
@@ -14,34 +15,44 @@ module Fog
           attribute :currently_attached
           attribute :device
           attribute :device_name
-          attribute :dns,                         :aliases => :DNS
+          attribute :dns,                         :aliases => :DNS,   :as => :DNS
           attribute :gateway
-          attribute :ip,                          :aliases => :IP
+          attribute :ip,                          :aliases => :IP,    :as => :IP
           attribute :ip_configuration_mode
-          attribute :ipv6,                        :aliases => :IPv6
+          attribute :ipv6,                        :aliases => :IPv6,  :as => :IPv6
           attribute :ipv6_configuration_mode
           attribute :ipv6_gateway
-          attribute :mac,                         :aliases => :MAC
+          attribute :mac,                         :aliases => :MAC,   :as => :MAC
           attribute :management
-          attribute :mtu,                         :aliases => :MTU
+          attribute :mtu,                         :aliases => :MTU,   :as => :MTU
           attribute :netmask
           attribute :other_config
           attribute :physical
           attribute :primary_address_type
           attribute :status_code
           attribute :status_detail
-          attribute :vlan,                        :aliases => :VLAN
+          attribute :vlan,                        :aliases => :VLAN,  :as => :VLAN
           attribute :uuid
 
-          has_one :bond_master_of,            :bonds
-          has_one :bond_slave_of,             :bonds
-          has_one :host,                      :hosts
-          has_one :metrics,                   :pif_metrics
-          has_one :network,                   :networks
-          has_one :tunnel_access_pif_of,      :tunnels,     :aliases => :tunnel_access_PIF_of
-          has_one :tunnel_transport_pif_of,   :tunnels,     :aliases => :tunnel_transport_PIF_of
-          has_one :vlan_master_of,            :vlans,       :aliases => :VLAN_master_of
-          has_one :vlan_slave_of,             :vlans,       :aliases => :VLAN_slave_of
+          has_one_identity :bond_master_of,            :bonds
+          has_one_identity :bond_slave_of,             :bonds
+          has_one_identity :host,                      :hosts
+          has_one_identity :metrics,                   :pif_metrics
+          has_one_identity :network,                   :networks
+          has_one_identity :tunnel_access_pif_of,      :tunnels,     :aliases => :tunnel_access_PIF_of,     :as => :tunnel_access_PIF_of
+          has_one_identity :tunnel_transport_pif_of,   :tunnels,     :aliases => :tunnel_transport_PIF_of,  :as => :tunnel_transport_PIF_of
+          has_one_identity :vlan_master_of,            :vlans,       :aliases => :VLAN_master_of,           :as => :VLAN_master_of
+          has_one_identity :vlan_slave_of,             :vlans,       :aliases => :VLAN_slave_of,            :as => :VLAN_slave_of
+          
+          methods = %w{ db_introduce introduce scan }
+
+          # would be much simpler just call __callee__ on request without reference
+          # instead of __method__ and set an alias for each method defined on
+          # methods, just creating a method for each one, so we can keep compatability
+          # with ruby 1.8.7 that does not have __callee__
+          methods.each do |method|
+            define_method(method.to_sym) { |*args| service.send("#{__method__}_#{provider_class.downcase}", *args) }
+          end
         end
       end
     end