vmit 0.0.3 → 0.0.3.99

data/test/{bootstrap_test.rb → workspace_test.rb}

@@ -20,31 +20,35 @@
 #
 require File.join(File.dirname(__FILE__), "helper")
 require 'test/unit'
-require 'vmit/bootstrap'
-require 'tempfile'
+require 'vmit/workspace'
+require 'tmpdir'
 
-class Bootstrap_test < Test::Unit::TestCase
+class Workspace_test < Test::Unit::TestCase
 
-  def test_accept_locations
-    assert Vmit::Bootstrap::FromMedia.accept?('http://www.foof.com/repo')
-    assert Vmit::Bootstrap::FromMedia.accept?(URI.parse('http://www.foof.com/repo'))
-    assert Vmit::Bootstrap::FromMedia.accept?('http://www.foof.com/repo/')
-    assert Vmit::Bootstrap::FromMedia.accept?(URI.parse('http://www.foof.com/repo/'))
+  def test_basic
+    Dir.mktmpdir do |dir|
+      workspace = Vmit::Workspace.new(dir)
+      assert_equal '1G', workspace.config.memory
+      assert !File.exist?(File.join(dir, 'config.yml'))
+      assert_raises RuntimeError do
+        workspace.current_image
+      end
 
-    iso_path = File.expand_path('data/test_vfs.iso', File.dirname(__FILE__))
-    tmp_raw = Tempfile.new(['vmit-test-', '.raw'])
-    raw_path = tmp_raw.path
+      workspace.save_config!
+      assert File.exist?(File.join(dir, 'config.yml'))
 
-    assert Vmit::Bootstrap::FromMedia.accept?(iso_path)
-    assert !Vmit::Bootstrap::FromMedia.accept?('/non/existing/file.iso')
-    assert !Vmit::Bootstrap::FromMedia.accept?('/non/existing/file.raw')
+      assert !File.exist?(File.join(dir, 'base.qcow2'))
+      workspace.disk_image_init!
+      STDERR.puts Dir.entries(dir)
+      assert File.exist?(File.join(dir, 'base.qcow2'))
 
-    assert !Vmit::Bootstrap::FromImage.accept?(iso_path)
-    assert !Vmit::Bootstrap::FromImage.accept?('/non/existing/file.iso')
-    assert !Vmit::Bootstrap::FromImage.accept?('/non/existing/file.raw')
+      assert workspace.current_image
 
-    assert !Vmit::Bootstrap::FromMedia.accept?(raw_path)
-    assert Vmit::Bootstrap::FromImage.accept?(raw_path)
+      workspace.disk_image_shift!
+      # calling this too fast screws the timestamp
+      sleep(1)
+      workspace.disk_image_shift!
+    end
   end
 
 end

data/vmit.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.required_ruby_version = '>= 1.9.2'
   s.add_dependency('clamp')
-  s.add_dependency('open4')
   s.add_dependency('pidfile')
   s.add_dependency('cheetah')
   s.add_dependency('ipaddress')
@@ -26,6 +27,8 @@ Gem::Specification.new do |s|
   s.add_dependency('progressbar')
   s.add_dependency('activesupport')
   s.add_dependency('nokogiri')
+  s.add_dependency('confstruct')
+  s.add_dependency('ruby-libvirt', '>= 0.4')
 
   s.add_development_dependency('webmock')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.3.99
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: pidfile
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pidfile
+  name: cheetah
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cheetah
+  name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ipaddress
+  name: abstract_method
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: abstract_method
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: progressbar
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: confstruct
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-libvirt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -176,8 +192,6 @@ email:
 - dmacvicar@suse.de
 executables:
 - vmit
-- vmit-ifdown
-- vmit-ifup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -187,29 +201,36 @@ files:
 - README.rdoc
 - Rakefile
 - bin/vmit
-- bin/vmit-ifdown
-- bin/vmit-ifup
 - lib/vmit.rb
 - lib/vmit/autoyast.rb
-- lib/vmit/bootstrap.rb
 - lib/vmit/debian_preseed.rb
 - lib/vmit/ext.rb
+- lib/vmit/install_media.rb
 - lib/vmit/kickstart.rb
+- lib/vmit/libvirt_vm.rb
 - lib/vmit/logger.rb
 - lib/vmit/network.rb
 - lib/vmit/plugins/bootstrap.rb
 - lib/vmit/plugins/hello.rb
 - lib/vmit/refcounted_resource.rb
+- lib/vmit/registry.rb
+- lib/vmit/unattended_install.rb
 - lib/vmit/utils.rb
 - lib/vmit/version.rb
 - lib/vmit/vfs.rb
-- lib/vmit/virtual_machine.rb
-- test/bootstrap_test.rb
+- lib/vmit/workspace.rb
 - test/data/dir1/file.txt
+- test/data/registry.yml
+- test/data/registry/key1
+- test/data/registry/key2
+- test/data/registry/key4/key1
 - test/data/test_vfs.iso
 - test/helper.rb
