bosh_vsphere_cpi 0.4.8 → 0.4.9

data/lib/cloud/vsphere/cloud.rb

@@ -906,7 +906,7 @@ module VSphereCloud
     def create_nic_config_spec(v_network_name, network, controller_key, dvs_index)
       raise "Can't find network: #{v_network_name}" if network.nil?
       if network.class == Vim::Dvs::DistributedVirtualPortgroup
-        portgroup_properties = client.get_properties(network, Vim::DistributedVirtualPortgroup,
+        portgroup_properties = client.get_properties(network, Vim::Dvs::DistributedVirtualPortgroup,
                                                      ["config.key", "config.distributedVirtualSwitch"],
                                                      :ensure_all => true)
 

data/lib/cloud/vsphere/resources.rb

@@ -218,23 +218,35 @@ module VSphereCloud
 
       return root_resource_pool if requested_resource_pool.nil?
 
-      # Get list of resource pools under this cluster
-      properties = @client.get_properties(root_resource_pool, Vim::ResourcePool, ["resourcePool"])
+      return traverse_resource_pool(requested_resource_pool, root_resource_pool)
+    end
+
+    def traverse_resource_pool(requested_resource_pool, resource_pool)
+      # Get list of resource pools under this resource pool
+      properties = @client.get_properties(resource_pool, Vim::ResourcePool, ["resourcePool"])
+
       if properties && properties["resourcePool"] && properties["resourcePool"].size != 0
 
-        # Get the name of each resource pool under this cluster
+        # Get the name of each resource pool under this resource pool
         child_properties = @client.get_properties(properties["resourcePool"], Vim::ResourcePool, ["name"])
         if child_properties
           child_properties.each_value do | resource_pool |
             if resource_pool["name"] == requested_resource_pool
-              @logger.info("Found requested resource pool #{requested_resource_pool} under cluster #{cluster_properties["name"]}")
+              @logger.info("Found requested resource pool #{requested_resource_pool}")
               return resource_pool[:obj]
             end
           end
+
+          child_properties.each_value do | resource_pool |
+            pool = traverse_resource_pool(requested_resource_pool, resource_pool[:obj])
+            return pool if pool != nil
+          end
         end
+
+        return nil
       end
-      @logger.info("Could not find requested resource pool #{requested_resource_pool} under cluster #{cluster_properties["name"]}")
-      nil
+
+      return nil
     end
 
     def fetch_datastores(datacenter, datastore_mobs, match_pattern)
@@ -326,14 +338,36 @@ module VSphereCloud
       @datacenters
     end
 
-    def filter_used_resources(memory, vm_disk_size, persistent_disks_size, cluster_affinity)
+    def filter_used_resources(memory, vm_disk_size, persistent_disks_size, cluster_affinity,
+                              report = nil)
       resources = []
       datacenters.each_value do |datacenter|
         datacenter.clusters.each do |cluster|
-          next unless cluster_affinity.nil? || cluster.mob == cluster_affinity.mob
-          next unless cluster.real_free_memory - memory > MEMORY_THRESHOLD
-          next if pick_datastore(cluster.persistent_datastores, persistent_disks_size).nil?
-          next if (datastore = pick_datastore(cluster.datastores, vm_disk_size)).nil?
+
+          unless cluster_affinity.nil? || cluster.mob == cluster_affinity.mob
+            report << "Skipping cluster #{cluster.name} because of affinity mismatch" if report
+            next
+          end
+
+          unless cluster.real_free_memory - memory > MEMORY_THRESHOLD
+            report << "Skipping cluster #{cluster.name} because of memory constraint. " +
+                      "Free #{cluster.real_free_memory}, requested #{memory}, " +
+                      "threshold #{MEMORY_THRESHOLD}" if report
+            next
+          end
+
+          if pick_datastore(cluster.persistent_datastores, persistent_disks_size, report).nil?
+            report << "Skipping cluster #{cluster.name} because of above persistent " +
+                      "disk constraint failure." if report
+            next
+          end
+
+          if (datastore = pick_datastore(cluster.datastores, vm_disk_size, report)).nil?
+            report << "Skipping cluster #{cluster.name} because of above " +
+                      "disk constraint failure." if report
+            next
+          end
+
           resources << [cluster, datastore]
         end
       end
@@ -375,11 +409,14 @@ module VSphereCloud
       datastore
     end
 
-    def pick_datastore(datastores, disk_space)
+    def pick_datastore(datastores, disk_space, report = nil)
       selected_datastores = {}
       datastores.each { |ds|
         if ds.real_free_space - disk_space > DISK_THRESHOLD
           selected_datastores[ds] = score_datastore(ds, disk_space)
+        else
+          report << "Skipping datastore #{ds.name}. Free space #{ds.real_free_space}, " +
+                    "requested #{disk_space}, threshold #{DISK_THRESHOLD}" if report
         end
       }
       return nil if selected_datastores.empty?
@@ -411,7 +448,7 @@ module VSphereCloud
       chosen_datastore
     end
 
-    def find_resources(memory, disk_size, persistent_disks_size, cluster_affinity)
+    def find_resources(memory, disk_size, persistent_disks_size, cluster_affinity, report = nil)
       cluster = nil
       datastore = nil
 
@@ -419,7 +456,8 @@ module VSphereCloud
       disk_size += memory
 
       @lock.synchronize do
-        resources = filter_used_resources(memory, disk_size, persistent_disks_size, cluster_affinity)
+        resources = filter_used_resources(memory, disk_size, persistent_disks_size,
+                                          cluster_affinity, report)
         break if resources.empty?
 
         scored_resources = {}
@@ -486,8 +524,10 @@ module VSphereCloud
                      "#{persistent_disks.pretty_inspect}")
       end
 
