rbovirt 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9848bea2f871ad9d719fe767623cb5a90693e1a6
-  data.tar.gz: bb231cd4f28257c2bae9d76cc721be3d39e5c705
+  metadata.gz: b97753a15261f2aefe05f131f10919c4e4462b86
+  data.tar.gz: e11ea2283df23bc959a966d4c3f0b5a48a60a25b
 SHA512:
-  metadata.gz: 0c08516ba05303b32daeee352a0ca5230447b820bbf4e781248af4bfbc01b8dfd3cf6d9c0385fee0cfa7ad2e0a3359a377be5793ca87ab82c1d505cd457ca15a
-  data.tar.gz: 00b59b5b92ebdb2f889b0dc7b6e0b0745ba0dc143cfabd7ea986e4f59c747981975a316048ab88664d14d9210e4ed2578f9f83f35a91bf1aa879381917e3e0c7
+  metadata.gz: 254c0845f58a8c0c81cdfd092d83138bb9347aeee338606e283e8d91d9f8791533e9bda06804b487d57e38dc722c982872a6982bfbbb73c064a725364454676e
+  data.tar.gz: 98637488a24997cc47b4ab67384b7b5994841fb953e1ca72bf9154dc129973e5418d07662445b12ba106e23df6510be4dca7d8f6b1b77bacb18db98c22a79d72

data/.gitignore

@@ -54,3 +54,6 @@ pkg
 
 # For rubinius:
 #*.rbc
+
+# Ignore generated .gem files:
+*.gem

data/CHANGES.rdoc

@@ -6,6 +6,13 @@ _rbovirt_ project.
 Note that this list of changes was added with the 0.0.30 release,
 previous releases aren't described here.
 
+== 0.0.31 / 2014-12-11
+
+New features:
+
+* Added support for starting virtual machines with _cloud-init_, using
+  the new +vm_start_with_cloud_init+ method of the client class.
+
 == 0.0.30 / 2014-11-25
 
 New features:

data/lib/client/vm_api.rb

@@ -97,6 +97,12 @@ module OVIRT
       return (xml_response/'action/status').first.text.strip.upcase=="COMPLETE"
     end
 
+    def vm_start_with_cloudinit(id, opts={})
+      xml = OVIRT::VM.cloudinit(opts)
+      xml_response = http_post("/vms/%s/%s" % [id, 'start'], xml, {} )
+      return (xml_response/'action/status').first.text.strip.upcase=="COMPLETE"
+    end
+
     def destroy_vm(id)
       http_delete("/vms/%s" % id)
     end

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module OVIRT
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

data/lib/ovirt/vm.rb

@@ -108,6 +108,124 @@ module OVIRT
       Nokogiri::XML(builder.to_xml).root.to_s
     end
 
+    def self.cloudinit(opts={})
+      hostname            = opts[:hostname]
+      ip                  = opts[:ip]
+      netmask             = opts[:netmask]
+      dns                 = opts[:dns]
+      gateway             = opts[:gateway]
+      domain              = opts[:domain]
+      nicname             = opts[:nicname]
+      password            = opts[:password]
+      ssh_authorized_keys = opts[:ssh_authorized_keys]
+      fileslist           = opts[:files]
+      runcmd              = opts[:runcmd]
+      unless opts[:phone_home].nil?
+        phone_home = \
+        "phone_home\n" \
+        "  url: #{opts[:phone_home]['url']}\n" \
+        "  post: #{opts[:phone_home]['post']}\n"
+      end
+      cmdlist             = 'runcmd:'
+      unless runcmd.nil?
+        runcmd.each do |cmd|
+          cmdlist = \
+	  "#{cmdlist}\n" \
+          "- #{cmd}\n"
+        end
+      end
+      builder   = Nokogiri::XML::Builder.new do
+        action {
+          vm {
+            initialization {
+              unless runcmd.nil?
+                custom_script cmdlist
+              end
+              unless phone_home.nil?
+                custom_script phone_home
+              end
+              cloud_init {
+                unless hostname.nil?
+                  host { address hostname  }
+                end
+                unless password.nil?
+                  users { 
+                    user {  
+                      user_name 'root'
+                      password password
+                    }
+                  }
+                end
+                unless ssh_authorized_keys.nil?
+                  authorized_keys {
+                    authorized_key {
+                      user { user_name 'root' }
+                      ssh_authorized_keys.each do |sshkey|
+                        key sshkey    
+                      end
+                    }
+                  }
+	        end
+                network_configuration { 
+                  unless nicname.nil?
+                    nics {
+                      nic {
+	                name_ nicname
+                        unless ip.nil? || netmask.nil? || gateway.nil?
+                          network { ip(:'address'=> ip , :'netmask'=> netmask, :'gateway'=> gateway ) }
+                          boot_protocol 'STATIC'
+                          on_boot 'true'
+                        end 
+                      }
+                    } 
+                  end
+                  dns { 
+                    unless dns.nil? 
+                      servers {
+                        dns.each do |dnsentry|
+                          host {  address dnsentry }
+                        end
+                      }
+                    end
+                    unless domain.nil? 
+                      search_domains { host {  address domain }}
+                    end
+                  }
+                }
+              regenerate_ssh_keys 'true'
+              files {
+	        unless runcmd.nil?
+                  file {
+                    name_   'ignored'
+                    content cmdlist
+                    type    'PLAINTEXT'
+                   }
+                end
+	        unless phone_home.nil?
+                  file {
+                    name_   'ignored'
+                    content phone_home
+                    type    'PLAINTEXT'
+                  }
+                end
+                unless fileslist.nil?
+                  fileslist.each do |fileentry|
+                    file {
+                      name_   fileentry['path']
+                      content fileentry['content']
+                      type    'PLAINTEXT'
+                    }
+                  end
+                end
+              }
+             }
+            }
+          }
+        }
+      end
+      Nokogiri::XML(builder.to_xml).root.to_xml
+    end
+
     private
 
     def parse_xml_attributes!(xml)