+- test/install_media_test.rb
 - test/refcounted_resource_test.rb
+- test/registry_test.rb
 - test/vfs_test.rb
+- test/workspace_test.rb
 - vmit.gemspec
 homepage: ''
 licenses: []
@@ -222,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -236,9 +257,15 @@ signing_key:
 specification_version: 3
 summary: Virtual machine (kvm) command line tool
 test_files:
-- test/bootstrap_test.rb
 - test/data/dir1/file.txt
+- test/data/registry.yml
+- test/data/registry/key1
+- test/data/registry/key2
+- test/data/registry/key4/key1
 - test/data/test_vfs.iso
 - test/helper.rb
+- test/install_media_test.rb
 - test/refcounted_resource_test.rb
+- test/registry_test.rb
 - test/vfs_test.rb
+- test/workspace_test.rb

data/bin/vmit-ifdown

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.join(File.dirname(__FILE__), "..", "lib")
-require 'rubygems'
-require 'vmit'
-require 'drb'
-
-DRb.start_service
-vmit = DRbObject.new nil, ENV['VMIT_SERVER']
-
-vmit.ifdown(ARGV[0])

data/bin/vmit-ifup

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.join(File.dirname(__FILE__), "..", "lib")
-
-#/sbin/brctl setfd ${switch} 0
-#/sbin/brctl stp ${switch} off
-
-require 'rubygems'
-require 'vmit'
-require 'drb'
-
-DRb.start_service
-vmit = DRbObject.new nil, ENV['VMIT_SERVER']
-
-vmit.ifup(ARGV[0])
-
-
-
-

data/lib/vmit/bootstrap.rb

