bosh_vsphere_cpi 1.2792.0 → 1.2797.0

data/lib/cloud/vsphere/cloud.rb

@@ -14,7 +14,6 @@ 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'
@@ -185,7 +184,7 @@ module VSphereCloud
 
     def stemcell_vm(name)
       dc = @resources.datacenters.values.first
-      client.find_by_inventory_path([dc.name, 'vm', dc.template_folder.name, name])
+      client.find_by_inventory_path([dc.name, 'vm', dc.template_folder.path, name])
     end
 
     def create_vm(agent_id, stemcell, cloud_properties, networks, disk_locality = nil, environment = nil)
@@ -599,7 +598,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.name, vm_cid])
+        vm = client.find_by_inventory_path([datacenter.name, 'vm', datacenter.vm_folder.path, vm_cid])
         return vm unless vm.nil?
       end
       raise Bosh::Clouds::VMNotFound, "VM `#{vm_cid}' not found"
@@ -607,7 +606,7 @@ module VSphereCloud
 
     def replicate_stemcell(cluster, datastore, stemcell)
       stemcell_vm = client.find_by_inventory_path([cluster.datacenter.name, 'vm',
-                                                   cluster.datacenter.template_folder.name, stemcell])
+                                                   cluster.datacenter.template_folder.path, 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)
 
@@ -615,7 +614,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.name, local_stemcell_name]
+          [cluster.datacenter.name, 'vm', cluster.datacenter.template_folder.path, local_stemcell_name]
         replicated_stemcell_vm = client.find_by_inventory_path(local_stemcell_path)
 
         if replicated_stemcell_vm.nil?

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

@@ -17,26 +17,26 @@ module VSphereCloud
 
       def vm_folder
         if @config.datacenter_use_sub_folder
-          MultiTenantFolder.new(@config.datacenter_vm_folder, Bosh::Clouds::Config.uuid, @config)
+          Folder.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)
+        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)
+          Folder.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)
+        Folder.new([@config.datacenter_template_folder], @config)
       end
 
       def name

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

@@ -1,21 +1,48 @@
 module VSphereCloud
   class Resources
     class Folder
-      attr_reader :mob, :name
+      attr_reader :mob, :path, :name
 
-      def initialize(name, config)
-        @name = name
+      # path - an array of names starting from parent down to child folders
+      def initialize(path, config)
+        @path = path
         @config = config
 
-        find_folder
+        @name = path.join('/')
+
+        @mob = find_or_create_folder
       end
 
       private
 
+      def find_or_create_folder
+        folder = find_folder
+
+        if folder.nil?
+          begin
+            @config.logger.debug("Creating folder #{@name}")
+            folder = parent_folder.create_folder(@path.last)
+          rescue VimSdk::SoapError => e
+            raise e unless VimSdk::Vim::Fault::DuplicateName === e.fault
+
+            @config.logger.debug("Folder already exists #{@name}")
+            folder = find_folder
+          end
+        end
+
+        folder
+      end
+
       def find_folder
-        folder = @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', @name])
-        raise "Missing folder: #{@name}" if folder.nil?
-        @mob = folder
+        @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', @path].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
       end
     end
   end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2792.0'
+      VERSION = '1.2797.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2792.0
+  version: 1.2797.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-19 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.2792.0
+        version: 1.2797.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2792.0
+        version: 1.2797.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.2792.0
+        version: 1.2797.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2792.0
+        version: 1.2797.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
 
-  5e7f33'
+  3fe6aa'
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi
@@ -204,7 +204,6 @@ 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
@@ -261,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3828918441549472426
+      hash: 1302345183759456352
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

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

@@ -1,42 +0,0 @@
-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