pve 0.1.2 → 0.2.3

data/README.adoc

@@ -14,6 +14,18 @@ You need to provide a config-file `/etc/pve/pvecli.yml`:
 	connect:
 		verify_tls: no if you do not use known CA-signed X509-Certificates
 
+Featurs
+=======
+
+The library provides an interface to interact with PVE-servers.
+Provided abstractions for:
+
+* Node
+* LXC (create, delete, modify, use)
+* Qemu (create, delete, modify, use)
+* Storages (list, list content)
+* Appliances (list, download to storage)
+
 pvecli
 ======
 

data/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+task :default => :spec

data/lib/pve/cli/base.rb

@@ -2,6 +2,8 @@ require 'pmap'
 
 class PVE::Cli
 
+  using IPAddress::ToSWithNetmaskForNetworks
+
 def cli_base
   cli.cmd :list, "List CT/VM-IDs", aliases: ['ls'], &lambda {|target=nil|
     connect
@@ -24,11 +26,11 @@ def cli_base
       else
         lambda {|n| to.virt n }
       end
-    nodes = Proxmox::Node.all
+    nodes = node ? Proxmox::Node.find_by_name( name) : Proxmox::Node.all
+    nodes.each &push
     nodes.
-      select {|n| not node or n === node }.
-      flat_map {|n| [ n.method(:lxc), n.method(:qemu) ] }.
-      each {|m| m.call.each &push }
+      flat_map {|n| [ Thread.new( n, &:lxc), Thread.new( n, &:qemu) ] }.
+      each {|n| n.value.each &push }
     to.print order: sort.each_char.map {|c| (2*c.ord[5]-1) * (' sainhucmd'.index( c.downcase)) }
   }).
     opt( :sort, '-s', '--sort=COLUMNS', "Sort by COLUMNs eg hn for host and name ([s]tatus, h[a], [i]d, [n]ame (default), [h]ost, [u]ptime, [c]pu, [m]em, [d]isk)").
@@ -82,15 +84,9 @@ def cli_base
   end
 
   cli.sub :config, "CT/VM Configuration", min: 2, aliases: %w[cnf] do |ccli|
-    ccli.cmd 'help', '', aliases: [nil, '-h', '--help'], &lambda {|*args| help ccli, *args }
-
-    ccli.cmd :show, "Show Config of CT/VM", &lambda {|name_or_id|
-      connect
-      th = Proxmox::LXC.find( name_or_id) || Proxmox::Qemu.find_by_name( name_or_id)
-      show_config th.config
-    }
+    ccli.cmd :help, '', aliases: [nil, '-h', '--help'], &lambda {|*args| help ccli, *args }
 