@@ -149,3 +267,4 @@ module OVIRT
 
   end
 end
+

data/lib/rbovirt.rb

@@ -149,12 +149,13 @@ module OVIRT
 
     def rest_client(suburl)
       if (URI.parse(@api_entrypoint)).scheme == 'https'
-        verify_options = {}
-        verify_options[:verify_ssl] = ca_no_verify ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
-        verify_options[:ssl_cert_store] = ca_cert_store if ca_cert_store
-        verify_options[:ssl_ca_file] = ca_cert_file if ca_cert_file
+        options = {}
+        options[:verify_ssl] = ca_no_verify ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
+        options[:ssl_cert_store] = ca_cert_store if ca_cert_store
+        options[:ssl_ca_file] = ca_cert_file if ca_cert_file
       end
-      RestClient::Resource.new(@api_entrypoint, verify_options)[suburl]
+      options[:timeout] = ENV['RBOVIRT_REST_TIMEOUT'] if ENV['RBOVIRT_REST_TIMEOUT']
+      RestClient::Resource.new(@api_entrypoint, options)[suburl]
     end
 
     def filter_header

data/rbovirt.gemspec

@@ -6,6 +6,7 @@ require 'ovirt/version'
 Gem::Specification.new do |gem|
   gem.name          = "rbovirt"
   gem.version       = OVIRT::VERSION
+  gem.license       = "MIT"
   gem.authors       = ['Amos Benari']
   gem.email         = ['abenari@redhat.com']
   gem.homepage      = "http://github.com/abenari/rbovirt"

data/spec/integration/vm_crud_spec.rb

@@ -41,6 +41,15 @@ shared_examples_for "Basic VM Life cycle" do
     @client.vm_action(@vm.id, :shutdown)
   end
 
+  it "test_should_start_with_cloudinit" do
+    hostname = "host-"+Time.now.to_i.to_s
+    user_data={ :hostname => hostname }
+    @client.vm_start_with_cloudinit(@vm.id, user_data)
+    while !@client.vm(@vm.id).running? do
+    end
+    @client.vm_action(@vm.id, :shutdown)
+  end
+
   it "test_should_set_vm_ticket" do
     @client.vm_action(@vm.id, :start)
     while !@client.vm(@vm.id).running? do

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
+require 'openssl'
+require 'rbovirt'
 require 'rspec/core'
 require 'rspec/mocks'
-require 'rbovirt'
+require 'socket'
+require 'uri'
 require 'yaml'
 
 module OVIRT::RSpec
@@ -8,13 +11,20 @@ module OVIRT::RSpec
   # get ovirt ca certificate public key
   # * url - ovirt server url
   def ca_cert(url)
-    ca_url = URI.parse(url)
-    ca_url.path = "/ca.crt"
-    http = Net::HTTP.new(ca_url.host, ca_url.port)
-    http.use_ssl = (ca_url.scheme == 'https')
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new(ca_url.path)
-    http.request(request).body
+    parsed_url = URI.parse url
+    begin
+      tcp_socket = TCPSocket.open parsed_url.host, parsed_url.port
+      ssl_socket = OpenSSL::SSL::SSLSocket.new tcp_socket
+      ssl_socket.connect
+      ssl_socket.peer_cert_chain.last.to_pem
+    ensure
+      unless ssl_socket.nil?
+        ssl_socket.close
+      end
+      unless tcp_socket.nil?
+        tcp_socket.close
+      end
+    end
   end
 
   def setup_client(options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -126,7 +126,8 @@ files:
 - spec/unit/client_spec.rb
 - spec/unit/vm_spec.rb
 homepage: http://github.com/abenari/rbovirt
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: