bosh_vsphere_cpi 0.4.9 → 0.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +42,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: ruby_vim_sdk
+  name: membrane
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: ruby_vim_sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: BOSH VSphere CPI
 email: support@vmware.com
 executables: []
@@ -100,14 +116,29 @@ files:
 - lib/cloud/vsphere.rb
 - lib/cloud/vsphere/client.rb
 - lib/cloud/vsphere/cloud.rb
+- lib/cloud/vsphere/config.rb
 - lib/cloud/vsphere/lease_updater.rb
 - lib/cloud/vsphere/models/disk.rb
 - lib/cloud/vsphere/resources.rb
+- lib/cloud/vsphere/resources/cluster.rb
+- lib/cloud/vsphere/resources/datacenter.rb
+- lib/cloud/vsphere/resources/datastore.rb
+- lib/cloud/vsphere/resources/folder.rb
+- lib/cloud/vsphere/resources/resource_pool.rb
+- lib/cloud/vsphere/resources/scorer.rb
+- lib/cloud/vsphere/resources/util.rb
 - lib/cloud/vsphere/version.rb
 - README
 - Rakefile
 - spec/spec_helper.rb
-- spec/unit/vsphere_resource_spec.rb
+- spec/unit/cloud/vsphere/resources/cluster_spec.rb
+- spec/unit/cloud/vsphere/resources/datacenter_spec.rb
+- spec/unit/cloud/vsphere/resources/datastore_spec.rb
+- spec/unit/cloud/vsphere/resources/folder_spec.rb
+- spec/unit/cloud/vsphere/resources/resource_pool_spec.rb
+- spec/unit/cloud/vsphere/resources/scorer_spec.rb
+- spec/unit/cloud/vsphere/resources/util_spec.rb
+- spec/unit/cloud/vsphere/resources_spec.rb
 homepage: http://www.vmware.com
 licenses: []
 post_install_message: 
@@ -120,24 +151,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3586558243084673783
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3586558243084673783
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: BOSH VSphere CPI
 test_files:
 - spec/spec_helper.rb
-- spec/unit/vsphere_resource_spec.rb
+- spec/unit/cloud/vsphere/resources/cluster_spec.rb
+- spec/unit/cloud/vsphere/resources/datacenter_spec.rb
+- spec/unit/cloud/vsphere/resources/datastore_spec.rb
+- spec/unit/cloud/vsphere/resources/folder_spec.rb
+- spec/unit/cloud/vsphere/resources/resource_pool_spec.rb
+- spec/unit/cloud/vsphere/resources/scorer_spec.rb
+- spec/unit/cloud/vsphere/resources/util_spec.rb
+- spec/unit/cloud/vsphere/resources_spec.rb
+has_rdoc: 

data/spec/unit/vsphere_resource_spec.rb

