bosh_cli 1.3137.0 → 1.3138.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb756f67ef17fbf6a0faa8677978bf8e099bfda
-  data.tar.gz: e1f95aaa0f1790e8b0153b6fd6478efe1ac0b60f
+  metadata.gz: cab55032d94ca82ccfcbabbccf72afae4dd11893
+  data.tar.gz: c8403927639e04ad6765c193d36ddbbcaaa23228
 SHA512:
-  metadata.gz: 67f549d198df70676f76e74546a530c9c41f2e2dadecc503e0c4a279d5782a91f8004ffaa0bdbf543dc6a52c3bfac70c7b3e726e2c0ed5cbdfef9077861a3c7e
-  data.tar.gz: f61374053e56373e734a10d6ce5c2f1c7a2e19ed6a02668f9424beb9e8b6539c67d455148fab0b3792505913ac7d4f3d848362ab8fb5714cfd8366aa3a5d8150
+  metadata.gz: 168282461378d2884f3dd028f4b1814a6b7f2f903d89987245ca42985a6da688c6e2b25b0f32f8563ecfabc4df98004f3bbde410ab03c64f89c5d202db1baa62
+  data.tar.gz: 0eb3d0bdcbd5cdde1c752873c3db06cba5c579e184c0457be96f080a22b94ada7b75b0b9e531a72fbeb2d132f707354f356086a51e74be4e60dd27d4ee7921a3

data/lib/cli/client/director.rb

@@ -300,12 +300,12 @@ module Bosh
         end
 
         def change_job_state(deployment_name, manifest_yaml,
-          job_name, index, new_state, options = {})
+          job, index, new_state, options = {})
           options = options.dup
 
           skip_drain = !!options.delete(:skip_drain)
 
-          url = "/deployments/#{deployment_name}/jobs/#{job_name}"
+          url = "/deployments/#{deployment_name}/jobs/#{job}"
           url += "/#{index}" if index
           url += "?state=#{new_state}"
           url += "&skip_drain=true" if skip_drain

data/lib/cli/commands/instances.rb

@@ -48,6 +48,8 @@ module Bosh::Cli::Command
 
       row_count = 0
       has_disk_cid = instances[0].has_key?('disk_cid')
+      has_uptime = instances[0]['processes'] && instances[0]['processes'].size > 0 && instances[0]['processes'][0].has_key?('uptime')
+      has_cpu = instances[0]['processes'] && instances[0]['processes'].size > 0 && instances[0]['processes'][0].has_key?('cpu')
 
       instances_table = table do |t|
         headings = ['Instance', 'State', 'Resource Pool', 'IPs']
@@ -58,16 +60,21 @@ module Bosh::Cli::Command
             headings += ['VM CID', 'Agent ID', 'Resurrection']
           end
         end
+
         if options[:dns]
           headings += ['DNS A records']
         end
+
         if options[:vitals]
+          headings += [{:value => "Uptime", :alignment => :center}] if options[:ps] && has_uptime
           headings += [{:value => "Load\n(avg01, avg05, avg15)", :alignment => :center}]
-          headings += ["CPU\nUser", "CPU\nSys", "CPU\nWait"]
+          headings += [{:value => "CPU %\n(User, Sys, Wait)", :alignment => :center}]
+          headings += ["CPU %"] if options[:ps] && has_cpu
           headings += ['Memory Usage', 'Swap Usage']
           headings += ["System\nDisk Usage", "Ephemeral\nDisk Usage", "Persistent\nDisk Usage"]
         end
-        t.headings = headings
+
+        last_job = ''
         sorted.each do |instance|
           if options[:failing]
             if options[:ps]
@@ -92,6 +99,7 @@ module Bosh::Cli::Command
           vitals = instance['vitals']
 
           row = [job, instance['job_state'], instance['resource_pool'], ips]
+          t << :separator if row_count.between?(2, instance_count) && (options[:ps] || last_job != '' && instance['job_name'] != last_job)
 
           if options[:details]
             if has_disk_cid
@@ -112,10 +120,10 @@ module Bosh::Cli::Command
               swap = vitals['swap']
               disk = vitals['disk']
 
+              row << '' if options[:ps] && has_uptime && instance['processes'].size > 0
               row << vitals['load'].join(', ')
-              row << "#{cpu['user']}%"
-              row << "#{cpu['sys']}%"
-              row << "#{cpu['wait']}%"
+              row << "#{cpu['user']}%, #{cpu['sys']}%, #{cpu['wait']}%"
+              row << '' if options[:ps] && has_cpu && instance['processes'].size > 0
               row << "#{mem['percent']}% (#{pretty_size(mem['kb'].to_i * 1024)})"
               row << "#{swap['percent']}% (#{pretty_size(swap['kb'].to_i * 1024)})"
               row << "#{disk['system']['percent']}%"
@@ -132,21 +140,54 @@ module Bosh::Cli::Command
             else
               9.times { row << 'n/a' }
             end
-          end
-
-          t << row
-          if options[:ps] && instance['processes']
-            instance['processes'].each do |process|
-              name = process['name']
-              state = process['state']
-              process_row = ["  #{name}", "#{state}"]
-              (headings.size - 2).times { process_row << '' }
-              t << process_row
+            t << row
+
+            if options[:ps] && instance['processes']
+              instance['processes'].each do |process|
+                prow = ['  ' + process['name'], process['state'], '', '']
+                if options[:details]
+                  prow += ['','','']
+                  prow << '' if has_disk_cid
+                end
+                if has_uptime
+                  if process['uptime']
+                    uptime = Integer(process['uptime']['secs'])
+                    days = uptime/60/60/24
+                    hours = uptime/60/60%24
+                    minutes = uptime/60%60
+                    seconds = uptime%60
+                    prow << "#{days}d #{hours}h #{minutes}m #{seconds}s"
+                  else
+                    prow << ''
+                  end
+                end
+                prow += ['','']
+                prow << (process['cpu'] ? "#{process['cpu']['total']}%":'') if has_cpu
+                prow << (process['mem'] ? "#{process['mem']['percent']}% (#{pretty_size(process['mem']['kb'].to_i * 1024)})":'')
+                4.times { prow << '' }
+                t << prow
+              end
+            end
+          else
+            t << row
+            if options[:ps] && instance['processes']
+              instance['processes'].each do |process|
+                name = process['name']
+                state = process['state']
+                process_row = ["  #{name}", "#{state}"]
+                (headings.size - 2).times { process_row << '' }
+                t << process_row
+              end
             end
+          end
 
-            t << :separator if row_count < instance_count
+          last_job = instance['job_name'] || 'unknown'
+          if instance['processes'].size == 0 && instance_count == 1
+            headings.delete_at(4)
+            headings.delete_at(6)
           end
         end
+        t.headings = headings
       end
 
       if options[:failing] && row_count == 0

data/lib/cli/commands/job_management.rb

@@ -1,6 +1,5 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 require 'cli/job_state'
-require 'cli/vm_state'
 
 module Bosh::Cli
   module Command
@@ -18,12 +17,12 @@ module Bosh::Cli
 
       # bosh stop
       usage 'stop'
-      desc 'Stop job/instance'
+      desc 'Stop all jobs/job/instance'
       option '--soft', 'Stop process only'
       option '--hard', 'Power off VM'
       option '--force', FORCE
       option '--skip-drain', SKIP_DRAIN
-      def stop_job(job, index = nil)
+      def stop_job(job = '*', index = nil)
         if hard?
           change_job_state(:detach, job, index)
         else
@@ -53,12 +52,13 @@ module Bosh::Cli
 
       def change_job_state(state, job, index = nil)
         auth_required
-        manifest = parse_manifest(state, job)
-
-        index = valid_index_for(manifest.hash, job, index)
-        vm_state = VmState.new(self, manifest, force?)
-        job_state = JobState.new(self, vm_state, skip_drain: skip_drain?)
-        status, task_id, completion_desc = job_state.change(state, job, index)
+        manifest = parse_manifest(state)
+        unless job == '*'
+          job_must_exist_in_deployment(manifest.hash, job)
+          index = valid_index_for(manifest.hash, job, index) unless state == :stop || state  == :detach
+        end
+        job_state = JobState.new(self, manifest, skip_drain: skip_drain?)
+        status, task_id, completion_desc = job_state.change(state, job, index, force?)
         task_report(status, task_id, completion_desc)
       end
 
@@ -78,9 +78,8 @@ module Bosh::Cli
         !!options[:skip_drain]
       end
 
-      def parse_manifest(operation, job)
+      def parse_manifest(operation)
         manifest = prepare_deployment_manifest(show_state: true)
-        job_must_exist_in_deployment(manifest.hash, job)
 
         if hard? && soft?
           err('Cannot handle both --hard and --soft options, please choose one')

data/lib/cli/job_state.rb

@@ -3,7 +3,7 @@ module Bosh::Cli
     OPERATION_DESCRIPTIONS = {
         start: 'start %s',
         stop: 'stop %s',
-        detach: 'stop %s and power off its VM(s)',
+        detach: 'stop %s and delete its VM(s)',
         restart: 'restart %s',
         recreate: 'recreate %s'
     }
@@ -17,39 +17,57 @@ module Bosh::Cli
     }
 
     COMPLETION_DESCRIPTIONS = {
-        start: '%s has been started',
-        stop: '%s has been stopped, VM(s) still running',
-        detach: '%s has been detached, VM(s) powered off',
-        restart: '%s has been restarted',
-        recreate: '%s has been recreated'
+        start: '%s started',
+        stop: '%s stopped, VM(s) still running',
+        detach: '%s detached, VM(s) deleted',
+        restart: '%s restarted',
+        recreate: '%s recreated'
     }
 
-    def initialize(command, vm_state, options)
+    def initialize(command, manifest, options)
       @command = command
-      @vm_state = vm_state
+      @manifest = manifest
       @options = options
     end
 
-    def change(state, job, index)
-      job_desc = job_description(job, index)
-      op_desc = OPERATION_DESCRIPTIONS.fetch(state) % job_desc
+    def change(state, job, index, force)
+      description = job_description(job, index)
+      op_desc = OPERATION_DESCRIPTIONS.fetch(state) % description
       new_state = NEW_STATES.fetch(state)
-      completion_desc = COMPLETION_DESCRIPTIONS.fetch(state) % job_desc.make_green
-
-      status, task_id = perform_vm_state_change(job, index, new_state, op_desc)
+      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, completion_desc]
     end
 
     private
-    attr_reader :command, :vm_state
 
-    def job_description(job, index)
-      index ? "#{job}/#{index}" : "#{job}"
+    def change_job_state(new_state, job, index, operation_desc, force)
+      @command.say("You are about to #{operation_desc.make_green}")
+
+      check_if_manifest_changed(@manifest.hash, force)
+      unless @command.confirmed?("#{operation_desc.capitalize}?")
+        @command.cancel_deployment
+      end
+
+      @command.nl
+      @command.say("Performing `#{operation_desc}'...")
+      @command.director.change_job_state(@manifest.name, @manifest.yaml, job, index, new_state, @options)
+    end
+
+
+    def check_if_manifest_changed(manifest_hash, force)
+      other_changes_present = @command.inspect_deployment_changes(manifest_hash, show_empty_changeset: false)
+
+      if other_changes_present && !force
+        @command.err("Cannot perform job management when other deployment changes are present. Please use `--force' to override.")
+      end
     end
 
-    def perform_vm_state_change(job, index, new_state, operation_desc)
-      vm_state.change(job, index, new_state, operation_desc, @options)
+    def job_description(job, index)
+      return 'all jobs' if job == '*'
+      index ? "#{job}/#{index}" : "#{job}/*"
     end
+
   end
 end

data/lib/cli/resources/job.rb

@@ -19,8 +19,8 @@ module Bosh::Cli::Resources
 
     def spec
       @spec ||= load_yaml_file(job_base.join('spec'))
-    rescue
-      raise Bosh::Cli::InvalidJob, 'Job spec is missing'
+    rescue Exception => e
+      raise Bosh::Cli::InvalidJob, "Job spec is missing or invalid: #{e.message}"
     end
 
     def name

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3137.0'
+    VERSION = '1.3138.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3137.0
+  version: 1.3138.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-16 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.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.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.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -447,7 +447,6 @@ files:
 - lib/cli/versions/releases_dir_migrator.rb
 - lib/cli/versions/version_file_resolver.rb
 - lib/cli/versions/versions_index.rb
-- lib/cli/vm_state.rb
 - lib/cli/yaml_helper.rb
 homepage: https://github.com/cloudfoundry/bosh
 licenses:

data/lib/cli/vm_state.rb

@@ -1,45 +0,0 @@
-module Bosh::Cli
-  class VmState
-    def initialize(command, manifest, force)
-      @command = command
-      @manifest = manifest
-      @force = force
-    end
-
-    def change(job, index, new_state, operation_desc, options = {})
-      command.say("You are about to #{operation_desc.make_green}")
-
-      check_if_manifest_changed(@manifest.hash)
-
-      unless command.confirmed?("#{operation_desc.capitalize}?")
-        command.cancel_deployment
-      end
-
-      command.nl
-      command.say("Performing `#{operation_desc}'...")
-      command.director.change_job_state(
-        @manifest.name,
-        @manifest.yaml,
-        job,
-        index,
-        new_state,
-        options
-      )
-    end
-
-    private
-    attr_reader :command
-
-    def force?
-      !!@force
-    end
-
-    def check_if_manifest_changed(manifest_hash)
-      other_changes_present = command.inspect_deployment_changes(manifest_hash, show_empty_changeset: false)
-
-      if other_changes_present && !force?
-        command.err("Cannot perform job management when other deployment changes are present. Please use `--force' to override.")
-      end
-    end
-  end
-end