fog 1.18.0 → 1.19.0

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

@@ -9,36 +9,51 @@ module Fog
 
         model Fog::Compute::Vsphere::Interface
 
-        attr_accessor :vm
+        attribute :server
 
         def all(filters = {})
-          requires :vm
-          case vm
+          requires :server
+
+          case server
             when Fog::Compute::Vsphere::Server
-              load service.list_vm_interfaces(vm.id)
+              load service.list_vm_interfaces(server.id)
             when Fog::Compute::Vsphere::Template
-              load service.list_template_interfaces(vm.id)
+              load service.list_template_interfaces(server.id)
             else
             raise 'interfaces should have vm or template'
           end
+
+          self.each { |interface| interface.server_id = server.id }
+          self
         end
 
         def get(id)
-          requires :vm
-          case vm
+          requires :server
+
+          case server
             when Fog::Compute::Vsphere::Server
-              interface=service.get_vm_interface(vm.id, :key => id, :mac=> id, :name => id)
+              interface = service.get_vm_interface(server.id, :key => id, :mac=> id, :name => id)
             when Fog::Compute::Vsphere::Template
-              interface=service.get_template_interfaces(vm.id, :key => id, :mac=> id, :name => id)
+              interface = service.get_template_interfaces(server.id, :key => id, :mac=> id, :name => id)
             else
+
             raise 'interfaces should have vm or template'
           end
+
           if interface 
-            Fog::Compute::Vsphere::Interface.new(interface) 
+            Fog::Compute::Vsphere::Interface.new(interface.merge(:server_id => server.id, :service => service))
           else
             nil         
           end
         end
+
+        def new(attributes = {})
+          if server
+            super({ :server_id => server.id  }.merge(attributes))
+          else
+            super
+          end
+        end
      end
     end
   end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Vsphere
+
+      class SCSIController < Fog::Model
+
+        attribute :shared_bus
+        attribute :type
+        attribute :unit_number
+        attribute :key
+
+        def to_s
+          "#{type} ##{key}: shared: #{shared_bus}, unit_number: #{unit_number}"
+        end
+      end
+
+    end
+  end
+end

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

@@ -46,6 +46,7 @@ module Fog
         attribute :resource_pool
         attribute :instance_uuid # move this --> id
         attribute :guest_id
+        attribute :scsi_controller # this is the first scsi controller. Right now no more of them can be used.
 
         def initialize(attributes={} )
           super defaults.merge(attributes)
@@ -53,6 +54,7 @@ module Fog
           initialize_interfaces
           initialize_volumes
           initialize_customvalues
+          initialize_scsi_controller
         end
 
         # Lazy Loaded Attributes
@@ -86,7 +88,7 @@ module Fog
         end
 
         def stop(options = {})
-          options = { :force => !tools_installed? }.merge(options)
+          options = { :force => !tools_installed? || !tools_running? }.merge(options)
           requires :instance_uuid
           service.vm_power_off('instance_uuid' => instance_uuid, 'force' => options[:force])
         end
@@ -101,7 +103,7 @@ module Fog
           requires :instance_uuid
           if ready?
             # need to turn it off before destroying
-            stop
+            stop(options)
             wait_for { !ready? }
           end
           service.vm_destroy('instance_uuid' => instance_uuid)
@@ -153,6 +155,10 @@ module Fog
           tools_state != "toolsNotInstalled"
         end
 
+        def tools_running?
+          tools_state == "toolsOk"
+        end
+
         # defines VNC attributes on the hypervisor
         def config_vnc(options = {})
           requires :instance_uuid
@@ -178,7 +184,7 @@ module Fog
         end
 
         def interfaces
-          attributes[:interfaces] ||= id.nil? ? [] : service.interfaces( :vm => self )
+          attributes[:interfaces] ||= id.nil? ? [] : service.interfaces( :server => self )
         end
         
         def interface_ready? attrs
@@ -186,8 +192,9 @@ module Fog
         end
 
         def add_interface attrs
-          wait_for { not ready? } if interface_ready? attrs
-          service.add_vm_interface(id, attrs)
+          Fog::Logger.deprecation("<server>.add_interface is deprecated. Call <server>.interfaces.create instead.")
+
+          interfaces.create(attrs)
         end
 
         def update_interface attrs
@@ -196,8 +203,9 @@ module Fog
         end
 
         def destroy_interface attrs
