bosh_cli 1.3160.0 → 1.3163.0

data/lib/cli/commands/ssh.rb

@@ -20,19 +20,19 @@ module Bosh::Cli
 
       def shell(*args)
         if args.size > 0
-          job, index, command = JobCommandArgs.new(args).to_a
+          job, id, command = JobCommandArgs.new(args).to_a
         else
           command    = ''
-          job, index = prompt_for_job_and_index
+          job, id = prompt_for_job_and_index
         end
 
         manifest = prepare_deployment_manifest(show_state: true)
 
         if command.empty?
-          setup_interactive_shell(manifest.name, job, index)
+          setup_interactive_shell(manifest.name, job, id)
         else
-          say("Executing `#{command.join(' ')}' on #{job}/#{index}")
-          perform_operation(:exec, manifest.name, job, index, command)
+          say("Executing `#{command.join(' ')}' on #{job}/#{id}")
+          perform_operation(:exec, manifest.name, job, id, command)
         end
       end
 
@@ -105,7 +105,7 @@ module Bosh::Cli
       # @param [String] job
       # @param [Integer] index
       # @param [optional,String] password
-      def setup_ssh(deployment_name, job, index, password)
+      def setup_ssh(deployment_name, job, id, password)
 
         say("Target deployment is `#{deployment_name}'")
         nl
@@ -114,7 +114,7 @@ module Bosh::Cli
         ssh_session = SSHSession.new
 
         status, task_id = director.setup_ssh(
-          deployment_name, job, index, ssh_session.user,
+          deployment_name, job, id, ssh_session.user,
           ssh_session.public_key, encrypt_password(password))
 
         unless status == :done
@@ -158,7 +158,7 @@ module Bosh::Cli
           nl
           say('Cleaning up ssh artifacts')
           ssh_session.cleanup
-          indices = sessions.map { |session| session['index'] }
+          indices = sessions.map { |session| session['id'] || session['index'] }
           director.cleanup_ssh(deployment_name, job, "^#{ssh_session.user}$", indices)
           gateway.shutdown! if gateway
         end
@@ -166,17 +166,17 @@ module Bosh::Cli
 
       # @param [String] job Job name
       # @param [Integer] index Job index
-      def setup_interactive_shell(deployment_name, job, index)
+      def setup_interactive_shell(deployment_name, job, id)
         password = options[:default_password] || ''
 
-        setup_ssh(deployment_name, job, index, password) do |sessions, gateway, ssh_session|
+        setup_ssh(deployment_name, job, id, password) do |sessions, gateway, ssh_session|
           session = sessions.first
 
           unless session['status'] == 'success' && session['ip']
-            err("Failed to set up SSH on #{job}/#{index}: #{session.inspect}")
+            err("Failed to set up SSH on #{job}/#{id}: #{session.inspect}")
           end
 
-          say("Starting interactive shell on job #{job}/#{index}")
+          say("Starting interactive shell on job #{job}/#{id}")
 
           skip_strict_host_key_checking = options[:strict_host_key_checking] =~ (/(no|false)$/i) ?
               '-o StrictHostKeyChecking=no' : '-o StrictHostKeyChecking=yes'

data/lib/cli/commands/vm.rb

@@ -6,21 +6,21 @@ module Bosh::Cli
     class Vm < Base
       usage 'vm resurrection'
       desc 'Enable/Disable resurrection for a given vm'
-      def resurrection_state(job=nil, index=nil, new_state)
+      def resurrection_state(job=nil, index_or_id=nil, new_state)
         auth_required
 
-        if job.nil? && index.nil?
+        if job.nil? && index_or_id.nil?
           resurrection = Resurrection.new(new_state)
           show_current_state
 
           director.change_vm_resurrection_for_all(resurrection.paused?)
         else
-          job_args = JobCommandArgs.new([job, index])
-          job, index, _ = job_args.to_a
+          job_args = JobCommandArgs.new([job, index_or_id])
+          job, index_or_id, _ = job_args.to_a
           resurrection = Resurrection.new(new_state)
 
           manifest = prepare_deployment_manifest(show_state: true)
-          director.change_vm_resurrection(manifest.name, job, index, resurrection.paused?)
+          director.change_vm_resurrection(manifest.name, job, index_or_id, resurrection.paused?)
         end
       end
     end

