fog-xenserver 0.0.1.beta1 → 0.0.1.beta2

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

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

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

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

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

@@ -1,8 +1,10 @@
 module Fog
   module Compute
     class XenServer
-      class PifsMetrics < Fog::Collection
-        model Fog::Compute::XenServer::Models::PifMetrics
+      module Models
+        class PifsMetrics < Collection
+          model Fog::Compute::XenServer::Models::PifMetrics
+        end
       end
     end
   end

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Pool < Fog::Model
+        class Pool < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=pool
 
           provider_class :pool
+          collection_name :pools
 
           identity :reference
 
@@ -33,13 +34,30 @@ module Fog
           attribute :wlb_username
           attribute :wlb_verify_cert
 
-          has_one  :crash_dump_sr,    :storage_repositories,   :aliases => :crash_dump_SR
-          has_one  :default_sr,       :storage_repositories,   :aliases => :default_SR
-          has_one  :master,           :hosts
-          has_many :metadata_vdis,    :vdis,                   :aliases => :metadata_VDIs
-          has_one  :suspend_image_sr, :storage_repositories,   :aliases => :suspend_image_SR
+          has_one_identity    :crash_dump_sr,    :storage_repositories,   :aliases => :crash_dump_SR,     :as => :crash_dump_SR
+          has_one_identity    :default_sr,       :storage_repositories,   :aliases => :default_SR,        :as => :default_SR
+          has_one_identity    :master,           :hosts
+          has_many_identities :metadata_vdis,    :vdis,                   :aliases => :metadata_VDIs,     :as => :metadata_VDIs
+          has_one_identity    :suspend_image_sr, :storage_repositories,   :aliases => :suspend_image_SR,  :as => :suspend_image_SR
 
           alias_method :default_storage_repository, :default_sr
+          methods = %w{
+                      certificate_install certificate_list certificate_sync certificate_uninstall create_vlan \
+                      create_vlan_from_pif crl_install crl_list crl_uninstall designate_new_master disable_ha \
+                      disable_redo_log emergency_reset_master emergency_transition_to_master enable_ha \
+                      enable_redo_log ha_compute_hypothetical_max_host_failures_to_tolerate \
+                      ha_compute_max_host_failures_to_tolerate ha_compute_vm_failover_plan \
+                      ha_failover_plan_exists ha_prevent_restarts_for join join_force recover_slaves \
+                      send_test_post set_vswitch_controller sync_database
+                    }
+
+          # 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

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class PoolPatch < Fog::Model
+        class PoolPatch < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=pool_patch
 
           provider_class :pool_patch
+          collection_name :pool_patchs
 
           identity :reference
 
@@ -19,7 +20,7 @@ module Fog
           attribute :uuid
           attribute :version
 
-          has_many  :host_patches,    :host_patchs
+          has_many_identities  :host_patches,    :host_patchs
         end
       end
     end

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

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

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

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

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class Role < Fog::Model
+        class Role < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=role
 
           provider_class :role
+          collection_name :roles
 
           identity :reference
 
@@ -14,7 +15,7 @@ module Fog
           attribute :name,                :aliases => :name_label
           attribute :uuid
 
-          has_many  :subroles,  :roles
+          has_many_identities  :subroles,  :roles
         end
       end
     end

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

@@ -1,8 +1,8 @@
 module Fog
   module Compute
     class XenServer
-      module Model
-        class Roles < Fog::Collection
+      module Models
+        class Roles < Collection
           model Fog::Compute::XenServer::Models::Role
         end
       end

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

@@ -8,13 +8,17 @@ module Fog
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VM
 
+          extend ClassMethods
+          include InstanceMethods
+
           provider_class :VM
+          collection_name :servers
 
           identity :reference
 
-          attribute :actions_after_crash
-          attribute :actions_after_reboot
-          attribute :actions_after_shutdown
+          attribute :actions_after_crash,                                             :default => 'Restart'
+          attribute :actions_after_reboot,                                            :default => 'Restart'
+          attribute :actions_after_shutdown,                                          :default => 'Destroy'
           attribute :allowed_operations
           attribute :blobs
           attribute :blocked_operations