-    ccli.cmd :set, "Set Configs for CT/VM", &lambda {|name_or_id, *args|
+    ccli.cmd :set, "Set Configs for CT/VM", min: 3, &lambda {|name_or_id, *args|
       if %w[-h --help].include? name_or_id
         STDERR.puts "Usage: set -h|--help # Show help"
         STDERR.puts "       set ct|vm --CNF1=VAL1 --CNF2=VAL2 ... # Set config-value.  Empty value clears field."
@@ -147,21 +143,37 @@ def cli_base
       th.cnfset opts
       show_config th.config, old
     }
+
+    ccli.cmd :show, "Show Config of CT/VM", aliases: %w[s], &lambda {|name_or_id|
+      connect
+      th = Proxmox::LXC.find( name_or_id) || Proxmox::Qemu.find_by_name( name_or_id)
+      show_config th.config
+    }
   end
 
-  cli.cmd :enter, "Enter Console of CT/Node", &lambda {|name_or_id|
+  cli.cmd( :enter, "Enter Console of CT/Node", &lambda {|name_or_id|
     connect
     th = Proxmox::LXC.find( name_or_id) || Proxmox::Node.find_by_name( name_or_id)
     raise UsageError, "Container or Node not found: #{name_or_id}"  unless th
     STDERR.puts "! #{$?.exitstatus}"  unless th.enter
-  }
+  }).
+    completion do |*pre, arg|
+      completion_helper *pre, arg do |f|
+        complete_lxc( f) + complete_node( f)
+      end
+    end
 
-  cli.cmd :run, "Starts CT/VM", aliases: %w[start star], &lambda {|name_or_id|
+  cli.cmd( :run, "Starts CT/VM", aliases: %w[start star], &lambda {|name_or_id|
     connect
     th = Proxmox::LXC.find( name_or_id) || Proxmox::Qemu.find_by_name( name_or_id)
     raise UsageError, "Container or Node not found: #{name_or_id}"  unless th
     start th
-  }
+  }).
+    completion do |*pre, arg|
+      completion_helper *pre, arg do |f|
+        complete_lxc( f) + complete_qemu( f)
+      end
+    end
 
   #cli.cmd :reboot, "Reboot CT/VM (not implemented, yet)", min: 6, &lambda {|name_or_id|
   #  connect
@@ -170,16 +182,28 @@ def cli_base
   #  reboot th
   #}
 
-  cli.cmd :stop, "Stops CT/VM", min: 4, &lambda {|name_or_id|
+  cli.cmd( :stop, "Stops CT/VM", min: 4, &lambda {|name_or_id|
     connect
     th = Proxmox::LXC.find( name_or_id) || Proxmox::Qemu.find_by_name( name_or_id)
     raise UsageError, "Container or Node not found: #{name_or_id}"  unless th
     stop th
-  }
+  }).
+    completion do |*pre, arg|
+      completion_helper *pre, arg do |f|
+        complete_lxc( f) + complete_qemu( f)
+      end
+    end
 
-  cli.cmd 'help', '', aliases: ['-h', '--help'], &lambda {|*args| help cli, *args }
+  cli.cmd( :help, '', aliases: ['-h', '--help'], &lambda {|*args, full:|
+    if full
+      cli.help_full *args, output: STDERR
+    else
+      cli.help *args, output: STDERR
+    end
+  }).
+    opt( :full, '-f', '--[no-]full', 'Includes all commands of all subcommands.', default: false)
 
-  cli.cmd 'cli', 'Opens interactive console', min: 3, aliases: [nil], &lambda {
+  cli.cmd :cli, 'Opens interactive console', min: 3, aliases: [nil], &lambda {
     @interactive = true
     cli.interactive( File.basename($0,'.rb')).run
   }

data/lib/pve/cli/ct.rb

@@ -3,23 +3,31 @@ def cli_ct
   cli.sub :ct, "Containers", aliases: %w[lx lxc] do |ct_cli|
     ct_cli.cmd :list, "List CT-IDs", aliases: ['ls'], &lambda {|node=nil|
       connect
-      nodes = Proxmox::Node.all
-      nodes = nodes.select {|n| node == n.name }  if node
+      nodes = node ? Proxmox::Node.find_by_name( name) : Proxmox::Node.all
       nodes.flat_map do |n|
         n.lxc.map {|c| c.vmid.to_i }
       end.sort.each {|c| puts c }
     }
 
-    ct_cli.cmd :status, "List CTs with status", aliases: [nil], &lambda {|node=nil|
+    ct_cli.cmd( :status, "Lists CTs with status", aliases: [nil], &lambda {|target=nil, sort: 'n', node: nil|
       connect
-      to = TablizedOutput.new %w[Status HA ID Name Host Uptime CPU Mem/MiB Disk/MiB]
-      nodes = Proxmox::Node.all
-      nodes = nodes.select {|n| node == n.name }  if node
-      nodes.each do |n|
-        n.lxc.each &to.method( :virt)
-      end
-      to.print order: [3]
-    }
+      node &&= /\A#{node}\z/
+      to = TablizedOutput.new %w[Status HA ID Name Host Uptime CPU/% Mem/MiB Mem/% Disk/MiB Disk/%]
+      push =
+        if target
+          target = /\A#{target}\z/
+          lambda {|n| to.virt n  if n === target }
+        else
+          lambda {|n| to.virt n }
+        end
+      nodes = node ? Proxmox::Node.find_by_name( name) : Proxmox::Node.all
+      nodes.
+        map {|n| Thread.new( n, &:lxc) }.
+        each {|n| n.value.each &push }
+      to.print order: sort.each_char.map {|c| (2*c.ord[5]-1) * (' sainhucmd'.index( c.downcase)) }
+    }).
+      opt( :sort, '-s', '--sort=COLUMNS', "Sort by COLUMNs eg hn for host and name ([s]tatus, h[a], [i]d, [n]ame (default), [h]ost, [u]ptime, [c]pu, [m]em, [d]isk)").
+      opt( :node, '-n', '--node=NODE', "List only hosted by this NODE")
 
     ct_cli.cmd :enter, "Enter Console of CT", &lambda {|name_or_id|
       connect
@@ -57,13 +65,19 @@ def cli_ct
       if %w[-h --help].include? template
         STDERR.puts "Usage: ct create TEMPLATE -h        # Shows template-related options"
         STDERR.puts "       ct create TEMPLATE [OPTIONS] # Creates a container"
+        STDERR.puts "       ct create -l                 # Listing available templates"
         exit 1
+      elsif %w[-l --list].include? template
+        STDERR.puts PVE::CTTemplate.constants.reject {|c|:Base==c}.map {|c|c.to_s.titlecase.dasherize.downcase}
+        exit 0
       end
       ctopts = {}
       OptionParser.new do |opts|
+        ctt = PVE::CTTemplate.const_get template.classify
         opts.banner = <<EOU
 Usage: ct create #{template} [options]
 
+#{ctt.help}
 Options: (*=Required)
 EOU
         opts.on '-h', '--help', " Help!" do
@@ -75,7 +89,6 @@ EOU
         opts.on( '-f', '--[no-]-fire', " Do not wait till running") {|v| ctopts[:start] = v }
         opts.on( '-t', '--timeout=TIMEOUT', " Wait for max TIMEOUT seconds (default: endless)") {|v| ctopts[:timeout] = v }
         opts.on( '-s', '--seconds=SECONDS', " Check every SECONDS for state (default: 0.2)") {|v| ctopts[:seconds] = v }
-        ctt = PVE::CTTemplate.const_get template.classify
         ctt.requirements.each do |name, (type, req, desc, *args)|
           req = req ? "*" : " "
           case type
@@ -94,10 +107,17 @@ EOU
       create Proxmox::LXC, template, **ctopts
     })
 
-    ct_cli.cmd( :config, '', &lambda {|name_or_id|
+    ct_cli.cmd( :config, 'Shows current config', aliases: %w[cnf], &lambda {|name_or_id|
+      connect
+      ct = Proxmox::LXC.find! name_or_id
+      STDOUT.puts JSON.dump( ct.config)
+    })
+
+    ct_cli.cmd( :resize, 'Resize a disk', &lambda {|name_or_id, disk, size|
       connect
       ct = Proxmox::LXC.find! name_or_id
-      STDOUT.puts ct.config.to_json
+      task = ct.resize disk, size
+      wait task, text: "Resizing #{ct.sid} #{disk} to #{size}"
     })
 
     ct_cli.cmd( :destroy, '', min: 7, &lambda {|name_or_id, fire:, secs:, timeout:, i_really_want_to_destroy:|

data/lib/pve/cli/ha.rb

@@ -15,7 +15,7 @@ def cli_ha
       th = Proxmox::LXC.find( name_or_id) || Proxmox::Qemu.find_by_name( name_or_id)
       raise UsageError, "Container or VirtualMachine not found: #{name_or_id}"  unless th
       ha = th.ha
-      raise UsageError, "#{th.sid} is already High-Available"  unless ha.active?
+      raise UsageError, "#{th.sid} is already High-Available"  if ha.active?
       ha.create group: group, comment: comment, max_relocate: max_relocate, max_restart: max_restart
     }).tap {|cl| opts_ha cl }
 
@@ -24,7 +24,7 @@ def cli_ha
       th = Proxmox::LXC.find( name_or_id) || Proxmox::Qemu.find_by_name( name_or_id)
       raise UsageError, "Container or VirtualMachine not found: #{name_or_id}"  unless th
       ha = th.ha
-      raise UsageError, "#{th.sid} is not High-Available"  if ha.active?
+      raise UsageError, "#{th.sid} is not High-Available"  unless ha.active?
       ha.delete
     }
 
@@ -52,7 +52,7 @@ def cli_ha
       ha = ha.create  unless ha.active?
       ha.disabled!  if force and ha.error?
       ha.started!
-    }).opt( :force, "-f", "--force", "If CT/VM is in error-state, first disable HA, than try to start.")
+    }).opt( :force, "-f", "--force", "If CT/VM is in error-state, first reset HA, than try to start.")
 
     hacli.cmd :stopped, "CT/VM should be in state stopped.  By starting CT/VM via pct/e state will be changed in HA, too.", min: 3, &lambda {|name_or_id|
       connect

data/lib/pve/cli/qm.rb

@@ -10,22 +10,38 @@ def cli_qm
       end.sort.each {|c| puts c }
     }
 
