bosh_cli_plugin_micro 1.1858.0 → 1.1868.0

data/lib/bosh/cli/commands/micro.rb

@@ -6,8 +6,6 @@ require 'bosh/stemcell/archive'
 
 module Bosh::Cli::Command
   class Micro < Base
-    include Bosh::Deployer::Helpers
-
     MICRO_DIRECTOR_PORT = 25555
     DEFAULT_CONFIG_PATH = File.expand_path('~/.bosh_deployer_config')
     MICRO_BOSH_YAML = 'micro_bosh.yml'
@@ -159,7 +157,7 @@ module Bosh::Cli::Command
 
       confirm_deployment("#{confirmation} #{desc}")
 
-      if is_tgz?(stemcell)
+      if File.extname(stemcell) == '.tgz'
         stemcell_file = Bosh::Cli::Stemcell.new(stemcell)
 
         say("\nVerifying stemcell...")
@@ -228,7 +226,7 @@ module Bosh::Cli::Command
     usage 'micro deployments'
     desc 'Show the list of deployments'
     def list
-      file = File.join(work_dir, DEPLOYMENTS_FILE)
+      file = File.join(work_dir, Bosh::Deployer::InstanceManager::DEPLOYMENTS_FILE)
       if File.exists?(file)
         deployments = load_yaml_file(file)['instances']
       else
@@ -402,5 +400,15 @@ AGENT_HELP
         'n/a'.make_red
       end
     end
