bosh_vsphere_cpi 1.2818.0 → 1.2820.0

data/lib/cloud/vsphere/cloud.rb

@@ -185,7 +185,7 @@ module VSphereCloud
 
     def stemcell_vm(name)
       dc = @resources.datacenters.values.first
-      client.find_by_inventory_path([dc.name, 'vm', dc.template_folder.path, name])
+      client.find_by_inventory_path([dc.name, 'vm', dc.template_folder.path_components, name])
     end
 
     def create_vm(agent_id, stemcell, cloud_properties, networks, disk_locality = nil, environment = nil)
@@ -524,7 +524,7 @@ module VSphereCloud
 
     def get_vm_by_cid(vm_cid)
       @resources.datacenters.each_value do |datacenter|
-        vm = client.find_by_inventory_path([datacenter.name, 'vm', datacenter.vm_folder.path, vm_cid])
+        vm = client.find_by_inventory_path([datacenter.name, 'vm', datacenter.vm_folder.path_components, vm_cid])
         return vm unless vm.nil?
       end
       raise Bosh::Clouds::VMNotFound, "VM `#{vm_cid}' not found"
@@ -532,7 +532,7 @@ module VSphereCloud
 
     def replicate_stemcell(cluster, datastore, stemcell)
       stemcell_vm = client.find_by_inventory_path([cluster.datacenter.name, 'vm',
-                                                   cluster.datacenter.template_folder.path, stemcell])
+                                                   cluster.datacenter.template_folder.path_components, stemcell])
       raise "Could not find stemcell: #{stemcell}" if stemcell_vm.nil?
       stemcell_datastore = @cloud_searcher.get_property(stemcell_vm, Vim::VirtualMachine, 'datastore', ensure_all: true)
 
@@ -540,7 +540,7 @@ module VSphereCloud
         @logger.info("Stemcell lives on a different datastore, looking for a local copy of: #{stemcell}.")
         local_stemcell_name = "#{stemcell} %2f #{datastore.mob.__mo_id__}"
         local_stemcell_path =
-          [cluster.datacenter.name, 'vm', cluster.datacenter.template_folder.path, local_stemcell_name]
+          [cluster.datacenter.name, 'vm', cluster.datacenter.template_folder.path_components, local_stemcell_name]
         replicated_stemcell_vm = client.find_by_inventory_path(local_stemcell_path)
 
         if replicated_stemcell_vm.nil?
@@ -848,9 +848,9 @@ module VSphereCloud
       subfolders = []
       with_thread_name("get_vms") do
         @resources.datacenters.each_value do |datacenter|
-          @logger.info("Looking for VMs in: #{datacenter.name} - #{datacenter.master_vm_folder.name}")
+          @logger.info("Looking for VMs in: #{datacenter.name} - #{datacenter.master_vm_folder.path}")
           subfolders += datacenter.master_vm_folder.mob.child_entity
-          @logger.info("Looking for Stemcells in: #{datacenter.name} - #{datacenter.master_template_folder.name}")
+          @logger.info("Looking for Stemcells in: #{datacenter.name} - #{datacenter.master_template_folder.path}")
           subfolders += datacenter.master_template_folder.mob.child_entity
         end
       end

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

@@ -17,26 +17,28 @@ module VSphereCloud
 
       def vm_folder
         if @config.datacenter_use_sub_folder
-          Folder.new([@config.datacenter_vm_folder, Bosh::Clouds::Config.uuid], @config)
+          folder_path = [@config.datacenter_vm_folder, Bosh::Clouds::Config.uuid].join('/')
+          Folder.new(folder_path, @config)
         else
           master_vm_folder
         end
       end
 
       def master_vm_folder
-        Folder.new([@config.datacenter_vm_folder], @config)
+        Folder.new(@config.datacenter_vm_folder, @config)
       end
 
       def template_folder
         if @config.datacenter_use_sub_folder
-          Folder.new([@config.datacenter_template_folder, Bosh::Clouds::Config.uuid], @config)
+          folder_path = [@config.datacenter_template_folder, Bosh::Clouds::Config.uuid].join('/')
+          Folder.new(folder_path, @config)
         else
           master_template_folder
         end
       end
 
       def master_template_folder
-        Folder.new([@config.datacenter_template_folder], @config)
+        Folder.new(@config.datacenter_template_folder, @config)
       end
 
       def name

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

@@ -1,48 +1,47 @@
 module VSphereCloud
   class Resources
     class Folder
-      attr_reader :mob, :path, :name
+      attr_reader :mob, :path, :path_components
 
-      # path - an array of names starting from parent down to child folders
       def initialize(path, config)
         @path = path
         @config = config
 
-        @name = path.join('/')
+        @path_components = path.split('/')
 
-        @mob = find_or_create_folder
+        @mob = find_or_create_folder(@path_components)
       end
 
       private
 
-      def find_or_create_folder
-        folder = find_folder
+      def find_or_create_folder(path_components)
+        return root_vm_folder if path_components.empty?
 
+        folder = find_folder(path_components)
         if folder.nil?
+          last_component = path_components.last
+          parent_folder = find_or_create_folder(path_components[0..-2])
+
           begin
-            @config.logger.debug("Creating folder #{@name}")
-            folder = parent_folder.create_folder(@path.last)
+            @config.logger.debug("Creating folder #{last_component}")
+            folder = parent_folder.create_folder(last_component)
           rescue VimSdk::SoapError => e
             raise e unless VimSdk::Vim::Fault::DuplicateName === e.fault
 
-            @config.logger.debug("Folder already exists #{@name}")
-            folder = find_folder
+            @config.logger.debug("Folder already exists #{last_component}")
+            folder = find_folder(path_components)
           end
         end
 
         folder
       end
 
-      def find_folder
-        @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', @path].flatten)
+      def find_folder(path_components)
+        @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', path_components].flatten)
       end
 
-      def parent_folder
-        if @path.size > 1
-          Folder.new(@path[0..-2], @config).mob
-        else
-          @config.client.find_by_inventory_path([@config.datacenter_name, 'vm'])
-        end
+      def root_vm_folder
+        @config.client.find_by_inventory_path([@config.datacenter_name, 'vm'])
       end
     end
   end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2818.0'
+      VERSION = '1.2820.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2818.0
+  version: 1.2820.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2818.0
+        version: 1.2820.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2818.0
+        version: 1.2820.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2818.0
+        version: 1.2820.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2818.0
+        version: 1.2820.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ dependencies:
         version: 0.7.1
 description: ! 'BOSH VSphere CPI
 
-  59d102'
+  ebc2f0'
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4401758864189890306
+      hash: -159309430642534818
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23