susi-qemu 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcd6b80ed80898c41c3ca6365ff62561c8dd6f6959e2bf0082ff2d30b30c0c49
-  data.tar.gz: 69b8b5eea4153430e9af7540fafd5a4b6a46ffb60bb2ec39e54aeae5a1bb5d19
+  metadata.gz: dca16e441c61254d6f6bb88e4ecd0dc3567d15af01d542ea0905e22eead6fdaf
+  data.tar.gz: 682d45fac603f15a70a175420c8f13c1764c9040f1986d2244ab5bc6867248fd
 SHA512:
-  metadata.gz: bcc80bdf535557fbc66257725635857521084b4574f2a58938c647bdfd3cdd79966235ce98373e163424b70120ba5c812651b007dabfbf94351b27bdb4fee9a4
-  data.tar.gz: e63022c2205e0405749e9c5339098d2818c270a0d783de626f076a57e4ab1e47f286cef7519c91b1e10240b016e3b307544b83b40bec21b2d88b968c09914fcf
+  metadata.gz: cdc1c3db00ed5e608d0e4f8b810b8be21273102d9e835b7f4ad5b091bb0a170e22e07cca22e92c4e280a5a137d6441bb7545b684b64d0b6df672836d416953a7
+  data.tar.gz: 6440884ac55b0a16cabdbaa38b74e70e2db6738a9a0dff87b8fb04d9895e031cfcabe789eec9bfab2017e267bae88eed2c15e4914adc2deb030f85f07fb7ecfb

data/bin/susi

@@ -1,87 +1,19 @@
 #!/usr/bin/env ruby
 
-require 'susi'
-require 'version'
-
-if ARGV[0] == 'init'
-  Susi::init
-
-elsif ARGV[0] == 'start'
-  Susi::start
-
-elsif ARGV[0] == 'rm'
-  # quit vm and remove disk
-  Susi::VM.quit(Susi::current_vm_name)
-  Susi::rm
-
-# create a disk
-elsif ARGV[0] == 'disk' && ARGV[1] == 'create' &&
-    ARGV[2].is_a?(String) && ARGV[3].to_i > 0
-  disk_name = ARGV[2]
-  disk_size = ARGV[3].to_i
-  Susi::Disk.create(disk_name, disk_size)
-
-# clone a disk
-elsif ARGV[0] == 'disk' && ARGV[1] == 'clone' &&
-    ARGV[2].is_a?(String) && ARGV[3].is_a?(String) &&
-    File.exist?("#{ARGV[2]}.qcow2") &&
-    !File.exist?("#{ARGV[3]}.qcow2")
-  disk_name = ARGV[2]
-  new_disk_name = ARGV[3]
-  Susi::Disk.clone(disk_name, new_disk_name)
-
-# start VM
-elsif ARGV[0] == 'vm' && ARGV[1] == 'start' &&
-    ARGV[2].is_a?(String) && File.exist?("#{ARGV[2]}.qcow2")
-  vm_name = ARGV[2]
-  Susi::VM.start(vm_name, vm_name)
-
-# install VM
-elsif ARGV[0] == 'vm' && ARGV[1] == 'install' &&
-  ARGV[2].is_a?(String) && File.exist?("#{ARGV[2]}.qcow2") &&
-    ARGV[3].is_a?(String) && File.exist?(ARGV[3])
-  vm_name = ARGV[2]
-  iso = ARGV[3]
-  Susi::VM.install(vm_name, vm_name, iso)
-
-# quit VM
-elsif ARGV[0] == 'vm' && ARGV[1] == 'quit' &&
-    ARGV[2].is_a?(String)
-  vm_name = ARGV[2]
-  Susi::VM.quit(vm_name)
-
-# list VMs
-elsif ARGV[0] == 'vm' && ARGV[1] == 'ls'
-  Susi::VM.ls
-elsif ARGV[0] == 'ls'
-  Susi::VM.ls
-
-# open VNC
-elsif ARGV[0] == 'vnc'
-  if ARGV[1].is_a?(String)
-    vm_name = ARGV[1]
-    Susi::VNC.open(vm_name)
-  else
-    Susi::VNC.open(Susi::current_vm_name)
+if File.exist?(File.expand_path('../susi.gemspec', __dir__))
+  puts "Running in development mode"
+  module Susi
+    DEBUG = true
   end
