rbovirt 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/client/cluster_api.rb

@@ -1,5 +1,10 @@
 module OVIRT
   class Client
+    def cluster_version(cluster_id)
+      c = cluster(cluster_id)
+      return c.version.split('.')[0].to_i, c.version.split('.')[1].to_i
+    end
+
     def cluster_version?(cluster_id, major)
       c = cluster(cluster_id)
       c.version.split('.')[0] == major

data/lib/client/vm_api.rb

@@ -14,6 +14,22 @@ module OVIRT
     end
 
     def create_vm(opts)
+      cluster_major_ver, cluster_minor_ver = cluster_version(self.cluster_id)
+
+      if opts[:user_data] and not opts[:user_data].empty?
+        if api_version?('3') and cluster_major_ver >= 3
+          if cluster_minor_ver >= 1
+            opts[:user_data_method] = :payload
+          elsif floppy_hook?
+            opts[:user_data_method] = :custom_property
+          else
+            raise "Required VDSM hook 'floppyinject' not supported by RHEV-M"
+          end
+        else
+          raise BackendVersionUnsupportedException.new
+        end
+      end
+
       opts[:cluster_name] ||= clusters.first.name
       OVIRT::VM::new(self, http_post("/vms",OVIRT::VM.to_xml(opts)).root)
     end
@@ -75,4 +91,4 @@ module OVIRT
       OVIRT::VM::new(self, result_xml.root)
     end
   end
-end
+end

data/lib/ovirt/template.rb

@@ -1,6 +1,6 @@
 module OVIRT
   class Template < BaseObject
-    attr_reader :description, :status, :cluster
+    attr_reader :description, :status, :cluster, :creation_time, :os, :storage, :display, :profile, :memory
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
@@ -47,4 +47,4 @@ module OVIRT
       }
     end
   end
-end
+end

data/lib/ovirt/vm.rb

@@ -49,10 +49,14 @@ module OVIRT
             cluster_{ name_(opts[:cluster_name])}
           end
           type_ opts[:hwp_id] || 'Server'
-          memory opts[:memory] ? opts[:memory].to_s : (512*1024*1024).to_s
-          cpu {
-            topology( :cores => (opts[:cores] || '1'), :sockets => '1' )
-          }
+          if opts[:memory]
+              memory opts[:memory]
+          end
+          if opts[:cores]
+             cpu {
+               topology( :cores => (opts[:cores] || '1'), :sockets => '1' )
+             }
+          end
           os{
             boot(:dev=> opts[:boot_dev1] || 'network')
             boot(:dev=> opts[:boot_dev2] || 'hd')
@@ -65,7 +69,12 @@ module OVIRT
               :name => "floppyinject",
               :value => "#{opts[:fileinject_path] || OVIRT::FILEINJECT_PATH}:#{opts[:user_data]}",
               :regexp => "^([^:]+):(.*)$"})
-          } if(opts[:user_data] && !opts[:user_data].empty?)
+          } if(opts[:user_data_method] && opts[:user_data_method] == :custom_property)
+          payloads {
+            payload(:type => 'floppy') {
+              file(:name => "#{opts[:fileinject_path] || OVIRT::FILEINJECT_PATH}") { content(Base64::decode64(opts[:user_data])) }
+            }
+          } if(opts[:user_data_method] && opts[:user_data_method] == :payload)
         }
       end
       Nokogiri::XML(builder.to_xml).root.to_s
@@ -85,6 +94,7 @@ module OVIRT
         :type => (xml/'display/type').first.text,
         :address => ((xml/'display/address').first.text rescue nil),
         :port => ((xml/'display/port').first.text rescue nil),
+        :secure_port => ((xml/'display/secure_port').first.text rescue nil),
         :monitors => (xml/'display/monitors').first.text
       }
       @cores = ((xml/'cpu/topology').first[:cores].to_i * (xml/'cpu/topology').first[:sockets].to_i rescue nil)

data/lib/rbovirt.rb

@@ -53,6 +53,11 @@ module OVIRT
       api_version.split('.')[0] == major
     end
 
+    def floppy_hook?
+      xml = http_get("/capabilities")
+      !(xml/"version/custom_properties/custom_property[@name='floppyinject']").empty?
+    end
+
     private
     def current_datacenter
       @current_datacenter ||= self.datacenter_id ? datacenter(self.datacenter_id) : datacenters.first
@@ -146,4 +151,4 @@ module OVIRT
       object_class.new(@client, (xml.root))
     end
   end
-end
+end

data/rbovirt.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rbovirt"
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Benari"]

metadata

@@ -1,135 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbovirt
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.0.13
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 12
-  version: 0.0.12
 platform: ruby
-authors: 
+authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2012-05-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id004
-  name: bundler
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  version_requirements: *id005
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
   name: rcov
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: A Ruby client for oVirt REST API
 email: abenari@redhat.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - LICENSE.txt
@@ -159,37 +160,28 @@ files:
 - spec/spec_helper.rb
 - spec/unit/vm_spec.rb
 homepage: http://github.com/abenari/rbovirt
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby client for oVirt REST API
 test_files: []
-