mbailey-ruby-xen 0.0.3 → 0.1.1

data/README.rdoc

@@ -22,13 +22,19 @@ ruby-xen can also be used by ruby code or from irb.
 
   require 'rubygems'
   require 'ruby-xen'
+  include Xen
 
-  slice = Xen::Slice.find(:example)
+  slice = Slice.find :example 
   slice.running? # true
   slice.stop
   slice.running? # false
   slice.start
   slice.running? # true
+  
+  slice.backups   # => [#<Xen::Backup:0xb7a96520 @name=:example, @version="20090118">]
+  s.create_backup # => #<Xen::Backup:0xb7a922a4 @name=:example, @version="20090123">
+
+
 
 == REQUIREMENTS:
 
@@ -41,23 +47,25 @@ sudo gem install ruby-xen
 
 == LICENSE:
 
-ruby-xen is licenced under the GPL. This means that you can use it in commercial 
-or open source applications. More details found here:
-http://www.gnu.org/licenses/gpl.html
+(The MIT License)
 
-ruby-xen
-Copyright (C) 2008 Mike Bailey and Nick Marfleet
+Copyright (c) 2008-2009 Mike Bailey
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+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:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+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.

data/lib/ruby-xen.rb

@@ -20,7 +20,7 @@ module Xen
   CONFIG_FILE_EXTENSION = '.cfg'
   
   # Directory for backups of system images
-  BACKUP_DIR='/var/xen_images'
+  BACKUP_DIR='/var/backups/xen'
   
   # File extension for backups
   BACKUP_FILE_EXT = '.tar'

data/lib/templates/exclude_from_backups

@@ -0,0 +1,2 @@
+./proc
+./etc/udev/rules.d/70-persistent-net.rules

data/lib/xen/backup.rb

@@ -8,34 +8,42 @@ module Xen
       options = args.extract_options!
       name = args.first
       
-      options = {}
-      name = 'foo' # XXX replace with real value
+      # options = {}
+      # name = 'foo' # XXX replace with real value
       version = options[:version] || Time.now.strftime('%Y%m%d')
       backup_dir = options[:backup_dir] || Xen::BACKUP_DIR
       backup_file_ext = options[:backup_file_ext] || Xen::BACKUP_FILE_EXT
-      archive_name="#{name}-#{version}.#{backup_file_ext}"
+      archive_name="#{name}-#{version}#{backup_file_ext}"
             
       slice = Xen::Slice.find(name) # XXX test for failure
-      slice.stop
-      sleep 10
+      if slice.running?
+        slice.stop
+        sleep 10
+        restart_slice = true
+      end
 
       temp_mount = `mktemp -d -p /mnt #{name}-XXXXX`.chomp # XXX test for failure
       `mount #{slice.root_disk.path} #{temp_mount}` # XXX test for failure
+      
+      
 
-      # Creating archive at $ARCHIVE_DIR/$ARCHIVE_NAME ...
-      `tar --create --exclude=/proc --exclude=/etc/udev/rules.d/70-persistent-net.rules --directory #{temp_mount} --file #{backup_dir}/#{archive_name} .`
-      # XXX test for failure
+      FileUtils.mkdir_p backup_dir
+      
+      # Creating archive at backup_dir/archive_name ...
+      excludes_file = File.join(File.dirname(__FILE__),'..','templates','exclude_from_backups')
+      temp_tarball = `mktemp -p #{backup_dir} #{name}-XXXXX`.chomp # XXX test for failure
+      `tar --create --exclude-from=#{excludes_file} --directory #{temp_mount} --file #{temp_tarball} . && mv #{temp_tarball} #{backup_dir}/#{archive_name}`
       
       # Unmounting image
       `umount #{temp_mount}`
       Dir.delete(temp_mount)
 
       # Creating symlink from new backup to filename without version number
-      last_backup = "#{backup_dir}/#{name}.#{backup_file_ext}"
-      File.delete(last_backup) if File.symlink(last_backup)
+      last_backup = "#{backup_dir}/#{name}#{backup_file_ext}"
+      File.delete(last_backup) if File.symlink?(last_backup)
       `ln -sf #{backup_dir}/#{archive_name} #{last_backup}`
       
-      slice.start
+      slice.start if restart_slice == true
       
       new(:name => name, :version => version)
     end

data/lib/xen/command.rb

@@ -93,6 +93,12 @@ module Xen
       system(cmd)
     end
     
+    def self.create_backup(*args)
+      name = args.shift
+      slice = Xen::Slice.find(name)
+      slice.create_backup
+    end
+    
     def self.xm_info
       result = `/usr/sbin/xm info`
       result.scan(/(\S+)\s*:\s*([^\n]+)/).inject({}){ |m, (i,j)| m[i.to_sym] = j; m }

data/lib/xen/config_file.rb

@@ -30,7 +30,7 @@ module Xen
     end
 
     def self.all
