fog-vsphere 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0eaac527da91308fec5066b89407f48b10c7ec
-  data.tar.gz: 150e3dc5e72cb0c27d617bf65b2d7db259edb609
+  metadata.gz: f3ecf2e2e7786673208a3301191bc8a2ccd5fc1f
+  data.tar.gz: c4282d6b04ab981c10e65d63ad071091743ece0e
 SHA512:
-  metadata.gz: c03d49413d12ba37d6a02365932583cafc87634cafaf55c8bceadc687ef08a9e0f9134b7928eb2aed94099ef01ee395340d5b10f76351e3870c0e7e409baec5a
-  data.tar.gz: 2d78b5e76edff6315f2601fc1830ae395c2419b3e159632a3ad0261d2309c7271d3a303c16ad1b5883fa40ef73e43bfa8958ec92c868d1e0c32d3e78e7124da1
+  metadata.gz: 49594f0acf240a9e7e8e49d8a0729f040c714de249e610c73cb6e2212e6a51c1cdc2340ea8bf493a2edfeb21f4e85fe3bcae2880dffe19a631256d8f7c1ca085
+  data.tar.gz: 19532eac88ce221bb6d0bdeef0511f399552625d5677faba6ca0c024bb0ebd24112d54acfd821d80d005fa76ef678e9e6f30464dfefb24c7d47cf5b6bcb43e85

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v0.4.0 12/15/2015
+
+* Fix cannot create vm on "Resources" resource pool
+* Fix Fog::Mock.reset
+* Implement support for DRS rules
+* Fix issues with boot options
+* Add boot retry support
+* Add support for annotation and extra_config
+
+## v0.3.0 12/3/2015
+
 * Fix update_vm_interface
 * Add add folder.destroy
 * Implement CD-ROM options

data/lib/fog/vsphere.rb

@@ -1,9 +1,11 @@
 require 'fog/core'
 
 module Fog
-  module Vsphere
-    autoload :Compute, File.expand_path('../vsphere/compute', __FILE__)
+  module Compute
+    autoload :Vsphere, File.expand_path('../vsphere/compute.rb', __FILE__)
+  end
 
+  module Vsphere
     extend Fog::Provider
 
     module Errors

data/lib/fog/vsphere/compute.rb

@@ -45,6 +45,8 @@ module Fog
       model :process
       model :cdrom
       collection :cdroms
+      model :rule
+      collection :rules
 
       request_path 'fog/vsphere/requests/compute'
       request :current_time
@@ -104,6 +106,9 @@ module Fog
       request :list_processes
       request :upload_iso
       request :folder_destroy
+      request :create_rule
+      request :list_rules
+      request :destroy_rule
 
       module Shared
         attr_reader :vsphere_is_vcenter
@@ -136,6 +141,7 @@ module Fog
           :cpuHotAddEnabled => 'config.cpuHotAddEnabled',
           :memoryHotAddEnabled => 'config.memoryHotAddEnabled',
           :firmware => 'config.firmware',
+          :annotation => 'config.annotation',
         }
 
         def convert_vm_view_to_attr_hash(vms)
@@ -400,7 +406,18 @@ module Fog
                                   :klass => "RbVmomi::VIM::ComputeResource"}
                    ]
                  }
-                ]
+               ],
+               :rules => {
+                 'anti-affinity-foo' => {
+                   :datacenter => 'Solutions',
+                   :cluster => 'Solutionscluster',
+                   :key => 4242,
+                   :name => 'anti-affinity-foo',
+                   :enabled => true,
+                   :type => RbVmomi::VIM::ClusterAntiAffinityRuleSpec,
+                   :vm_ids => ['5032c8a5-9c5e-ba7a-3804-832a03e16381', '502916a3-b42e-17c7-43ce-b3206e9524dc']
+                 }
+               }
             }
           end
         end
@@ -481,6 +498,29 @@ module Fog
                                              :ssl  => @vsphere_ssl,
                                              :insecure => bad_cert,
                                              :debug => @vsphere_debug
+              
+              # Create a shadow class to change the behaviour of @connection.obj2xml
+              # so that xsd:any types are converted to xsd:int (and not xsd:long).
+              #
+              # This is a known issue with RbVmomi.
+              #
+              # See https://communities.vmware.com/message/2505334 for discussion
+              # and https://github.com/rlane/rbvmomi/pull/30 for an unmerged
+              # pull request that fixes it in RbVmomi.
+              #
+              class <<@connection
+                def obj2xml xml, name, type, is_array, o, attrs={}
+                  case o
+                  when Integer
+                    attrs['xsi:type'] = 'xsd:int' if type(type) == RbVmomi::BasicTypes::AnyType
+                    xml.tag! name, o.to_s, attrs
+                    xml
+                  else
+                    super xml, name, type, is_array, o, attrs
+                  end
+                end
+              end
+                                             
               break
             rescue OpenSSL::SSL::SSLError
               raise if bad_cert

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

