fog-libvirt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16a2da13c5fbd9d2c90b771de515227de201df13
-  data.tar.gz: 09ea82a8f5f472158821bc8190e07018ba00cf00
+  metadata.gz: 2d00b54cddae7049cf3de22c6ba3b0b64b8a0a7f
+  data.tar.gz: a8c5e11a8d0e93f0f3a27141c4684d22f5e9fed2
 SHA512:
-  metadata.gz: feab17cc3360f3b1392e4b634406d2d455ab552737a197c2bc421dd2e3f246d9747b5beb665d47887d8c6111e5eae4c8fe6fa0fc8d18ba309ad3cdfc21643999
-  data.tar.gz: 6282c89565f040f88c6ae831a883dd47337eb898cdfaf60547edbd9408c95923cff6c3173c99ba26a3555594978f232f69f090c47b08e968a1cea1f5f7f87f88
+  metadata.gz: 78b727f4016fcbf9d6794378298666d04495dd7477f475c7fda1b594eb28c3f68dd7b5299c9c67f7cc182d0762690eca55406d115d2cac1331f605d8b84d6a66
+  data.tar.gz: 55f21716980e467ce27c1518998665c80eb4afbd74c4b47acb8d6afc682f0dc0485680511505425ab3aa469e812e5840ef28ef7529ac1ae8a8f7bcf19385b0fb

data/Rakefile

@@ -34,9 +34,14 @@ end
 #############################################################################
 
 GEM_NAME = "#{name}"
-task :default => :test
-
-Rake::TestTask.new do |t|
+task :default => [:test, :minitest]
+
+Rake::TestTask.new(:minitest) do |t|
+  t.libs << '.'
+  t.libs << 'lib'
+  t.libs << 'minitests'
+  t.test_files  =  Dir.glob('minitests/**/*_test.rb')
+  t.verbose = true
 end
 
 desc 'Run tests'

data/fog-libvirt.gemspec

@@ -27,6 +27,10 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-json")
   s.add_dependency("fog-xml", "~> 0.1.1")
   s.add_dependency('ruby-libvirt','~> 0.5.0')
+  s.add_dependency('mime-types','< 2.0') if RUBY_VERSION < '1.9'
+  s.add_dependency('nokogiri', '< 1.6') if RUBY_VERSION < '1.9'
+  s.add_dependency('octokit', '< 3.0') if RUBY_VERSION < '1.9'
+  s.add_dependency('rest-client', '<= 1.7.0') if RUBY_VERSION < '1.9'
 
   # Fedora and derivates need explicit require
   s.add_dependency("json")
@@ -38,9 +42,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rubocop") if RUBY_VERSION > "1.9"
   s.add_development_dependency("shindo", "~> 0.3.4")
   s.add_development_dependency("simplecov")
-  s.add_development_dependency("thor")
   s.add_development_dependency("yard")
-  s.add_development_dependency("redcarpet")
+  s.add_development_dependency("mocha", "~> 1.1.0")
 
   # Let's not ship dot files and gemfiles
   git_files = `git ls-files`.split("\n")

data/lib/fog/libvirt/compute.rb

@@ -36,6 +36,7 @@ module Fog
       request :list_volumes
       request :volume_action
       request :create_volume
+      request :upload_volume
       request :clone_volume
       request :list_networks
       request :destroy_network

data/lib/fog/libvirt/models/compute/server.rb

@@ -1,6 +1,7 @@
 require 'fog/compute/models/server'
 require 'fog/libvirt/models/compute/util/util'
 require 'net/ssh/proxy/command'
+require 'fileutils'
 
 module Fog
   module Compute
@@ -36,6 +37,7 @@ module Fog
         attr_accessor :network_interface_type ,:network_nat_network, :network_bridge_name
         attr_accessor :volume_format_type, :volume_allocation,:volume_capacity, :volume_name, :volume_pool_name, :volume_template_name, :volume_path
         attr_accessor :password