data/lib/cli/commands/vms.rb

@@ -34,15 +34,18 @@ module Bosh::Cli::Command
         return
       end
 
-      sorted = vms.sort do |a, b|
-        s = a['job_name'].to_s <=> b['job_name'].to_s
-        s = a['index'].to_i <=> b['index'].to_i if s == 0
-        s = a['resource_pool'].to_s <=> b['resource_pool'].to_s if s == 0
-        s
-      end
+      sorted = sort(vms)
+
+      has_az = vms.any? {|vm| vm.has_key? 'az' }
 
       vms_table = table do |t|
-        headings = ['Job/index', 'State', 'Resource Pool', 'IPs']
+        headings = ['VM', 'State']
+
+        if has_az
+          headings << 'AZ'
+        end
+        headings += ['VM Type', 'IPs']
+
         if options[:details]
           headings += ['CID', 'Agent ID', 'Resurrection']
         end
@@ -58,12 +61,26 @@ module Bosh::Cli::Command
         t.headings = headings
 
         sorted.each do |vm|
-          job = "#{vm['job_name'] || 'unknown'}/#{vm['index'] || 'unknown'}"
+          job_name = vm['job_name'] || 'unknown'
+          job_index = vm['index'] || 'unknown'
+          job = vm.has_key?('id') ? "#{job_name}/#{job_index} (#{vm['id']})" : "#{job_name}/#{job_index}"
           ips = Array(vm['ips']).join("\n")
           dns_records = Array(vm['dns']).join("\n")
           vitals = vm['vitals']
+          az = vm['az'].nil? ? 'n/a' : vm['az']
+
+          row = [job, vm['job_state']]
+          if has_az
+            row << az
+          end
+
+          if vm['resource_pool']
+            row << vm['resource_pool']
+          else
+            row << vm['vm_type']
+          end
 
-          row = [job, vm['job_state'], vm['resource_pool'], ips]
+          row << ips
 
           if options[:details]
             row += [vm['vm_cid'], vm['agent_id'], vm['resurrection_paused'] ? 'paused' : 'active']
@@ -112,5 +129,15 @@ module Bosh::Cli::Command
       say('VMs total: %d' % vms.size)
     end
 
+    def sort(vms)
+      sorted = vms.sort do |a, b|
+        comparison = a['job_name'].to_s <=> b['job_name'].to_s
+        comparison = a['az'].to_s <=> b['az'].to_s if comparison == 0
+        comparison = a['index'].to_i <=> b['index'].to_i if comparison == 0
+        comparison
+      end
+      sorted
+    end
+
   end
 end

data/lib/cli/core_ext.rb

@@ -5,7 +5,7 @@ module BoshExtensions
   def say(message, sep = "\n")
     return unless Bosh::Cli::Config.output && message
     message = message.dup.to_s
-    sep = "" if message[-1..-1] == sep
+    sep = "" if message[-1] == sep
     Bosh::Cli::Config.output.print("#{$indent}#{message}#{sep}")
   end
 

data/lib/cli/deployment_helper.rb

@@ -129,14 +129,20 @@ module Bosh::Cli
     end
 
     def prompt_for_job_and_index
-      jobs_list = jobs_and_indexes
-
-      return jobs_list.first if jobs_list.size == 1
+      manifest = prepare_deployment_manifest
+      deployment_name = manifest.name
+      instances = director.fetch_vm_state(deployment_name, {}, false)
+      return [instances.first['job'], instances.first['index'] ] if instances.size == 1
 
       choose do |menu|
         menu.prompt = 'Choose an instance: '
-        jobs_list.each do |job_name, index|
-          menu.choice("#{job_name}/#{index}") { [job_name, index] }
+        instances.each do |instance|
+          job_name = instance['job']
+          index = instance['index']
+          id = instance['id']
+          name = "#{job_name}/#{index}"
+          name = "#{name} (#{id})" if id
+          menu.choice(name) { [job_name, index] }
         end
       end
     end

data/lib/cli/job_command_args.rb

@@ -1,23 +1,19 @@
 module Bosh::Cli