-          wait_for { not ready? } if interface_ready? attrs
-          service.destroy_vm_interface(id, attrs)
+          Fog::Logger.deprecation("<server>.destroy_vm_interface is deprecated. Call <server>.interfaces.get(:key => <nic_key>).destroy instead.")
+
+          interfaces.get(attrs[:key] || attrs['key']).destroy
         end
 
         def volumes
@@ -208,6 +216,10 @@ module Fog
           attributes[:customvalues] ||= id.nil? ? [] : service.customvalues( :vm => self )
         end
 
+        def scsi_controller
+          self.attributes[:scsi_controller] ||= service.get_vm_first_scsi_controller(id)
+        end
+
         def folder
           return nil unless datacenter and path
           attributes[:folder] ||= service.folders(:datacenter => datacenter, :type => :vm).get(path)
@@ -243,7 +255,7 @@ module Fog
             :cpus      => 1,
 #            :corespersocket => 1,
             :memory_mb => 512,
-#            :guest_id  => 'otherGuest',
+            :guest_id  => 'otherGuest',
             :path      => '/'
           }
         end
@@ -265,6 +277,13 @@ module Fog
             self.attributes[:customvalues].map { |cfield| cfield.is_a?(Hash) ? service.customvalue.new(cfield) : cfield}
           end
         end
+
+        def initialize_scsi_controller
+          if attributes[:scsi_controller] and attributes[:scsi_controller].is_a?(Hash)
+            Fog::Compute::Vsphere::SCSIController.new(self.attributes[:scsi_controller])
+          end
+        end
+
       end
 
     end

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

@@ -44,7 +44,7 @@ module Fog
           end
 
           if (disks = attributes[:volumes])
-            devices << create_controller
+            devices << create_controller(attributes[:scsi_controller]||attributes["scsi_controller"]||{})
             devices << disks.map { |disk| create_disk(disk, disks.index(disk)) }
           end
           devices.flatten
@@ -80,17 +80,43 @@ module Fog
           }
         end
 
-        def create_controller operation = :add, controller_key = 1000, bus_id = 0
+        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 
+                  end
+          controller_class=if options[:type].is_a? String then 
+                             Fog::class_from_string options[:type], "RbVmomi::VIM"
+                           else 
+                             options[:type] 
+                           end
           {
-            :operation => operation,
-            :device    => RbVmomi::VIM.VirtualLsiLogicController(
-              :key       => controller_key,
-              :busNumber => bus_id,
-              :sharedBus => :noSharing
-            )
+            :operation => options[:operation],
+            :device    => controller_class.new({
+              :key       => options[:key],
+              :busNumber => options[:bus_id],
+              :sharedBus => controller_get_shared_from_options(options),
+            })
           }
         end
 
+        def controller_default_options
+          {:operation => "add", :type => RbVmomi::VIM.VirtualLsiLogicController.class, :key => 1000, :bus_id => 0, :shared => false }
+        end
+
+        def controller_get_shared_from_options options
+          if (options.has_key? :shared and options[:shared]==false) or not options.has_key? :shared then
+            :noSharing
+          elsif options[:shared]==true then
+            :virtualSharing
+          elsif options[:shared].is_a? String
+            options[:shared]
+          else
+            :noSharing
+          end
+        end
+
         def create_disk disk, index = 0, operation = :add, controller_key = 1000
           payload = {
             :operation     => operation,

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

@@ -0,0 +1,26 @@
+
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def get_vm_first_scsi_controller(vm_id)
+          Fog::Compute::Vsphere::SCSIController.new(get_vm_first_scsi_controller_raw(vm_id))
+        end
+        def get_vm_first_scsi_controller_raw(vm_id)
+          ctrl=get_vm_ref(vm_id).config.hardware.device.grep(RbVmomi::VIM::VirtualSCSIController).select{ | ctrl | ctrl.key == 1000 }.first
+          {
+            :type    => ctrl.class.to_s,
+            :shared_bus  => ctrl.sharedBus.to_s,
+            :unit_number => ctrl.scsiCtlrUnitNumber,
+            :key => ctrl.key,
+          } 
+        end
+
+      end
+      class Mock
+        def get_vm_first_scsi_controller(vm_id)
+        end
+      end
+    end
+  end
+end

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

@@ -19,13 +19,14 @@ module Fog
 
         def datastore_attributes datastore, datacenter
           {
-            :id         => managed_obj_id(datastore),
-            :name       => datastore.name,
-            :accessible => datastore.summary.accessible,
-            :type       => datastore.summary.type,
-            :freespace  => datastore.summary.freeSpace,
-            :capacity   => datastore.summary.capacity,
-            :datacenter => datacenter,
+            :id          => managed_obj_id(datastore),
+            :name        => datastore.name,
+            :accessible  => datastore.summary.accessible,
+            :type        => datastore.summary.type,
+            :freespace   => datastore.summary.freeSpace,
+            :capacity    => datastore.summary.capacity,
+            :uncommitted => datastore.summary.uncommitted,
+            :datacenter  => datacenter,
           }
         end
 
@@ -37,4 +38,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -6,33 +6,36 @@ module Fog
         def add_vm_interface(vmid, options = {})
           raise ArgumentError, "instance id is a required parameter" unless vmid
 
-          interface=get_interface_from_options(vmid, options)
+          interface = get_interface_from_options(vmid, options.merge(:server_id => vmid))
           vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface)]})
         end
 
         def destroy_vm_interface(vmid, options = {})
           raise ArgumentError, "instance id is a required parameter" unless vmid
 
-          interface=get_vm_interface(vmid, options)
+          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
 
-          interface=get_vm_interface(vmid, options)
-          vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface, interface.key, :edit)]})          
+          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, :edit)]})
         end
 
         private
         def get_interface_from_options(vmid, options)
           if options and options[:interface]
             options[:interface]
+
           elsif options[:key] and options[:key]>0
-            oldattributes=get_vm_interface(vmid, options)
-            Fog::Compute::Vsphere::Interface.new oldattributes.merge options
+            oldattributes = get_vm_interface(vmid, options)
+            Fog::Compute::Vsphere::Interface.new(oldattributes.merge(options))
+
           elsif options[:type] and options[:network]
             Fog::Compute::Vsphere::Interface.new options
+
           else
             raise ArgumentError, "interface is a required parameter or pass options with type and network"
           end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def set_vm_customvalue(vm_id, key, value)
+          vm_ref = get_vm_ref(vm_id)
+          vm_ref.setCustomValue(:key => key, :value => value)
+        end
+
+      end
+      class Mock
+        def set_vm_customvalue(vm_id, key, value)
+          nil
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/xenserver.rb

@@ -14,9 +14,10 @@ module Fog
     class Connection
       require 'xmlrpc/client'
     
-      def initialize(host)
+      def initialize(host, timeout)
         @factory = XMLRPC::Client.new(host, '/')
         @factory.set_parser(NokogiriStreamParser.new)
+        @factory.timeout = timeout
       end
     
       def authenticate( username, password )

data/lib/fog/xenserver/compute.rb

@@ -12,10 +12,45 @@ module Fog
       requires :xenserver_password
       requires :xenserver_url
       recognizes :xenserver_defaults
+      recognizes :xenserver_timeout
 
       model_path 'fog/xenserver/models/compute'
+      model :blob
+      collection :blobs
+      model :bond
+      collection :bonds
+      model :crash_dump
+      collection :crash_dumps
+      model :dr_task
+      collection :dr_tasks
+      model :gpu_group
+      collection :gpu_groups
+      model :host_crash_dump
+      collection :host_crash_dumps
+      model :host_patch
+      collection :host_patchs
+      model :pci
+      collection :pcis
+      model :pgpu
+      collection :pgpus
+      model :pif_metrics
+      collection :pifs_metrics
+      model :pool_patch
+      collection :pool_patchs
+      model :role
+      collection :roles
       model :server
       collection :servers
+      model :server_appliance
+      collection :server_appliances
+      model :storage_manager
+      collection :storage_managers
+      model :tunnel
+      collection :tunnels
+      model :vmpp
+      collection :vmpps
+      model :vtpm
+      collection :vtpms
       model :host
       collection :hosts
       collection :vifs
@@ -86,7 +121,8 @@ module Fog
           @username    = options[:xenserver_username]
           @password    = options[:xenserver_password]
           @defaults    = options[:xenserver_defaults] || {}
-          @connection  = Fog::XenServer::Connection.new(@host)
+          @timeout     = options[:xenserver_timeout] || 30
+          @connection  = Fog::XenServer::Connection.new(@host, @timeout)
           @connection.authenticate(@username, @password)
         end
 

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

@@ -0,0 +1,22 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Blob < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=blob
+
+        identity :reference
+
+        attribute :last_updated
+        attribute :mime_type
+        attribute :description,         :aliases => :name_description
+        attribute :name,                :aliases => :name_label
+        attribute :public
+        attribute :size
+        attribute :uuid
+      end
+    end
+  end
+end