+
+    def strip_relative_path(path)
+      path[/#{Regexp.escape File.join(Dir.pwd, '')}(.*)/, 1] || path
+    end
+
+    def dig_hash(hash, *path)
+      path.inject(hash) do |location, key|
+        location.respond_to?(:keys) ? location[key] : nil
+      end
+    end
   end
 end

data/lib/bosh/deployer/configuration.rb

@@ -1,13 +1,11 @@
 module Bosh::Deployer
   class Configuration
-    include Helpers
-
     attr_accessor :logger, :db, :uuid, :resources, :cloud_options,
                   :spec_properties, :agent_properties, :bosh_ip, :env, :name, :net_conf
 
     # rubocop:disable MethodLength
     def configure(config)
-      plugin = cloud_plugin(config)
+      plugin = config['cloud']['plugin']
 
       config = deep_merge(load_defaults(plugin), config)
 

data/lib/bosh/deployer/instance_manager/aws.rb

@@ -1,6 +1,45 @@
+require 'bosh/deployer/registry'
+require 'bosh/deployer/remote_tunnel'
+require 'bosh/deployer/ssh_server'
+
 module Bosh::Deployer
   class InstanceManager
     class Aws < InstanceManager
+      def initialize(config, config_sha1, ui_messager)
+        super
+
+        @registry = Registry.new(
+          Config.cloud_options['properties']['registry']['endpoint'],
+          'aws',
+          Config.cloud_options['properties']['aws'],
+          @deployments,
+          logger,
+        )
+
+        properties = Config.cloud_options['properties']
+        ssh_user = properties['aws']['ssh_user']
+        ssh_port = properties['aws']['ssh_port'] || 22
+        ssh_wait = properties['aws']['ssh_wait'] || 60
+
+        key = properties['aws']['ec2_private_key']
+        err 'Missing properties.aws.ec2_private_key' unless key
+        ssh_key = File.expand_path(key)
+        unless File.exists?(ssh_key)
+          err "properties.aws.ec2_private_key '#{key}' does not exist"
+        end
+
+        ssh_server = SshServer.new(ssh_user, ssh_key, ssh_port, logger)
+        @remote_tunnel = RemoteTunnel.new(ssh_server, ssh_wait, logger)
+      end
+
+      def remote_tunnel(port)
+        @remote_tunnel.create(Config.bosh_ip, port)
+      end
+
+      def disk_model
+        nil
+      end
+
       def update_spec(spec)
         properties = spec.properties
 
@@ -18,110 +57,17 @@ module Bosh::Deployer
         spec.delete('networks')
       end
 
-      # rubocop:disable MethodLength
-      def configure
-        properties = Config.cloud_options['properties']
-        @ssh_user = properties['aws']['ssh_user']
-        @ssh_port = properties['aws']['ssh_port'] || 22
-        @ssh_wait = properties['aws']['ssh_wait'] || 60
-
-        key = properties['aws']['ec2_private_key']
-        err 'Missing properties.aws.ec2_private_key' unless key
-        @ssh_key = File.expand_path(key)
-        unless File.exists?(@ssh_key)
-          err "properties.aws.ec2_private_key '#{key}' does not exist"
-        end
-
-        uri = URI.parse(properties['registry']['endpoint'])
-        user, password = uri.userinfo.split(':', 2)
-        @registry_port = uri.port
-
-        @registry_db = Tempfile.new('bosh_registry_db')
-
-        @registry_connection_settings = {
-            'adapter' => 'sqlite',
-            'database' => @registry_db.path
-        }
-
-        registry_config = {
-          'logfile' => './bosh-registry.log',
-          'http' => {
-            'port' => uri.port,
-            'user' => user,
-            'password' => password
-          },
-          'db' => @registry_connection_settings,
-          'cloud' => {
-            'plugin' => 'aws',
-            'aws' => properties['aws']
-          }
-        }
-
-        @registry_config = Tempfile.new('bosh_registry_yml')
-        @registry_config.write(Psych.dump(registry_config))
-        @registry_config.close
+      def check_dependencies
+        # nothing to check, move on...
       end
-      # rubocop:enable MethodLength
 
-      # rubocop:disable MethodLength
       def start
-        configure
-
-        Sequel.connect(@registry_connection_settings) do |db|
-          migrate(db)
-          instances = @deployments['registry_instances']
-          db[:registry_instances].insert_multiple(instances) if instances
-        end
-
-        unless has_bosh_registry?
-          err 'bosh-registry command not found - ' +
-            "run 'gem install bosh-registry'"
-        end
-
-        cmd = "bosh-registry -c #{@registry_config.path}"
-
-        @registry_pid = spawn(cmd)
-
-        5.times do
-          sleep 0.5
-          if Process.waitpid(@registry_pid, Process::WNOHANG)
-            err "`#{cmd}` failed, exit status=#{$?.exitstatus}"
-          end
-        end
-
-        timeout_time = Time.now.to_f + (60 * 5)
-        http_client = HTTPClient.new
-        begin
-          http_client.head("http://127.0.0.1:#{@registry_port}")
-          sleep 0.5
-        rescue URI::Error, SocketError, Errno::ECONNREFUSED, HTTPClient::ReceiveTimeoutError => e
-          if timeout_time - Time.now.to_f > 0
-            retry
-          else
-            err "Cannot access bosh-registry: #{e.message}"
-          end
-        end
-
-        logger.info("bosh-registry is ready on port #{@registry_port}")
-      ensure
-        @registry_config.unlink if @registry_config
+        registry.start
       end
-      # rubocop:enable MethodLength
 
       def stop
-        if @registry_pid && process_exists?(@registry_pid)
-          Process.kill('INT', @registry_pid)
-          Process.waitpid(@registry_pid)
-        end
-
-        return unless @registry_connection_settings
-
-        Sequel.connect(@registry_connection_settings) do |db|
-          @deployments['registry_instances'] = db[:registry_instances].map { |row| row }
-        end
-
+        registry.stop
         save_state
-        @registry_db.unlink if @registry_db
       end
 
       def discover_bosh_ip
@@ -141,7 +87,7 @@ module Bosh::Deployer
           end
         end
 
-        super
+        Config.bosh_ip
       end
 
       def service_ip
@@ -165,20 +111,7 @@ module Bosh::Deployer
 
       private
 
-      def has_bosh_registry?(path = ENV['PATH'])
-        path.split(File::PATH_SEPARATOR).each do |dir|
-          return true if File.exist?(File.join(dir, 'bosh-registry'))
-        end
-        false
-      end
-
-      def migrate(db)
-        db.create_table :registry_instances do
-          primary_key :id
-          column :instance_id, :text, unique: true, null: false
-          column :settings,    :text, null: false
-        end
-      end
+      attr_reader :registry
     end
   end
 end

data/lib/bosh/deployer/instance_manager/openstack.rb

@@ -1,122 +1,68 @@
+require 'bosh/deployer/registry'
+require 'bosh/deployer/remote_tunnel'
+require 'bosh/deployer/ssh_server'
+
 module Bosh::Deployer
   class InstanceManager
     class Openstack < InstanceManager
-      def update_spec(spec)
-        properties = spec.properties
-
-        properties['openstack'] =
-          Config.spec_properties['openstack'] ||
-          Config.cloud_options['properties']['openstack'].dup
+      def initialize(config, config_sha1, ui_messager)
+        super
 
-        properties['openstack']['registry'] = Config.cloud_options['properties']['registry']
-        properties['openstack']['stemcell'] = Config.cloud_options['properties']['stemcell']
+        @registry = Registry.new(
+          Config.cloud_options['properties']['registry']['endpoint'],
+          'openstack',
+          Config.cloud_options['properties']['openstack'],
+          @deployments,
+          logger,
+        )
 
-        spec.delete('networks')
-      end
-
-      # rubocop:disable MethodLength
-      def configure
         properties = Config.cloud_options['properties']
-        @ssh_user = properties['openstack']['ssh_user']
-        @ssh_port = properties['openstack']['ssh_port'] || 22
-        @ssh_wait = properties['openstack']['ssh_wait'] || 60
+        ssh_user = properties['openstack']['ssh_user']
+        ssh_port = properties['openstack']['ssh_port'] || 22
+        ssh_wait = properties['openstack']['ssh_wait'] || 60
 
         key = properties['openstack']['private_key']
         err 'Missing properties.openstack.private_key' unless key
-        @ssh_key = File.expand_path(key)
-        unless File.exists?(@ssh_key)
+        ssh_key = File.expand_path(key)
+        unless File.exists?(ssh_key)
           err "properties.openstack.private_key '#{key}' does not exist"
         end
-
-        uri = URI.parse(properties['registry']['endpoint'])
-        user, password = uri.userinfo.split(':', 2)
-        @registry_port = uri.port
-
-        @registry_db = Tempfile.new('bosh_registry_db')
-        @registry_connection_settings = {
-            'adapter' => 'sqlite',
-            'database' => @registry_db.path
-        }
-
-        registry_config = {
-          'logfile' => './bosh-registry.log',
-          'http' => {
-            'port' => uri.port,
-            'user' => user,
-            'password' => password
-          },
-          'db' => @registry_connection_settings,
-          'cloud' => {
-            'plugin' => 'openstack',
-            'openstack' => properties['openstack']
-          }
-        }
-
-        @registry_config = Tempfile.new('bosh_registry_yml')
-        @registry_config.write(Psych.dump(registry_config))
-        @registry_config.close
+        ssh_server = SshServer.new(ssh_user, ssh_key, ssh_port, logger)
+        @remote_tunnel = RemoteTunnel.new(ssh_server, ssh_wait, logger)
       end
-      # rubocop:enable MethodLength
 
-      # rubocop:disable MethodLength
-      def start
-        configure
+      def remote_tunnel(port)
+        @remote_tunnel.create(Config.bosh_ip, port)
+      end
 
-        Sequel.connect(@registry_connection_settings) do |db|
-          migrate(db)
-          instances = @deployments['registry_instances']
-          db[:registry_instances].insert_multiple(instances) if instances
-        end
+      def disk_model
+        nil
+      end
 
-        unless has_bosh_registry?
-          err 'bosh-registry command not found - ' +
-            "run 'gem install bosh-registry'"
-        end
+      def update_spec(spec)
+        properties = spec.properties
 
-        cmd = "bosh-registry -c #{@registry_config.path}"
+        properties['openstack'] =
+          Config.spec_properties['openstack'] ||
+          Config.cloud_options['properties']['openstack'].dup
 
-        @registry_pid = spawn(cmd)
+        properties['openstack']['registry'] = Config.cloud_options['properties']['registry']
+        properties['openstack']['stemcell'] = Config.cloud_options['properties']['stemcell']
 
-        5.times do
-          sleep 0.5
-          if Process.waitpid(@registry_pid, Process::WNOHANG)
-            err "`#{cmd}` failed, exit status=#{$?.exitstatus}"
-          end
-        end
+        spec.delete('networks')
+      end
 
-        timeout_time = Time.now.to_f + (60 * 5)
-        http_client = HTTPClient.new
-        begin
-          http_client.head("http://127.0.0.1:#{@registry_port}")
-          sleep 0.5
-        rescue URI::Error, SocketError, Errno::ECONNREFUSED, HTTPClient::ReceiveTimeoutError => e
-          if timeout_time - Time.now.to_f > 0
-            retry
-          else
-            err "Cannot access bosh-registry: #{e.message}"
-          end
-        end
+      def check_dependencies
+        # nothing to check, move on...
+      end
 
-        logger.info("bosh-registry is ready on port #{@registry_port}")
-      ensure
-        @registry_config.unlink if @registry_config
+      def start
+        registry.start
       end
-      # rubocop:enable MethodLength
 
       def stop
-        if @registry_pid && process_exists?(@registry_pid)
-          Process.kill('INT', @registry_pid)
-          Process.waitpid(@registry_pid)
-        end
-
-        return unless @registry_connection_settings
-
-        Sequel.connect(@registry_connection_settings) do |db|
-          @deployments['registry_instances'] = db[:registry_instances].map { |row| row }
-        end
-
+        registry.stop
         save_state
-        @registry_db.unlink if @registry_db
       end
 
       def discover_bosh_ip
@@ -130,7 +76,7 @@ module Bosh::Deployer
           end
         end
 
-        super
+        Config.bosh_ip
       end
 
       def service_ip
@@ -154,20 +100,7 @@ module Bosh::Deployer
 
       private
 
-      def has_bosh_registry?(path = ENV['PATH'])
-        path.split(File::PATH_SEPARATOR).each do |dir|
-          return true if File.exist?(File.join(dir, 'bosh-registry'))
-        end
-        false
-      end
-
-      def migrate(db)
-        db.create_table :registry_instances do
-          primary_key :id
-          column :instance_id, :text, unique: true, null: false
-          column :settings, :text, null: false
-        end
-      end
+      attr_reader :registry
     end
   end
 end

data/lib/bosh/deployer/instance_manager/vcloud.rb

@@ -3,11 +3,16 @@
 module Bosh::Deployer
   class InstanceManager
     class Vcloud < InstanceManager
+
       def remote_tunnel(port)
         # VCloud / vsphere does not use bosh-registry so no remote_tunnel
         # to bosh-registry is required
       end
 
+      def disk_model
+        nil
+      end
+
       def update_spec(spec)
         properties = spec.properties
 
@@ -18,6 +23,26 @@ module Bosh::Deployer
         properties['vcd']['address'] ||= properties['vcd']['url']
       end
 
+      def check_dependencies
+        if Bosh::Common.which(%w[genisoimage mkisofs]).nil?
+          err("either of 'genisoimage' or 'mkisofs' commands must be present")
+        end
+      end
+
+      def start
+      end
+
+      def stop
+      end
+
+      def discover_bosh_ip
+        bosh_ip
+      end
+
+      def service_ip
+        bosh_ip
+      end
+
       # @return [Integer] size in MiB
       def disk_size(cid)
         cloud.get_disk_size_mb(cid)
@@ -27,10 +52,11 @@ module Bosh::Deployer
         Config.resources['persistent_disk'] != disk_size(state.disk_cid)
       end
 
-      def check_dependencies
-        if Bosh::Common.which(%w[genisoimage mkisofs]).nil?
-          err("either of 'genisoimage' or 'mkisofs' commands must be present")
-        end
+      private
+
+      FakeRegistry = Struct.new(:port)
+      def registry
+        @registry ||= FakeRegistry.new(nil)
       end
     end
   end

data/lib/bosh/deployer/instance_manager/vsphere.rb

@@ -24,6 +24,26 @@ module Bosh::Deployer
         properties['vcenter']['address'] ||= properties['vcenter']['host']
       end
 
+      def check_dependencies
+        if Bosh::Common.which(%w[genisoimage mkisofs]).nil?
+          err("either of 'genisoimage' or 'mkisofs' commands must be present")
+        end
+      end
+
+      def start
+      end
+
+      def stop
+      end
+
+      def discover_bosh_ip
+        bosh_ip
+      end
+
+      def service_ip
+        bosh_ip
+      end
+
       # @return [Integer] size in MiB
       def disk_size(cid)
         disk_model.first(uuid: cid).size
@@ -33,10 +53,11 @@ module Bosh::Deployer
         Config.resources['persistent_disk'] != disk_size(state.disk_cid)
       end
 
-      def check_dependencies
-        if Bosh::Common.which(%w[genisoimage mkisofs]).nil?
-          err("either of 'genisoimage' or 'mkisofs' commands must be present")
-        end
+      private
+
+      FakeRegistry = Struct.new(:port)
+      def registry
+        @registry ||= FakeRegistry.new(nil)
       end
     end
   end

data/lib/bosh/deployer/instance_manager.rb

@@ -6,7 +6,6 @@ require 'bosh/deployer/ui_messager'
 
 module Bosh::Deployer
   class InstanceManager
-
     CONNECTION_EXCEPTIONS = [
       Bosh::Agent::Error,
       Errno::ECONNREFUSED,
@@ -15,14 +14,16 @@ module Bosh::Deployer
       HTTPClient::ConnectTimeoutError
     ]
 
-    extend Helpers
-    include Helpers
+    DEPLOYMENTS_FILE = 'bosh-deployments.yml'
 
     attr_reader :state
     attr_accessor :renderer
 
     def self.create(config)
-      plugin_name = cloud_plugin(config)
+      err 'No cloud properties defined' if config['cloud'].nil?
+      err 'No cloud plugin defined' if config['cloud']['plugin'].nil?
+
+      plugin_name = config['cloud']['plugin']
 
       begin
         require "bosh/deployer/instance_manager/#{plugin_name}"
@@ -81,12 +82,6 @@ module Bosh::Deployer
       result
     end
 
-    def start
-    end
-
-    def stop
-    end
-
     def with_lifecycle
       start
       yield
@@ -204,7 +199,7 @@ module Bosh::Deployer
 
     # rubocop:disable MethodLength
     def create_stemcell(stemcell_tgz)
-      unless is_tgz?(stemcell_tgz)
+      unless File.extname(stemcell_tgz) == '.tgz'
         step 'Using existing stemcell' do
         end
 
@@ -232,7 +227,7 @@ module Bosh::Deployer
     rescue => e
       logger.err("create stemcell failed: #{e.message}:\n#{e.backtrace.join("\n")}")
       # make sure we clean up the stemcell if something goes wrong
-      delete_stemcell if is_tgz?(stemcell_tgz) && state.stemcell_cid
+      delete_stemcell if File.extname(stemcell_tgz) == '.tgz' && state.stemcell_cid
       raise e
     end
     # rubocop:enable MethodLength
@@ -386,18 +381,6 @@ module Bosh::Deployer
       agent_start
     end
 
-    def discover_bosh_ip
-      bosh_ip
-    end
-
-    def service_ip
-      bosh_ip
-    end
-
-    def check_dependencies
-      # nothing to check, move on...
-    end
-
     private
 
     def bosh_ip
@@ -438,7 +421,7 @@ module Bosh::Deployer
     end
 
     def wait_until_agent_ready
-      remote_tunnel(@registry_port)
+      remote_tunnel(registry.port)
       wait_until_ready('agent') { agent.ping }
     end
 

data/lib/bosh/deployer/registry.rb

@@ -0,0 +1,146 @@
+require 'sequel'
+require 'sqlite3'
+
+module Bosh::Deployer
+  class Registry
+    attr_reader :port
+
+    def initialize(endpoint, cloud_plugin, cloud_properties, deployments, logger)
+      @cloud_properties = cloud_properties
+      @deployments = deployments
+      @logger = logger
+
+      uri = URI.parse(endpoint)
+      @user, @password = uri.userinfo.split(':', 2)
+      @port = uri.port
+      @cloud_plugin = cloud_plugin
+    end
+
+    def start
+      write_configure
+      Sequel.connect(connection_settings) do |db|
+        migrate(db)
+        instances = deployments['registry_instances']
+        db[:registry_instances].insert_multiple(instances) if instances
+      end
+
+      unless has_bosh_registry?
+        err "bosh-registry command not found - run 'gem install bosh-registry'"
+      end
+
+      cmd = "bosh-registry -c #{@registry_config.path}"
+
+      @registry_pid = Process.spawn(cmd)
+
+      watch_for_crash(cmd)
+      wait_for_listen
+
+      logger.info("bosh-registry is ready on port #{port}")
+    ensure
+      @registry_config.unlink if @registry_config
+    end
+
+    def stop
+      kill_registry if registry_pid
+
+      return unless db_file
+
+      Sequel.connect(connection_settings) do |db|
+        deployments['registry_instances'] = db[:registry_instances].map { |row| row }
+      end
+    ensure
+      db_file.unlink if db_file
+    end
+
+    RETRYABLE_HTTP_EXCEPTIONS = [
+      URI::Error,
+      SocketError,
+      Errno::ECONNREFUSED,
+      HTTPClient::ReceiveTimeoutError
+    ]
+
+    private
+
+    attr_reader(
+      :deployments,
+      :cloud_properties,
+      :logger,
+      :user,
+      :password,
+      :cloud_plugin,
+      :db_file,
+      :registry_pid,
+    )
+
+    def watch_for_crash(cmd)
+      5.times do
+        Kernel.sleep 0.5
+        _, status = Process.waitpid2(@registry_pid, Process::WNOHANG)
+        if status
+          err "`#{cmd}` failed, exit status=#{status.exitstatus}"
+        end
+      end
+    end
+
+    def wait_for_listen
+      http_client = HTTPClient.new
+      Bosh::Common.retryable(on: RETRYABLE_HTTP_EXCEPTIONS, sleep: 0.5, tries: 300) do
+        http_client.head("http://127.0.0.1:#{port}")
+      end
+
+    rescue Bosh::Common::RetryCountExceeded => e
+      err "Cannot access bosh-registry: #{e.message}"
+    end
+
+    def has_bosh_registry?(path = ENV.to_hash['PATH'])
+      path.split(File::PATH_SEPARATOR).each do |dir|
+        return true if File.exist?(File.join(dir, 'bosh-registry'))
+      end
+      false
+    end
+
+    def migrate(db)
+      db.create_table :registry_instances do
+        primary_key :id
+        column :instance_id, :text, unique: true, null: false
+        column :settings, :text, null: false
+      end
+    end
+
+    def write_configure
+      @db_file = Tempfile.new('bosh_registry_db')
+
+      registry_config = {
+        'logfile' => './bosh-registry.log',
+        'http' => {
+          'port' => port,
+          'user' => user,
+          'password' => password
+        },
+        'db' => connection_settings,
+        'cloud' => {
+          'plugin' => cloud_plugin,
+          cloud_plugin => cloud_properties
+        }
+      }
+
+      @registry_config = Tempfile.new('bosh_registry_yml')
+      @registry_config.write(Psych.dump(registry_config))
+      @registry_config.close
+    end
+
+    def connection_settings
+      {
+        'adapter' => 'sqlite',
+        'database' => db_file.path
+      }
+    end
+
+    def kill_registry
+      Process.kill('INT', @registry_pid)
+      Process.waitpid2(@registry_pid)
+    rescue Errno::ESRCH
+      logger.debug('registry already stopped')
+    end
+  end
+end

data/lib/bosh/deployer/remote_tunnel.rb

@@ -0,0 +1,71 @@
+require 'bosh/deployer/ssh_server'
+
+module Bosh::Deployer
+  class RemoteTunnel
+    def initialize(ssh_server, wait, logger)
+      @ssh_server = ssh_server
+      @wait = wait
+      @logger = logger
+    end
+
+    def create(ip, port)
+      return if sessions[port]
+
+      loop until ssh_server.readable?(ip)
+
+      # sshd is up, sleep while host keys are generated
+      Kernel.sleep(wait)
+
+      loop do
+        session = ssh_server.start_session(ip)
+
+        if session
+          sessions[port] = session
+          break
+        end
+      end
+
+      sessions[port].forward.remote(port, '127.0.0.1', port)
+      logger.info("SSH forwarding for port #{port} started: OK")
+
+      monitor_session(port)
+      cleanup_at_exit
+    end
+
+    private
+
+    attr_reader :ssh_server, :wait, :logger
+
+    def monitor_session(port)
+      Thread.new do
+        while sessions[port]
+          begin
+            sessions[port].loop { true }
+          rescue IOError => e
+            logger.debug(
+              "SSH session #{sessions[port].inspect} " +
+                "forwarding for port #{port} terminated: #{e.inspect}"
+            )
+            sessions.delete(port)
+          end
+        end
+      end
+    end
+
+    def cleanup_at_exit
+      Kernel.at_exit do
+        status = $!.is_a?(::SystemExit) ? $!.status : nil
+        close_ssh_sessions
+        exit status if status
+      end
+    end
+
+    def close_ssh_sessions
+      sessions.each_value { |s| s.close }
+    end
+
+    def sessions
+      @sessions ||= {}
+    end
+  end
+end

data/lib/bosh/deployer/ssh_server.rb

@@ -0,0 +1,50 @@
+require 'net/ssh'
+
+module Bosh::Deployer
+  class SshServer
+    def initialize(user, key, port, logger)
+      @user = user
+      @key = key
+      @port = port
+      @logger = logger
+    end
+
+    SSH_EXCEPTIONS = [
+      Net::SSH::AuthenticationFailed,
+      Net::SSH::ConnectionTimeout,
+      Net::SSH::Disconnect,
+      Net::SSH::HostKeyError,
+    ]
+
+    def readable?(ip)
+      socket = TCPSocket.new(ip, port)
+      if IO.select([socket], nil, nil, 5)
+        logger.debug("tcp socket #{ip}:#{port} is readable")
+        true
+      else
+        false
+      end
+    rescue SocketError, SystemCallError => e
+      logger.debug("tcp socket #{ip}:#{port} #{e.inspect}")
+      Kernel.sleep(1)
+      false
+    ensure
+      socket.close if socket
+    end
+
+    def start_session(ip)
+      logger.info("Starting SSH session for port forwarding to #{user}@#{ip}...")
+      session = Net::SSH.start(ip, user, keys: [key], paranoid: false, port: port)
+      logger.debug("ssh #{user}@#{ip}: ESTABLISHED")
+      session
+    rescue *SSH_EXCEPTIONS => e
+      logger.debug("ssh start #{user}@#{ip} failed: #{e.inspect}")
+      Kernel.sleep(1)
+      return nil
+    end
+
+    private
+
+    attr_reader :user, :key, :port, :logger
+  end
+end

data/lib/bosh/deployer/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Deployer
-    VERSION = '1.1858.0'
+    VERSION = '1.1868.0'
   end
 end

data/lib/bosh/deployer.rb

@@ -17,7 +17,6 @@ require 'common/common'
 require 'common/thread_formatter'
 
 require 'bosh/deployer/version'
-require 'bosh/deployer/helpers'
 require 'bosh/deployer/config'
 require 'bosh/deployer/specification'
 require 'bosh/deployer/instance_manager'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli_plugin_micro
 version: !ruby/object:Gem::Version
-  version: 1.1858.0
+  version: 1.1868.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh-stemcell
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: agent_client
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +205,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI plugin for Micro BOSH deployment
 
-  570d8c'
+  f69423'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -222,7 +222,6 @@ files:
 - lib/bosh/deployer/deployer_renderer.rb
 - lib/bosh/deployer/director_gateway_error.rb
 - lib/bosh/deployer/hash_fingerprinter.rb
-- lib/bosh/deployer/helpers.rb
 - lib/bosh/deployer/instance_manager.rb
 - lib/bosh/deployer/instance_manager/aws.rb
 - lib/bosh/deployer/instance_manager/openstack.rb
@@ -230,8 +229,10 @@ files:
 - lib/bosh/deployer/instance_manager/vsphere.rb
 - lib/bosh/deployer/logger_renderer.rb
 - lib/bosh/deployer/models/instance.rb
-- lib/bosh/deployer/render_thingy.rb
+- lib/bosh/deployer/registry.rb
+- lib/bosh/deployer/remote_tunnel.rb
 - lib/bosh/deployer/specification.rb
+- lib/bosh/deployer/ssh_server.rb
 - lib/bosh/deployer/ui_messager.rb
 - lib/bosh/deployer/version.rb
 - README.rdoc
@@ -257,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3890851221761234991
+      hash: 2960688641481672505
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/bosh/deployer/helpers.rb

@@ -1,110 +0,0 @@
-require 'net/ssh'
-
-module Bosh::Deployer
-  module Helpers
-    DEPLOYMENTS_FILE = 'bosh-deployments.yml'
-
-    def is_tgz?(path)
-      File.extname(path) == '.tgz'
-    end
-
-    def cloud_plugin(config)
-      err 'No cloud properties defined' if config['cloud'].nil?
-      err 'No cloud plugin defined' if config['cloud']['plugin'].nil?
-
-      config['cloud']['plugin']
-    end
-
-    def dig_hash(hash, *path)
-      path.inject(hash) do |location, key|
-        location.respond_to?(:keys) ? location[key] : nil
-      end
-    end
-
-    def process_exists?(pid)
-      Process.kill(0, pid)
-    rescue Errno::ESRCH
-      false
-    end
-
-    def socket_readable?(ip, port)
-      socket = TCPSocket.new(ip, port)
-      if IO.select([socket], nil, nil, 5)
-        logger.debug("tcp socket #{ip}:#{port} is readable")
-        yield
-        true
-      else
-        false
-      end
-    rescue SocketError => e
-      logger.debug("tcp socket #{ip}:#{port} SocketError: #{e.inspect}")
-      sleep 1
-      false
-    rescue SystemCallError => e
-      logger.debug("tcp socket #{ip}:#{port} SystemCallError: #{e.inspect}")
-      sleep 1
-      false
-    ensure
-      socket.close if socket
-    end
-
-    # rubocop:disable MethodLength
-    def remote_tunnel(port)
-      @sessions ||= {}
-      return if @sessions[port]
-
-      ip = Config.bosh_ip
-
-      # sshd is up, sleep while host keys are generated
-      loop until socket_readable?(ip, @ssh_port) { sleep(@ssh_wait) }
-
-      if @sessions[port].nil?
-        logger.info("Starting SSH session for port forwarding to #{@ssh_user}@#{ip}...")
-        loop do
-          begin
-            @sessions[port] = Net::SSH.start(ip, @ssh_user, keys: [@ssh_key], paranoid: false)
-            logger.debug("ssh #{@ssh_user}@#{ip}: ESTABLISHED")
-            break
-          rescue => e
-            logger.debug("ssh start #{@ssh_user}@#{ip} failed: #{e.inspect}")
-            sleep 1
-          end
-        end
-      end
-
-      lo = '127.0.0.1'
-      @sessions[port].forward.remote(port, lo, port)
-
-      logger.info("SSH forwarding for port #{port} started: OK")
-
-      Thread.new do
-        while @sessions[port]
-          begin
-            @sessions[port].loop { true }
-          rescue IOError => e
-            logger.debug(
-              "SSH session #{@sessions[port].inspect} " +
-              "forwarding for port #{port} terminated: #{e.inspect}"
-            )
-            @sessions.delete(port)
-          end
-        end
-      end
-
-      at_exit do
-        status = $!.is_a?(::SystemExit) ? $!.status : nil
-        close_ssh_sessions
-        exit status if status
-      end
-    end
-    # rubocop:enable MethodLength
-
-    def close_ssh_sessions
-      @sessions.each_value { |s| s.close }
-    end
-
-    def strip_relative_path(path)
-      path[/#{Regexp.escape File.join(Dir.pwd, '')}(.*)/, 1] || path
-    end
-  end
-end