@@ -18,6 +18,10 @@ module Fog
                                                                                           :datacenter => datacenter
                                                                                         }.merge(filters))
         end
+        
+        def rules
+          service.rules(:datacenter => datacenter, :cluster => name)
+        end
 
         def to_s
           name

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

@@ -0,0 +1,46 @@
+module Fog
+  module Compute
+    class Vsphere
+      # ClusterRuleInfo
+      class Rule < Fog::Model
+        identity :key
+        
+        attribute :datacenter
+        attribute :cluster
+        attribute :name
+        attribute :enabled
+        # Type should be a class - either
+        #  - RbVmomi::VIM::ClusterAntiAffinityRuleSpec
+        #  - RbVmomi::VIM::ClusterAffinityRuleSpec
+        attribute :type
+        attribute :vm_ids
+        
+        def vms
+          vm_ids.map {|id| service.servers.get(id, datacenter) }
+        end
+        
+        def vms=(vms)
+          self.vm_ids = vms.map(&:instance_uuid)
+        end
+        
+        def save
+          requires :datacenter, :cluster, :name, :enabled, :type, :vm_ids
+          if vm_ids.length < 2
+            raise ArgumentError, "A rule must have at least 2 VMs"
+          end
+          if persisted?
+            raise "Update is not supported yet"
+          else
+            self.key = service.create_rule(attributes)
+          end
+          reload
+        end
+        
+        def destroy
+          service.destroy_rule(attributes)
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Rules < Fog::Collection
+        autoload :Rule, File.expand_path('../rule', __FILE__)
+        
+        model Fog::Compute::Vsphere::Rule
+        attribute :datacenter
+        attribute :cluster
+        
+        def all(filters = {})
+          requires :datacenter, :cluster
+          load service.list_rules(:datacenter => datacenter, :cluster => cluster)
+        end
+        
+        def get(key_or_name)
+          all.find {|rule| [rule.key, rule.name].include? key_or_name } or
+            raise Fog::Compute::Vsphere::NotFound, "no such rule #{key_or_name}"
+        end
+        
+        # Pass datacenter/cluster to every new rule
+        def new(attributes={})
+          requires :datacenter, :cluster
+          super(attributes.merge(datacenter: datacenter, cluster: cluster))
+        end
+
+      end
+    end
+  end
+end

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

@@ -49,6 +49,7 @@ module Fog
         attribute :cpuHotAddEnabled
         attribute :memoryHotAddEnabled
         attribute :firmware
+        attribute :annotation
 
         def initialize(attributes={} )
           super defaults.merge(attributes)

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

