bosh_cli 1.0.3 → 1.5.0.pre.1113

data/lib/cli/commands/stemcell.rb

@@ -9,9 +9,7 @@ module Bosh::Cli::Command
 
     # The URL of the public stemcell index.
     PUBLIC_STEMCELL_INDEX_URL =
-      "https://blob.cfblob.com/rest/objects/4e4e78bca2" +
-      "1e121204e4e86ee151bc04f6a19ce46b22?uid=bb6a0c89ef4048a8a0f814e2538" +
-      "5d1c5/user1&expires=1893484800&signature=NJuAr9c8eOid7dKFmOEN7bmzAlI="
+      "https://s3.amazonaws.com/blob.cfblob.com/stemcells/public_stemcells_index.yml"
 
     DEFAULT_PUB_STEMCELL_TAG = "stable"
     ALL_STEMCELLS_TAG = "all"
@@ -27,9 +25,9 @@ module Bosh::Cli::Command
       nl
 
       if stemcell.valid?
-        say("`#{tarball_path}' is a valid stemcell".green)
+        say("`#{tarball_path}' is a valid stemcell".make_green)
       else
-        say("Validation errors:".red)
+        say("Validation errors:".make_red)
         stemcell.errors.each do |error|
           say("- %s" % [error])
         end
@@ -39,38 +37,50 @@ module Bosh::Cli::Command
 
     # bosh upload stemcell
     usage "upload stemcell"
-    desc "Upload stemcell"
-    def upload(tarball_path)
+    desc "Upload stemcell (stemcell_location can be a local file or a remote URI)"
+    def upload(stemcell_location)
       auth_required
 
-      stemcell = Bosh::Cli::Stemcell.new(tarball_path, cache)
-
-      nl
-      say("Verifying stemcell...")
-      stemcell.validate
-      nl
+      stemcell_type = stemcell_location =~ /^#{URI::regexp}$/ ? "remote" : "local"
+      if stemcell_type == "local"
+        stemcell = Bosh::Cli::Stemcell.new(stemcell_location, cache)
+  
+        nl
+        say("Verifying stemcell...")
+        stemcell.validate
+        nl
+  
+        unless stemcell.valid?
+          err("Stemcell is invalid, please fix, verify and upload again")
+        end
+  
+        say("Checking if stemcell already exists...")
+        name = stemcell.manifest["name"]
+        version = stemcell.manifest["version"]
+  
+        if exists?(name, version)
+          err("Stemcell `#{name}/#{version}' already exists, " +
+                "increment the version if it has changed")
+        else
+          say("No")
+        end
+        
+        stemcell_location = stemcell.stemcell_file
 
-      unless stemcell.valid?
-        err("Stemcell is invalid, please fix, verify and upload again")
+        nl
+        say("Uploading stemcell...")
+        nl
+      else
+        nl
+        say("Using remote stemcell `#{stemcell_location}'")
       end
 
-      say("Checking if stemcell already exists...")
-      name = stemcell.manifest["name"]
-      version = stemcell.manifest["version"]
-
-      if exists?(name, version)
-        err("Stemcell `#{name}/#{version}' already exists, " +
-              "increment the version if it has changed")
+      if stemcell_type == "local"
+        status, task_id = director.upload_stemcell(stemcell_location)
       else
-        say("No")
+        status, task_id = director.upload_remote_stemcell(stemcell_location)
       end
 
-      nl
-      say("Uploading stemcell...")
-      nl
-
-      status, task_id = director.upload_stemcell(stemcell.stemcell_file)
-
       task_report(status, task_id, "Stemcell uploaded and created")
     end
 
@@ -170,15 +180,17 @@ module Bosh::Cli::Command
         err("The downloaded file sha1 `#{file_sha1}' does not match the " +
             "expected sha1 `#{sha1}'")
       else
-        say("Download complete".green)
+        say("Download complete".make_green)
       end
     end
 
     # bosh delete stemcell
     usage "delete stemcell"
     desc  "Delete stemcell"
+    option "--force", "ignore errors while deleting the stemcell"
     def delete(name, version)
       auth_required
+      force = !!options[:force]
 
       say("Checking if stemcell exists...")
 