-    qm.cmd :status, "List VMs with status", aliases: [nil], &lambda {|node=nil|
+    qm.cmd( :status, "Lists CTs with status", aliases: [nil], &lambda {|target=nil, sort: 'n', node: nil|
       connect
-      to = TablizedOutput.new %w[Status HA ID Name Host Uptime CPU Mem/MiB Disk/MiB]
-      nodes = Proxmox::Node.all
-      nodes = nodes.select {|n| node == n.name }  if node
-      nodes.each do |n|
-        n.qemu.each &to.method( :virt)
-      end
-      to.print order: [3]
-    }
+      node &&= /\A#{node}\z/
+      to = TablizedOutput.new %w[Status HA ID Name Host Uptime CPU/% Mem/MiB Mem/% Disk/MiB Disk/%]
+      push =
+        if target
+          target = /\A#{target}\z/
+          lambda {|n| to.virt n  if n === target }
+        else
+          lambda {|n| to.virt n }
+        end
+      nodes = node ? Proxmox::Node.find_by_name( name) : Proxmox::Node.all
+      nodes.
+        map {|n| Thread.new( n, &:qemu) }.
+        each {|n| n.value.each &push }
+      to.print order: sort.each_char.map {|c| (2*c.ord[5]-1) * (' sainhucmd'.index( c.downcase)) }
+    }).
+      opt( :sort, '-s', '--sort=COLUMNS', "Sort by COLUMNs eg hn for host and name ([s]tatus, h[a], [i]d, [n]ame (default), [h]ost, [u]ptime, [c]pu, [m]em, [d]isk)").
+      opt( :node, '-n', '--node=NODE', "List only hosted by this NODE")
 
     qm.cmd :exec, "Executes Command in VM via qemu-guest-agent", min: 4, &lambda {|name_or_id, *command|
       connect
       STDERR.puts "! #{$?.exitstatus}"  unless Proxmox::Qemu.find!( name_or_id).exec *command
     }
 