+        attr_accessor :user_data
 
         # Can be created by passing in :xml => "<xml to create domain/server>"
         # or by providing :template_options => {
@@ -48,6 +50,7 @@ module Fog
           super defaults.merge(attributes)
           initialize_nics
           initialize_volumes
+          @user_data = attributes.delete(:user_data)
         end
 
         def new?
@@ -57,6 +60,7 @@ module Fog
         def save
           raise Fog::Errors::Error.new('Saving an existing server may create a duplicate') unless new?
           create_or_clone_volume unless xml or @volumes
+          create_user_data_iso if user_data
           @xml ||= to_xml
           self.id = (persistent ? service.define_domain(xml) : service.create_domain(xml)).uuid
           reload
@@ -215,6 +219,35 @@ module Fog
           display[:port]
         end
 
+        def generate_config_iso(user_data, &blk)
+          Dir.mktmpdir('config') do |wd|
+            generate_config_iso_in_dir(wd, user_data, &blk)
+          end
+        end
+
+        def generate_config_iso_in_dir(dir_path, user_data, &blk)
+          FileUtils.touch(File.join(dir_path, "meta-data"))
+          File.open(File.join(dir_path, 'user-data'), 'w') { |f| f.write user_data }
+
+          isofile = Tempfile.new(['init', '.iso']).path
+          unless system("genisoimage -output #{isofile} -volid cidata -joliet -rock #{File.join(dir_path, 'user-data')} #{File.join(dir_path, 'meta-data')}")
+            raise Fog::Errors::Error("Couldn't generate cloud-init iso disk.")
+          end
+          blk.call(isofile)
+        end
+
+        def create_user_data_iso
+          generate_config_iso(user_data) do |iso|
+            vol = service.volumes.create(:name => cloud_init_volume_name, :capacity => "#{File.size(iso)}b", :allocation => "0G")
+            vol.upload_image(iso)
+            @iso_file = cloud_init_volume_name
+          end
+        end
+
+        def cloud_init_volume_name
+          "#{name}-cloud-init.iso"
+        end
+
         private
         attr_accessor :volumes_path
 

data/lib/fog/libvirt/models/compute/volume.rb

@@ -71,6 +71,11 @@ module Fog
           new_volume.reload
         end
 
+        def upload_image(file_path)
+          requires :pool_name
+          service.upload_volume(pool_name, name, file_path)
+        end
+
         private
 
         def image_suffix

data/lib/fog/libvirt/requests/compute/upload_volume.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class Libvirt
+      class Real
+        def upload_volume(pool_name, volume_name, file_path)
+          volume = client.lookup_storage_pool_by_name(pool_name).lookup_volume_by_name(volume_name)
+          stream = client.stream
+
+          image_file = File.open(file_path, "rb")
+          volume.upload(stream, 0, image_file.size)
+          stream.sendall do |_opaque, n|
+            begin
+              r = image_file.read(n)
+              [r.length < n ? 0 : r.length, r]
+            rescue Exception => e
+              [-1, ""]
+            end
+          end
+          stream.finish
+        ensure
+          image_file.close if image_file
+        end
+      end
+
+      class Mock
+        def upload_volume(pool_name, volume_name, file_path)
+        end
+      end
+    end
+  end
+end

data/lib/fog/libvirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Libvirt
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/minitests/server/user_data_iso_test.rb