-      config_files = Dir.glob("#{Xen::XEN_DOMU_CONFIG_DIR}/*#{Xen::CONFIG_FILE_EXTENSION}")
+      config_files = Dir.glob("#{Xen::XEN_DOMU_CONFIG_DIR}/*#{Xen::CONFIG_FILE_EXTENSION}").sort
       config_files.collect do |filename|
         create_from_config_file(File.read(filename))
       end
@@ -113,7 +113,7 @@ module Xen
 
     def to_str
       %w(ip mac bridge vifname).collect { |key| 
-        "#{key}=#{instance_variable_get('@' + key)}" if !instance_variable_get('@'+key).nil?
+        "#{key}=#{instance_variable_get('@' + key)}" unless instance_variable_get('@'+key) == ''
       }.compact.join(',')
     end 
   end
@@ -146,10 +146,9 @@ module Xen
       Xen::Command.lv_size(@volume_group, @name)
     end
     
-    # XXX Not needed?
-    # def path
-    #   "/dev/#{volume_group}/#{name}"
-    # end
+    def path
+      "/dev/#{volume_group}/#{name}"
+    end
     
     def to_str
       "phy:#{volume_group}/#{name},#{domu},#{mode}"

data/lib/xen/host.rb

@@ -24,4 +24,41 @@ module Xen
   
   end
   
+  
+  # XXX Move this somewhere else!
+  
+  # Network Bridge Script looks like this.
+  #
+  # #!/bin/sh
+  # /etc/xen/scripts/network-bridge $1 netdev=eth0 bridge=xenbr0 vifnum=0 antispoof=no
+  # /etc/xen/scripts/network-bridge $1 netdev=eth1 bridge=xenbr1 vifnum=1 antispoof=no
+  
+  class Bridges
+    NETWORK_BRIDGE_WRAPPER = '/etc/xen/scripts/network-bridge-wrapper'
+    
+    def self.find
+      f = File.readlines(NETWORK_BRIDGE_WRAPPER).collect { |line|
+        if (m = line.match /netdev=(.*) bridge=(.*) vifnum=(.*) antispoof=(.*)/)
+          Xen::Bridge.new :netdev => m[1], :bridge => m[2], :vifnum => m[3], :antispoof => m[4]
+        end
+      }.compact
+    end
+    
+    def self.save
+    end
+    
+  end
+  
+  class Bridge
+    attr_accessor :netdev, :bridge, :vifnum, :antispoof
+    
+    def initialize(*args)
+      options = args.extract_options!
+      @netdev = options[:netdev]
+      @bridge = options[:bridge]
+      @vifnum = options[:vifnum]
+      @antispoof = options[:antispoof]
+    end
+  end
+  
 end

data/lib/xen/lvm.rb

@@ -15,19 +15,26 @@ module Xen
       name ||= nil
       # XXX deal with not found error
       cmd = "vgs --options=vg_name,vg_size --separator=' ' --noheadings --units=g --nosuffix #{name}"
-      output = Xen::Command.run cmd
-      result = output.collect { |line|
-        name, size = line.strip.split(' ')
-        new name, size
-      }
+      begin
+        output = Xen::Command.run cmd
+        result = output.collect { |line|
+          name, size = line.strip.split(' ')
+          new name, size
+        }
+      rescue # don't die if `vgs` command missing
+      end
       name ? result[0] : result
     end
   
     def free
       cmd = "vgs --options=vg_free --separator=' ' --noheadings --units=g --nosuffix #{@name}"
-      Xen::Command.run cmd
+      begin
+        result = Xen::Command.run cmd
+      rescue # don't die if `vgs` command missing
+      end
+      result
     end
     
   end
   
-end
+end

data/lib/xen/slice.rb

@@ -34,6 +34,7 @@ module Xen
       # Set some derived options
       options.reverse_merge! 'hostname' => name # Name host after this slice
       options['dhcp'] = true unless options['ip']
+      options['accounts'].to_i == 1 ? options['accounts'] = true : options.delete('accounts')
       options['swap'] ||= options['memory'].to_i * 2
       if options['root_pass']
         options['role'] = 'passwd'
@@ -91,6 +92,10 @@ module Xen
       self.instance ? :running : :stopped
     end
     
+    def first_ip
+      config_file.vifs.first.ip if config_file and config_file.vifs
+    end
+    
     def running?
       self.instance ? true : false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbailey-ruby-xen
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mike Bailey
@@ -10,11 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-21 00:00:00 -07:00
+date: 2009-02-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -24,6 +25,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: open4
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -58,6 +60,7 @@ files:
 - lib/xen/slice.rb
 - lib/xen/xen_tools_conf.rb
 - lib/templates/domu.cfg.erb
+- lib/templates/exclude_from_backups
 - lib/templates/xen-tools.conf.erb
 has_rdoc: true
 homepage: http://github.com/mbailey/ruby-xen