fog 1.11.0 → 1.11.1

data/changelog.txt

@@ -1,3 +1,21 @@
+1.11.1 05/05/2013 2cfeaf236e4ebcf883d0e17f586293d6cd66f379
+==========================================================
+
+Stats! { 'collaborators' => 47, 'downloads' => 2177247, 'forks' => 783, 'open_issues' => 140, 'watchers' => 2494 }
+
+[VSphere]
+  Added VMware customvalue and customfields to read the annotations for each VM. thanks Marc Grimme
+  Removed dependency to the Datacenters root path. So that now it should even work with other localizations. thanks Marc Grimme
+
+[misc]
+  Load google/api_client late to avoid dep. thanks Dan Prince
+  Add a custom log warning on load error. thanks Dan Prince
+
+[vSphere]
+  Refactor and extend network interface methods (similar to the ovirt implementation)     * added methods to add, remove and update interfaces for vSphere     * added missing method to retrieve the interface     * added existing attribute key to interface (required for modifying, deleting interfaces)     * alias interface's mac to id. thanks Marc Grimme
+  fixed bug that datastores in subfolders would not be found. thanks Marc Grimme
+
+
 1.11.0 05/04/2013 bbea0162df01317405bfbb4c427fdde40e5f0f2c
 ==========================================================
 

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.11.0'
-  s.date              = '2013-05-04'
+  s.version           = '1.11.1'
+  s.date              = '2013-05-05'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('google-api-client', '~>0.6.2')
   s.add_dependency('excon', '~>0.20')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('json', '~>1.7')
@@ -63,6 +62,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('shindo', '~>0.3.4')
   s.add_development_dependency('fission')
   s.add_development_dependency('pry')
+  s.add_development_dependency('google-api-client', '~>0.6.2')
 #  s.add_development_dependency('ruby-libvirt','~>0.4.0')
 
   s.files = `git ls-files`.split("\n")

data/lib/fog/google/compute.rb

@@ -1,6 +1,5 @@
 require 'fog/google'
 require 'fog/compute'
-require 'google/api_client'
 
 module Fog
   module Compute
@@ -67,6 +66,8 @@ module Fog
         attr_reader :project
 
         def initialize(options)
+
+
           base_url = 'https://www.googleapis.com/compute/'
           api_version = 'v1beta14'
           api_scope_url = 'https://www.googleapis.com/auth/compute'
@@ -74,6 +75,12 @@ module Fog
           @project = options[:google_project]
           google_client_email = options[:google_client_email]
           @api_url = base_url + api_version + '/projects/'
+          #NOTE: loaded here to avoid requiring this as a core Fog dependency
+          begin
+            require 'google/api_client'
+          rescue LoadError
+            Fog::Logger.warning("Please install the google-api-client gem before using this provider.")
+          end
           key = ::Google::APIClient::KeyUtils.load_from_pkcs12(File.expand_path(options[:google_key_location]), 'notasecret')
 
           @client = ::Google::APIClient.new({

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.11.0'
+  VERSION = '1.11.1'
 end

data/lib/fog/vsphere/compute.rb

@@ -29,6 +29,10 @@ module Fog
       collection :datastores
       model :folder
       collection :folders
+      model :customvalue
+      collection :customvalues
+      model :customfield
+      collection :customfields
 
       request_path 'fog/vsphere/requests/compute'
       request :current_time
@@ -55,6 +59,7 @@ module Fog
       request :list_folders
       request :create_vm
       request :list_vm_interfaces
+      request :modify_vm_interface
       request :list_vm_volumes
       request :get_virtual_machine
       request :vm_reconfig_hardware
@@ -62,6 +67,8 @@ module Fog
       request :vm_reconfig_cpus
       request :vm_config_vnc
       request :create_folder
+      request :list_vm_customvalues
+      request :list_customfields
 
       module Shared
 

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Vsphere
+
+      class Customfield < Fog::Model
+
+        identity :key
+
+        attribute :name
+        attribute :type
+
+        def to_s
+          name
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/vsphere/models/compute/customfield'
+
+module Fog
+  module Compute
+    class Vsphere
+
+      class Customfields < Fog::Collection
+
+        model Fog::Compute::Vsphere::Customfield
+
+        attr_accessor :vm
+
+        def all(filters = {})
+          load service.list_customfields()
+        end
+
+        def get(key)
+          load(service.list_customfields()).find do | cv | 
+            cv.key == ((key.is_a? String) ? key.to_i : key)
+          end
+        end
+
+     end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class Vsphere
+
+      class Customvalue < Fog::Model
+
+        attribute :value
+        attribute :key
+
+        def to_s
+          value
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'fog/core/collection'
+require 'fog/vsphere/models/compute/customvalue'
+
+module Fog
+  module Compute
+    class Vsphere
+
+      class Customvalues < Fog::Collection
+
+        model Fog::Compute::Vsphere::Customvalue
+
+        attr_accessor :vm
+
+        def all(filters = {})
+          requires :vm
+          case vm
+            when Fog::Compute::Vsphere::Server
+              load service.list_vm_customvalues(vm.id)
+            else
+            raise 'customvalues should have vm'
+          end
+        end
+
+        def get(key)
+          requires :vm
+          case vm
+            when Fog::Compute::Vsphere::Server
+              load service.list_vm_customvalues(vm.id)
+            else
+            raise 'customvalues should have vm'
+          end.find { | cv | cv.key == key }
+        end
+
+     end
+    end
+  end
+end

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

@@ -27,6 +27,10 @@ module Fog
         def virtual_machines filters = {}
           service.servers({ :datacenter => name }.merge(filters))
         end
+        
+        def customfields filters = {}
+          service.customfields({ :datacenter => name}.merge(filters))
+        end
 
         def to_s
           name

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

@@ -5,12 +5,14 @@ module Fog
       class Interface < Fog::Model
 
         identity :mac
+        alias :id :mac
 
         attribute :network
         attribute :name
         attribute :status
         attribute :summary
         attribute :type
+        attribute :key
 
         def initialize(attributes={} )
           super defaults.merge(attributes)

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

@@ -24,9 +24,21 @@ module Fog
         end
 
         def get(id)
-          new service.get_interface(id)
+          requires :vm
+          case vm
+            when Fog::Compute::Vsphere::Server
+              interface=service.get_vm_interface(vm.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)
+            else
+            raise 'interfaces should have vm or template'
+          end
+          if interface 
+            Fog::Compute::Vsphere::Interface.new(interface) 
+          else
+            nil         
+          end
         end
-
      end
     end
   end

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

@@ -38,6 +38,7 @@ module Fog
         attribute :cpus
         attribute :interfaces
         attribute :volumes
+        attribute :customvalues
         attribute :overall_status, :aliases => 'status'
         attribute :cluster
         attribute :datacenter
@@ -50,6 +51,7 @@ module Fog
           self.instance_uuid ||= id # TODO: remvoe instance_uuid as it can be replaced with simple id
           initialize_interfaces
           initialize_volumes
+          initialize_customvalues
         end
 
         # Lazy Loaded Attributes
@@ -72,8 +74,8 @@ module Fog
           service.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus)
         end
 
-        def vm_reconfig_hardware(options = {})
-          requires :instance_uuid, :hardware_spec
+        def vm_reconfig_hardware(hardware_spec, options = {})
+          requires :instance_uuid
           service.vm_reconfig_hardware('instance_uuid' => instance_uuid, 'hardware_spec' => hardware_spec)
         end
 
@@ -163,10 +165,33 @@ module Fog
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : service.interfaces( :vm => self )
         end
+        
+        def interface_ready? attrs
+          (attrs.is_a? Hash and attrs[:blocking]) or attrs.is_a? Fog::Compute::Vsphere::Interface
+        end
+
+        def add_interface attrs
+          wait_for { not ready? } if interface_ready? attrs
+          service.add_vm_interface(id, attrs)
+        end
+
+        def update_interface attrs
+          wait_for { not ready? } if interface_ready? attrs
+          service.update_vm_interface(id, attrs)
+        end
+
+        def destroy_interface attrs
+          wait_for { not ready? } if interface_ready? attrs
+          service.destroy_vm_interface(id, attrs)
+        end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : service.volumes( :vm => self )
         end
+        
+        def customvalues
+          attributes[:customvalues] ||= id.nil? ? [] : service.customvalues( :vm => self )
+        end
 
         def folder
           return nil unless datacenter and path
@@ -218,6 +243,12 @@ 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}
+          end
+        end
       end
 
     end

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

