rbovirt 0.0.18 → 0.0.19

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjEzMDgxMWNjZGQzMTUwYzVmNzFhNmEzNmU3ZDNlYzZkZjJhMWQwYg==
+  data.tar.gz: !binary |-
+    YjRmNmQyNmZlYzJjODk0NjgxYTY2NGE1ZmJmMWY1MGQzNWIzNGFhOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MjM5Njc2MWI5ZGYxMzgxMGJiN2E4OGUwMGVmNDdmMzUwMWMzMGM0MmNiZThi
+    ZmM4MjVjMDBkNzgzODcxMTI1Njg1NWQ0YjIwNzdkNGE2OWM3OWNiNTgwOTAy
+    ODg2NTRmMjZlOWE4NjQ5NzEwZTYyYmM3MDRhZGRkNTNlNDExYjk=
+  data.tar.gz: !binary |-
+    NGVmOGUwNjc2YzcxODI2YTQ3MGNjOTg1YWRiNjQ2ZWQ0MjBiZGIxNDAxN2Ix
+    ZGY4ZjU2NmU2N2E0MWY1ZTYxYzYxN2Y3NWU1MWI0ODk5ZDE2ODAxYmRmOThm
+    NTcxY2Q1OGJiNjBkMjgwZDA0NDRlZjdhNjQwNDk1YTlhOGM4ZGI=

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/lib/client/quota_api.rb

@@ -0,0 +1,14 @@
+module OVIRT
+  class Client
+    def quota(quota_id, opts={})
+      q = http_get("/datacenters/%s/quotas/%s" % current_datacenter.id % quota_id)
+      OVIRT::Quota::new(self, q.root)
+    end
+
+    def quotas(opts={})
+      http_get("/datacenters/%s/quotas" % CGI.escape(current_datacenter.id)).xpath('/quotas/quota').collect do |q|
+        OVIRT::Quota::new(self, q)
+      end.compact
+    end
+  end
+end

data/lib/client/vm_api.rb

@@ -36,10 +36,15 @@ module OVIRT
     end
 
     def vm_interfaces vm_id
-      http_get("/vms/%s/nics" % vm_id, http_headers).xpath('/nics/nic').collect do |nic|
-        OVIRT::Interface::new(self, nic)
+      begin
+        http_get("/vms/%s/nics" % vm_id, http_headers).xpath('/nics/nic').collect do |nic|
+          OVIRT::Interface::new(self, nic)
+        end
+      rescue => e # Catch case were vm_id is destroyed.
+        raise e unless e.message =~ /Entity not found/
+        []
       end
-    end
+    end 
 
     def destroy_interface(vm_id, interface_id)
       http_delete("/vms/%s/nics/%s" % [vm_id, interface_id])
@@ -54,8 +59,13 @@ module OVIRT
     end
 
     def vm_volumes vm_id
-      volumes = http_get("/vms/%s/disks" % vm_id, http_headers).xpath('/disks/disk').collect do |disk|
-        OVIRT::Volume::new(self, disk)
+      begin
+        volumes = http_get("/vms/%s/disks" % vm_id, http_headers).xpath('/disks/disk').collect do |disk|
+          OVIRT::Volume::new(self, disk)
+        end
+      rescue => e # Catch case were vm_id is destroyed.
+        raise e unless e.message =~ /Entity not found/
+        volumes = []
       end
       #this is a workaround to a bug that the list is not sorted by default.
       volumes.sort{ |l, r| l.name <=> r.name }

data/lib/ovirt/quota.rb

@@ -0,0 +1,17 @@
+module OVIRT
+class Quota < BaseObject
+    attr_reader :name, :description
+
+    def initialize(client, xml)
+      super(client, xml[:id], xml[:href], (xml/'name').first.text)
+      parse_xml_attributes!(xml)
+      self
+    end
+
+    private
+    def parse_xml_attributes!(xml)
+      @desciption = ((xml/'description').first.text rescue nil)
+    end
+  end
+end
+

data/lib/ovirt/vm.rb

@@ -5,7 +5,7 @@ module OVIRT
 
   class VM < BaseObject
     attr_reader :description, :status, :memory, :profile, :display, :host, :cluster, :template
-    attr_reader :storage, :cores, :creation_time, :os, :ips, :vnc
+    attr_reader :storage, :cores, :creation_time, :os, :ips, :vnc, :quota
     attr_accessor :interfaces, :volumes
 
     def initialize(client, xml)
