pve 0.1.2 → 0.2.3

data/lib/pve/helper.rb

@@ -1,15 +1,36 @@
+module IPAddress::ToSWithNetmaskForNetworks
+  refine IPAddress::IPv6 do
+    def to_s
+      128 == prefix ? super() : to_string
+    end
+  end
+  refine IPAddress::IPv4 do
+    def to_s
+      32 == prefix ? super() : to_string
+    end
+  end
+end
+
+
 class Measured
+  class V
+    attr_reader :value, :length
+
+    def initialize( value, length = nil) @value, @length = value, length || value.length end
+    def inspect() "#<Measured::V #{@value.inspect} (#{@length})>" end
+    alias :to_s :value
+    alias :to_str :value
+  end
+
   class <<self
     def bytes1 v
       v = v.to_f
-      return "%d B" % v  if 512 > v
+      return units '%d ' % v , :B  if 512 > v
       %w[KiB MiBy GiByt TiByte ExiByte PetiByte].each_with_index do |m|
         v /= 1024
-        #return "%.1f %s" % [v, m]  if 10 > v
-        #return "%d %s" % [v, m]  if 512 > v
-        return "%.1f %s" % [v, m]  if 512 > v
+        return units '%.1f ' % v, m  if 512 > v
       end
-      "%d  PetiByte" % v
+      units '%d ' % v, :PetiByte
     end
 
     def bytes2 v
@@ -26,21 +47,28 @@ class Measured
     end
     alias bytes bytes2
 
+    def units val, unit
+      v = "#{val}\e[1;30m#{unit}\e[0m"
+      V.new v, v.length - 11
+    end
+
     def seconds i
       i = i.to_i
-      return '·'  if 0 == i
-      return "%d s" % i  if 90 > i
+      return V.new "\e[1;30m·\e[0m", 1  if 0 == i
+      return units '%d ' % i, :s  if 90 > i
       i /= 60
-      return "%d mi" % i  if 90 > i
+      return units '%d ' % i, :mi  if 90 > i
       i /= 60
-      return "%d hou" % i  if 36 > i
+      return units '%d ' % i, :hou  if 36 > i
       i /= 24
-      return "%d days" % i  if 14 > i
+      return units '%d ' % i, :days  if 14 > i
       j = i / 7
-      return "%d weeks" % j  if 25 > j
-      i /= 365
-      return "%.1f years"  if 550 > i
-      "%dy" % i
+      return units '%d ' % j, :weeks  if 8 > j
+      j = i / 30
+      return units '%d ' % j, :months  if 11 > j
+      i /= 365.0
+      return units '%.2f ' % i, :years  if 550 > i
+      units '%d ' % i, :years
     end
   end
 end
@@ -58,10 +86,8 @@ class ColoredString
 
   def length() @string.length end
   alias size length
-  #def to_str() self end 
   def to_s() "\e[#{@color_codes}m#{@string}\e[0m" end
   alias to_str to_s
-  #alias inspect to_str
   
   include Comparable
   def <=>(o) @string <=> o.string end
@@ -70,9 +96,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    = []
@@ -86,7 +113,7 @@ class TablizedOutput
   class V < B
     attr_reader :v, :s
     def initialize( v, s=nil) @v, @s = v, s || "#{v}" end
-    def to_s() @s end
+    def to_s() @s.to_s end
     def length() @s.length end
     def inspect() "#<TO:V #{@v.inspect} #{@s.inspect}>" end
   end
@@ -98,10 +125,10 @@ class TablizedOutput
     def inspect() "#<TO:Percentage #{@v}%>" end
 
     def to_s