+  $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+end
 
-# open SSH
-elsif ARGV[0] == 'ssh'
-  if ARGV[1].is_a?(String)
-    vm_name = ARGV[1]
-    Susi::SSH.open(vm_name)
-  else
-    Susi::SSH.open(Susi::current_vm_name)
-  end
-
-# download Debian netinstall ISO
-elsif ARGV[0] == 'iso' && ARGV[1] == 'download'
-  Susi::Disk.download_debian_netinstall
-
-else
-  puts <<-EOF
-Invalid command
+require 'susi'
+require 'version'
+require 'optparse'
 
+def print_usage
+  Susi::info <<-EOF
 Usage: 
   Init susi setting
   susi init
@@ -127,8 +59,121 @@ susi (v#{Susi::VERSION}) - Simple User System Interface
 author:  Daniel Bovensiepen
 contact: oss@bovi.li
 www:     https://github.com/bovi/susi
-EOF
+  EOF
+  exit 1
+end
+
+options = {}
+subcommands = %w[init start rm disk vm ls vnc ssh iso]
 
-exit 1
+global = OptionParser.new do |opts|
+  opts.banner = "Usage: susi [options] [subcommand [options]]"
+  opts.on("-h", "--help", "Prints this help") do
+    Susi::info opts
+    print_usage
+  end
+end
 
+subcommand = ARGV.shift
+global.order!
+print_usage if subcommand.nil?
+
+case subcommand
+when "init"
+  Susi::init
+when "start"
+  Susi::start
+when "stop", "shutdown"
+  vm_name = ARGV.shift || Susi::current_vm_name
+  Susi::VM.new(vm_name) do |vm|
+    vm.shutdown
+  end
+when "rm"
+  Susi::VM.quit(Susi::current_vm_name)
+  Susi::rm
+when "disk"
+  disk_command = ARGV.shift
+  case disk_command
+  when "create"
+    disk_name, disk_size = ARGV
+    if disk_name && disk_size.to_i > 0
+      Susi::Disk.create(disk_name, disk_size.to_i)
+    else
+      Susi::info "Invalid disk create command"
+      print_usage
+    end
+  when "clone"
+    disk_name, new_disk_name = ARGV
+    if disk_name && new_disk_name &&
+        File.exist?("#{disk_name}.qcow2") &&
+        !File.exist?("#{new_disk_name}.qcow2")
+      Susi::Disk.clone(disk_name, new_disk_name)
+    else
+      Susi::info "Invalid disk clone command"
+      print_usage
+    end
+  else
+    Susi::info "Invalid disk command"
+    print_usage
+  end
+when "vm"
+  vm_command = ARGV.shift
+  case vm_command
+  when "start"
+    vm_name = ARGV.shift
+    if vm_name && File.exist?("#{vm_name}.qcow2")
+      Susi::VM.start(vm_name, vm_name)
+    else
+      Susi::info "Invalid vm start command"
+      print_usage
+    end
+  when "install"
+    vm_name, iso = ARGV
+    if vm_name && File.exist?("#{vm_name}.qcow2") && iso && File.exist?(iso)
+      Susi::VM.install(vm_name, vm_name, iso)
+    else
+      Susi::info "Invalid vm install command"
+      print_usage
+    end
+  when "quit"
+    vm_name = ARGV.shift
+    if vm_name
+      Susi::VM.quit(vm_name)
+    else
+      Susi::info "Invalid vm quit command"
+      print_usage
+    end
+  when "ls"
+    Susi::VM.ls
+  else
+    Susi::info "Invalid vm command"
+    print_usage
+  end
+when "ls"
+  Susi::VM.ls
+when "vnc"
+  vm_name = ARGV.shift
+  if vm_name
+    Susi::VNC.open(vm_name)
+  else
+    Susi::VNC.open(Susi::current_vm_name)
+  end
+when "ssh"
+  vm_name = ARGV.shift
+  if vm_name
+    Susi::SSH.open(vm_name)
+  else
+    Susi::SSH.open(Susi::current_vm_name)
+  end
+when "iso"
+  iso_command = ARGV.shift
+  if iso_command == "download"
+    Susi::Disk.download_debian_netinstall
+  else
+    Susi::info "Invalid iso command"
+    print_usage
+  end
+else
+  Susi::info "Invalid command"
+  print_usage
 end

data/lib/output.rb

@@ -1,6 +1,4 @@
 module Susi
-  DEBUG = true
-
   def self.debug(msg)
     puts msg if DEBUG
   end

data/lib/qmp.rb

@@ -11,6 +11,8 @@ module Susi
       @port = port
       @server = TCPSocket.new('localhost', @port)
 
+      Susi::debug "QMP connected"
+
       resp = JSON.parse(@server.gets)
       unless resp["QMP"]["version"]["qemu"]["major"] == 9
         server.close

data/lib/ssh.rb

@@ -11,11 +11,49 @@ module Susi
     end
 
     def self.set_hostname(name)
-      vm = VM.new(name)
-      Net::SSH.start(vm.ip, 'dabo', port: vm.ssh_port, keys: [File.expand_path('~/.ssh/id_ed25519')]) do |ssh|
-        Susi::debug "Setting up VM..."
-        ssh.exec!("sudo hostnamectl set-hostname #{name}")
-        ssh.exec!("sudo sed -i 's/susi/#{name}/' /etc/hosts")
+      VM.new(name) do |vm|
+        Net::SSH.start(vm.ip, 'dabo', port: vm.ssh_port, keys: [File.expand_path('~/.ssh/id_ed25519')]) do |ssh|
+          Susi::debug "Setting up VM hostname..."
+
+          output = ssh.exec!("sudo hostnamectl set-hostname #{name}")
+          Susi::debug "Setting hostname: #{output}"
+
+          output = ssh.exec!("sudo sed -i 's/susi/#{name}/' /etc/hosts")
+          Susi::debug "Updating /etc/hosts: #{output}"
+
+          Susi::debug "Hostname setup complete."
+        end
+      end
+    end
+
+    def self.setup_virtio_filesystem(name)
+      VM.new(name) do |vm|
+        Net::SSH.start(vm.ip, 'dabo', port: vm.ssh_port, keys: [File.expand_path('~/.ssh/id_ed25519')]) do |ssh|
+          Susi::debug "Setting up virtio filesystem..."
+
+          output = ssh.exec!("echo 'susi_virtio_share /mnt/susi 9p trans=virtio,version=9p2000.L,rw 0 0' | sudo tee -a /etc/fstab")
+          Susi::debug "Adding virtio share to /etc/fstab: #{output}"
+
+          output = ssh.exec!("sudo mkdir -p /mnt/susi")
+          Susi::debug "Creating mount point: #{output}"
+
+          output = ssh.exec!("sudo systemctl daemon-reload")
+          Susi::debug "Reloading systemd: #{output}"
+
+          output = ssh.exec!("sudo mount -a")
+          Susi::debug "Mounting all filesystems: #{output}"
+
+          # Check if the mount was successful
+          output = ssh.exec!("mount | grep susi_virtio_share")
+          if output.empty?
+            Susi::debug "Warning: virtio share mount not found. Checking dmesg for errors..."
+            dmesg_output = ssh.exec!("dmesg | tail -n 20")
+            Susi::debug "Recent dmesg output: #{dmesg_output}"
+          else
+            Susi::debug "Virtio share mounted successfully: #{output}"
+          end
+          Susi::debug "Virtio filesystem setup complete."
+        end
       end
     end
   end

data/lib/susi.rb

@@ -51,6 +51,7 @@ YAML
     id = config['id']
     name = config['name'] || Dir.pwd.split('/').last
     usb = config['usb']
+    shared_dir = config['shared_dir']
     disk_template = "#{TEMPLATE_DIR}/#{config['template']}"
 
     # check if vm is already running
@@ -64,12 +65,15 @@ YAML
       Susi::debug "Disk not found, cloning..."
       Disk.clone(disk_template, disk_name)
 
-      VM.start(name, disk_name, usb: usb)
+      VM.start(name, disk_name, usb: usb, shared_dir: shared_dir)
 
       # SSH into VM and set hostname
       SSH.set_hostname(name)
+      if shared_dir
+        SSH.setup_virtio_filesystem(name)
+      end
     else
-      VM.start(name, disk_name, usb: usb)
+      VM.start(name, disk_name, usb: usb, shared_dir: shared_dir)
     end
   end
 
@@ -101,7 +105,7 @@ if __FILE__ == $0
     end
 
     def test_cli_empty
-      assert_equal(false, run_command("ruby ./susi.rb"))
+      assert_equal(false, run_command("ruby ./bin/susi"))
     end
 
     def test_create_img
@@ -117,15 +121,15 @@ if __FILE__ == $0
     end
 
     def test_cli_create_img
-      assert_equal(true, run_command("ruby ./susi.rb disk create test 1"))
+      assert_equal(true, run_command("ruby ./bin/susi disk create test 1"))
       assert(File.exist?("test.qcow2"))
       run_command("rm test.qcow2")
     end
 
     def test_cli_create_img_fail
-      assert_equal(false, run_command("ruby ./susi.rb disk create test"))
-      assert_equal(false, run_command("ruby ./susi.rb disk create test pest"))
-      assert_equal(false, run_command("ruby ./susi.rb disk create 1"))
+      assert_equal(false, run_command("ruby ./bin/susi disk create test"))
+      assert_equal(false, run_command("ruby ./bin/susi disk create test pest"))
+      assert_equal(false, run_command("ruby ./bin/susi disk create 1"))
     end
 
     def test_clone_img
@@ -144,19 +148,19 @@ if __FILE__ == $0
     end
 
     def test_cli_clone_img
-      assert_equal(true, run_command("ruby ./susi.rb disk create test 1"))
-      assert_equal(true, run_command("ruby ./susi.rb disk clone test clone"))
+      assert_equal(true, run_command("ruby ./bin/susi disk create test 1"))
+      assert_equal(true, run_command("ruby ./bin/susi disk clone test clone"))
       assert(File.exist?("clone.qcow2"))
       run_command("rm clone.qcow2")
       run_command("rm test.qcow2")
     end
 
     def test_cli_clone_img_fail
-      assert_equal(false, run_command("ruby ./susi.rb disk clone test clone"))
-      assert_equal(true, run_command("ruby ./susi.rb disk create test 1"))
-      assert_equal(false, run_command("ruby ./susi.rb disk clone test"))
-      assert_equal(true, run_command("ruby ./susi.rb disk clone test clone"))
-      assert_equal(false, run_command("ruby ./susi.rb disk clone test clone"))
+      assert_equal(false, run_command("ruby ./bin/susi disk clone test clone"))
+      assert_equal(true, run_command("ruby ./bin/susi disk create test 1"))
+      assert_equal(false, run_command("ruby ./bin/susi disk clone test"))
+      assert_equal(true, run_command("ruby ./bin/susi disk clone test clone"))
+      assert_equal(false, run_command("ruby ./bin/susi disk clone test clone"))
 
       run_command("rm clone.qcow2")
       run_command("rm test.qcow2")

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Susi
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/vm.rb

@@ -45,8 +45,13 @@ module Susi
       end
     end
 
+    def shutdown
+      Susi::debug "Initiating shutdown for VM #{@name}"
+      @qmp.execute("system_powerdown")
+    end
+
     def quit
-      #QMP.new(@qmp_port) { |q| q.quit }
+      Susi::debug "Quitting QMP for VM #{@name}"
       @qmp.quit
     end
 
@@ -122,7 +127,7 @@ module Susi
       raise "No free port found in range #{start_port}..#{end_port}"
     end
 
-    def self.start(name, disk, cdrom: nil, usb: nil)
+    def self.start(name, disk, cdrom: nil, usb: nil, shared_dir: nil)
       qmp_port = self.get_free_port(4000, 4099)
       ssh_port = self.get_free_port(2000, 2099)
       vnc_port = self.get_free_port(5900, 5999)
@@ -143,6 +148,14 @@ module Susi
       cmd << "-daemonize"
       cmd << "-enable-kvm"
 
+      # Add shared directory passthrough if specified
+      if shared_dir
+        Susi::debug "Adding shared directory #{shared_dir}"
+        shared_dir_path = File.expand_path(shared_dir)
+        cmd << "-fsdev local,security_model=passthrough,id=fsdev0,path=#{shared_dir_path}"
+        cmd << "-device virtio-9p-pci,fsdev=fsdev0,mount_tag=susi_virtio_share"
+      end
+
       # control interfaces
       cmd << "-qmp tcp:localhost:#{qmp_port},server,nowait"
       cmd << "-vnc :#{vnc_port-5900},websocket=on"
@@ -182,6 +195,9 @@ module Susi
           # get local device name or IP
           ip = vm.ip
 
+          shared_dir = line.match(/-fsdev.*path=([^\s,]+)/)
+          shared_dir_info = shared_dir ? "  - Shared Directory: #{shared_dir[1]}" : ""
+
           puts <<-EOF
 VM: #{n}
   - Disk: #{vm.disk}
@@ -190,6 +206,7 @@ VM: #{n}
   - Screen: http://#{ip}:#{vm.vnc_www_port}/
   - Websocket: ws://#{ip}:#{vm.vnc_websocket_port}/
   - SSH: ssh -p #{vm.ssh_port} dabo@#{ip}
+#{shared_dir_info}
 EOF
         end
       end

data/lib/vnc.rb

@@ -6,6 +6,12 @@ require_relative 'output'
 module Susi
   class VNC
     def self.open(name)
+      port = nil
+      token = nil
+      html = nil
+      novnc_path = nil
+      url = nil
+
       VM.new(name) do |vm|
         port = vm.vnc_www_port
         token = (0...8).map { (65 + rand(26)).chr }.join
@@ -19,31 +25,42 @@ module Susi
         html.gsub!("###TOKEN###", token)
         html.gsub!("###HOST###", vm.ip)
         html.gsub!("###PORT###", vm.vnc_websocket_port.to_s)
+      end
 
-        server = WEBrick::HTTPServer.new(:Port => port,
-                                       :Logger => WEBrick::Log.new("/dev/null"),
-                                       :AccessLog => [])
-        server.mount_proc "/#{token}.html" do |req, res|
-          # print access by someone on command line
-          Susi.info "[#{Time.now}] Access by: #{req.peeraddr[3]}"
-          res.body = html
-        end
-        server.mount_proc "/#{token}.close.html" do |req, res|
-          Susi.info "[#{Time.now}] Closing by #{req.peeraddr[3]}"
-          res.body = "Closing VNC..."
-          server.shutdown
-        end
-        server.mount("/core",
-                     WEBrick::HTTPServlet::FileHandler,
-                     File.join(novnc_path, "core"))
-        server.mount("/vendor",
-                     WEBrick::HTTPServlet::FileHandler,
-                     File.join(novnc_path, "vendor"))
+      server = WEBrick::HTTPServer.new(:Port => port,
+                                     :Logger => WEBrick::Log.new("/dev/null"),
+                                     :AccessLog => [])
+      server.mount_proc "/#{token}.html" do |req, res|
+        # print access by someone on command line
+        Susi.info "[#{Time.now}] Access by: #{req.peeraddr[3]}"
+        res.body = html
+      end
+      server.mount_proc "/#{token}.close.html" do |req, res|
+        Susi.info "[#{Time.now}] Closing by #{req.peeraddr[3]}"
+        res.body = "Closing VNC..."
+        server.shutdown
+      end
+      server.mount("/core",
+                   WEBrick::HTTPServlet::FileHandler,
+                   File.join(novnc_path, "core"))
+      server.mount("/vendor",
+                   WEBrick::HTTPServlet::FileHandler,
+                   File.join(novnc_path, "vendor"))
 
-        Susi::debug "[#{Time.now}] VNC screen: #{url}"
+      Susi::debug "[#{Time.now}] VNC screen: #{url}"
 
-        server.start
+      Thread.new do
+        loop do
+          unless VM.running?(name)
+            Susi::info "VM #{name} is no longer running. Shutting down VNC server."
+            server.shutdown
+            break
+          end
+          sleep 10
+        end
       end
+
+      server.start
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: susi-qemu
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Daniel Bovensiepen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-29 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh