fog 1.20.0 → 1.21.0

data/lib/fog/vsphere/models/compute/datacenter.rb

@@ -28,7 +28,7 @@ module Fog
         def virtual_machines filters = {}
           service.servers({ :datacenter => path.join("/") }.merge(filters))
         end
-        
+
         def servertypes filters={}
           service.servertypes({:datacenter => name }.merge(filters))
         end

data/lib/fog/vsphere/models/compute/interface.rb

@@ -22,8 +22,10 @@ module Fog
           # Assign server first to prevent race condition with persisted?
           self.server_id = attributes.delete(:server_id)
 
-          if attributes.has_key? :type and attributes[:type].is_a? String then
-            attributes[:type] = Fog.class_from_string(attributes[:type], "RbVmomi::VIM")
+          if attributes.has_key? :type then
+            if attributes[:type].is_a? String then
+              attributes[:type] = Fog.class_from_string(attributes[:type], "RbVmomi::VIM")
+            end
           else
             attributes[:type] = Fog.class_from_string("VirtualE1000", "RbVmomi::VIM")
           end

data/lib/fog/vsphere/models/compute/interfaces.rb

@@ -40,10 +40,10 @@ module Fog
             raise 'interfaces should have vm or template'
           end
 
-          if interface 
+          if interface
             Fog::Compute::Vsphere::Interface.new(interface.merge(:server_id => server.id, :service => service))
           else
-            nil         
+            nil
           end
         end
 

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

@@ -178,7 +178,7 @@ module Fog
         def sockets
           cpus / corespersocket
         end
-        
+
         def mac
           interfaces.first.mac unless interfaces.empty?
         end
@@ -186,7 +186,7 @@ module Fog
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : service.interfaces( :server => self )
         end
-        
+
         def interface_ready? attrs
           (attrs.is_a? Hash and attrs[:blocking]) or attrs.is_a? Fog::Compute::Vsphere::Interface
         end
@@ -271,7 +271,7 @@ module Fog
             self.attributes[:volumes].map! { |vol| vol.is_a?(Hash) ? service.volumes.new(vol) : vol }
           end
         end
-        
+
         def initialize_customvalues
           if attributes[:customvalues] and attributes[:customvalues].is_a?(Array)
             self.attributes[:customvalues].map { |cfield| cfield.is_a?(Hash) ? service.customvalue.new(cfield) : cfield}

data/lib/fog/vsphere/models/compute/template.rb

@@ -5,6 +5,8 @@ module Fog
       class Template < Fog::Model
 
         identity :id
+        attribute :name
+        attribute :uuid
 
       end
 

data/lib/fog/vsphere/requests/compute/create_vm.rb

@@ -83,13 +83,13 @@ module Fog
         def create_controller options=nil
           options=if options
                     controller_default_options.merge(Hash[options.map{|k,v| [k.to_sym,v] }])
-                  else 
-                    controller_default_options 
+                  else
+                    controller_default_options
                   end
-          controller_class=if options[:type].is_a? String then 
+          controller_class=if options[:type].is_a? String then
                              Fog::class_from_string options[:type], "RbVmomi::VIM"
-                           else 
-                             options[:type] 
+                           else
+                             options[:type]
                            end
           {
             :operation => options[:operation],

data/lib/fog/vsphere/requests/compute/get_server_type.rb

@@ -5,11 +5,11 @@ module Fog
         def get_server_type(id, datacenter, filter={})
           server_type=get_raw_server_type(id, datacenter)
           raise(Fog::Compute::Vsphere::NotFound) unless server_type
-          server_type_attributes(server_type, datacenter)           
+          server_type_attributes(server_type, datacenter)
         end
 
         protected
-        
+
         def get_raw_server_type(id, datacenter, filter={})
            types=raw_server_types(datacenter)
            raise(Fog::Compute::Vsphere::NotFound) unless types
@@ -20,13 +20,13 @@ module Fog
       end
       class Mock
         def get_server_type(id)
-          {:id=>"rhel6Guest", 
-            :name=>"rhel6Guest", 
-            :family=>"linuxGuest", 
-            :fullname=>"Red Hat Enterprise Linux 6 (32-Bit)", 
-            :datacenter=>"Solutions"}          
+          {:id=>"rhel6Guest",
+            :name=>"rhel6Guest",
+            :family=>"linuxGuest",
+            :fullname=>"Red Hat Enterprise Linux 6 (32-Bit)",
+            :datacenter=>"Solutions"}
         end
-      end      
+      end
     end
   end
 end

data/lib/fog/vsphere/requests/compute/get_vm_first_scsi_controller.rb

@@ -13,7 +13,7 @@ module Fog
             :shared_bus  => ctrl.sharedBus.to_s,
             :unit_number => ctrl.scsiCtlrUnitNumber,
             :key => ctrl.key,
-          } 
+          }
         end
 
       end

data/lib/fog/vsphere/requests/compute/list_datacenters.rb

@@ -16,11 +16,11 @@ module Fog
 
         protected
 
