fog 1.18.0 → 1.19.0

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

@@ -0,0 +1,21 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class ServerAppliance < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VM_appliance
+
+        identity :reference
+
+        attribute :allowed_operations
+        attribute :current_operations
+        attribute :description,             :aliases => :name_description
+        attribute :name,                    :aliases => :name_label
+        attribute :uuid
+        attribute :__vms,                   :aliases => :VMs
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/server_appliance'
+
+module Fog
+  module Compute
+    class XenServer
+      class ServerAppliances < Fog::Collection
+        model Fog::Compute::XenServer::ServerAppliance
+
+        def all(options={})
+          data = service.get_records 'VM_appliance'
+          load(data)
+        end
+
+        def get( server_appliance_ref )
+          if server_appliance_ref && server_appliance = service.get_record( server_appliance_ref, 'VM_appliance' )
+            new(server_appliance)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class StorageManager < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=SM
+
+        identity :reference
+
+        attribute :capabilities
+        attribute :configuration
+        attribtue :copyright
+        attribute :driver_filename
+        attribute :features
+        attribute :description,               :aliases => :name_description
+        attribute :name,                      :aliases => :name_label
+        attribute :other_config
+        attribute :required_api_version
+        attribute :type
+        attribute :uuid
+        attribute :vendor
+        attribute :version
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/storage_manager'
+
+module Fog
+  module Compute
+    class XenServer
+      class StorageManagers < Fog::Collection
+        model Fog::Compute::XenServer::StorageManager
+
+        def all(options={})
+          data = service.get_records 'SM'
+          load(data)
+        end
+
+        def get( sm_ref )
+          if sm_ref && sm = service.get_record( sm_ref, 'SM' )
+            new(sm)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,15 +6,18 @@ module Fog
 
       class StorageRepository < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=SR
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=SR
 
         identity :reference
 
         attribute :name,                 :aliases => :name_label
         attribute :description,          :aliases => :name_description
         attribute :uuid
+        attribute :blobs
         attribute :allowed_operations
         attribute :current_operations
+        attribute :introduced_by
+        attribute :local_cache_enabled
         attribute :content_type
         attribute :other_config
         attribute :__pbds,               :aliases => :PBDs

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

@@ -0,0 +1,20 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Tunnel < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=tunnel
+
+        identity :reference
+
+        attribute :access_pif,          :aliases => :access_PIF
+        attribute :other_config
+        attribute :status
+        attribute :transport_pif,       :aliases => :transport_PIF
+        attribute :uuid
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/tunnel'
+
+module Fog
+  module Compute
+    class XenServer
+      class Tunnels < Fog::Collection
+        model Fog::Compute::XenServer::Tunnel
+
+        def all(options={})
+          data = service.get_records 'tunnel'
+          load(data)
+        end
+
+        def get( tunnel_ref )
+          if tunnel_ref && tunnel = service.get_record( tunnel_ref, 'tunnel' )
+            new(tunnel)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Fog
 
       class VBD < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VBD
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VBD
 
         identity :reference
 
@@ -22,8 +22,8 @@ module Fog
         attribute :type
         attribute :userdevice
         attribute :empty
-        attribute :type
         attribute :mode
+        attribute :other_config
         attribute :storage_lock
         attribute :runtime_properties
         attribute :unpluggable
@@ -31,6 +31,7 @@ module Fog
         attribute :qos_supported_algorithms
         attribute :qos_algorithm_params
         attribute :qos_algorithm_type
+        attribute :qos_supported_algorithms
         attribute :empty
         attribute :__metrics,           :aliases => :metrics
 

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

@@ -6,7 +6,7 @@ module Fog
     
       class VbdMetrics < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VBD_metrics
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VBD_metrics
         
         identity :reference
         

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

@@ -6,7 +6,7 @@ module Fog
 
       class VDI < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VDI
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VDI
 
         identity :reference
 
@@ -22,6 +22,7 @@ module Fog
         attribute :read_only
         attribute :current_operations
         attribute :allowed_operations
+        attribute :__crash_dumps,               :aliases => :crash_dumps
         attribute :type
         attribute :other_config
         attribute :tags
@@ -30,6 +31,8 @@ module Fog
         attribute :missing
         attribute :location
         attribute :managed
+        attribute :metadata_latest
+        attribute :metadata_of_pool
         attribute :allow_caching
         attribute :on_boot
         attribute :sm_config

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

@@ -6,17 +6,26 @@ module Fog
 
       class VIF < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VIF
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VIF
 
         identity :reference
 
         attribute :mac,                :aliases => :MAC
         attribute :uuid
         attribute :allowed_operations
+        attribute :current_operations
         attribute :currently_attached
         attribute :device
+        attribute :ipv4_allowed
+        attribute :ipv6_allowed
+        attribute :locking_mode
         attribute :mac_autogenerated,  :aliases => :MAC_autogenerated
