rbovirt 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bc880c41ea4532df8b68011f5d9f68b8118b403
-  data.tar.gz: 58445a4c11abd89d373b40448b327167a6f95915
+  metadata.gz: 9848bea2f871ad9d719fe767623cb5a90693e1a6
+  data.tar.gz: bb231cd4f28257c2bae9d76cc721be3d39e5c705
 SHA512:
-  metadata.gz: 84fb76a2e15e4c715390fb51c8485099d2fda933e219cc687b4dc23948335a998cd9140b57c3faa8cd4d82629851457b83fdd6df5bbc2dab3ed4635c20ea263d
-  data.tar.gz: bbd004504dba3fd58ef03a51b310970ee1b3d069daa753e4085c46e02c96deb0863893caaf5e36a24cb35b4acf0ac6a937c8e7f4c55d12b4d7358a3ca54784f9
+  metadata.gz: 0c08516ba05303b32daeee352a0ca5230447b820bbf4e781248af4bfbc01b8dfd3cf6d9c0385fee0cfa7ad2e0a3359a377be5793ca87ab82c1d505cd457ca15a
+  data.tar.gz: 00b59b5b92ebdb2f889b0dc7b6e0b0745ba0dc143cfabd7ea986e4f59c747981975a316048ab88664d14d9210e4ed2578f9f83f35a91bf1aa879381917e3e0c7

data/CHANGES.rdoc

@@ -0,0 +1,18 @@
+== Changes
+
+This document describes the relevant changes beween releases of the
+_rbovirt_ project.
+
+Note that this list of changes was added with the 0.0.30 release,
+previous releases aren't described here.
+
+== 0.0.30 / 2014-11-25
+
+New features:
+
+* Added support for updating disks.
+* Added support for the data center +local+ attribute.
+
+Bug fixes:
+
+* Parse correctly the +status+ element.

data/README.rdoc

@@ -16,14 +16,18 @@ A Ruby client for oVirt.
 
 * Copy the file spec/endpoint.yml.example to spec/endpoint.yml
 * Edit the endpoint properties (user, password and host name)
-* `wget --no-check-certificate -O spec/ca_cert.pem https://host/ca.crt`
 * From command line run => rake spec
 
-RHEV/oVirt can be installed with all-in-one setup, but host certificate must be self-signed otherwise one test will fail.
+RHEV/oVirt can be installed with all-in-one setup, but host certificate must be
+self-signed otherwise one test will fail.
+
+Also note that oVirt must be configured with correct certificate (hostname must
+match, must be valid and oVirt must return correct CA under /ca.crt URL).
 
 == Logging
 
-If you want to see API requests and responses, use the following environment variables:
+If you want to see API requests and responses, use the following environment
+variables:
 
     RESTCLIENT_LOG=stdout RBOVIRT_LOG_RESPONSE=1 rake spec
 

data/lib/client/vm_api.rb

@@ -73,14 +73,25 @@ module OVIRT
 
     def add_volume(vm_id, opts={})
       search = opts[:search] || ("datacenter=%s" % current_datacenter.name)
-      storage_domain_id = opts[:storage_domain] || storagedomains(:role => 'data', :search => search).first.id
-      http_post("/vms/%s/disks" % vm_id, OVIRT::Volume.to_xml(storage_domain_id, opts))
+      opts[:storage_domain_id] = opts[:storage_domain] || storagedomains(:role => 'data', :search => search).first.id
+      # If no size is given, default to a volume size of 8GB
+      opts[:size] = 8 * 1024 * 1024 * 1024 unless opts[:size]
+      opts[:type] = 'data' unless opts[:type]
+      opts[:bootable] = 'true' unless opts[:bootable]
+      opts[:interface] = 'virtio' unless opts[:interface]
+      opts[:format] = 'cow' unless opts[:format]
+      opts[:sparse] = 'true' unless opts[:sparse]
+      http_post("/vms/%s/disks" % vm_id, OVIRT::Volume.to_xml(opts))
     end
 
     def destroy_volume(vm_id, vol_id)
       http_delete("/vms/%s/disks/%s" % [vm_id, vol_id])
     end
 
+    def update_volume(vm_id, vol_id, opts={})
+      http_put("/vms/%s/disks/%s" % [vm_id, vol_id], OVIRT::Volume.to_xml(opts))
+    end
+
     def vm_action(id, action, opts={})
       xml_response = http_post("/vms/%s/%s" % [id, action],'<action/>', opts)
       return (xml_response/'action/status').first.text.strip.upcase=="COMPLETE"

data/lib/ovirt/base_object.rb

@@ -12,5 +12,11 @@ module OVIRT
     def parse_version xml
       (xml/'version').first[:major] +"."+ (xml/'version').first[:minor]
     end