@@ -22,88 +26,78 @@ module Fog
           attribute :current_operations
           attribute :domarch
           attribute :domid
-          attribute :description,                 :aliases => :name_description
+          attribute :description,                 :aliases => :name_description,      :default => '',         :as => :name_description
           attribute :generation_id
           attribute :ha_always_run
           attribute :ha_restart_priority
-          attribute :hvm_boot_params,             :aliases => :HVM_boot_params
-          attribute :hvm_boot_policy,             :aliases => :HVM_boot_policy
-          attribute :hvm_shadow_multiplier,       :aliases => :HVM_shadow_multiplier
+          attribute :hvm_boot_params,             :aliases => :HVM_boot_params,       :default => {},         :as => :HVM_boot_params
+          attribute :hvm_boot_policy,             :aliases => :HVM_boot_policy,       :default => '',         :as => :HVM_boot_policy
+          attribute :hvm_shadow_multiplier,       :aliases => :HVM_shadow_multiplier,                         :as => :HVM_shadow_multiplier
           attribute :is_a_snapshot
-          attribute :is_a_template
+          attribute :is_a_template,                                                   :default => true
           attribute :is_control_domain
           attribute :is_snapshot_from_vmpp
           attribute :last_booted_record
-          attribute :last_boot_cpu_flags,         :aliases => :last_boot_CPU_flags
-          attribute :memory_dynamic_max
-          attribute :memory_dynamic_min
+          attribute :last_boot_cpu_flags,         :aliases => :last_boot_CPU_flags,                           :as => :last_boot_CPU_flags
+          attribute :memory_dynamic_max,                                              :default => '536870912'
+          attribute :memory_dynamic_min,                                              :default => '536870912'
           attribute :memory_overhead
-          attribute :memory_static_max
-          attribute :memory_static_min
+          attribute :memory_static_max,                                               :default => '536870912'
+          attribute :memory_static_min,                                               :default => '536870912'
           attribute :memory_target
-          attribute :name,                        :aliases => :name_label
+          attribute :name,                        :aliases => :name_label,            :default => '',         :as => :name_label
           attribute :order
-          attribute :other_config
-          attribute :pci_bus,                     :aliases => :PCI_bus
-          attribute :platform
+          attribute :other_config,                                                    :default => {}
+          attribute :pci_bus,                     :aliases => :PCI_bus,               :default => '',         :as => :PCI_bus
+          attribute :platform,                                                        :default => { 'nx' => 'true',
+                                                                                                    'acpi' => 'true',
+                                                                                                    'apic' => 'true',
+                                                                                                    'pae' => 'true',
+                                                                                                    'viridian' => 'true' }
           attribute :power_state
-          attribute :pv_args,                     :aliases => :PV_args
-          attribute :pv_bootloader,               :aliases => :PV_bootloader
-          attribute :pv_bootloader_args,          :aliases => :PV_bootloader_args
-          attribute :pv_kernel,                   :aliases => :PV_kernel
-          attribute :pv_legacy_args,              :aliases => :PV_legacy_args
-          attribute :pv_ramdisk,                  :aliases => :PV_ramdisk
-          attribute :recommendations
+          attribute :pv_args,                     :aliases => :PV_args,               :default => '-- quiet console=hvc0',  :as => :PV_args
+          attribute :pv_bootloader,               :aliases => :PV_bootloader,         :default => 'pygrub',                 :as => :PV_bootloader
+          attribute :pv_bootloader_args,          :aliases => :PV_bootloader_args,    :default => '',                       :as => :PV_bootloader_args
+          attribute :pv_kernel,                   :aliases => :PV_kernel,             :default => '',                       :as => :PV_kernel
+          attribute :pv_legacy_args,              :aliases => :PV_legacy_args,        :default => '',                       :as => :PV_legacy_args
+          attribute :pv_ramdisk,                  :aliases => :PV_ramdisk,            :default => '',                       :as => :PV_ramdisk
+          attribute :recommendations,                                                 :default => ''
           attribute :shutdown_delay
           attribute :snapshot_info
           attribute :snapshot_metadata
