rbovirt 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/ovirt/cluster.rb

@@ -13,9 +13,7 @@ module OVIRT
     def parse_xml_attributes!(xml)
       @description = ((xml/'description').first.text rescue nil)
       @version = parse_version(xml)
-      unless (xml/'data_center').empty?
-        @datacenter = Link::new(@client, (xml/'data_center').first[:id], (xml/'data_center').first[:href])
-      end
+      @datacenter = Link::new(@client, (xml/'data_center').first[:id], (xml/'data_center').first[:href]) unless (xml/'data_center').empty?
     end
 
   end

data/lib/ovirt/network.rb

@@ -0,0 +1,21 @@
+module OVIRT
+ class Network < BaseObject
+    attr_reader :description, :datacenter, :cluster, :stp
+
+    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)
+      @description = ((xml/'description').first.text rescue nil)
+      @stp = ((xml/'stp').first.text rescue false)
+      @datacenter = Link::new(@client, (xml/'data_center').first[:id], (xml/'data_center').first[:href]) unless (xml/'data_center').empty?
+      @cluster = Link::new(@client, (xml/'cluster').first[:id], (xml/'cluster').first[:href]) unless (xml/'cluster').empty?
+    end
+
+  end
+end

data/lib/ovirt/template.rb

@@ -32,7 +32,7 @@ module OVIRT
         :type => (xml/'display/type').first.text,
         :monitors => (xml/'display/monitors').first.text
       }
-      @cores = ((xml/'cpu/topology').first[:cores] rescue nil)
+      @cores = ((xml/'cpu/topology').first[:cores].to_i * (xml/'cpu/topology').first[:sockets].to_i rescue nil)
       @storage = ((xml/'disks/disk/size').first.text rescue nil)
       @creation_time = (xml/'creation_time').text
       @os = {

data/lib/ovirt/vm.rb

@@ -21,8 +21,8 @@ module OVIRT
       @interfaces ||= @client.interfaces(id)
     end
 
-    def disks
-      @disks ||= @client.disks(id)
+    def volumes
+      @volumes ||= @client.disks(id)
     end
 
     def self.to_xml( opts={})
@@ -42,9 +42,9 @@ module OVIRT
             cluster_{ name_(opts[:cluster_name])}
           end
           type_ opts[:hwp_id] || 'Server'
-          memory opts[:hwp_memory] ? (opts[:hwp_memory].to_i*1024*1024).to_s : (512*1024*1024).to_s
+          memory opts[:memory] ? opts[:memory].to_s : (512*1024*1024).to_s
           cpu {
-            topology( :cores => (opts[:hwp_cpu] || '1'), :sockets => '1' )
+            topology( :cores => (opts[:cores] || '1'), :sockets => '1' )
           }
           os{
             boot(:dev=>'network')
@@ -82,7 +82,7 @@ module OVIRT
         :port => ((xml/'display/port').first.text rescue nil),
         :monitors => (xml/'display/monitors').first.text
       }
-      @cores = ((xml/'cpu/topology').first[:cores] rescue nil)
+      @cores = ((xml/'cpu/topology').first[:cores].to_i * (xml/'cpu/topology').first[:sockets].to_i rescue nil)
       @storage = ((xml/'disks/disk/size').first.text rescue nil)
       @creation_time = (xml/'creation_time').text
       @ip = ((xml/'guest_info/ip').first[:address] rescue nil)

data/lib/rbovirt.rb

@@ -7,6 +7,7 @@ require "ovirt/template"
 require "ovirt/vm"
 require "ovirt/volume"
 require "ovirt/interface"
+require "ovirt/network"
 
 require "nokogiri"
 require "rest_client"
@@ -144,7 +145,14 @@ module OVIRT
     def cluster(cluster_id)
       headers = {:accept => "application/xml; detail=datacenters"}
       cluster_xml = http_get("/clusters/%s" % cluster_id, headers)
-      OVIRT::Cluster.new(self, cluster_xml)
+      OVIRT::Cluster.new(self, cluster_xml.root)
+    end
+
+    def networks(opts)
+      cluster_id = opts[:cluster_id] || current_cluster.id
+      http_get("/clusters/%s/networks" % cluster_id, http_headers).xpath('/networks/network').collect do |cl|
+        OVIRT::Network.new(self, cl)
+      end
     end
 
     def current_datacenter

data/rbovirt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbovirt}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Benari"]
-  s.date = %q{2012-01-30}
+  s.date = %q{2012-02-01}
   s.description = %q{A Ruby client for oVirt REST API}
   s.email = %q{abenari@redhat.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/ovirt/datacenter.rb",
     "lib/ovirt/host.rb",
     "lib/ovirt/interface.rb",
+    "lib/ovirt/network.rb",
     "lib/ovirt/storage_domain.rb",
     "lib/ovirt/template.rb",
     "lib/ovirt/vm.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbovirt
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Amos Benari
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 +02:00
+date: 2012-02-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,6 +142,7 @@ files:
 - lib/ovirt/datacenter.rb
 - lib/ovirt/host.rb
 - lib/ovirt/interface.rb
+- lib/ovirt/network.rb
 - lib/ovirt/storage_domain.rb
 - lib/ovirt/template.rb
 - lib/ovirt/vm.rb