@@ -1,273 +0,0 @@
-#
-# Copyright (C) 2013 Duncan Mac-Vicar P. <dmacvicar@suse.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-require 'vmit'
-require 'vmit/autoyast'
-require 'vmit/kickstart'
-require 'vmit/debian_preseed'
-
-module Vmit
-
-  module Bootstrap
-
-    def self.arch
-      Cheetah.run('arch', :stdout => :capture).strip
-    end
-
-    def self.bootstrapper_for(location)
-      case
-      when local_iso
-      end
-    end
-
-    module MethodDebianPreseed
-      # @param [Hash] args Arguments for 1st stage
-      def execute_autoinstall(args)
-        auto_install_args = {}
-        preseed = Vmit::DebianPreseed.new
-
-        Dir.mktmpdir do |floppy_dir|
-          qemu_args = {:floppy => floppy_dir,
-                      :append => "preseed/file=/floppy/preseed.cfg auto=true priority=critical",
-                      :reboot => false}
-          qemu_args.merge!(auto_install_args)
-          # transform duplicates into an array
-          qemu_args.merge!(args) do |key, oldv, newv|
-            case key
-              when :append then [oldv, newv].flatten
-              else newv
-            end
-          end
-
-          # Configure the autoinstallation profile to persist eth0
-          # for the current MAC address
-          # The interface will be setup with DHCP by default.
-          # TODO: make this more flexible in the future?
-          #autoyast.name_network_device(vm[:mac_address], 'eth0')
-          File.write(File.join(floppy_dir, 'preseed.cfg'), preseed.to_txt)
-          Vmit.logger.info "Preseed: 1st stage."
-          vm.run(qemu_args)
-          Vmit.logger.info "Preseed: 2st stage."
-          # 2nd stage
-          vm.run(:reboot => false)
-        end
-      end
-    end
-
-    module MethodKickstart
-      # @param [Hash] args Arguments for 1st stage
-      def execute_autoinstall(args)
-        auto_install_args = {}
-        kickstart = Vmit::Kickstart.new
-
-        case media
-          when Vmit::VFS::URI
-            kickstart.install = location
-          when Vmit::VFS::ISO
-            kickstart.install = :cdrom
-            auto_install_args.merge!(:cdrom => location.to_s)
-          else raise ArgumentError.new("Unsupported autoinstallation: #{location}")
-        end
-
-        Dir.mktmpdir do |floppy_dir|
-          qemu_args = {:floppy => floppy_dir,
-                      :append => "ks=floppy repo=#{kickstart.install}",
-                      :reboot => false}
-          qemu_args.merge!(auto_install_args)
-          # transform duplicates into an array
-          qemu_args.merge!(args) do |key, oldv, newv|
-            case key
-              when :append then [oldv, newv].flatten
-              else newv
-            end
-          end
-
-          File.write(File.join(floppy_dir, 'ks.cfg'), kickstart.to_ks_script)
-          Vmit.logger.info "Kickstart: 1st stage."
-          vm.run(qemu_args)
-        end
-      end
-    end
-
-    module MethodAutoYaST
-      # @param [Hash] args Arguments for 1st stage
-      def execute_autoinstall(args)
-        auto_install_args = {}
-        auto_install_args.merge!(args)
-        kernel_append_arg = case media
-          when Vmit::VFS::URI then "install=#{location}"
-          when Vmit::VFS::ISO then 'install=cdrom'
-          else raise ArgumentError.new("Unsupported autoinstallation: #{location}")
-        end
-        auto_install_args.merge!(:append => kernel_append_arg)
-        if media.is_a?(Vmit::VFS::ISO)
-          auto_install_args.merge!(:cdrom => location.to_s)
-        end
-
-        Dir.mktmpdir do |floppy_dir|
-          qemu_args = {:floppy => floppy_dir,
-                      :append => "autoyast=device://fd0/autoinst.xml",
-                      :reboot => false}
-          # transform duplicates into an array
-          qemu_args.merge!(auto_install_args) do |key, oldv, newv|
-            case key
-              when :append then [oldv, newv].flatten
-              else newv
-            end
-          end
-
-          autoyast = Vmit::AutoYaST.new
-
-          # WTF SLE and openSUSE have different
-          # base pattern names
-          media.open('/content') do |content_file|
-            content_file.each_line do |line|
-              case line
-                when /^DISTRIBUTION (.+)$/
-                  case $1
-                    when /SUSE_SLE/ then autoyast.minimal_sle!
-                    when /openSUSE/ then autoyast.minimal_opensuse!
-                  end
-              end
-            end
-          end
-
-          # Configure the autoinstallation profile to persist eth0
-          # for the current MAC address
-          # The interface will be setup with DHCP by default.
-          # TODO: make this more flexible in the future?
-          #autoyast.name_network_device(vm[:mac_address], 'eth0')
-          File.write(File.join(floppy_dir, 'autoinst.xml'), autoyast.to_xml)
-          Vmit.logger.info "AutoYaST: 1st stage."
-          vm.run(qemu_args)
-          Vmit.logger.info "AutoYaST: 2st stage."
-          # 2nd stage
-          vm.run(:reboot => false)
-        end
-      end
-    end
-
-    module SUSEMedia
-      include MethodAutoYaST
-
-      def get_initrd
-        media.open("/boot/#{Vmit::Bootstrap.arch}/loader/initrd")
-      end
-
-      def get_kernel
-        media.open("/boot/#{Vmit::Bootstrap.arch}/loader/linux")
-      end
-    end
-
-    module FedoraMedia
-      include MethodKickstart
-
-      def get_initrd
-        media.open("/images/pxeboot/initrd.img")
-      end
-
-      def get_kernel
-        media.open("/images/pxeboot/vmlinuz")
-      end
-    end
-
-    module DebianMedia
-      include MethodDebianPreseed
-
-      def get_initrd
-        arch = Vmit::Bootstrap.arch.gsub(/x86_64/, 'amd64')
-        media.open("/main/installer-#{arch}/current/images/netboot/debian-installer/#{arch}/initrd.gz")
-      end
-
-      def get_kernel
-        arch = Vmit::Bootstrap.arch.gsub(/x86_64/, 'amd64')
-        media.open("/main/installer-#{arch}/current/images/netboot/debian-installer/#{arch}/linux")
-      end
-    end
-
-    # Boostraps a vm from a SUSE repository
-    class FromMedia
-
-      attr_reader :vm
-      attr_reader :media
-      attr_reader :location
-
-      # @param [URI] location
-      def self.accept?(location)
-        # either a local ISO or a remote repository
-        # (and not a remote file, but we don't have
-        # a good way to check)
-        Vmit::VFS::ISO.accept?(location) ||
-          (Vmit::VFS::URI.accept?(location) &&
-            File.extname(location.to_s) == '')
-      end
-
-      def initialize(vm, location)
-        @location = location
-        @vm = vm
-        @media = Vmit::VFS.from(location)
-
-        # TODO FIXME we need a clever way to detect the
-        # location distro type. I could uname the kernel, but
-        # I need the type to know the location.
-        media_handler = case location.to_s.downcase
-          when /fedora|redhat|centos/ then FedoraMedia
-          when /suse/ then SUSEMedia
-          when /debian/ then DebianMedia
-          else
-            raise "Don't know how to bootstrap media #{location}"
-        end
-        self.extend media_handler
-
-        @boot_kernel = get_kernel
-        @boot_initrd = get_initrd
-      end
-
-      def execute
-        args = {}
-        args.merge!({:kernel => @boot_kernel.path, :initrd => @boot_initrd.path})
-        execute_autoinstall(args)
-      end
-    end
-
-    class FromImage
-
-       # @param [URI] location
-      def self.accept?(location)
-        uri = case location
-          when ::URI then location
-          else ::URI.parse(location.to_s)
-        end
-        return false unless ['.raw', '.qcow2'].include?(File.extname(uri.to_s))
-        uri.scheme == 'http' || File.exist?(uri.to_s)
-      end
-
-      def initialize(vm, location)
-        @location = location
-        #http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/1.7:/Appliance/images/SUSE_Manager_Server_pg_Devel.x86_64-1.7.0-Build3.126.raw.xz
-      end
-
-      def execute
-        Vmit.logger.info "From media!!!"
-      end
-    end
-
-  end
-end