pve 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f41d6fba5690429b625a55d147bf468834c1e705d6e73fdcd879566037dd47
-  data.tar.gz: 5237da733be939f52f26818f6c12a20d2389c5a26e8ba7343cbce62bcb280001
+  metadata.gz: a06ddcb47642c05e1741f36743dddc8549fe0a662d72246b8965d63474f437a2
+  data.tar.gz: 458054ab599bc236cbae0e708180778a38b4d9136d6278f4c3866047af0f4819
 SHA512:
-  metadata.gz: adfe44900fc74f93932b12ffed27abced7d33e04c910fad519b406755d8d9f9de140347341da45a3a35d4e315f4c5e7b5286af2ec4fbdf6ec2f9116a94221224
-  data.tar.gz: 3b55ec2a97b1973ae66d08e17cb50c70ec765305292748fe306bb99e3dd30bf33a46c5bc824570a8786e832c767f422e4da814ad14dd0497ab83ec707d46e0e9
+  metadata.gz: e967e72848d1ca823b8ebb85737a78018116e3ac28c7bc070d1d3a8936ad6c79e9e09a2ff11344f0ce1aa62fa54634602e3993f5081126bf8f72d2b7ac841a32
+  data.tar.gz: 673189e3d7318103b2dad96f653c072c1cef4a1a9a329aa920b17e8f43ecc8741763379b2a2a3f07ccaaf8af8c46eac2c9cef715225f6b6faa8353edaafa1a8a

data/lib/pve/cli.rb

@@ -59,16 +59,18 @@ class PVE::Cli
     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],
+        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,
-          s[:status]
+          text && "#{text}:",
+          s[:status] == 'stopped' ? :finished : s[:status]
         return task
       end
       log = task.log start: logn
@@ -78,7 +80,10 @@ class PVE::Cli
         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
@@ -112,12 +117,12 @@ 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
+    start host, timeout: timeout, secs: secs  if start
   end
 
   def destroy ct, timeout: nil, fire: nil, secs: nil
@@ -151,7 +156,7 @@ class PVE::Cli
   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

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

data/lib/pve/cli/ct.rb

@@ -57,13 +57,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 +81,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,12 +99,19 @@ EOU
       create Proxmox::LXC, template, **ctopts
     })
 
-    ct_cli.cmd( :config, '', &lambda {|name_or_id|
+    ct_cli.cmd( :config, 'Shows current config', &lambda {|name_or_id|
       connect
       ct = Proxmox::LXC.find! name_or_id
       STDOUT.puts ct.config.to_json
     })
 
+    ct_cli.cmd( :resize, 'Resize a disk', &lambda {|name_or_id, disk, size|
+      connect
+      ct = Proxmox::LXC.find! name_or_id
+      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:|
       raise UsageError, "Name/ID is not what you want to destroy"  unless name_or_id == i_really_want_to_destroy
       connect

data/lib/pve/helper.rb

@@ -1,3 +1,17 @@
+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 <<self
     def bytes1 v

data/lib/pve/proxmox.rb

@@ -331,6 +331,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
@@ -490,9 +495,10 @@ 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
 

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

data/lib/pve/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pve
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Denis Knauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dencli
@@ -117,7 +117,6 @@ files:
 - 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

data/lib/pve/qm.rb

@@ -1,32 +0,0 @@
-class PVE::Cli
-def cli_qm
-  cli.sub :qm, "Virtual Machines", aliases: %w[v vm qemu], &lambda {|qm|
-    qm.cmd :list, "List VM-IDs", aliases: ['ls'], &lambda {|node=nil|
-      connect
-      nodes = Proxmox::Node.all
-      nodes = nodes.select {|n| node == n.name }  if node
-      nodes.flat_map do |n|
-        n.qemu.map {|c| c.vmid.to_i }
-      end.sort.each {|c| puts c }
-    }
-
-    qm.cmd :status, "List VMs with status", aliases: [nil], &lambda {|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]
-    }
-
-    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 'help', '', aliases: ['-h', '--help'], &lambda {|*args| help qm, *args }
-  }
-end
-end