@@ -186,14 +198,14 @@ module Bosh::Cli::Command
         err("Stemcell `#{name}/#{version}' does not exist")
       end
 
-      say("You are going to delete stemcell `#{name}/#{version}'".red)
+      say("You are going to delete stemcell `#{name}/#{version}'".make_red)
 
       unless confirmed?
-        say("Canceled deleting stemcell".green)
+        say("Canceled deleting stemcell".make_green)
         return
       end
 
-      status, task_id = director.delete_stemcell(name, version)
+      status, task_id = director.delete_stemcell(name, version, :force => force)
 
       task_report(status, task_id, "Deleted stemcell `#{name}/#{version}'")
     end
@@ -232,7 +244,7 @@ module Bosh::Cli::Command
       if status_code != HTTP::Status::OK
         err("Received HTTP #{status_code} from #{PUBLIC_STEMCELL_INDEX_URL}.")
       end
-      YAML.load(response.body)
+      Psych.load(response.body)
     end
 
   end

data/lib/cli/commands/task.rb

@@ -118,9 +118,9 @@ module Bosh::Cli::Command
     def show_tasks_table(tasks)
       return if tasks.empty?
       tasks_table = table do |t|
-        t.headings = "#", "State", "Timestamp", "Description", "Result"
+        t.headings = "#", "State", "Timestamp", "User", "Description", "Result"
         tasks.map do |task|
-          t << [task["id"], task["state"], Time.at(task["timestamp"]).utc,
+          t << [task["id"], task["state"], Time.at(task["timestamp"]).utc, task["user"],
                 task["description"].to_s, task["result"].to_s.truncate(80)]
         end
       end

data/lib/cli/commands/user.rb

@@ -10,9 +10,12 @@ module Bosh::Cli::Command
       auth_required
 
       if interactive?
-        username = ask("Enter username: ") if username.blank?
+        username = ask("Enter new username: ") if username.blank?
         if password.blank?
-          password = ask("Enter password: ") { |q| q.echo = "*" }
+          password = ask("Enter new password: ") { |q| q.echo = "*" }
+          password_confirmation = ask("Verify new password: ") { |q| q.echo = "*" }
+
+          err("Passwords do not match") if password != password_confirmation
         end
       end
 
@@ -21,11 +24,32 @@ module Bosh::Cli::Command
       end
 
       if director.create_user(username, password)
-        say("User `#{username}' has been created".green)
+        say("User `#{username}' has been created".make_green)
       else
         err("Error creating user")
       end
     end
 
+    usage "delete user"
+    desc "Deletes the user from the director"
+    def delete(username = nil)
+      auth_required
+
+      if interactive?
+        username ||= ask("Username to delete: ")
+      end
+
+      if username.blank?
+        err("Please provide a username to delete")
+      end
+
+      if confirmed?("Are you sure you would like to delete the user `#{username}'?")
+        if director.delete_user(username)
+          say("User `#{username}' has been deleted".make_green)
+        else
+          err("Unable to delete user")
+        end
+      end
+    end
   end
 end

data/lib/cli/commands/vm.rb

@@ -0,0 +1,28 @@
+require 'cli/job_command_args'
+require 'cli/resurrection'
+
+module Bosh::Cli
+  module Command
+    class Vm < Base
+      usage 'vm resurrection'
+      desc 'Enable/Disable resurrection for a given vm'
+      def resurrection_state(job=nil, index=nil, new_state)
+        if job.nil? && index.nil?
+          resurrection = Resurrection.new(new_state)
+
+          director.change_vm_resurrection_for_all(resurrection.paused?)
+        else
+          job_args = JobCommandArgs.new([job, index])
+          job, index, _ = job_args.to_a
+          resurrection = Resurrection.new(new_state)
+
+          job_must_exist_in_deployment(job)
+          index = valid_index_for(job, index, integer_index: true)
+
+          manifest           = prepare_deployment_manifest
+          director.change_vm_resurrection(manifest['name'], job, index, resurrection.paused?)
+        end
+      end
+    end
+  end
+end

data/lib/cli/commands/vms.rb

@@ -2,45 +2,103 @@
 
 module Bosh::Cli::Command
   class Vms < Base
-    include Bosh::Cli::DeploymentHelper
-
-    usage "vms"
-    desc  "List all VMs that in a deployment"
-    option "--full", "Return detailed VM information"
+    usage 'vms'
+    desc 'List all VMs in a deployment'
+    option '--details', 'Return detailed VM information'
+    option '--dns', 'Return VM DNS A records'
+    option '--vitals', 'Return VM vitals information'
     def list(deployment_name = nil)
       auth_required
       no_track_unsupported
-      show_full_stats = options[:full]
 
       if deployment_name.nil?
-        deployment_required
-        manifest = prepare_deployment_manifest
-        deployment_name = manifest["name"]
+        deps = director.list_deployments
+        err('No deployments') if deps.empty?
+        deps.each { |dep| show_deployment(dep['name'], options) }
+      else
+        show_deployment deployment_name, options
       end
+    end
 
-      say("Deployment `#{deployment_name.green}'")
-      vms = director.fetch_vm_state(deployment_name)
-      err("No VMs") if vms.empty?
+    def show_deployment(name, options={})
+      say("Deployment `#{name.make_green}'")
+
+      vms = director.fetch_vm_state(name)
+
+      if vms.empty?
+        nl
+        say('No VMs')
+        nl
+        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 = 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
 
       vms_table = table do |t|
-        headings = ["Job/index", "State", "Resource Pool", "IPs"]
-        headings += ["CID", "Agent ID"] if show_full_stats
-
+        headings = ['Job/index', 'State', 'Resource Pool', 'IPs']
+        if options[:details]
+          headings += ['CID', 'Agent ID', 'Resurrection']
+        end
+        if options[:dns]
+          headings += ['DNS A records']
+        end
+        if options[:vitals]
+          headings += [{:value => "Load\n(avg01, avg05, avg15)", :alignment => :center}]
+          headings += ["CPU\nUser", "CPU\nSys", "CPU\nWait"]
+          headings += ['Memory Usage', 'Swap Usage']
+          headings += ["System\nDisk Usage", "Ephemeral\nDisk Usage", "Persistent\nDisk Usage"]
+        end
         t.headings = headings
 
         sorted.each do |vm|
-          job = "#{vm["job_name"] || "unknown"}/#{vm["index"] || "unknown"}"
-          ips = Array(vm["ips"]).join(", ")
+          job = "#{vm['job_name'] || 'unknown'}/#{vm['index'] || 'unknown'}"
+          ips = Array(vm['ips']).join(', ')
+          dns_records = Array(vm['dns']).join("\n")
+          vitals = vm['vitals']
+
+          row = [job, vm['job_state'], vm['resource_pool'], ips]
+
+          if options[:details]
+            row += [vm['vm_cid'], vm['agent_id'], vm['resurrection_paused'] ? 'paused' : 'active']
+          end
+
+          if options[:dns]
+            row += [dns_records.empty? ? 'n/a' : dns_records]
+          end
+
+          if options[:vitals]
+            if vitals
+              cpu =  vitals['cpu']
+              mem =  vitals['mem']
+              swap = vitals['swap']
+              disk = vitals['disk']
 
-          row = [job, vm["job_state"], vm["resource_pool"], ips]
-          row += [vm["vm_cid"], vm["agent_id"]] if show_full_stats
+              row << vitals['load'].map { |l| "#{l}%" }.join(', ')
+              row << "#{cpu['user']}%"
+              row << "#{cpu['sys']}%"
+              row << "#{cpu['wait']}%"
+              row << "#{mem['percent']}% (#{pretty_size(mem['kb'].to_i * 1024)})"
+              row << "#{swap['percent']}% (#{pretty_size(swap['kb'].to_i * 1024)})"
+              row << "#{disk['system']['percent']}%"
+              if disk['ephemeral'].nil?
+                row << 'n/a'
+              else
+                row << "#{disk['ephemeral']['percent']}%"
+              end
+              if disk['persistent'].nil?
+                row << 'n/a'
+              else
+                row << "#{disk['persistent']['percent']}%"
+              end
+            else
+              9.times { row << 'n/a' }
+            end
+          end
 
           t << row
         end
@@ -49,7 +107,7 @@ module Bosh::Cli::Command
       nl
       say(vms_table)
       nl
-      say("VMs total: %d" % vms.size)
+      say('VMs total: %d' % vms.size)
     end
 
   end

data/lib/cli/config.rb

@@ -19,6 +19,9 @@ module Bosh::Cli
 
       # @return [Bosh::Cli::Cache] CLI cache (to save task logs etc.)
       attr_accessor :cache
+
+      # @return [Integer] CLI polling interval
+      attr_accessor :poll_interval
     end
 
     @commands = {}
@@ -42,7 +45,7 @@ module Bosh::Cli
       @work_dir = work_dir
 
       unless File.exists?(@filename)
-        File.open(@filename, "w") { |f| YAML.dump({}, f) }
+        File.open(@filename, "w") { |f| Psych.dump({}, f) }
         File.chmod(0600, @filename)
       end
 
@@ -188,12 +191,13 @@ module Bosh::Cli
 
     def save
       File.open(@filename, "w") do |f|
-        YAML.dump(@config_file, f)
+        Psych.dump(@config_file, f)
       end
 
     rescue SystemCallError => e
       raise ConfigError, e.message
     end
 
+    attr_reader :filename
   end
 end

data/lib/cli/core_ext.rb

@@ -66,30 +66,42 @@ module BoshExtensions
   end
 
   def load_yaml_file(path, expected_type = Hash)
-    err("Cannot find file `#{path}'") unless File.exists?(path)
-    yaml = YAML.load_file(path)
+    err("Cannot find file `#{path}'".make_red) unless File.exist?(path)
 
-    if expected_type && !yaml.is_a?(expected_type)
-      err("Incorrect file format in `#{path}', #{expected_type} expected")
+    begin
+      yaml_str = ERB.new(File.read(path)).result
+    rescue SystemCallError => e
+      err("Cannot load YAML file at `#{path}': #{e}".make_red)
+    end
+
+    begin
+      Bosh::Cli::YamlHelper.check_duplicate_keys(yaml_str)
+    rescue => e
+      err("Incorrect YAML structure in `#{path}': #{e}".make_red)
     end
 
-    Bosh::Cli::YamlHelper.check_duplicate_keys(path)
+    yaml = Psych::load(yaml_str)
+    if expected_type && !yaml.is_a?(expected_type)
+      err("Incorrect YAML structure in `#{path}': expected #{expected_type} at the root".make_red)
+    end
 
     yaml
-  rescue SystemCallError => e
-    err("Cannot load YAML file at `#{path}': #{e}")
   end
 
-  def dump_yaml_to_file(obj, file)
-    yaml = YAML.dump(obj)
-    file.write(yaml.gsub(" \n", "\n"))
-    file.flush
+  def write_yaml(manifest, path)
+    File.open(path, "w+") do |f|
+      f.write(manifest.to_yaml)
+    end
   end
 
   # @return [Fixnum]
   def terminal_width
     STDIN.tty? ? [HighLine::SystemExtensions.terminal_size[0], 120].min : 80
   end
+
+  def warning(message)
+    warn("[WARNING] #{message}".make_yellow)
+  end
 end
 
 module BoshStringExtensions
@@ -100,19 +112,19 @@ module BoshStringExtensions
     :yellow => "\e[0m\e[33m"
   }
 
-  def red
-    colorize(:red)
+  def make_red
+    make_color(:red)
   end
 
-  def green
-    colorize(:green)
+  def make_green
+    make_color(:green)
   end
 
-  def yellow
-    colorize(:yellow)
+  def make_yellow
+    make_color(:yellow)
   end
 
-  def colorize(color_code)
+  def make_color(color_code)
     if Bosh::Cli::Config.output &&
        Bosh::Cli::Config.output.tty? &&
        Bosh::Cli::Config.colorize &&
@@ -144,18 +156,7 @@ module BoshStringExtensions
   end
 
   def columnize(width = 80, left_margin = 0)
-    result = ""
-    buf = ""
-    self.split(/\s+/).each do |word|
-      if buf.size + word.size > width
-        result << buf << "\n" << " " * left_margin
-        buf = word + " "
-      else
-        buf << word << " "
-      end
-
-    end
-    result + buf
+    Bosh::Cli::LineWrap.new(width, left_margin).wrap(self)
   end
 
   def indent(margin = 2)