+    qm.cmd( :resize, 'Resize a disk', &lambda {|name_or_id, disk, size|
+      connect
+      qm = Proxmox::Qemu.find! name_or_id
+      task = qm.resize disk, size
+      wait task, text: "Resizing #{qm.sid} #{disk} to #{size}"
+    })
+
     qm.cmd 'help', '', aliases: ['-h', '--help'], &lambda {|*args| help qm, *args }
   }
 end

data/lib/pve/cli/storage.rb

@@ -0,0 +1,97 @@
+class PVE::Cli
+def cli_storage
+  cli.sub :storage, "Storages", min: 3 do |cli_sm|
+    cli_sm.cmd :list, "List Storages", aliases: ['ls'], &lambda {|node=nil|
+      connect
+      nodes = node ? [Proxmox::Node.find_by_name!( node)] : Proxmox::Node.all
+      nodes.flat_map do |n|
+        n.lxc.map {|c| c.vmid.to_i }
+      end.sort.each {|c| puts c }
+    }
+
+    cli_sm.cmd :status, "List Storages with status", aliases: [nil], &lambda {|node=nil|
+      connect
+      to = TablizedOutput.new %w[A E S Storage Host Type]
+      nodes = node ? [Proxmox::Node.find_by_name!( node)] : Proxmox::Node.all
+      nodes.each do |n|
+        n.storage.each do |v|
+          to.push [ 
+            case v.active
+            when 1 then ColoredString.new 'Y', "32"
+            when 0 then ColoredString.new 'n', "31"
+            else v.active.to_s
+            end,
+            case v.enabled
+            when 1 then ColoredString.new 'Y', "32"
+            when 0 then ColoredString.new 'n', "31"
+            else v.enabled.to_s
+            end,
+            1 == v.shared ? 's' : 'l', v.storage, v.node.node, v.type
+          ]
+        end
+      end
+      to.print order: [4,5]
+    }
+
+    cli_sm.sub :content, "Content of Storage", aliases: ['cnt'] do |cli_cnt|
+      cli_cnt.cmd :list, "List Content", aliases: ['ls'], &lambda {|node=nil, storage|
+        connect
+        node = node ? Proxmox::Node.find_by_name!( node) : Proxmox::Node.all.first
+        storage = node.storage.select {|sm| storage == sm.storage }.first
+        storage.content.each {|c| puts c.to_s }
+      }
+      cli_cnt.cmd( :help, '', aliases: ['-h', '--help']) {|*args| help cli_cnt, *args }
+    end
+
+    cli_sm.cmd( :help, '', aliases: ['-h', '--help']) {|*args| help cli_sm, *args }
+    #cli_sm.provide_help
+  end
+
+  cli.sub :apl, "Appliances - Downloadable container images", min: 3 do |cli_apl|
+
+    cli_apl.cmd( :content, "Table of all provided appliances", aliases: [nil], &lambda {|node:, regexp:, system:, applications:|
+      connect
+      appliances node, regexp, system, applications
+    }).
+    opt( :node, '-n=NODE', '--node', 'Ask this node for appliances (any node should list the same)', default: nil).
+    opt( :regexp, '-r=REGEXP', '--regexp', 'Filter by template', default: nil).
+    opt( :system, '-s', '--system', 'Only system templates', default: nil).
+    opt( :applications, '-a', '--applications', 'Only applications (non system) templates', default: nil)
+
+    cli_apl.cmd( :system, "Table of provided systems", aliases: [nil], &lambda {|node:, regexp:|
+      connect
+      appliances node, regexp, true, nil
+    }).
+    opt( :node, '-n=NODE', '--node', 'Ask this node for appliances (any node should list the same)', default: nil).
+    opt( :regexp, '-r=REGEXP', '--regexp', 'Filter by template', default: nil)
+
+    cli_apl.cmd( :applications, "Table of provided applications", aliases: [nil], &lambda {|node:, regexp:|
+      connect
+      appliances node, regexp, nil, true
+    }).
+    opt( :node, '-n=NODE', '--node', 'Ask this node for appliances (any node should list the same)', default: nil).
+    opt( :regexp, '-r=REGEXP', '--regexp', 'Filter by template', default: nil)
+
+    cli_apl.cmd( :list, "List provided appliances", aliases: ['ls'], &lambda {|node=nil, regexp:|
+      connect
+      node = node ? Proxmox::Node.find_by_name!( node) : Proxmox::Node.all.first
+      node.aplinfo.each do |apl|
+        puts apl.template
+      end
+    }).
+      opt( :regexp, '-r=REGEXP', '--regexp', 'Filters by name', default: nil)
+
+    cli_apl.cmd :download, "Download appliance", aliases: ['dl'], min: 2, &lambda {|template, node, storage=nil|
+      storage ||= 'local'
+      connect
+      node = Proxmox::Node.find_by_name! node
+      apl = node.aplinfo.find {|apl| apl.template == template }
+      raise UsageError, "Appliance not found"  unless apl
+      task = apl.download storage
+      wait task, text: "Download #{apl.template} on #{node.node} to #{storage}"
+    }
+
+    cli_apl.cmd( :help, '', aliases: ['-h', '--help']) {|*args| help cli_apl, *args }
+  end
+end
+end