@@ -0,0 +1,46 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def create_rule(attributes={})
+          cluster = get_raw_cluster(attributes[:cluster], attributes[:datacenter])
+          # Check if it already exists and blow up if it does
+          # (otherwise ESX just happily accepts it and then considers it a conflict)
+          rule = cluster.configurationEx.rule.find {|n| n[:name] == attributes[:name]}
+          if rule
+            raise ArgumentError, "Rule #{attributes[:name]} already exists!"
+          end
+          # First, create the rulespec
+          vms = attributes[:vm_ids].to_a.map {|id| get_vm_ref(id, attributes[:datacenter])}
+          spec = attributes[:type].new(
+            name: attributes[:name],
+            enabled: attributes[:enabled],
+            vm: vms
+          )
+          # Now, attach it to the cluster
+          cluster_spec = RbVmomi::VIM.ClusterConfigSpecEx(rulesSpec: [
+            RbVmomi::VIM.ClusterRuleSpec(
+              operation: RbVmomi::VIM.ArrayUpdateOperation('add'),
+              info: spec
+            )
+          ])
+          ret = cluster.ReconfigureComputeResource_Task(spec: cluster_spec, modify: true).wait_for_completion
+          rule = cluster.configurationEx.rule.find {|n| n[:name] == attributes[:name]}
+          if rule
+            return rule[:key]
+          else
+            raise Fog::Vsphere::Errors::ServiceError, "Unknown error creating rule #{attributes[:name]}"
+          end
+        end
+        
+      end
+      class Mock
+        def create_rule(attributes={})
+          attributes[:key] = rand(9999)
+          self.data[:rules][attributes[:name]] = attributes
+          attributes[:key]
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module Fog
 
           vm_cfg        = {
             :name         => attributes[:name],
+            :annotation   => attributes[:annotation],
             :guestId      => attributes[:guest_id],
             :version      => attributes[:hardware_version],
             :files        => { :vmPathName => vm_path_name(attributes) },
@@ -19,8 +20,8 @@ module Fog
           vm_cfg[:cpuHotAddEnabled] = attributes[:cpuHotAddEnabled] if attributes.key?(:cpuHotAddEnabled)
           vm_cfg[:memoryHotAddEnabled] = attributes[:memoryHotAddEnabled] if attributes.key?(:memoryHotAddEnabled)
           vm_cfg[:firmware] = attributes[:firmware] if attributes.key?(:firmware)
-          vm_cfg[:bootOptions] = boot_options(attributes) if attributes.key?(:boot_order)
-          resource_pool = if attributes[:resource_pool]
+          vm_cfg[:bootOptions] = boot_options(attributes) if attributes.key?(:boot_order) || attributes.key?(:boot_retry)
+          resource_pool = if attributes[:resource_pool] && attributes[:resource_pool] != 'Resources'
                             get_raw_resource_pool(attributes[:resource_pool], attributes[:cluster], attributes[:datacenter])
                           else
                             get_raw_cluster(attributes[:cluster], attributes[:datacenter]).resourcePool
@@ -106,10 +107,18 @@ module Fog
         def boot_options attributes
           # NOTE: you must be using vsphere_rev 5.0 or greater to set boot_order
           # e.g. Fog::Compute.new(provider: "vsphere", vsphere_rev: "5.5", etc)
-          return unless @vsphere_rev.to_f >= 5
-          RbVmomi::VIM::VirtualMachineBootOptions.new(
-            :bootOrder => boot_order(attributes)
-          )
+          options = {}
+          if @vsphere_rev.to_f >= 5 and attributes[:boot_order]
+            options[:bootOrder] = boot_order(attributes)
+          end
+
+          # Set attributes[:boot_retry] to a delay in miliseconds to enable boot retries
+          if attributes[:boot_retry]
+            options[:bootRetryEnabled] = true
+            options[:bootRetryDelay]   = attributes[:boot_retry]
+          end
+                   
+          options.empty? ? nil : RbVmomi::VIM::VirtualMachineBootOptions.new(options)
         end
 
         def boot_order attributes
@@ -280,12 +289,8 @@ module Fog
         end
 
         def extra_config attributes
-          [
-            {
-              :key   => 'bios.bootOrder',
-              :value => 'ethernet0'
-            }
-          ]
+          extra_config = attributes[:extra_config] || {'bios.bootOrder' => 'ethernet0'}
+          extra_config.map {|k,v| {:key => k, :value => v.to_s} }
         end
       end
 

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

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def destroy_rule(attributes = {})
+          cluster = get_raw_cluster(attributes[:cluster], attributes[:datacenter])
+          rule    = cluster.configurationEx.rule.find {|rule| rule.key == attributes[:key]}
+          raise Fog::Vsphere::Error::NotFound, "rule #{attributes[:key]} not found" unless rule
+          delete_spec = RbVmomi::VIM.ClusterConfigSpecEx(rulesSpec: [
+            RbVmomi::VIM.ClusterRuleSpec(
+              operation: RbVmomi::VIM.ArrayUpdateOperation('remove'),
+              removeKey: rule.key
+            )
+          ])
+          cluster.ReconfigureComputeResource_Task(spec: delete_spec, modify: true).wait_for_completion
+        end
+      end
+      class Mock
+        def destroy_rule(attributes = {})
+          rule = self.data[:rules][attributes[:name]]
+          raise Fog::Vsphere::Error::NotFound unless rule
+          self.data[:rules].delete(attributes[:name])
+        end
+      end
+    end
+  end
+end

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

@@ -17,7 +17,9 @@ module Fog
       end
 
       class Mock
-        def get_cluster(id)
+        def get_cluster(name, datacenter_name)
+          self.data[:clusters].find {|c| c[:name] == name && c[:datacenter] == datacenter_name} or
+            raise Fog::Compute::Vsphere::NotFound
         end
       end
     end

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

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def list_rules(filters = {})
+          cluster = get_raw_cluster(filters[:cluster], filters[:datacenter])
+          cluster.configurationEx.rule.map {|r| rule_attributes r, filters}
+        end
+
+        protected
+      
+        def rule_attributes(rule, filters)
+          {
+            datacenter: filters[:datacenter],
+            cluster:    filters[:cluster],
+            key:        rule[:key],
+            name:       rule[:name],
+            enabled:    rule[:enabled],
+            type:       rule.class,
+            vm_ids:     rule[:vm].map {|vm| vm.config.instanceUuid }
+          }
+        end
+      end
+      class Mock
+        def list_rules(filters = {})
+          self.data[:rules].values.select {|r| r[:datacenter] == filters[:datacenter] && r[:cluster] == filters[:cluster]}
+        end
+      end
+    end
+  end
+end

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

@@ -108,7 +108,7 @@ module Fog
 
           # Options['resource_pool']<~Array>
           # Now find _a_ resource pool to use for the clone if one is not specified
-          if ( options.key?('resource_pool') && options['resource_pool'].is_a?(Array) && options['resource_pool'].length == 2 )
+          if ( options.key?('resource_pool') && options['resource_pool'].is_a?(Array) && options['resource_pool'].length == 2 && options['resource_pool'][1] != 'Resources')
             cluster_name = options['resource_pool'][0]
             pool_name = options['resource_pool'][1]
             resource_pool = get_raw_resource_pool(pool_name, cluster_name, options['datacenter'])

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/tests/models/compute/rules_tests.rb

@@ -0,0 +1,34 @@
+Shindo.tests('Fog::Compute[:vsphere] | rules collection', ['vsphere']) do
+  
+  compute = Fog::Compute[:vsphere]
+  cluster = compute.datacenters.first.clusters.get('Solutionscluster')
+  servers = compute.servers
+  rules = cluster.rules
+  
+  tests('The rules collection') do
+    test('should not be empty') { not rules.empty? }
+    test('should be a kind of Fog::Compute::Vsphere::Rules') { rules.kind_of? Fog::Compute::Vsphere::Rules }
+    test('should get rules') { rules.get('anti-affinity-foo').key == 4242 }
+    test('should destroy rules') { rules.first.destroy; rules.reload; rules.empty? }
+    test('should create rules') do
+      r = rules.new({
+        name: 'affinity-foo',
+        enabled: true,
+        type: RbVmomi::VIM::ClusterAffinityRuleSpec
+      })
+      r.vms = [servers.get('5032c8a5-9c5e-ba7a-3804-832a03e16381'), servers.get('502916a3-b42e-17c7-43ce-b3206e9524dc')]
+      r.save
+      rules.reload
+      rules.get('affinity-foo').key > 0
+    end
+    raises(ArgumentError, 'should not create rules with <2 vms') do
+      rules.create({
+        name: 'affinity-foo',
+        enabled: true,
+        type: RbVmomi::VIM::ClusterAffinityRuleSpec,
+        vm_ids: ['5032c8a5-9c5e-ba7a-3804-832a03e16381']
+      })
+    end
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -154,6 +154,8 @@ files:
 - lib/fog/vsphere/models/compute/process.rb
 - lib/fog/vsphere/models/compute/resource_pool.rb
 - lib/fog/vsphere/models/compute/resource_pools.rb
+- lib/fog/vsphere/models/compute/rule.rb
+- lib/fog/vsphere/models/compute/rules.rb
 - lib/fog/vsphere/models/compute/scsicontroller.rb
 - lib/fog/vsphere/models/compute/server.rb
 - lib/fog/vsphere/models/compute/servers.rb
@@ -169,8 +171,10 @@ files:
 - lib/fog/vsphere/models/compute/volumes.rb
 - lib/fog/vsphere/requests/compute/cloudinit_to_customspec.rb
 - lib/fog/vsphere/requests/compute/create_folder.rb
+- lib/fog/vsphere/requests/compute/create_rule.rb
 - lib/fog/vsphere/requests/compute/create_vm.rb
 - lib/fog/vsphere/requests/compute/current_time.rb
+- lib/fog/vsphere/requests/compute/destroy_rule.rb
 - lib/fog/vsphere/requests/compute/folder_destroy.rb
 - lib/fog/vsphere/requests/compute/get_cluster.rb
 - lib/fog/vsphere/requests/compute/get_compute_resource.rb
@@ -196,6 +200,7 @@ files:
 - lib/fog/vsphere/requests/compute/list_networks.rb
 - lib/fog/vsphere/requests/compute/list_processes.rb
 - lib/fog/vsphere/requests/compute/list_resource_pools.rb
+- lib/fog/vsphere/requests/compute/list_rules.rb
 - lib/fog/vsphere/requests/compute/list_server_types.rb
 - lib/fog/vsphere/requests/compute/list_storage_pods.rb
 - lib/fog/vsphere/requests/compute/list_templates.rb
@@ -229,6 +234,7 @@ files:
 - tests/helper.rb
 - tests/helpers/mock_helper.rb
 - tests/helpers/succeeds_helper.rb
+- tests/models/compute/rules_tests.rb
 - tests/models/compute/server_tests.rb
 - tests/models/compute/servers_tests.rb
 - tests/requests/compute/current_time_tests.rb
@@ -284,6 +290,7 @@ test_files:
 - tests/helper.rb
 - tests/helpers/mock_helper.rb
 - tests/helpers/succeeds_helper.rb
+- tests/models/compute/rules_tests.rb
 - tests/models/compute/server_tests.rb
 - tests/models/compute/servers_tests.rb
 - tests/requests/compute/current_time_tests.rb