-      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[1;4;#{0.75>v ? 32 : 31}m#{r[0...y]}\e[0m#{r[y..-1]}"
     end
   end
 
@@ -122,7 +149,6 @@ class TablizedOutput
   end
 
   def print order: nil
-    format = "#{(["\e[%%sm%% %ds\e[0m"] * @columnc).join( '  ') % @maxs}\n"
     ls = @lines
     if order
       eval <<-EOC, binding, __FILE__, 1+__LINE__
@@ -132,9 +158,22 @@ class TablizedOutput
         }
       EOC
     end
-    #ls = ls.sort_by {|e| p e; order.map &e.method(:[]) }  if order
-    @stdout.printf format, *@header.flat_map {|s|['',s]}
-    ls.each {|l| @stdout.printf format, *l.flat_map {|s| s.is_a?(ColoredString) ? [s.color_codes, s.string] : ["", s.to_s] } }
+    @stdout.puts \
+      @header.each_with_index.map {|s, i|
+        "#{' ' * (@maxs[i] - s.length)}#{s}"
+      }.join( '  ')
+    ls.each_with_index do |l|
+      @stdout.puts \
+        l.each_with_index.map {|s, i|
+          pad = ' ' * (@maxs[i] - s.length)
+          case @format[i]
+          when '<'
+            "#{s}#{pad}"
+          else
+            "#{pad}#{s}"
+          end
+        }.join( '  ')
+    end
   end
 
   def virt v

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
@@ -331,6 +383,11 @@ module Proxmox
       r.delete :delete  if r[:delete].empty?
       rest_put "#{@rest_prefix}/config", r
     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 Qemu < Hosted
@@ -341,19 +398,15 @@ module Proxmox
 
       def find_by_vmid vmid
         vmid = vmid.to_s
-        Node.all.each do |n|
-          n.qemu.each do |l|
-            return l  if l.vmid == vmid
-          end
+        all.each do |l|
+          return l  if l.vmid == vmid
         end
         nil
       end
 
       def find_by_name name
-        Node.all.each do |n|
-          n.qemu.each do |l|
-            return l  if l.name == name
-          end
+        all.each do |l|
+          return l  if l.name == name
         end
         nil
       end
@@ -387,8 +440,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
 
@@ -399,6 +456,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
@@ -490,14 +552,19 @@ module Proxmox
           swap: tmplt.swap,
           unprivileged: tmplt.unprivileged,
         }.delete_if {|k,v| v.nil? }
-        @temp = LXC.send :__new__, node: node, vmid: options[:vmid], name: name, hostname: options[:hostname]
+
+        temp = LXC.send :__new__, node: node, vmid: options[:vmid], name: name, hostname: options[:hostname]
         upid = rest_post( "/nodes/%s/lxc" % node.node, **options)
-        Task.send :__new__, node: node, host: @temp, upid: upid
+        Task.send :__new__, node: node, host: temp, upid: upid
       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
 
@@ -515,8 +582,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
@@ -576,20 +647,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 error?
-      'error' == self.state
+    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
+
+  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

@@ -27,14 +27,27 @@ module PVE::CTTemplate
         File.read( options[:'ssh-public-keys-file'] || '/root/.ssh/authorized_keys')
     end
 
+    def _ipv4 ip, gw
+      return [ip, nil]  if %w[dhcp].include? ip
+      ip = IPAddress::IPv4.new ip
+      [ip.to_string, gw || ip.hosts.last.to_s]
+    end
+
+    def _ipv6 ip, gw
+      return [ip, nil]  if %w[dhcp auto].include? ip
+      ip = IPAddress::IPv6.new ip
+      [ip.to_string, gw || ip.hosts.last.to_s]
+    end
+
     def net0()
       if options.ipv4 || options.ipv6
-        ipv4 = IPAddress::IPv4.new options.ipv4
+        ipv4, gw4 = _ipv4( options.ipv4, options.gateway4)
+        ipv6, gw6 = _ipv6( options.ipv6, options.gateway6)
         {
           name: 'eth0',
           bridge: 'vmbr1',
-          ip: ipv4.to_string,
-          gw: options.gateway || ipv4.hosts.last.to_s
+          ip: ipv4, ip6: ipv6,
+          gw: gw4, gw6: gw6,
         }
       end
     end
@@ -44,6 +57,10 @@ module PVE::CTTemplate
   end
 
   class Default < Base
+    def self.help
+      nil
+    end
+
     def self.requirements
       {
         node:                      [:string,  false, "Create CT on this node."],
@@ -62,7 +79,7 @@ module PVE::CTTemplate
         :'ssh-public-keys-file' => [:string,  false, "Read SSH-Public-Keys from file."],
         ipv4:                      [:string,  false, "IPv4-Address with net-size."],
         gateway4:                  [:string,  false, "IPv4-Address of gateway."],
-        ipv6:                      [:string,  false, "IPv6-Address with net-size."],
+        ipv6:                      [:string,  false, "IPv6-Address with net-size or auto."],
         gateway6:                  [:string,  false, "IPv6-Address of gateway."],
         storage:                   [:string,  false, "Device will be create on this Storage (default: local"],
       }
@@ -70,12 +87,24 @@ module PVE::CTTemplate
   end
 
   class Datacenter < Base
+    def self.help
+      <<-EOF.gsub /^ {6}/, ''
+      Datacenter provides an interface for special network-settings.
+      Networks in Datacenters are often based on this behaviour:
+      A Network has an ID like 99.
+      This defines the VLANs: 2099 for Layer2/3099 for Layer3.
+      The IPv4-Range would be 10.99.0.0/16, but container will be put static in 10.99.255.0/24.
+      IPv6 uses RADV, so we do not need to know the IPv6-Range => auto.
+      VMID can be generated by Network-ID, too: smallest unused VMID in 100*ID.
+      EOF
+    end
+
     def self.requirements
       {
         node:                      [:string,  false, "Create CT on this node."],
         name:                      [:string,  true,  "Set (uniq) name"],
         arch:                      [:enum,    false, "Architecture", %w[amd64 i386 arm64 armhf]],
-        vmid:                      [:numeric, true,  "VM-ID.  Proxmox internal number (100...)"],
+        vmid:                      [:numeric, false, "VM-ID.  Proxmox internal number (100...)"],
         ostype:                    [:string,  true,  "OS-Type (OS or distribution)"],
         cmode:                     [:enum,    false, "Console-mode", %w[shell console tty]],
         cores:                     [:numeric, false, "Count of cores"],
@@ -87,11 +116,12 @@ module PVE::CTTemplate
         :'ssh-public-keys' =>      [:string,  false, "SSH-Public-Keys, which should be added to root-user in CT."],
         :'ssh-public-keys-file' => [:string,  false, "Read SSH-Public-Keys from file."],
         :'network-id' =>           [:numeric, true,  "Put Container to this VLAN and use a random IPv4-Address for this CT."],
-        ipv4:                      [:string,  false, "IPv4-Address with net-size."],
+        ipv4:                      [:string,  false, "IPv4-Address with net-size or dhcp."],
         gateway4:                  [:string,  false, "IPv4-Address of gateway."],
-        ipv6:                      [:string,  false, "IPv6-Address with net-size."],
+        ipv6:                      [:string,  false, "IPv6-Address with net-size or auto|dhcp."],
         gateway6:                  [:string,  false, "IPv6-Address of gateway."],
         storage:                   [:string,  false, "Device will be create on this Storage (default: root)"],
+        ostemplate:                [:string,  false, "OS-Template eg. local:vztmpl/superlinux-1.2-amd64.tar.xz"],
       }
     end
 
@@ -111,15 +141,27 @@ module PVE::CTTemplate
     end
 
     def net0
+      ipv4, gw4 =
+        if options.ipv4
+          _ipv4( options.ipv4, options.gateway4)
+        else
+          self.ipv4_gw
+        end
+      ipv6, gw6 =
+        if options.ipv6
+          _ipv6( options.ipv6, options.gateway6)
+        else
+          ['auto', nil]
+        end
       {
         name: 'eth0',
         bridge: 'vmbr1',
         tag: 2000+network_id,
         mtu: 9166,
         firewall: 1,
-        ip: ipv4.to_string,
-        gw: ipv4.hosts.last.to_s,
-      }
+        ip: ipv4, gw: gw4,
+        ip6: ipv6, gw6: gw6,
+      }.delete_if {|k,v| v.nil? }
     end
 
     def vmid
@@ -130,14 +172,13 @@ module PVE::CTTemplate
       IPAddress::IPv4.new "10.#{network_id}.255.0/24"
     end
 
-    def ipv4
-      return options.ipv4  if options.ipv4
-      return @ipv4  if @ipv4
+    def ipv4_gw
+      return @ipv4_gw  if @ipv4_gw
       ipv4s = network.hosts
       @virts.each do |v|
         v.config[:network].each {|n| ipv4s.delete n[:ip]  if n[:ip] }
       end
-      @ipv4 = ipv4s.first
+      @ipv4_gw = [ipv4s.first.to_string, network.last.to_s]
     end
 
     def ostemplate
@@ -145,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.2'
+  VERSION = '0.2.3'
 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.5.3'
   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.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Denis Knauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-12-13 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.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -104,8 +104,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
+- LICENSE.txt
 - README.adoc
+- Rakefile
 - bin/pvecli
 - lib/pve.rb
 - lib/pve/cli.rb
@@ -114,10 +115,10 @@ 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
-- lib/pve/qm.rb
 - lib/pve/templates.rb
 - lib/pve/version.rb
 - pve.gemspec