data/lib/pve/cli/task.rb

@@ -16,7 +16,7 @@ def cli_task
         n.tasks.each do |t|
           next  unless t.upid == upid
           puts t.upid
-          t.log.each {|l| puts l[:l] }
+          t.log( start: 0, limit: 1024).each {|l| puts l[:t] }
           return
         end
       end

data/lib/pve/cli.rb

@@ -9,10 +9,22 @@ require_relative 'cli/ha'
 require_relative 'cli/task'
 require_relative 'cli/qm'
 require_relative 'cli/node'
+require_relative 'cli/storage'
 
 class UsageError <RuntimeError
 end
 
+class DenCli::Sub
+  def provide_help name: nil, aliases: nil, min: nil
+    base = self
+    name = :help  if name.nil?
+    aliases = %w[-h --help]  if aliases.nil?
+    min = 1  if min.nil?
+    #p name: name, aliases: aliases, min: min
+    cmd( name, '', aliases: aliases, min: min) {|*args| help *args }
+  end
+end
+
 class PVE::Cli
   attr_reader :cfg, :cli
 
@@ -55,30 +67,42 @@ class PVE::Cli
     exit 1  unless interactive?  and  r
   end
 
+  def task_log task, logn, limit = 1024
+    log = task.log start: logn, limit: limit
+    log = []  if [{n: 1, t: 'no content'}] == log
+    unless log.empty?
+      STDERR.printf "\r\e[J"
+      log.each {|l| puts l[:t] }
+      logn = log.last[:n]
+    end
+    logn
+  end
+
   def wait task, secs: nil, text: nil
     secs ||= 0.1
     spinners, spin, logn = "▖▘▝▗", 0, 0
     STDERR.puts task.upid
+    host = task.host&.name
     loop do
       s = task.status