-  class JobCommandArgs < Struct.new(:job, :index, :args)
+  class JobCommandArgs < Struct.new(:job, :id, :args)
     def initialize(args)
       job = args.shift
       err('Please provide job name') if job.nil?
-      job, index = job.split('/', 2)
+      job, id = job.split('/', 2)
 
-      if index
-        if index =~ /^\d+$/
-          index = index.to_i
-        else
-          err('Invalid job index, integer number expected')
-        end
-      elsif args[0] =~ /^\d+$/
-        index = args.shift.to_i
-      end
+      id = args.shift if id.nil?
 
       self.job = job
-      self.index = index
+      self.id = id
       self.args = args
     end
+
+    def index
+      id
+    end
   end
 end

data/lib/cli/job_state.rb

@@ -30,19 +30,20 @@ module Bosh::Cli
       @options = options
     end
 
-    def change(state, job, index, force)
-      description = job_description(job, index)
+    def change(state, job, index_or_id, force)
+      job, index_or_id = job.split('/') if index_or_id.nil?
+      description = job_description(job, index_or_id)
       op_desc = OPERATION_DESCRIPTIONS.fetch(state) % description
       new_state = NEW_STATES.fetch(state)
       completion_desc = COMPLETION_DESCRIPTIONS.fetch(state) % description.make_green
-      status, task_id = change_job_state(new_state, job, index, op_desc, force)
+      status, task_id = change_job_state(new_state, job, index_or_id, op_desc, force)
 
       [status, task_id, completion_desc]
     end
 
     private
 
-    def change_job_state(new_state, job, index, operation_desc, force)
+    def change_job_state(new_state, job, index_or_id, operation_desc, force)
       @command.say("You are about to #{operation_desc.make_green}")
 
       check_if_manifest_changed(@manifest.hash, force)
@@ -52,7 +53,7 @@ module Bosh::Cli
 
       @command.nl
       @command.say("Performing `#{operation_desc}'...")
-      @command.director.change_job_state(@manifest.name, @manifest.yaml, job, index, new_state, @options)
+      @command.director.change_job_state(@manifest.name, @manifest.yaml, job, index_or_id, new_state, @options)
     end
 
 
@@ -64,10 +65,9 @@ module Bosh::Cli
       end
     end
 
-    def job_description(job, index)
+    def job_description(job, index_or_id)
       return 'all jobs' if job == '*'
-      index ? "#{job}/#{index}" : "#{job}/*"
+      index_or_id ? "#{job}/#{index_or_id}" : "#{job}/*"
     end
-
   end
 end

data/lib/cli/logs_downloader.rb

@@ -5,9 +5,9 @@ module Bosh::Cli
       @ui = ui
     end
 
-    def build_destination_path(job_name, job_index, directory)
+    def build_destination_path(job_name, job_index_or_id, directory)
       time = Time.now.strftime('%Y-%m-%d-%H-%M-%S')
-      File.join(directory, "#{job_name}.#{job_index}.#{time}.tgz")
+      File.join(directory, "#{job_name}.#{job_index_or_id}.#{time}.tgz")
     end
 
     def download(resource_id, logs_destination_path)

data/lib/cli/resources/job.rb

@@ -59,7 +59,7 @@ module Bosh::Cli::Resources
         raise Bosh::Cli::InvalidJob, "'#{name}' is not a valid BOSH identifier"
       end
 
-      unless spec['templates'].is_a?(Hash)
+      unless  spec['templates'].nil? or spec['templates'].is_a?(Hash)
         raise Bosh::Cli::InvalidJob, "Incorrect templates section in '#{name}' job spec (Hash expected, #{spec['templates'].class} given)"
       end
 
@@ -138,7 +138,7 @@ module Bosh::Cli::Resources
     end
 
     def templates
-      spec['templates'].keys
+      spec['templates'] ? spec['templates'].keys : []
     end
 
     def templates_dir

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3160.0'
+    VERSION = '1.3163.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3160.0
+  version: 1.3163.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-23 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.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +359,7 @@ files:
 - lib/cli/commands/cloudcheck.rb
 - lib/cli/commands/complete.rb
 - lib/cli/commands/deployment.rb
+- lib/cli/commands/disks.rb
 - lib/cli/commands/errand.rb
 - lib/cli/commands/help.rb
 - lib/cli/commands/instances.rb