-        def raw_getpathmo mo 
+        def raw_getpathmo mo
           if mo.parent == nil or mo.parent.name == @connection.rootFolder.name then
             [ mo.name ]
           else
-            [ raw_getpathmo(mo.parent), mo.name ].flatten 
+            [ raw_getpathmo(mo.parent), mo.name ].flatten
           end
         end
 
@@ -29,13 +29,13 @@ module Fog
           @raw_datacenters ||= get_raw_datacenters_from_folder folder
         end
 
-        def get_raw_datacenters_from_folder folder=nil 
+        def get_raw_datacenters_from_folder folder=nil
           folder.childEntity.map do | childE |
             if childE.is_a? RbVmomi::VIM::Datacenter
                childE
             elsif childE.is_a? RbVmomi::VIM::Folder
                get_raw_datacenters_from_folder childE
-            end 
+            end
           end.flatten
         end
 

data/lib/fog/vsphere/requests/compute/list_interface_types.rb

@@ -9,7 +9,7 @@ module Fog
             next if filters.has_key?(:id) and filters[:id] != nictype
             interface_type_attributes(nictype, servertype_name, datacenter_name)
           end.compact
-        end 
+        end
         def interface_type_attributes(nic, servertype, datacenter)
           {
             :id => nic,

data/lib/fog/vsphere/requests/compute/list_networks.rb

@@ -35,4 +35,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/vsphere/requests/compute/list_server_types.rb

@@ -7,14 +7,14 @@ module Fog
           servertypes=raw_server_types(datacenter_name)
           if servertypes
             servertypes.map do | servertype |
-               server_type_attributes(servertype, datacenter_name) 
+               server_type_attributes(servertype, datacenter_name)
             end.compact
           else
             nil
           end
           #select{ | guestdesc | guestdesc.select{ | k, v | filter.has_key?(k) and filter[k] == v }==filter }
         end
-      
+
         def raw_server_types(datacenter_name, filter={})
           datacenter=find_raw_datacenter(datacenter_name)
           environmentBrowser=datacenter.hostFolder.childEntity.grep(RbVmomi::VIM::ComputeResource).first.environmentBrowser
@@ -22,9 +22,9 @@ module Fog
             environmentBrowser.QueryConfigOption[:guestOSDescriptor]
           end
         end
-        
+
         protected
-        
+
         def server_type_attributes(servertype, datacenter)
           {
             :id         => servertype.id,
@@ -32,20 +32,20 @@ module Fog
             :family     => servertype.family,
             :fullname   => servertype.fullName,
             :datacenter => datacenter,
-          }          
+          }
         end
       end
       class Mock
         def list_server_types(datacenter_name)
-          [{:id=>"rhel6Guest", 
-            :name=>"rhel6Guest", 
-            :family=>"linuxGuest", 
-            :fullname=>"Red Hat Enterprise Linux 6 (32-Bit)", 
-            :datacenter=>"Solutions"}, 
-           {:id=>"rhel5_64Guest", 
-            :name=>"rhel5_64Guest", 
-            :family=>"linuxGuest", 
-            :fullname=>"Red Hat Enterprise Linux 5 (64-Bit)", 
+          [{:id=>"rhel6Guest",
+            :name=>"rhel6Guest",
+            :family=>"linuxGuest",
+            :fullname=>"Red Hat Enterprise Linux 6 (32-Bit)",
+            :datacenter=>"Solutions"},
+           {:id=>"rhel5_64Guest",
+            :name=>"rhel5_64Guest",
+            :family=>"linuxGuest",
+            :fullname=>"Red Hat Enterprise Linux 5 (64-Bit)",
             :datacenter=>"Solutions"}]
         end
       end

data/lib/fog/vsphere/requests/compute/list_vm_interfaces.rb

@@ -42,7 +42,7 @@ module Fog
           end
 
         end
-        
+
         def get_vm_interface(vm_id, options={})
           raise ArgumentError, "instance id is a required parameter" unless vm_id
           if options.is_a? Fog::Compute::Vsphere::Interface

data/lib/fog/vsphere/requests/compute/list_vm_volumes.rb

@@ -31,7 +31,7 @@ module Fog
           get_vm_ref(vm_id).disks.map do |vol|
             {
               :id => vol.backing.uuid,
-              :thin => vol.backing.thinProvisioned,
+              :thin => (vol.backing.thinProvisioned rescue(nil)),
               :mode => vol.backing.diskMode,
               :filename => vol.backing.fileName,
               :datastore => (vol.backing.datastore.name rescue(nil)),

data/lib/fog/vsphere/requests/compute/modify_vm_interface.rb

@@ -16,7 +16,7 @@ module Fog
           interface = get_interface_from_options(vmid, options.merge(:server_id => vmid))
           vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface, interface.key, :remove)]})
         end
-        
+
         def update_vm_interface(vmid, options = {})
           raise ArgumentError, "instance id is a required parameter" unless vmid
 
@@ -58,4 +58,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/vsphere/requests/compute/modify_vm_volume.rb