-          attribute :snapshot_time
+          attribute :snapshot_time,   :type => :time
           attribute :start_delay
           attribute :tags
-          attribute :template_name
           attribute :transportable_snapshot_id
-          attribute :user_version
+          attribute :user_version,                                                    :default => '0'
           attribute :uuid
-          attribute :vcpus_at_startup,            :aliases => :VCPUs_at_startup
-          attribute :vcpus_max,                   :aliases => :VCPUs_max
-          attribute :vcpus_params,                :aliases => :VCPUs_params
+          attribute :vcpus_at_startup,            :aliases => :VCPUs_at_startup,      :default => '1',    :as => :VCPUs_at_startup
+          attribute :vcpus_max,                   :aliases => :VCPUs_max,             :default => '1',    :as => :VCPUs_max
+          attribute :vcpus_params,                :aliases => :VCPUs_params,          :default => {},     :as => :VCPUs_params
           attribute :version
           attribute :xenstore_data
 
-          has_one   :affinity,          :hosts
-          has_one   :appliance,         :server_appliances
-          has_many  :attached_pcis,     :pcis,                    :aliases => :attached_PCIs
-          has_many  :children,          :servers
-          has_many  :consoles,          :consoles
-          has_many  :crash_dumps,       :crash_dumps
-          has_one   :guest_metrics,     :guests_metrics
-          has_one   :metrics,           :servers_metrics
-          has_one   :parent,            :servers
-          has_one   :protection_policy, :vmpps
-          has_one   :resident_on,       :hosts
-          has_many  :snapshots,         :servers
-          has_one   :snapshot_of,       :servers
-          has_one   :suspend_sr,        :storage_repositories,    :aliases => :suspend_SR
-          has_one   :suspend_vdi,       :vdis,                    :aliases => :suspend_VDI
-          has_many  :vbds,              :vbds,                    :aliases => :VBDs
-          has_many  :vgpus,             :vgpus,                   :aliases => :VGPUs
-          has_many  :vifs,              :vifs,                    :aliases => :VIFs
-          has_many  :vtpms,             :vtpms,                   :aliases => :VTPMs
-
-          def destroy
-            # Make sure it's halted
-            stop('hard')
-            vbds.each do |vbd|
-              if vbd.type == "Disk"
-                vbd.unplug \
-                if vbd.allowed_operations.include?("unplug")
-                vbd.vdi.destroy \
-                if vbd.vdi.allowed_operations.include?("destroy")
-              end
-            end
-            service.destroy_server( reference )
-            true
-          end
+          has_one_identity      :affinity,          :hosts
+          has_one_identity      :appliance,         :server_appliances
+          has_many_identities   :attached_pcis,     :pcis,                    :aliases => :attached_PCIs,   :as => :attached_PCIs
+          has_many_identities   :children,          :servers
+          has_many_identities   :consoles,          :consoles
+          has_many_identities   :crash_dumps,       :crash_dumps
+          has_one_identity      :guest_metrics,     :guests_metrics
+          has_one_identity      :metrics,           :servers_metrics
+          has_one_identity      :parent,            :servers
+          has_one_identity      :protection_policy, :vmpps
+          has_one_identity      :resident_on,       :hosts
+          has_many_identities   :snapshots,         :servers
+          has_one_identity      :snapshot_of,       :servers
+          has_one_identity      :suspend_sr,        :storage_repositories,    :aliases => :suspend_SR,      :as => :suspend_SR
+          has_one_identity      :suspend_vdi,       :vdis,                    :aliases => :suspend_VDI,     :as => :suspend_VDI
+          has_many_identities   :vbds,              :vbds,                    :aliases => :VBDs,            :as => :VBDs
+          has_many_identities   :vgpus,             :vgpus,                   :aliases => :VGPUs,           :as => :VGPUs
+          has_many_identities   :vifs,              :vifs,                    :aliases => :VIFs,            :as => :VIFs
+          has_many_identities   :vtpms,             :vtpms,                   :aliases => :VTPMs,           :as => :VTPMs
+
+          require_before_save :name, :affinity
 
           def tools_installed?
             !guest_metrics.nil?
