fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -8,18 +8,18 @@ module Fog
       class Pifs < Fog::Collection
 
         model Fog::Compute::XenServer::PIF
-        
+
         def initialize(attributes)
           super
         end
 
         def all(options = {})
-          data = connection.get_records 'PIF'
+          data = service.get_records 'PIF'
           load(data)
         end
 
         def get( ref )
-          if ref && obj = connection.get_record( ref, 'PIF' )
+          if ref && obj = service.get_record( ref, 'PIF' )
             new(obj)
           end
         rescue Fog::XenServer::NotFound

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

@@ -3,38 +3,60 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class Pool < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=pool
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :name,                   :aliases => :name_label
         attribute :description,            :aliases => :name_description
         attribute :__default_sr,           :aliases => :default_SR
         attribute :__master,               :aliases => :master
-        attribute :tags 
+        attribute :tags
         attribute :restrictions
         attribute :ha_enabled
         attribute :vswitch_controller
+        attribute :__suspend_image_sr,     :aliases => :suspend_image_SR
+
 
-        
         def default_sr
-          connection.storage_repositories.get __default_sr
+          service.storage_repositories.get __default_sr
+        end
+
+        def default_sr=(sr)
+          connection.set_attribute( 'pool', reference, 'default_SR', sr.reference )
         end
+        alias :default_storage_repository= :default_sr=
 
         def default_storage_repository
           default_sr
         end
 
+        def suspend_image_sr=(sr)
+          connection.set_attribute( 'pool', reference, 'suspend_image_SR', sr.reference )
+        end
+
+        def suspend_image_sr
+          connection.storage_repositories.get __suspend_image_sr
+        end
+
         def master
-          connection.hosts.get __master
+          service.hosts.get __master
+        end
+        
+        def set_attribute(name, *val)
+          data = connection.set_attribute( 'pool', reference, name, *val )
+          # Do not reload automatically for performance reasons
+          # We can set multiple attributes at the same time and
+          # then reload manually
+          #reload
         end
 
       end
-      
+
     end
   end
 end

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

@@ -8,18 +8,18 @@ module Fog
       class Pools < Fog::Collection
 
         model Fog::Compute::XenServer::Pool
-        
+
         def initialize(attributes)
           super
         end
 
         def all(options = {})
-          data = connection.get_records 'pool'
+          data = service.get_records 'pool'
           load(data)
         end
 
         def get( pool_ref )
-          if pool_ref && pool = connection.get_record( pool_ref, 'pool' )
+          if pool_ref && pool = service.get_record( pool_ref, 'pool' )
             new(pool)
           else
             nil

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

@@ -7,9 +7,9 @@ module Fog
       class Server < Fog::Compute::Server
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VM
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :name,                 :aliases => :name_label
         attribute :__affinity,           :aliases => :affinity
@@ -56,11 +56,11 @@ module Fog
         end
 
         def vbds
-          __vbds.collect {|vbd| connection.vbds.get vbd }
+          __vbds.collect {|vbd| service.vbds.get vbd }
         end
 
         def affinity
-          connection.hosts.get __affinity
+          service.hosts.get __affinity
         end
 
         def destroy
@@ -74,26 +74,26 @@ module Fog
                 if vbd.vdi.allowed_operations.include?("destroy")
             end
           end
-          connection.destroy_server( reference )
+          service.destroy_server( reference )
           true
         end
 
         def set_attribute(name, *val)
-          data = connection.set_attribute( 'VM', reference, name, *val )
+          data = service.set_attribute( 'VM', reference, name, *val )
           # Do not reload automatically for performance reasons
           # We can set multiple attributes at the same time and
           # then reload manually
           #reload
         end
-        
+
         def refresh
-          data = connection.get_record( reference, 'VM' )
+          data = service.get_record( reference, 'VM' )
           merge_attributes( data )
           true
         end
 
         def vifs
-          __vifs.collect { |vif| connection.vifs.get vif }
+          __vifs.collect { |vif| service.vifs.get vif }
         end
 
         # associations
@@ -102,44 +102,44 @@ module Fog
         end
 
         def resident_on
-          connection.hosts.get __resident_on
+          service.hosts.get __resident_on
         end
-        
+
         #
         # This is not always present in XenServer VMs
         # Guest needs XenTools installed to report this AFAIK
         def guest_metrics
           return nil unless __guest_metrics