-      if s[:exitstatus]
-        STDERR.printf "\r[%s] %s %s\e[J\n",
-          task.host ? task.host.name : s[:id],
-          case s[:exitstatus]
-          when "OK" then "\e[32;1m✓\e[0m"
-          else "\e[31;1m✗\e[0m"
-          end,
-          s[:status]
-        return task
+      logn = self.task_log task, logn
+      if s.finished?
+        loop do
+          r = self.task_log task, logn
+          break  if 0 == logn - r
+          logn = r
+        end
+        STDERR.printf "\r[%s] %s %s %s\e[J\n",
+          host || s.id,
+          s.successfull? ? "\e[32;1m✓\e[0m" : "\e[31;1m✗\e[0m",
+          text && "#{text}:",
+          s.stopped? ? :finished : s.status
+        return s
       end
-      log = task.log start: logn
-      log = []  if [{n: 1, t: 'no content'}] == log
-      unless log.empty?
-        STDERR.printf "\r\e[J"
-        log.each {|l| puts l[:t] }
-        logn = log.last[:n]
-      end
-      STDERR.printf "\r[%s] \e[33;1m%s\e[0m %s...\e[J", task.host ? task.host.name : s[:id], spinners[spin = (spin + 1) % 4], text || "Working"
+      STDERR.printf "\r[%s] \e[33;1m%s\e[0m %s...\e[J",
+        host || s[:id],
+        spinners[spin = (spin + 1) % 4],
+        text || "Working"
       sleep secs
     end
   end
@@ -94,9 +118,7 @@ class PVE::Cli
       return
     end
     task = host.start
-    unless fire
-      wait task, text: "Starting"
-    end
+    wait task, text: "Starting"  unless fire
   end
 
   def stop host, timeout: nil, fire: nil, secs: nil
@@ -112,12 +134,16 @@ class PVE::Cli
   end
 
   def create klass, template, timeout: nil, fire: nil, secs: nil, start: nil, **options
-    options[:start] = true  if fire and start
+    options[:start] = fire && start
     task = klass.create template, **options
     return  if fire
-    wait task, text: "Creating"
-    host = task.host.refresh!
-    start host, timeout: timeout, secs: secs
+    status = wait task, text: "Creating"
+    if status.successfull?
+      host = task.host.refresh!
+      start host, timeout: timeout, secs: secs  if start
+    elsif not interactive?
+      exit 1
+    end
   end
 
   def destroy ct, timeout: nil, fire: nil, secs: nil
@@ -139,6 +165,36 @@ class PVE::Cli
       opt( :fire, "-f", "--[no-]fire", "Do not wait till running", default: false)
   end
 
+  def complete_lxc f
+    Proxmox::LXC.all.
+      flat_map {|x| [x.name, x.vmid.to_s] }.
+      select {|x| f =~ x }
+  end
+
+  def complete_qemu f
+    Proxmox::Qemu.all.
+      flat_map {|x| [x.name, x.vmid.to_s] }.
+      select {|x| f =~ x }
+  end
+
+  def complete_node f
+    Proxmox::Qemu.all.
+      map {|x| x.name }.
+      select {|x| f =~ x }
+  end
+
+  def completion_helper *pre, arg, &exe
+    if pre.empty?
+      connect
+      xs = yield /\A#{Regexp.quote arg}/
+      STDOUT.print "\a"  if xs.empty?
+      xs
+    else
+      STDOUT.print "\a"
+      []
+    end
+  end
+
   def prepare
     cli_node
     cli_ct
@@ -146,14 +202,34 @@ class PVE::Cli
     cli_task
     cli_ha
     cli_base
+    cli_storage
   end
 
   def call *argv
     cli.call *argv
   rescue RestClient::ExceptionWithResponse
-    STDERR.puts "#$! - #{$!.response} (#{$!.class})", $!.backtrace.map {|b|"  #{b}"}
+    STDERR.puts "#$! - #{$!.response} (#{$!.class})" #, $!.backtrace.map {|b|"  #{b}"}
   rescue UsageError, DenCli::UsageError
     STDERR.puts $!
     exit 1
   end
+
+  def appliances node, regexp, system, applications
+    system = applications = true  if system.nil? and applications.nil?
+    node = node ? Proxmox::Node.find_by_name!( node) : Proxmox::Node.all.first
+    to = TablizedOutput.new %w<Section Package Version OS Template Description>, format: %w[> > > > > <]
+    node.aplinfo.
+      select {|a| 'system' == a.section ? system : applications}.
+      each do |apl|
+        to.push [
+          apl.section,
+          apl.package,
+          apl.version,
+          apl.os,
+          apl.template,
+          apl.description,
+        ]
+      end
+    to.print order: [1,2]
+  end
 end