@@ -0,0 +1,69 @@
+require 'test_helper'
+
+class UserDataIsoTest < Minitest::Test
+  def setup
+    @compute = Fog::Compute[:libvirt]
+    @server = @compute.servers.new(:name => "test")
+    @test_data = "test data"
+  end
+
+  def test_contains_meta_data_file
+    @server.stubs(:system).returns(true)
+    in_a_temp_dir do |d|
+      @server.generate_config_iso_in_dir(d, @test_data) {|iso| assert File.exist?(File.join(d, 'meta-data')) }
+    end
+  end
+
+  def test_contains_user_data_file
+    @server.stubs(:system).returns(true)
+    in_a_temp_dir do |d|
+      @server.generate_config_iso_in_dir(d, @test_data) do |iso|
+        assert File.exist?(File.join(d, 'user-data'))
+        assert_equal @test_data,  File.read(File.join(d, 'user-data'))
+      end
+    end
+  end
+
+  def test_iso_is_generated
+    in_a_temp_dir do |d|
+      @server.expects(:system).with(regexp_matches(/^genisoimage/)).returns(true)
+      @server.generate_config_iso_in_dir(d, @test_data) {|iso| }
+    end
+  end
+
+  def test_volume_is_created_during_user_data_iso_generation
+    iso_path = "iso_file_path"
+    @server.stubs(:system).returns(true)
+    Fog::Compute::Libvirt::Volumes.any_instance.expects(:create).
+        with(has_entries(:name => @server.cloud_init_volume_name)).
+        returns(@compute.volumes.new)
+    Fog::Compute::Libvirt::Volume.any_instance.stubs(:upload_image)
+
+    @server.create_user_data_iso
+  end
+
+  def test_volume_is_uploaded_during_user_data_iso_generation
+    iso_path = "iso_file_path"
+    @server.stubs(:system).returns(true)
+    Fog::Compute::Libvirt::Volumes.any_instance.stubs(:create).returns(@compute.volumes.new)
+    Fog::Compute::Libvirt::Volume.any_instance.expects(:upload_image).returns(true)
+
+    @server.create_user_data_iso
+  end
+
+  def test_iso_file_is_set_during_user_data_iso_generation
+    iso_path = "iso_file_path"
+    @server.stubs(:system).returns(true)
+    Fog::Compute::Libvirt::Volumes.any_instance.stubs(:create).returns(@compute.volumes.new)
+    Fog::Compute::Libvirt::Volume.any_instance.stubs(:upload_image)
+
+    @server.create_user_data_iso
+    assert_equal @server.cloud_init_volume_name, @server.iso_file
+  end
+
+  def in_a_temp_dir
+    Dir.mktmpdir('test-dir') do |d|
+      yield d
+    end
+  end
+end

data/minitests/test_helper.rb

@@ -0,0 +1,18 @@
+require 'minitest/autorun'
+require 'mocha/mini_test'
+require 'fileutils'
+
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+
+logdir = File.join(File.dirname(__FILE__), '..', 'logs')
+FileUtils.mkdir_p(logdir) unless File.exist?(logdir)
+
+ENV['TMPDIR'] = 'test/tmp'
+FileUtils.rm_f Dir.glob 'test/tmp/*.tmp'
+
+require 'fog/libvirt'
+
+Fog.mock!
+Fog.credentials = {
+    :libvirt_uri => 'qemu://libvirt/system',
+}.merge(Fog.credentials)

data/tests/libvirt/models/compute/server_tests.rb

@@ -54,5 +54,4 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
     end
     test('be a kind of Fog::Compute::Libvirt::Server') { server.kind_of? Fog::Compute::Libvirt::Server }
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -184,20 +184,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -213,19 +199,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 description: This library can be used as a module for 'fog' or as standalone libvirt
   provider.
 email: geemus@gmail.com
@@ -281,9 +267,12 @@ files:
 - lib/fog/libvirt/requests/compute/mock_files/domain.xml
 - lib/fog/libvirt/requests/compute/pool_action.rb
 - lib/fog/libvirt/requests/compute/update_display.rb
+- lib/fog/libvirt/requests/compute/upload_volume.rb
 - lib/fog/libvirt/requests/compute/vm_action.rb
 - lib/fog/libvirt/requests/compute/volume_action.rb
 - lib/fog/libvirt/version.rb
+- minitests/server/user_data_iso_test.rb
+- minitests/test_helper.rb
 - tests/helper.rb
 - tests/helpers/formats_helper.rb
 - tests/helpers/formats_helper_tests.rb