bosh_vsphere_cpi 0.6.0 → 1.5.0.pre.1100

data/bin/vsphere_cpi_console

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+unless ARGV[0]
+  puts 'Usage: pry.rb <director_config_yaml>'
+  exit 1
+end
+
+require 'yaml'
+
+require 'pry'
+require 'sequel'
+require 'sequel/adapters/sqlite'
+require 'cloud'
+require 'cloud/vsphere'
+
+db = Sequel.sqlite
+Sequel.extension :migration
+
+Sequel::TimestampMigrator.new(db, File.expand_path('../../db/migrations', __FILE__), {}).run
+
+bosh_director_config = OpenStruct.new(logger: Logger.new(STDOUT), uuid: 'uuid', task_checkpoint: nil, db: Sequel.sqlite)
+
+Bosh::Clouds::Config.configure(bosh_director_config)
+
+director_config = YAML.load_file(ARGV[0])
+vsphere_properties = director_config['cloud']['properties']
+
+cpi = Bosh::Clouds::VSphere.new(vsphere_properties)
+
+puts "You are connected to #{vsphere_properties['vcenters'].first['host']}"
+
+# Welcome to the vSphere console!
+# you can access the cpi through the 'cpi' object
+
+Pry.start binding

data/db/migrations/20120123235022_initial.rb

@@ -1,6 +1,11 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 
 Sequel.migration do
+  # there is a bug in sequel where create_table? on postgres causes the transaction to abort with:
+  # PG::Error: ERROR:  current transaction is aborted, commands ignored until end of transaction block
+  # to work around this until it is fixed, transactions are disabled, which is fine as it is an atomic operation
+  no_transaction
+
   up do
     # This used to be included in the director migrations, so we should not fail (hence create_table?) if this table
     # already exists to allow old installations to keep working with the new migrations.

data/lib/cloud/vsphere/client.rb

@@ -1,3 +1,5 @@
+require 'ruby_vim_sdk'
+
 module VSphereCloud
 
   class Client
@@ -56,7 +58,6 @@ module VSphereCloud
 
       filter_spec = PC::FilterSpec.new(:prop_set => property_specs, :object_set => object_spec)
 
-      # TODO: cache partial results
       attempts = 0
       begin
         properties_response = get_all_properties(filter_spec)
@@ -201,9 +202,8 @@ module VSphereCloud
     end
 
     def find_by_inventory_path(path)
-      path = [path] unless path.kind_of?(Array)
-      path = path.flatten.collect { |name| name.gsub("/", "%2f") }.join("/")
-      @service_content.search_index.find_by_inventory_path(path)
+      full_path = Array(path).join("/")
+      @service_content.search_index.find_by_inventory_path(full_path)
     end
 
     def wait_for_task(task)
@@ -214,7 +214,6 @@ module VSphereCloud
                                     :ensure => ["info.state"])[task]
 
         duration = Time.now - started
-        # TODO: make configurable?
         raise "Task taking too long" if duration > 3600 # 1 hour
 
         # Update the polling interval based on task progress