@@ -23,4 +23,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/xenserver/CHANGELOG.md

@@ -4,7 +4,7 @@
 
   See https://github.com/fog/fog/blob/master/lib/fog/xenserver/examples/networks-and-vlans.rb
 
-# 1.9.0 2013/01/19 
+# 1.9.0 2013/01/19
 
 * Added missing HostCpu model
 
@@ -13,7 +13,7 @@
 
   See http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=host_cpu
 
-* Host model improvements 
+* Host model improvements
 
   Added missing host attributes:
 
@@ -37,10 +37,10 @@
 
   - Added missing create/destroy/save operations
   - Added missing generic set_attribute method
-  
+
   See http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=SR
 
-* Pool model improvements 
+* Pool model improvements
 
   - Added missing suspend_image_sr attribute
   - Added default_sr getter/setter

data/lib/fog/xenserver/compute.rb

@@ -1,5 +1,4 @@
 require 'fog/xenserver/core'
-require 'fog/compute'
 
 module Fog
   module Compute
@@ -165,7 +164,7 @@ module Fog
           @host        = options[:xenserver_pool_master]
           @username    = options[:xenserver_username]
           @password    = options[:xenserver_password]
-          @connection  = Fog::Connection.new(@host)
+          @connection  = Fog::XML::Connection.new(@host)
           @connection.authenticate(@username, @password)
         end
 

data/lib/fog/xenserver/core.rb

@@ -1,36 +1,37 @@
 require 'fog/core'
+require 'fog/xml'
 
 module Fog
-  module XenServer 
+  module XenServer
 
     class InvalidLogin < Fog::Errors::Error; end
     class NotFound < Fog::Errors::Error; end
     class RequestFailed < Fog::Errors::Error; end
 
     extend Fog::Provider
-    
-    service(:compute, 'Compute')  
-    
+
+    service(:compute, 'Compute')
+
     class Connection
       require 'xmlrpc/client'
-    
+
       def initialize(host, timeout)
         @factory = XMLRPC::Client.new(host, '/')
         @factory.set_parser(NokogiriStreamParser.new)
         @factory.timeout = timeout
       end
-    
+
       def authenticate( username, password )
         response = @factory.call('session.login_with_password', username.to_s, password.to_s)
         raise Fog::XenServer::InvalidLogin.new unless response["Status"] =~ /Success/
         @credentials = response["Value"]
       end
-    
+
       def request(options, *params)
         begin
           parser   = options.delete(:parser)
           method   = options.delete(:method)
-          
+
           if params.empty?
             response = @factory.call(method, @credentials)
           else
@@ -47,20 +48,20 @@ module Fog
             parser.parse( response["Value"] )
             response = parser.response
           end
-          
+
           response
         end
       end
     end
 
     class NokogiriStreamParser < XMLRPC::XMLParser::AbstractStreamParser
-      
+
       def initialize
         require 'nokogiri/xml/sax/document'
         require 'nokogiri/xml/sax/parser'
 
         @parser_class = Class.new(Nokogiri::XML::SAX::Document) do
-          
+
           include XMLRPC::XMLParser::StreamParserMixin
 
           alias_method :start_element, :startElement
@@ -71,10 +72,10 @@ module Fog
           def parse(str)
             Nokogiri::XML::SAX::Parser.new(self).parse(str)
           end
-          
+
         end
       end
-      
+
     end
 
   end

data/lib/fog/xenserver/examples/chage_default_storage_repository.md

@@ -1,8 +1,8 @@
-# How To Change the Default Storage Repository to File-based VHD-on-EXT3 
+# How To Change the Default Storage Repository to File-based VHD-on-EXT3
 
 **NOTE: Requires fog > 1.8 (currently in development as of this writing)**
 
-This tutorial explains how to convert a local Logical Volume Manager (LVM) 
+This tutorial explains how to convert a local Logical Volume Manager (LVM)
 based storage repository into a file-based (VHD) storage repository.
 
 It's the fog/xenserver version of the original Citrix KB article:
@@ -33,7 +33,7 @@ Find the default LVM storage repository:
 # Equivalent to:
 # xe sr-list type=lvm
 #
-lvm_sr = nil 
+lvm_sr = nil
 conn.storage_repositories.each do |sr|
   lvm_sr = sr if sr.type == 'lvm'
 end
@@ -55,7 +55,7 @@ if lvm_sr
     pbd.unplug if pbd.storage_repository.uuid == lvm_sr.uuid
   end
   # Destroy the SR
-  lvm_sr.destroy 
+  lvm_sr.destroy
 end
 ```
 
@@ -66,7 +66,7 @@ Create a new VHD-backed SR:
 # Equivalent to:
 #
 # xe sr-create content-type="local SR" \
-#              host-uuid=5d189b7a-cd5e-4029-9940-d4daaa34633d \ 
+#              host-uuid=5d189b7a-cd5e-4029-9940-d4daaa34633d \
 #              type=ext device-config-device=/dev/sda3 shared=false \
 #              name-label="Local File SR"
 #