-        attribute :metrics
+        attribute :__metrics,          :aliases => :metrics
+        attribute :other_config
+        attribute :qos_algorithm_params
+        attribute :qos_algorithm_type
+        attribute :qos_supported_algorithms
+        attribute :runtime_properties
         attribute :mtu,                :aliases => :MTU
         attribute :__network,          :aliases => :network
         attribute :status_code

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

@@ -6,12 +6,13 @@ module Fog
 
       class VLAN < Fog::Model
         # API Reference here:
-        # @see http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VLAN
+        # @see http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VLAN
 
         identity :reference
 
         attribute :uuid
         attribute :tag,                :type => :integer
+        attribute :other_config
         attribute :__untagged_pif,     :aliases => :untagged_PIF
         attribute :__tagged_pif,       :aliases => :tagged_PIF
 

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

@@ -0,0 +1,35 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Vmpp < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VMPP
+
+        identity :reference
+
+        attribute :alarm_config
+        attribute :archive_frequency
+        attribute :archive_last_run_time
+        attribute :archive_schedule
+        attribute :archive_target_config
+        attribute :archive_target_type
+        attribute :backup_frequency
+        attribute :backup_last_run_time
+        attribute :backup_retention_value
+        attribute :backup_schedule
+        attribute :backup_type
+        attribute :is_alarm_enabled
+        attribute :is_archive_running
+        attribute :is_backup_running
+        attribute :is_policy_enabled
+        attribute :description,         :aliases => :name_description
+        attribute :name,                :aliases => :name_label
+        attribute :recent_alerts
+        attribute :uuid
+        attribute :__vms,               :aliases => :VMs
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/vmpp'
+
+module Fog
+  module Compute
+    class XenServer
+      class Vmpps < Fog::Collection
+        model Fog::Compute::XenServer::Vmpp
+
+        def all(options={})
+          data = service.get_records 'VMPP'
+          load(data)
+        end
+
+        def get( vmpp_ref )
+          if vmpp_ref && vmpp = service.get_record( vmpp_ref, 'VMPP' )
+            new(vmpp)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Vtpm < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VTPM
+
+        identity :reference
+
+        attribute :__backend,       :aliases => :backend
+        attribute :uuid
+        attribute :__vm,            :aliases => :vm
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/vtpm'
+
+module Fog
+  module Compute
+    class XenServer
+      class Vtpms < Fog::Collection
+        model Fog::Compute::XenServer::Vtpm
+
+        def all(options={})
+          data = service.get_records 'VTPM'
+          load(data)
+        end
+
+        def get( vtpm_ref )
+          if vtpm_ref && vtpm = service.get_record( vtpm_ref, 'VTPM' )
+            new(vtpm)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/reboot_server.rb

@@ -5,7 +5,7 @@ module Fog
       class Real
         
         def reboot_server( ref, stype = 'clean' )
-          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "VM.#{stype}_shutdown"}, ref)
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => "VM.#{stype}_reboot"}, ref)
         end
         
       end

data/lib/tasks/changelog_task.rb

@@ -14,7 +14,6 @@ module Fog
           changelog << ('=' * changelog[0].length)
           changelog << ''
 
-          require 'multi_json'
           github_repo_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog', :headers => {'User-Agent' => 'geemus'}).body)
           data = github_repo_data.reject {|key, value| !['forks', 'open_issues', 'watchers'].include?(key)}
           github_collaborator_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog/collaborators', :headers => {'User-Agent' => 'geemus'}).body)

data/tests/aws/models/dns/record_tests.rb

@@ -1,13 +1,12 @@
 Shindo.tests("Fog::Dns[:aws] | record", ['aws', 'dns']) do
 
-  pending if Fog.mocking?
   tests("zones#create").succeeds do
     @zone = Fog::DNS[:aws].zones.create(:domain => generate_unique_domain)
   end
 
   params = { :name => @zone.domain, :type => 'A', :ttl => 3600, :value => ['1.2.3.4'] }
 
-  model_tests(@zone.records, params, false) do
+  model_tests(@zone.records, params) do
 
     # Newly created records should have a change id
     tests("#change_id") do

data/tests/aws/models/dns/records_tests.rb

@@ -1,5 +1,4 @@
 Shindo.tests("Fog::DNS[:aws] | records", ['aws', 'dns']) do
-  pending if Fog.mocking?
 
   tests("zones#create").succeeds do
     @zone = Fog::DNS[:aws].zones.create(:domain => generate_unique_domain)
@@ -13,7 +12,7 @@ Shindo.tests("Fog::DNS[:aws] | records", ['aws', 'dns']) do
   ]
 
   param_groups.each do |params|
-    collection_tests(@zone.records, params, false)
+    collection_tests(@zone.records, params)
   end
 
   records = []
@@ -24,11 +23,7 @@ Shindo.tests("Fog::DNS[:aws] | records", ['aws', 'dns']) do
 
   records << @zone.records.create(:name => "*.#{@zone.domain}", :type => "A", :ttl => 3600, :value => ['1.2.3.4'])
 
-  tests("#all!").returns(103) do
-    @zone.records.all!.size
-  end
-
-  tests("#all!").returns(103) do
+  tests("#all!").returns(101) do
     @zone.records.all!.size
   end