-      resources = find_resources(memory_size, non_persistent_disks_size, persistent_disks_size, nil)
-      raise "No available resources" if resources.empty?
+      report = []
+      resources = find_resources(memory_size, non_persistent_disks_size,
+                                 persistent_disks_size, nil, report)
+      raise "No available resources as #{report.join("\n")}" if resources.empty?
       resources
     end
 

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = "0.4.8"
+      VERSION = "0.4.9"
     end
   end
 end

data/spec/unit/vsphere_resource_spec.rb

@@ -35,6 +35,12 @@ describe VSphereCloud::Resources do
     datastore
   end
 
+  def mark_clusters_full
+    @datacenters["dc"].clusters.each do |cluster|
+      cluster.free_memory = 0
+    end
+  end
+
   def mark_datastore_full(cluster_index, datastore_index)
     datastore = @datacenters["dc"].clusters[cluster_index].datastores[datastore_index]
     datastore.free_space = 0
@@ -69,7 +75,7 @@ describe VSphereCloud::Resources do
     begin
       @resources.get_resources
     rescue => e
-      if e.message == "No available resources"
+      if e.message =~ /No available resources.*/
         got_exception = true
       end
     end
@@ -214,6 +220,20 @@ describe VSphereCloud::Resources do
     datastore.name.should match(/cluster2/)
   end
 
+  it "should raise an exception if clusters are out of memory" do
+    mark_clusters_full
+    @resources.stub!(:datacenters).and_return(@datacenters)
+    got_exception = false
+    begin
+    cluster, datastore = @resources.get_resources
+    rescue => e
+      if e.message =~ /No available resources.*/ && e.message =~ /.*Skipping.*/
+        got_exception = true
+      end
+    end
+    got_exception.should be_true
+  end
+
   it "should raise an exception if all persistent datastores are full" do
     mark_persistent_datastore_full(0, 0)
     mark_persistent_datastore_full(0, 1)
@@ -226,7 +246,7 @@ describe VSphereCloud::Resources do
     begin
     cluster, datastore = @resources.get_resources
     rescue => e
-      if e.message == "No available resources"
+      if e.message =~ /No available resources.*/ && e.message =~ /.*Skipping.*/
         got_exception = true
       end
     end
@@ -245,7 +265,7 @@ describe VSphereCloud::Resources do
     begin
     cluster, datastore = @resources.get_resources
     rescue => e
-      if e.message == "No available resources"
+      if e.message =~ /No available resources.*/ && e.message =~ /.*Skipping.*/
         got_exception = true
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
-  requirement: &70324495660600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324495660600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
-  requirement: &70324495659920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70324495659920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: ruby_vim_sdk
-  requirement: &70324495659280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324495659280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70324495658320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324495658320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70324495657720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324495657720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: BOSH VSphere CPI
 email: support@vmware.com
 executables: []
@@ -97,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4503052860220546544
+      hash: 3586558243084673783
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,10 +131,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4503052860220546544
+      hash: 3586558243084673783
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: BOSH VSphere CPI