@@ -31,6 +31,10 @@ module OVIRT
       @interfaces ||= @client.vm_interfaces(id)
     end
 
+    def quota
+      @quota ||= @client.quota(id)
+    end
+
     def volumes
       @volumes ||= @client.vm_volumes(id)
     end
@@ -53,6 +57,9 @@ module OVIRT
           else
             template_{name_('Blank')}
           end
+          if opts[:quota]
+            quota_( :id => opts[:quota])
+          end
           if opts[:cluster]
             cluster_( :id => opts[:cluster])
           elsif opts[:cluster_name]
@@ -67,10 +74,17 @@ module OVIRT
                topology( :cores => (opts[:cores] || '1'), :sockets => '1' )
              }
           end
-          os{
-            boot(:dev=> opts[:boot_dev1] || 'network')
-            boot(:dev=> opts[:boot_dev2] || 'hd')
-          }
+          if(opts[:first_boot_dev] && opts[:first_boot_dev] == 'network')
+            os{
+              boot(:dev=> opts[:boot_dev1] || 'network')
+              boot(:dev=> opts[:boot_dev2] || 'hd')
+            }
+          else
+            os{
+              boot(:dev=> opts[:boot_dev2] || 'hd')
+              boot(:dev=> opts[:boot_dev1] || 'network')
+            }
+          end
           display_{
             type_(opts[:display])
           } if opts[:display]

data/lib/ovirt/volume.rb

@@ -1,7 +1,7 @@
 module OVIRT
 
   class Volume < BaseObject
-    attr_reader :size, :disk_type, :bootable, :interface, :format, :sparse, :status, :storage_domain, :vm
+    attr_reader :size, :disk_type, :bootable, :interface, :format, :sparse, :status, :storage_domain, :vm, :quota 
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
@@ -21,6 +21,7 @@ module OVIRT
           interface_(opts[:interface] || 'virtio')
           format_(opts[:format] || 'cow')
           sparse_(opts[:sparse] || 'true')
+	  quota_( :id => opts[:quota])
         }
       end
       Nokogiri::XML(builder.to_xml).root.to_s

data/lib/rbovirt.rb

@@ -8,6 +8,7 @@ require "ovirt/vm"
 require "ovirt/volume"
 require "ovirt/interface"
 require "ovirt/network"
+require "ovirt/quota"
 
 require "client/vm_api"
 require "client/template_api"
@@ -15,6 +16,7 @@ require "client/cluster_api"
 require "client/host_api"
 require "client/datacenter_api"
 require "client/storage_domain_api"
+require "client/quota_api"
 
 require "nokogiri"
 require "rest_client"

data/rbovirt.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rbovirt"
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Benari"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "lib/client/cluster_api.rb",
     "lib/client/datacenter_api.rb",
     "lib/client/host_api.rb",
+    "lib/client/quota_api.rb",
     "lib/client/storage_domain_api.rb",
     "lib/client/template_api.rb",
     "lib/client/vm_api.rb",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/ovirt/host.rb",
     "lib/ovirt/interface.rb",
     "lib/ovirt/network.rb",
+    "lib/ovirt/quota.rb",
     "lib/ovirt/storage_domain.rb",
     "lib/ovirt/template.rb",
     "lib/ovirt/vm.rb",

metadata

@@ -1,135 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbovirt
-version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 18
-  version: 0.0.18
+version: !ruby/object:Gem::Version
+  version: 0.0.19
 platform: ruby
-authors: 
+authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2013-02-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rest-client
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: *id004
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  requirement: *id005
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  requirement: *id007
+      - !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'
 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
@@ -139,6 +125,7 @@ files:
 - lib/client/cluster_api.rb
 - lib/client/datacenter_api.rb
 - lib/client/host_api.rb
+- lib/client/quota_api.rb
 - lib/client/storage_domain_api.rb
 - lib/client/template_api.rb
 - lib/client/vm_api.rb
@@ -148,6 +135,7 @@ files:
 - lib/ovirt/host.rb
 - lib/ovirt/interface.rb
 - lib/ovirt/network.rb
+- lib/ovirt/quota.rb
 - lib/ovirt/storage_domain.rb
 - lib/ovirt/template.rb
 - lib/ovirt/vm.rb
@@ -161,37 +149,27 @@ files:
 - spec/spec_helper.rb
 - spec/unit/vm_spec.rb
 homepage: http://github.com/abenari/rbovirt
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-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 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: A Ruby client for oVirt REST API
 test_files: []
-