+
+    def parse_bool text
+      return true if text =~ /^true$/i
+      return false if text =~ /^false$/i
+      raise ArgumentError.new %Q[The string "#{text}" isn't a valid boolean, it should be "true" or "false"]
+    end
   end
-end
+end

data/lib/ovirt/datacenter.rb

@@ -1,7 +1,7 @@
 
 module OVIRT
   class DataCenter < BaseObject
-    attr_reader :description, :status, :storage_type, :storage_format, :supported_versions, :version
+    attr_reader :description, :status, :local, :storage_type, :storage_format, :supported_versions, :version
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
@@ -14,6 +14,7 @@ module OVIRT
     def parse_xml_attributes!(xml)
       @description = (xml/'description').first.text rescue nil
       @status = (xml/'status').first.text.strip
+      @local = parse_bool((xml/'local').first.text) rescue nil
       @storage_type = (xml/'storage_type').first.text rescue nil
       @storage_format = (xml/'storage_format').first.text rescue nil
       @supported_versions = (xml/'supported_versions').collect { |v|

data/lib/ovirt/version.rb

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

data/lib/ovirt/volume.rb

@@ -9,18 +9,32 @@ module OVIRT
       self
     end
 
-    def self.to_xml(storage_domain_id,opts={})
+    def self.to_xml(opts={})
        builder = Nokogiri::XML::Builder.new do
         disk_{
-          storage_domains_{
-            storage_domain_(:id => storage_domain_id)
-          }
-          size_(opts[:size] || 8589934592)
-          type_(opts[:type] || 'data')
-          bootable_(opts[:bootable] || 'true')
-          interface_(opts[:interface] || 'virtio')
-          format_(opts[:format] || 'cow')
-          sparse_(opts[:sparse] || 'true')
+          if opts[:storage_domain_id]
+            storage_domains_{
+              storage_domain_(:id => opts[:storage_domain_id])
+            }
+          end
+          if opts[:size]
+            size_(opts[:size])
+          end
+          if opts[:type]
+            type_(opts[:type])
+          end
+          if opts[:bootable]
+            bootable_(opts[:bootable])
+          end
+          if opts[:interface]
+            interface_(opts[:interface])
+          end
+          if opts[:format]
+            format_(opts[:format])
+          end
+          if opts[:sparse]
+            sparse_(opts[:sparse])
+          end
           if opts[:quota]
             quota_( :id => opts[:quota])
           end
@@ -37,8 +51,7 @@ module OVIRT
      @interface = (xml/'interface').first.text
      @format = ((xml/'format').first.text rescue nil)
      @sparse = ((xml/'sparse').first.text rescue nil)
-     @status = ((xml/'status').first.text rescue nil)
-     @status ||= ((xml/'status/state').first.text rescue nil)
+     @status = ((xml/'status/state').first.text rescue nil)
      @vm = Link::new(@client, (xml/'vm').first[:id], (xml/'vm').first[:href]) rescue nil
      @quota = ((xml/'quota').first[:id] rescue nil)
     end

data/rbovirt.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake')
 
   gem.rdoc_options << '--title' << gem.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
-  gem.extra_rdoc_files = ['README.rdoc']
-end
+  gem.extra_rdoc_files = ['README.rdoc', 'CHANGES.rdoc']
+end

data/spec/integration/vm_crud_spec.rb

@@ -66,6 +66,13 @@ shared_examples_for "Basic VM Life cycle" do
     vm.class.to_s.should eql("OVIRT::VM")
     @client.destroy_vm(vm.id)
   end
+
+  it "test_should_update_volume" do
+    @client.update_volume(@vm.id, @vm.volumes.first.id, :size => 10737418240)
+    while @client.vm(@vm.id).volumes.first.status != 'ok' do
+    end
+    @client.vm(@vm.id).volumes.first.size.should eql("10737418240")
+  end
 end
 
 shared_examples_for "VM Life cycle without template" do

data/spec/spec_helper.rb

@@ -19,9 +19,9 @@ module OVIRT::RSpec
 
   def setup_client(options = {})
     user, password, url, datacenter = endpoint
-    opts = {
-      :ca_cert_file => "#{File.dirname(__FILE__)}/ca_cert.pem"
-    }
+    cert = ca_cert(url)
+    store = OpenSSL::X509::Store.new().add_cert(OpenSSL::X509::Certificate.new(cert))
+    opts = { :ca_cert_store => store }
     @client = ::OVIRT::Client.new(user, password, url, opts)
     datacenter_id = @client.datacenters.find{|x| x.name == datacenter}.id rescue raise("Cannot find datacenter #{datacenter}")
     opts.merge!(:datacenter_id => datacenter_id)

data/spec/unit/vm_spec.rb

@@ -171,7 +171,7 @@ END_HEREDOC
 
     before(:each) do
       @mock_client = double("mock_client")
-      allow(@mock_client).to receive(:vm_interfaces) do
+      @mock_client.stub(:vm_interfaces) do
         xml = <<END_HEREDOC
 <nic href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012" id="12345678-1234-1234-1234-123456789012">
 <actions>
@@ -190,7 +190,7 @@ END_HEREDOC
 END_HEREDOC
         [OVIRT::Interface::new(nil, Nokogiri::XML(xml).xpath('/').first)]
       end
-      allow(@mock_client).to receive(:vm_volumes) do
+      @mock_client.stub(:vm_volumes) do
         xml = <<END_HEREDOC
 <disk href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012" id="12345678-1234-1234-1234-123456789012">
 <actions>

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 description: |2
@@ -88,9 +88,11 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- CHANGES.rdoc
 files:
-- ".document"
-- ".gitignore"
+- .document
+- .gitignore
+- CHANGES.rdoc
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -128,27 +130,27 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--title"
+- --title
 - rbovirt
-- "--main"
+- --main
 - README.rdoc
-- "--line-numbers"
-- "--inline-source"
+- --line-numbers
+- --inline-source
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A Ruby client for oVirt REST API