@@ -114,87 +108,64 @@ module Fog
           end
 
           def mac_address
-            networks.first.MAC
+            vifs.first.mac
           end
 
           def running?
             reload
-            power_state == "Running"
+            power_state == 'Running'
           end
 
           def halted?
             reload
-            power_state == "Halted"
+            power_state == 'Halted'
           end
 
-          # operations
-          def start
-            return false if running?
-            service.start_server( reference )
-            true
+          def destroy
+            hard_shutdown
+            vbds.map(&:destroy)
+            service.destroy_record(reference, provider_class)
           end
 
-          def save(params = {})
-            requires :name
-            nets = attributes[:networks] || []
-            if params[:auto_start].nil?
-              auto_start = true
-            else
-              auto_start = params[:auto_start]
-            end
-            if template_name
-              attr = service.get_record(
-                  service.create_server( name, template_name, nets, :auto_start => auto_start),
-                  'VM'
-              )
-            else
-              attr = service.get_record(
-                  service.create_server_raw(attributes),
-                  'VM'
-              )
-            end
-            merge_attributes attr
+          def start
+            return false if running?
+            service.start_vm(reference)
+            wait_for(&:running?)
             true
           end
 
-          def reboot(stype = 'clean')
-            service.reboot_server(reference, stype)
+          def hard_shutdown
+            return false if halted?
+            service.hard_shutdown_vm(reference)
+            wait_for(&:halted?)
             true
           end
 
-          def hard_reboot
-            reboot 'hard'
-          end
-
-          def clean_reboot
-            reboot 'clean'
-          end
-
-          def stop(stype = 'clean')
-            return false if !running?
-            service.shutdown_server( reference, stype )
-            wait_for { power_state == 'Halted' }
+          def clean_shutdown
+            return false if halted?
+            service.clean_shutdown_vm(reference)
+            wait_for(&:halted?)
             true
           end
 
-          def hard_shutdown
-            stop 'hard'
-          end
-
-          def clean_shutdown
-            stop 'clean'
+          def can_be_cloned?
+            allowed_operations.include?('clone')
           end
 
-          def provision
-            service.provision_server reference
+          def clone(name)
+            raise 'Clone Operation not Allowed' unless can_be_cloned?
+            self.reference = service.clone_vm(name, self.reference)
+            reload
           end
 
-          def snapshot(name)
-            service.snapshot_server(reference, name)
+          def revert(snapshot_ref)
+            Fog::Logger.deprecation 'This method is DEPRECATED. Use #revert_to instead.'
+            revert_to(snapshot_ref)
           end
 
-          def revert(snapshot_ref)
-            service.snapshot_revert(snapshot_ref)
+          def revert_to(snapshot)
+            snapshot = collection.get_by_reference_or_name_or_uuid(snapshot)
+            service.revert_to_vm(snapshot.reference)
           end
         end
       end

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

@@ -2,11 +2,12 @@ module Fog
   module Compute
     class XenServer
       module Models
-        class ServerAppliance < Fog::Model
+        class ServerAppliance < Model
           # API Reference here:
           # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VM_appliance
 
           provider_class :VM_appliance
+          collection_name :server_appliances
 
           identity :reference
 
@@ -16,7 +17,7 @@ module Fog
           attribute :name,                    :aliases => :name_label
           attribute :uuid
 
-          has_many  :vms,   :servers,         :aliases => :VMs
+          has_many_identities  :vms,   :servers,         :aliases => :VMs,   :as => :VMs
         end
       end
     end