-          rec = connection.get_record( __guest_metrics, 'VM_guest_metrics' )
+          rec = service.get_record( __guest_metrics, 'VM_guest_metrics' )
           Fog::Compute::XenServer::GuestMetrics.new(rec)
         end
 
         def tools_installed?
           !guest_metrics.nil?
         end
-        
+
         def home_hypervisor
-          connection.hosts.first
+          service.hosts.first
         end
-        
+
         def mac_address
           networks.first.MAC
         end
-        
+
         def running?
           reload
           power_state == "Running"
         end
-        
+
         def halted?
           reload
           power_state == "Halted"
         end
-        
+
         # operations
         def start
           return false if running?
-          connection.start_server( reference )
+          service.start_server( reference )
           true
         end
 
@@ -149,25 +149,25 @@ module Fog
           if params[:auto_start].nil?
             auto_start = true
           else
-            auto_start = params[:auto_start] 
+            auto_start = params[:auto_start]
           end
           if template_name
-            attr = connection.get_record(
-              connection.create_server( name, template_name, nets, :auto_start => auto_start),
+            attr = service.get_record(
+              service.create_server( name, template_name, nets, :auto_start => auto_start),
               'VM'
             )
           else
-            attr = connection.get_record(
-              connection.create_server_raw(attributes),
+            attr = service.get_record(
+              service.create_server_raw(attributes),
               'VM'
             )
           end
-          merge_attributes attr 
+          merge_attributes attr
           true
         end
 
         def reboot(stype = 'clean')
-          connection.reboot_server(reference, stype)
+          service.reboot_server(reference, stype)
           true
         end
 
@@ -181,7 +181,7 @@ module Fog
 
         def stop(stype = 'clean')
           return false if !running?
-          connection.shutdown_server( reference, stype )
+          service.shutdown_server( reference, stype )
           wait_for { power_state == 'Halted' }
           true
         end
@@ -195,12 +195,12 @@ module Fog
         end
 
         def provision
-          connection.provision_server reference
+          service.provision_server reference
         end
 
         # def snapshot
         #   requires :reference, :name_label
-        #   data = connection.snapshot_server(@reference, @name_label)
+        #   data = service.snapshot_server(@reference, @name_label)
         #   merge_attributes(data.body)
         #   true
         # end

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

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::XenServer::Server
 
         def templates
-          data = connection.get_records 'VM'
+          data = service.get_records 'VM'
           data.delete_if do |vm|
             !vm[:is_a_template]
           end
@@ -18,15 +18,15 @@ module Fog
         end
 
         def custom_templates
-          data = connection.get_records 'VM'
+          data = service.get_records 'VM'
           data.delete_if do |vm|
-            !vm[:is_a_template] or !vm[:other_config]['default_template'].nil? 
+            !vm[:is_a_template] or !vm[:other_config]['default_template'].nil?
           end
           load(data)
         end
-        
+
         def builtin_templates
-          data = connection.get_records 'VM'
+          data = service.get_records 'VM'
           data.delete_if do |vm|
             !vm[:is_a_template] or vm[:other_config]['default_template'].nil?
           end
@@ -34,7 +34,7 @@ module Fog
         end
 
         def all(options = {})
-          data = connection.get_records 'VM'
+          data = service.get_records 'VM'
           # Exclude templates
           data.delete_if { |vm| vm[:is_control_domain] or vm[:is_a_template] }
           data.delete_if { |vm| vm[:is_a_snapshot] and !options[:include_snapshots] }
@@ -44,12 +44,12 @@ module Fog
         end
 
         def get_by_name( name )
-          ref = connection.get_vm_by_name( name )
+          ref = service.get_vm_by_name( name )
           get ref
         end
 
         def get( vm_ref )
-          if vm_ref && vm = connection.get_record( vm_ref, 'VM' )
+          if vm_ref && vm = service.get_record( vm_ref, 'VM' )
             new(vm)
           end
         rescue Fog::XenServer::NotFound

data/lib/fog/xenserver/models/compute/storage_repositories.rb

@@ -10,14 +10,14 @@ module Fog
         model Fog::Compute::XenServer::StorageRepository
 
         def all
-          data = connection.get_records 'SR'
+          data = service.get_records 'SR'
           #data.delete_if {|sr| sr[:shared].eql?(false)}
           #data.delete_if {|sr| sr[:content_type].eql?('iso')}
           load(data)
         end
 
         def get( sr_ref )
-          if sr_ref && sr = connection.get_record( sr_ref, 'SR' )
+          if sr_ref && sr = service.get_record( sr_ref, 'SR' )
             new(sr)
           else
             nil

data/lib/fog/xenserver/models/compute/storage_repository.rb

@@ -3,13 +3,13 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class StorageRepository < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=SR
-        
+
         identity :reference
-        
+
         attribute :name,                 :aliases => :name_label
         attribute :description,          :aliases => :name_description
         attribute :uuid
@@ -26,22 +26,65 @@ module Fog
         attribute :physical_utilisation
         attribute :sm_config
         attribute :virtual_allocation
-        
+
         def vdis
-          __vdis.collect { |vdi| connection.vdis.get vdi }
+          __vdis.collect { |vdi| service.vdis.get vdi }
         end
-        
+
         def pbds
-          __pbds.collect { |pbd| connection.pbds.get pbd }
+          __pbds.collect { |pbd| service.pbds.get pbd }
         end
 
         def scan
-          connection.scan_sr reference
+          service.scan_sr reference
           reload
         end
 
+        def destroy
+          connection.destroy_sr reference
+        end
+        
+        def save
+          requires :name
+          requires :type
+
+          # host is not a model attribute (not in XAPI at least), 
+          # but we need it here
+          host = attributes[:host]
+          raise ArgumentError.new('host is required for this operation') unless
+            host
+
+          # Not sure if this is always required, so not raising exception if nil
+          device_config = attributes[:device_config]
+
+          # create_sr request provides sane defaults if some attributes are
+          # missing
+          attr = connection.get_record(
+            connection.create_sr( host.reference, 
+                                  name,
+                                  type,
+                                  description || '',
+                                  device_config || {},
+                                  physical_size || '0',
+                                  content_type || 'user',
+                                  shared || false,
+                                  sm_config || {}),
+            'SR'
+          )
+          merge_attributes attr 
+          true
+        end
+        
+        def set_attribute(name, *val)
+          data = connection.set_attribute( 'SR', reference, name, *val )
+          # Do not reload automatically for performance reasons
+          # We can set multiple attributes at the same time and
+          # then reload manually
+          #reload
+        end
+
       end
-      
+
     end
   end
 end

data/lib/fog/xenserver/models/compute/vbd.rb

@@ -3,13 +3,13 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class VBD < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VBD
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :currently_attached
         attribute :allowed_operations
@@ -23,7 +23,7 @@ module Fog
         attribute :userdevice
         attribute :empty
         attribute :type
-        attribute :mode        
+        attribute :mode
         attribute :storage_lock
         attribute :runtime_properties
         attribute :unpluggable
@@ -38,36 +38,36 @@ module Fog
         # May return nil
         #
         def vdi
-          connection.vdis.get __vdi
+          service.vdis.get __vdi
         end
 
         #
         # TODO: May it return nil?
         #
         def server
-          connection.servers.get __vm
+          service.servers.get __vm
         end
 
         def save
           requires :vdi, :server
-          ref = connection.create_vbd attributes[:server], attributes[:vdi], attributes
-          merge_attributes connection.vbds.get(ref).attributes
+          ref = service.create_vbd attributes[:server], attributes[:vdi], attributes
+          merge_attributes service.vbds.get(ref).attributes
         end
 
         def unplug
-          connection.unplug_vbd reference
+          service.unplug_vbd reference
         end
 
         def unplug_force
-          connection.unplug_force_vbd reference
+          service.unplug_force_vbd reference
         end
-        
+
         def eject
-          connection.eject_vbd reference
+          service.eject_vbd reference
         end
-        
+
         def insert(vdi)
-          connection.insert_vbd reference, vdi.reference
+          service.insert_vbd reference, vdi.reference
         end
 
         #
@@ -79,12 +79,12 @@ module Fog
         #
         def metrics
           return nil unless currently_attached
-          rec = connection.get_record( __metrics, 'VBD_metrics' )
+          rec = service.get_record( __metrics, 'VBD_metrics' )
           Fog::Compute::XenServer::VbdMetrics.new(rec)
         end
 
       end
-      
+
     end
   end
 end