@@ -12,7 +12,12 @@ module Fog
 
         def get_raw_datastore(name, datacenter_name)
           dc = find_raw_datacenter(datacenter_name)
-          dc.datastoreFolder.find(name)
+
+          @connection.serviceContent.viewManager.CreateContainerView({
+            :container  => dc.datastoreFolder,
+            :type       =>  ["Datastore"],
+            :recursive  => true
+          }).view.select{|ds| ds.name == name}.first
         end
       end
 

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

@@ -27,9 +27,11 @@ module Fog
           # The required path syntax - 'topfolder/subfolder
 
           # Clean up path to be relative since we're providing datacenter name
-          paths          = path.sub(/^\/?Datacenters\/#{datacenter_name}\/vm\/?/, '').split('/')
           dc             = find_raw_datacenter(datacenter_name)
           dc_root_folder = dc.vmFolder
+          # Filter the root path for this datacenter not to be used."
+          dc_root_folder_path=dc_root_folder.path.map { | id, name | name }.join("/")
+          paths          = path.sub(/^\/?#{dc_root_folder_path}\/?/, '').split('/')
 
           return dc_root_folder if paths.empty?
           # Walk the tree resetting the folder pointer as we go

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

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def list_customfields()
+          @connection.serviceContent.customFieldsManager.field.map do |customfield|
+            {
+              :key   => customfield.key.to_i,
+              :name  => customfield.name,
+              :type  => customfield.type
+            }
+          end
+        end
+
+      end
+      class Mock
+        def list_vm_customfields()
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def list_vm_customvalues(vm_id)
+          get_vm_ref(vm_id).summary.customValue.map do |customvalue|
+            {
+              :key    => customvalue.key.to_i,
+              :value  => customvalue.value,
+            }
+          end
+
+        end
+
+      end
+      class Mock
+        def list_vm_customfields(vm_id)
+        end
+      end
+    end
+  end
+end

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

@@ -37,10 +37,23 @@ module Fog
               :status  => nic.connectable.status,
               :summary => nic.deviceInfo.summary,
               :type    => nic.class,
+              :key     => nic.key,
             }
           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
+            options
+          else
+            raise ArgumentError, "Either key or name is a required parameter. options: #{options}" unless options.has_key? :key or options.has_key? :mac or options.has_key? :name
+            list_vm_interfaces(vm_id).find do | nic |
+              (options.has_key? :key and nic[:key]==options[:key].to_i) or (options.has_key? :mac and nic[:mac]==options[:mac]) or (options.has_key? :name and nic[:name]==options[:name])
+            end
+          end
+        end
 
       end
       class Mock