@@ -1,274 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-require File.expand_path("../../spec_helper", __FILE__)
-
-describe VSphereCloud::Resources do
-
-  def create_datacenter(name)
-    datacenter = VSphereCloud::Resources::Datacenter.new
-    datacenter.name = name
-    datacenter.persistent_datastore_pattern = /.*/
-    datacenter.clusters = []
-    datacenter
-  end
-
-  def create_cluster(name)
-    cluster = VSphereCloud::Resources::Cluster.new
-    cluster.name = name
-    cluster.mob = name
-    cluster.total_memory = 2048
-    cluster.free_memory = 1024
-    cluster.unaccounted_memory = 0
-    cluster.mem_over_commit = 1
-    cluster.idle_cpu = 0.9
-    cluster.datastores = []
-    cluster.persistent_datastores = []
-    cluster
-  end
-
-  def create_datastore(name)
-    datastore = VSphereCloud::Resources::Datastore.new
-    datastore.name = name
-    datastore.total_space = 2048
-    datastore.free_space = 1024
-    datastore.unaccounted_space = 0
-    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
-  end
-
-  def mark_persistent_datastore_full(cluster_index, datastore_index)
-    datastore = @datacenters["dc"].clusters[cluster_index].persistent_datastores[datastore_index]
-    datastore.free_space = 0
-  end
-
-  before(:each) do
-    @resources = VSphereCloud::Resources.new("client", "vcenter")
-    datacenter = create_datacenter("dc")
-    3.times do |n|
-      cluster = create_cluster("cluster#{n}")
-      2.times do |x|
-        cluster.datastores << create_datastore("#{cluster.name}-#{x}")
-      end
-      2.times do |x|
-        cluster.persistent_datastores << create_datastore("#{cluster.name}-p-#{x}")
-      end
-      datacenter.clusters << cluster
-    end
-    @datacenters = {}
-    @datacenters[datacenter.name] = datacenter
-  end
-
-
-  it "should raise exception if no resources available" do
-    @resources.stub!(:find_resources).and_return([])
-    got_exception = false
-    begin
-      @resources.get_resources
-    rescue => e
-      if e.message =~ /No available resources.*/
-        got_exception = true
-      end
-    end
-    got_exception.should be_true
-  end
-
-  it "should match given persistent disk affinity" do
-    @resources.stub!(:datacenters).and_return(@datacenters)
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 100}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should == "cluster0"
-    datastore.name.should match(/cluster0*/)
-  end
-
-  it "should match expected datastore and cluster" do
-    mark_datastore_full(0, 0)
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 100}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should == "cluster0"
-    datastore.name.should == "cluster0-1"
-  end
-
-  it "should match expected datastore and cluster" do
-    mark_datastore_full(0, 1)
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 100}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should == "cluster0"
-    datastore.name.should == "cluster0-0"
-  end
-
-  it "should match next available datastore and cluster" do
-    mark_datastore_full(0, 0)
-    mark_datastore_full(0, 1)
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 100}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should_not match(/cluster0/)
-    datastore.name.should_not match(/cluster0/)
-  end
-
-  it "should match given persistent datastore affinity" do
-    mark_persistent_datastore_full(0, 0)
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 100}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should == "cluster0"
-    datastore.name.should match(/cluster0*/)
-  end
-
-  it "should match given persistent datastore affinity" do
-    mark_persistent_datastore_full(0, 1)
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 100}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should == "cluster0"
-    datastore.name.should match(/cluster0*/)
-  end
-
-  it "should match next available datastore and cluster" do
-    mark_persistent_datastore_full(0, 0)
-    mark_persistent_datastore_full(0, 1)
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 100}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should_not match(/cluster0/)
-    datastore.name.should_not match(/cluster0/)
-  end
-
-  it "should match the cluster with largest footprint" do
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster2-p-0", "size" => 512}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-1", "size" => 200}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should == "cluster2"
-    datastore.name.should match(/cluster2/)
-  end
-
-  it "should match the cluster with largest cummulative footprint" do
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-0", "size" => 200}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster2-p-0", "size" => 256}
-    disks << {"persistent" => true, "datacenter" => "dc", "datastore" => "cluster0-p-1", "size" => 200}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should == "cluster0"
-    datastore.name.should match(/cluster0/)
-  end
-
-  it "should match any available datastore and cluster" do
-    @resources.stub!(:datacenters).and_return(@datacenters)
-
-    disks = []
-    disks << {"size" => 100}
-    cluster, datastore = @resources.get_resources(0, disks)
-    cluster.name.should_not be_nil
-    datastore.name.should_not be_nil
-  end
-
-  it "should match any available datastore and cluster" do
-    @resources.stub!(:datacenters).and_return(@datacenters)
-    cluster, datastore = @resources.get_resources
-    cluster.name.should_not be_nil
-    datastore.name.should_not be_nil
-  end
-
-  it "should match the exact expected datastore and cluster" do
-    mark_persistent_datastore_full(0, 0)
-    mark_persistent_datastore_full(0, 1)
-    mark_persistent_datastore_full(1, 0)
-    mark_persistent_datastore_full(1, 1)
-    @resources.stub!(:datacenters).and_return(@datacenters)
-    cluster, datastore = @resources.get_resources
-    cluster.name.should == "cluster2"
-    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)
-    mark_persistent_datastore_full(1, 0)
-    mark_persistent_datastore_full(1, 1)
-    mark_persistent_datastore_full(2, 0)
-    mark_persistent_datastore_full(2, 1)
-    @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 nonpersistent datastores are full" do
-    mark_datastore_full(0, 0)
-    mark_datastore_full(0, 1)
-    mark_datastore_full(1, 0)
-    mark_datastore_full(1, 1)
-    mark_datastore_full(2, 0)
-    mark_datastore_full(2, 1)
-    @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
-end