pve 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a06ddcb47642c05e1741f36743dddc8549fe0a662d72246b8965d63474f437a2
-  data.tar.gz: 458054ab599bc236cbae0e708180778a38b4d9136d6278f4c3866047af0f4819
+  metadata.gz: a44ba988b57b1f008d06b521e2f10821a36db9532bb4947ee60627a324cd4c23
+  data.tar.gz: 1c048a050ee35b3e479c23d527eca2d44d7d56246b25ee38f9843ececb2269e0
 SHA512:
-  metadata.gz: e967e72848d1ca823b8ebb85737a78018116e3ac28c7bc070d1d3a8936ad6c79e9e09a2ff11344f0ce1aa62fa54634602e3993f5081126bf8f72d2b7ac841a32
-  data.tar.gz: 673189e3d7318103b2dad96f653c072c1cef4a1a9a329aa920b17e8f43ecc8741763379b2a2a3f07ccaaf8af8c46eac2c9cef715225f6b6faa8353edaafa1a8a
+  metadata.gz: 1e6c00aa82db977e9616f7fd29cb72c8b442881f5253446610551f964c7a11f9d4a49cc7b5e0830e54e88a563ec03a0f6d7c231d05aa660bea10126c2e026cf3
+  data.tar.gz: 95b41594c329cfbd03633a77bc1ed32100a3b35ef9f9082578b7e8550095a768daacf3ae41417d630136c6c07c1c21c2143c5f43a4fa539b50c4ed53408c70f0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pve (0.1.1)
+    pve (0.1.3)
       activesupport (>= 2)
       dencli (~> 0.3.1)
       ipaddress (~> 0.8.3)
@@ -11,26 +11,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     dencli (0.3.1)
     diff-lcs (1.4.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2021.0901)
     minitest (5.14.4)
     netrc (0.11.0)
     pmap (1.1.1)
@@ -56,7 +56,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
     zeitwerk (2.4.2)
 
 PLATFORMS

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/lib/pve/cli/base.rb

@@ -26,9 +26,8 @@ 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.
-      select {|n| not node or n === node }.
       flat_map {|n| [ n.method(:lxc), n.method(:qemu) ] }.
       each {|m| m.call.each &push }
     to.print order: sort.each_char.map {|c| (2*c.ord[5]-1) * (' sainhucmd'.index( c.downcase)) }
@@ -86,13 +85,7 @@ def cli_base
   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 :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."
@@ -149,21 +142,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
@@ -172,12 +181,17 @@ 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 }
 

data/lib/pve/cli/ct.rb

@@ -3,8 +3,7 @@ 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 }
@@ -99,10 +98,10 @@ EOU
       create Proxmox::LXC, template, **ctopts
     })
 
-    ct_cli.cmd( :config, 'Shows current 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 ct.config.to_json
+      STDOUT.puts JSON.dump( ct.config)
     })
 
     ct_cli.cmd( :resize, 'Resize a disk', &lambda {|name_or_id, disk, size|

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

@@ -26,6 +26,13 @@ def cli_qm
       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

@@ -13,6 +13,17 @@ require_relative 'cli/node'
 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,6 +66,17 @@ 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
@@ -62,23 +84,19 @@ class PVE::Cli
     host = task.host&.name
     loop do
       s = task.status
-      if s[:exitstatus]
+      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],
-          case s[:exitstatus]
-          when "OK" then "\e[32;1m✓\e[0m"
-          else "\e[31;1m✗\e[0m"
-          end,
+          host || s.id,
+          s.successfull? ? "\e[32;1m✓\e[0m" : "\e[31;1m✗\e[0m",
           text && "#{text}:",
-          s[:status] == 'stopped' ? :finished : s[:status]
-        return task
-      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]
+          s.stopped? ? :finished : s.status
+        return s
       end
       STDERR.printf "\r[%s] \e[33;1m%s\e[0m %s...\e[J",
         host || s[:id],
@@ -99,9 +117,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
@@ -120,9 +136,13 @@ class PVE::Cli
     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  if start
+    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
@@ -144,6 +164,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
@@ -161,4 +211,23 @@ class PVE::Cli
     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

data/lib/pve/helper.rb

@@ -84,9 +84,10 @@ end
 
 
 class TablizedOutput
-  def initialize header, stdout: nil
+  def initialize header, stdout: nil, format: nil
     @header   = header.map &:to_s
     @columnc  = header.size
+    @format   = format || ['>']*@columnc
     @maxs     = header.map &:length
     @stdout ||= STDOUT
     @lines    = []
@@ -112,10 +113,12 @@ class TablizedOutput
     def inspect() "#<TO:Percentage #{@v}%>" end
 
     def to_s
-      y = w - (v*w).round
+      #y = w - (v*w).round
+      y = (v*w).round
       x = (100*v).round
       r = "%*s" % [w, 0==x ? '·' : x]
