bosh_vsphere_cpi 1.2719.0 → 1.2732.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78dc8a7eb2e667d88b7d2615dc9b05c473e4e199
-  data.tar.gz: ad1e065f7327fe484b02162fa90e2aebfc24e95e
+  metadata.gz: 8188f0675089aad281d4fb9992ec91a3beb83e4a
+  data.tar.gz: 626c483bb8e09007bc5e96e5b5e36e3750c75ef6
 SHA512:
-  metadata.gz: fc7191329c78d6aa802f938eea9d7c47c2b9f8113af75b7144485943b18b836049a80b06bcb66132d5bcc09b48c5913d22d74ff46980982b14c6b18a66ac4758
-  data.tar.gz: 8f07bbfa49a2e9a6e9f9bfee73128e1530c156673151b6a6337e8bffbcbacf5375e3b0185f7cbc2c0566c6187be912bd527b6e3913c56d6919b8b5efe4a09bff
+  metadata.gz: a96c8f1900d94d85be0ea8ed851bd34a1b2e0d3f5537d90557abbf2e134e79e76c33bed2a2644b03710101d8e0c75e5a2abbe02372e00891e634de88b3dd5ddc
+  data.tar.gz: 58c627aca4372244009a3c793221d86d7b102ad72ed5966b61ae6537a1abd1126f82610cd5759023ea3178d453276234d9f8918a8bb80d3e946a42b34fd7f1e8

data/lib/cloud/vsphere/cloud.rb

@@ -14,6 +14,7 @@ require 'cloud/vsphere/resources/cluster'
 require 'cloud/vsphere/resources/datacenter'
 require 'cloud/vsphere/resources/datastore'
 require 'cloud/vsphere/resources/folder'
+require 'cloud/vsphere/resources/multi_tenant_folder'
 require 'cloud/vsphere/resources/resource_pool'
 require 'cloud/vsphere/resources/scorer'
 require 'cloud/vsphere/resources/util'
@@ -947,21 +948,16 @@ module VSphereCloud
 
     def get_vms
       subfolders = []
-      vms = []
       with_thread_name("get_vms") do
         @resources.datacenters.each_value do |datacenter|
-          @logger.info("Looking for VMs in: #{datacenter.name} - #{datacenter.vm_folder.name}")
-          subfolders += datacenter.vm_folder.mob.child_entity
-          @logger.info("Looking for Stemcells in: #{datacenter.name} - #{datacenter.template_folder.name}")
-          subfolders += datacenter.template_folder.mob.child_entity
+          @logger.info("Looking for VMs in: #{datacenter.name} - #{datacenter.master_vm_folder.name}")
+          subfolders += datacenter.master_vm_folder.mob.child_entity
+          @logger.info("Looking for Stemcells in: #{datacenter.name} - #{datacenter.master_template_folder.name}")
+          subfolders += datacenter.master_template_folder.mob.child_entity
         end
       end
 
-      subfolders.each do |folder|
-        vms += folder.child_entity
-      end
-
-      vms
+      subfolders.map { |folder| folder.child_entity }.flatten
     end
 
     def ping

data/lib/cloud/vsphere/resources/datacenter.rb

@@ -16,10 +16,26 @@ module VSphereCloud
       end
 
       def vm_folder
+        if @config.datacenter_use_sub_folder
+          MultiTenantFolder.new(@config.datacenter_vm_folder, Bosh::Clouds::Config.uuid, @config)
+        else
+          master_vm_folder
+        end
+      end
+
+      def master_vm_folder
         Folder.new(@config.datacenter_vm_folder, @config)
       end
 
       def template_folder
+        if @config.datacenter_use_sub_folder
+          MultiTenantFolder.new(@config.datacenter_template_folder, Bosh::Clouds::Config.uuid, @config)
+        else
+          master_template_folder
+        end
+      end
+
+      def master_template_folder
         Folder.new(@config.datacenter_template_folder, @config)
       end
 

data/lib/cloud/vsphere/resources/folder.rb

@@ -1,54 +1,22 @@
 module VSphereCloud
-
   class Resources
-
     class Folder
-      attr_reader :mob
-      attr_reader :name
+      attr_reader :mob, :name
 
       def initialize(name, config)
         @name = name
         @config = config
 
-        find_or_create_folder
+        find_folder
       end
 
       private
 
-      def find_or_create_folder
-        folder = find_folder
-
-        if @config.datacenter_use_sub_folder
-          @name, @mob = find_or_create_sub_folder(folder)
-        else
-          @mob = folder
-        end
-      end
-
       def find_folder
         folder = @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', @name])
         raise "Missing folder: #{@name}" if folder.nil?
-        folder
+        @mob = folder
       end
-
-      def find_or_create_sub_folder(folder)
-        parent_folder = folder
-        uuid = Bosh::Clouds::Config.uuid
-
-        sub_folder_name = [@name, uuid]
-        name_join = sub_folder_name.join("/")
-
-        @config.logger.debug("Search for folder #{name_join}")
-        sub_folder = @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', sub_folder_name])
-        if sub_folder.nil?
-          @config.logger.debug("Creating folder #{name_join}")
-          sub_folder = parent_folder.create_folder(uuid)
-        end
-        @config.logger.debug("Found folder #{name_join}: #{sub_folder}")
-
-        [sub_folder_name, sub_folder]
-      end
-
     end
   end
 end

data/lib/cloud/vsphere/resources/multi_tenant_folder.rb

@@ -0,0 +1,42 @@
+module VSphereCloud
+  class Resources
+    class MultiTenantFolder
+      attr_reader :mob, :name
+
+      def initialize(parent_folder_name, sub_folder_name, config)
+        @parent_folder_name = parent_folder_name
+        @sub_folder_name = sub_folder_name
+        @name = [parent_folder_name, sub_folder_name]
+        @config = config
+
+        find_or_create_sub_folder
+      end
+
+      private
+
+      def find_or_create_sub_folder
+        parent_folder = find_parent_folder
+        name_join = @name.join("/")
+
+        @config.logger.debug("Attempting to create folder #{name_join}")
+
+        begin
+          sub_folder = parent_folder.create_folder(@sub_folder_name)
+          @config.logger.debug("Created folder #{name_join}")
+        rescue VimSdk::SoapError => e
+          raise e unless VimSdk::Vim::Fault::DuplicateName === e.fault
+          sub_folder = @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', @name])
+          @config.logger.debug("Folder #{name_join} already exists")
+        end
+
+        @mob = sub_folder
+      end
+
+      def find_parent_folder
+        folder = @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', @parent_folder_name])
+        raise "Missing folder: #{@parent_folder_name}" if folder.nil?
+        folder
+      end
+    end
+  end
+end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2719.0'
+      VERSION = '1.2732.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2719.0
+  version: 1.2732.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2719.0
+        version: 1.2732.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2719.0
+        version: 1.2732.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2719.0
+        version: 1.2732.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2719.0
+        version: 1.2732.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ dependencies:
         version: 0.7.1
 description: |-
   BOSH VSphere CPI
-  024418
+  f6dedd
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi
@@ -185,6 +185,7 @@ files:
 - lib/cloud/vsphere/resources/datacenter.rb
 - lib/cloud/vsphere/resources/datastore.rb
 - lib/cloud/vsphere/resources/folder.rb
+- lib/cloud/vsphere/resources/multi_tenant_folder.rb
 - lib/cloud/vsphere/resources/resource_pool.rb
 - lib/cloud/vsphere/resources/scorer.rb
 - lib/cloud/vsphere/resources/util.rb