-      "\e[0m#{r[0...y]}\e[1;4;#{0.75>v ? 32 : 31}m#{r[y..-1]}\e[0m"
+      #"\e[0m#{r[0...y]}\e[1;4;#{0.75>v ? 32 : 31}m#{r[y..-1]}\e[0m"
+      "\e[1;4;#{0.75>v ? 32 : 31}m#{r[0...y]}\e[0m#{r[y..-1]}"
     end
   end
 
@@ -136,7 +139,7 @@ class TablizedOutput
   end
 
   def print order: nil
-    format = "#{(["\e[%%sm%% %ds\e[0m"] * @columnc).join( '  ') % @maxs}\n"
+    format = "#{@format.map {|f| "\e[%%sm%%#{case f when '<' then '-' else ' ' end}%ds\e[0m"}.join( '  ') % @maxs}\n"
     ls = @lines
     if order
       eval <<-EOC, binding, __FILE__, 1+__LINE__

data/lib/pve/proxmox.rb

@@ -123,10 +123,14 @@ module Proxmox
         n.send :__update__, data
       end
       private :__new__
+
+      def fetch predata
+        __new__( predata).refresh!
+      end
     end
 
-    def respond_to? method
-      super or instance_variable_defined?( "@#{method}")
+    def respond_to? method, also_private = false
+      instance_variable_defined?( "@#{method}") or super(method, also_private)
     end
 
     def method_missing method, *args, &exe
@@ -147,6 +151,7 @@ module Proxmox
       initialize
       self
     end
+    private :__update__
 
     def refresh!
       __update__ rest_get( @rest_prefix)
@@ -176,9 +181,13 @@ module Proxmox
     def === t
       @name =~ t or @vmid.to_s =~ t or @sid =~ t
     end
+  
+    def rest_prefix
+      @rest_prefix ||= "/nodes/#{@node}"
+    end
 
     def initialize
-      @rest_prefix = "/nodes/#{@node}"
+      rest_prefix
       @sid = "nd:#{@node}"
       @name = @node
     end
@@ -191,6 +200,20 @@ module Proxmox
       rest_get( "#{@rest_prefix}/lxc").map {|d| LXC.send :__new__, d.merge( node: self, t: 'ct') }
     end
 
+    def aplinfo
+      return []  if offline?
+      rest_get( "#{@rest_prefix}/aplinfo").map do |d|
+        AplInfo.send :__new__, d.merge( node: self, t: 'apl')
+      end
+    end
+
+    def storage
+      return []  if offline?
+      rest_get( "#{@rest_prefix}/storage").map do |d|
+        Storage.send :__new__, d.merge( node: self, t: 'sm')
+      end
+    end
+
     def qemu
       return []  if offline?
       rest_get( "#{@rest_prefix}/qemu").map {|d| Qemu.send :__new__, d.merge( node: self, t: 'qm') }
@@ -211,21 +234,51 @@ module Proxmox
   end
 
   class Task < Base
-    def initialize
+    class Status < Base
+      def rest_prefix
+        @rest_prefix ||= '/nodes/%s/tasks/%s/status' % [@node.node, @upid]
+      end
+
+      def refresh!
+        d = rest_get @rest_prefix
+        d[:starttime] &&= Time.at d[:starttime]
+        d = {exitstatus: nil}.merge d
+        __update__ d.merge( node: @node, t: 'status', upid: @upid, task: @task)
+      end
+
+      def initialize
+        rest_prefix
+        @sid = upid
+      end
+
+      def inspect
+        h = instance_variables - %i[@node @task @sid @rest_prefix @upid @t]
+        h.map! {|k| "#{k[1..-1]}=#{instance_variable_get(k).inspect}" }
+        "#<#{self.class.name}|#{@upid} node=#{@node.node} #{h.join ' '}>"
+      end
+
+      def running?() 'running' == @status end
+      def finished?() 'stopped' == @status end
+      alias stopped? finished?
+      def successfull?() stopped? ? 'OK' == @exitstatus : nil end
+      def failed?() stopped? ? 'OK' != @exitstatus : nil end
+    end
+
+    def rest_prefix
       @rest_prefix = "/nodes/#{@node.node}/tasks/#{upid}"
+    end
+
+    def initialize
+      rest_prefix
       @sid = upid
     end
 
     def inspect
-      "#<#{self.class.name} #{upid}>"
+      "#<#{self.class.name} #{@upid}>"
     end
 
-    #def finished?
-    #  rest_get( "/nodes/#{node}/tasks/")
-    #end
-
     def status
-      rest_get( "#{@rest_prefix}/status")
+      Status.fetch node: @node, task: self, upid: @upid
     end
 
     def log start: nil, limit: nil
@@ -235,8 +288,7 @@ module Proxmox
 
   class Hosted < Base
     def refresh!
-      node, t = @node, @t
-      __update__ rest_get( "#{@rest_prefix}/status/current").merge( node: node, t: t)
+      __update__ rest_get( "#{@rest_prefix}/status/current").merge( node: @node, t: @t)
     end
 
     def === t
@@ -392,8 +444,12 @@ module Proxmox
       end
     end
 
+    def rest_prefix
+      @rest_prefix ||= "/nodes/%s/qemu/%d" % [@node.node, @vmid]
+    end
+
     def initialize
-      @rest_prefix = "/nodes/%s/qemu/%d" % [@node.node, @vmid]
+      rest_prefix
       @sid = "qm:#{@vmid}"
     end
 
@@ -404,6 +460,11 @@ module Proxmox
     def exec *args
       node.exec 'qm', 'guest', 'exec', vmid, '--', *args
     end
+
+    def resize disk, size
+      upid = rest_put "#{@rest_prefix}/resize", disk: disk, size: size
+      Task.send :__new__, node: @node, host: self, upid: upid
+    end
   end
 
   class LXC < Hosted
@@ -502,8 +563,12 @@ module Proxmox
       end
     end
 
+    def rest_prefix
+      @rest_prefix ||= "/nodes/%s/lxc/%d" % [@node.node, @vmid]
+    end
+
     def initialize
-      @rest_prefix = "/nodes/%s/lxc/%d" % [@node.node, @vmid]
+      rest_prefix
       @sid = "ct:#{@vmid}"
     end
 
@@ -521,8 +586,12 @@ module Proxmox
   end
 
   class HA < Base
+    def rest_prefix
+      @rest_prefix ||= "/cluster/ha/resources/#{virt.sid}"
+    end
+
     def initialize
-      @rest_prefix = "/cluster/ha/resources/#{virt.sid}"
+      rest_prefix
     end
 
     class <<self
@@ -582,20 +651,51 @@ module Proxmox
       self
     end
 
-    def started?
-      'started' == self.state
+    def started?() 'started' == self.state end
+    def stopped?() 'stopped' == self.state end
+    def error?() 'error' == self.state end
+    def active?() ! ! digest end
+  end
+
+  class Storage < Base
+    def rest_prefix
+      @rest_prefix ||= "/nodes/#{@node.node}/storage/#{@storage}"
     end
 
-    def stopped?
-      'stopped' == self.state
+    def content
+      rest_get( "#{@rest_prefix}/content").map do |c|
+        Content.send :__new__, c.merge( node: @node, storage: self, t: 'smc')
+      end
+    end
+
+    def initialize() rest_prefix end
+
+    def to_s() "#{@node.node}:#{@storage}" end
+
+    class Content < Base
+      def rest_prefix
+        @rest_prefix ||= "/nodes/#{@node.node}/storage/#{@storage}/content/#{@content}"
+      end
+
+      def initialize() rest_prefix end
+      def to_s() "#{node.node} #{volid}" end
     end
+  end
 
-    def error?
-      'error' == self.state
+  class AplInfo < Base
+    def rest_prefix
+      @rest_prefix ||= "/nodes/#{@node.node}/aplinfo"
     end
 
-    def active?
-      ! ! digest
+    def initialize() rest_prefix end
+    def name() @template end
+    def system?() 'system' == @section end
+    def debian?() %r[\Adebian-] =~ @os end
+    def lxc?() 'lxc' == @type end
+
+    def download storage
+      upid = rest_post "#{@rest_prefix}", template: @template, storage: storage.to_s
+      Task.send :__new__, node: @node, host: self, upid: upid
     end
   end
 end

data/lib/pve/templates.rb

@@ -186,7 +186,8 @@ module PVE::CTTemplate
         options.ostemplate ||
           case ostype
           when 'debian'
-            'local:vztmpl/debian-10-standard_10.5-1_amd64.tar.gz'
+            # TODO: how to determine which template?
+            'local:vztmpl/debian-11-standard_11.0-1_amd64.tar.gz'
           else
             raise ArgumentError, "OS-Template for ostype #{ostype} not found or ostemplate not provided."
           end

data/lib/pve/version.rb

@@ -1,3 +1,3 @@
 module PVE
-  VERSION = '0.1.3'
+  VERSION = '0.2.1'
 end

data/pve.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"]   = spec.homepage
 
-  spec.add_dependency 'dencli', '~> 0.3.1'
+  spec.add_dependency 'dencli', '~> 0.4'
   spec.add_dependency 'rest-client', '~> 2.1'
   spec.add_dependency 'ipaddress', '~> 0.8.3'
   spec.add_dependency 'activesupport', '>= 2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pve
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Denis Knauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dencli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ files:
 - lib/pve/cli/ha.rb
 - lib/pve/cli/node.rb
 - lib/pve/cli/qm.rb
+- lib/pve/cli/storage.rb
 - lib/pve/cli/task.rb
 - lib/pve/helper.rb
 - lib/pve/proxmox.rb