rbovirt 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/client/cluster_api.rb

@@ -0,0 +1,29 @@
+module OVIRT
+  class Client
+    def cluster_version?(cluster_id, major)
+      c = cluster(cluster_id)
+      c.version.split('.')[0] == major
+    end
+
+    def clusters(opts={})
+      headers = {:accept => "application/xml; detail=datacenters"}
+      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
+      http_get("/clusters?search=%s" % CGI.escape(search), headers).xpath('/clusters/cluster').collect do |cl|
+        OVIRT::Cluster.new(self, cl)
+      end
+    end
+
+    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.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
+  end
+end

data/lib/client/datacenter_api.rb

@@ -0,0 +1,20 @@
+module OVIRT
+  class Client
+    def datacenter(datacenter_id)
+        begin
+          datacenter = http_get("/datacenters/%s" % datacenter_id)
+          OVIRT::DataCenter::new(self, datacenter.root)
+        rescue
+          handle_fault $!
+        end
+      end
+
+      def datacenters(opts={})
+        search = opts[:search] ||""
+        datacenters = http_get("/datacenters?search=%s" % CGI.escape(search))
+        datacenters.xpath('/data_centers/data_center').collect do |dc|
+          OVIRT::DataCenter::new(self, dc)
+        end
+      end
+  end
+end

data/lib/client/host_api.rb

@@ -0,0 +1,15 @@
+module OVIRT
+  class Client
+    def host(host_id, opts={})
+      xml_response = http_get("/hosts/%s" % host_id)
+      OVIRT::Host::new(self, xml_response.root)
+    end
+
+    def hosts(opts={})
+      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
+      http_get("/hosts?search=%s" % CGI.escape(search)).xpath('/hosts/host').collect do |h|
+        OVIRT::Host::new(self, h)
+      end
+    end
+  end
+end

data/lib/client/storage_domain_api.rb

@@ -0,0 +1,15 @@
+module OVIRT
+  class Client
+    def storagedomain(sd_id)
+      sd = http_get("/storagedomains/%s" % sd_id)
+      OVIRT::StorageDomain::new(self, sd.root)
+    end
+
+    def storagedomains(opts={})
+      search= opts[:search] ||''
+      http_get("/storagedomains?search=%s" % CGI.escape(search)).xpath('/storage_domains/storage_domain').collect do |sd|
+        OVIRT::StorageDomain::new(self, sd)
+      end
+    end
+  end
+end

data/lib/client/template_api.rb

@@ -0,0 +1,37 @@
+module OVIRT
+  class Client
+    def templates(opts={})
+      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
+      http_get("/templates?search=%s" % CGI.escape(search)).xpath('/templates/template').collect do |t|
+        OVIRT::Template::new(self, t)
+      end.compact
+    end
+
+    def template(template_id, opts={})
+      results = http_get("/templates/%s" % template_id)
+      template = OVIRT::Template::new(self, results.root)
+      template
+    end
+
+    def create_template(opts)
+      template = http_post("/templates", Template.to_xml(opts))
+      OVIRT::Template::new(self, template.root)
+    end
+
+    def destroy_template(id)
+      http_delete("/templates/%s" % id)
+    end
+
+    def template_interfaces template_id
+      http_get("/templates/%s/nics" % template_id, http_headers).xpath('/nics/nic').collect do |nic|
+        OVIRT::Interface::new(self, nic)
+      end
+    end
+
+    def template_volumes template_id
+      http_get("/templates/%s/disks" % template_id, http_headers).xpath('/disks/disk').collect do |disk|
+        OVIRT::Volume::new(self, disk)
+      end
+    end
+  end
+end

data/lib/client/vm_api.rb

@@ -0,0 +1,65 @@
+module OVIRT
+  class Client
+    def vm(vm_id, opts={})
+      headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
+      OVIRT::VM::new(self,  http_get("/vms/%s" % vm_id, headers).root)
+    end
+
+    def vms(opts={})
+      headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
+      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
+      http_get("/vms?search=%s" % CGI.escape(search), headers).xpath('/vms/vm').collect do |vm|
+        OVIRT::VM::new(self, vm)
+      end
+    end
+
+    def create_vm(opts)
+      opts[:cluster_name] ||= clusters.first.name
+      OVIRT::VM::new(self, http_post("/vms",OVIRT::VM.to_xml(opts)).root)
+    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)
+      end
+    end
+
+    def destroy_interface(vm_id, interface_id)
+      http_delete("/vms/%s/nics/%s" % [vm_id, interface_id])
+    end
+
+    def add_interface(vm_id, opts={})
+      http_post("/vms/%s/nics" % vm_id, OVIRT::Interface.to_xml( opts))
+    end
+
+    def update_interface(vm_id, interface_id, opts={})
+      http_put("/vms/%s/nics/%s" % [vm_id, interface_id], OVIRT::Interface.to_xml( opts))
+    end
+
+    def vm_volumes vm_id
+      http_get("/vms/%s/disks" % vm_id, http_headers).xpath('/disks/disk').collect do |disk|
+        OVIRT::Volume::new(self, disk)
+      end
+    end
+
+    def add_volume(vm_id, opts={})
+      storage_domain_id = opts[:storage_domain] || storagedomains.first.id
+      http_post("/vms/%s/disks" % vm_id, OVIRT::Volume.to_xml(storage_domain_id, 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"
+    end
+
+    def destroy_vm(id)
+      http_delete("/vms/%s" % id)
+    end
+
+    def update_vm(opts)
+      opts[:cluster_name] ||= clusters.first.name
+      result_xml = http_put("/vms/%s" % opts[:id], OVIRT::VM.to_xml(opts))
+      OVIRT::VM::new(self, result_xml.root)
+    end
+  end
+end

data/lib/ovirt/interface.rb

@@ -3,30 +3,42 @@ module OVIRT
   class Interface < BaseObject
     attr_reader :name, :mac, :interface, :network, :vm
 
-    def initialize(client, xml)
-      super(client, xml[:id], xml[:href], (xml/'name').first.text)
-      parse_xml_attributes!(xml)
+    def initialize(client=nil, xml={})
+      if xml.is_a?(Hash)
+        super(client, xml[:id], xml[:href], xml[:name])
+        @network = xml[:network]
+        @persisted = xml[:persisted]
+      else
+        super(client, xml[:id], xml[:href], (xml/'name').first.text)
+        parse_xml_attributes!(xml)
+      end
       self
     end
 
     def self.to_xml(opts={})
       builder = Nokogiri::XML::Builder.new do
         nic{
-          name_(opts[:name] || 'eth0')
-          network{
-            name_(opts[:network] || 'ovirtmgmt')
-          }
+          name_(opts[:name] || "nic-#{Time.now.to_i}")
+          if opts[:network]
+            network :id => opts[:network]
+          else
+            network{ name_(opts[:network_name] || 'ovirtmgmt') }
+          end
         }
       end
       Nokogiri::XML(builder.to_xml).root.to_s
     end
 
+    def persisted?
+      @persisted || !!id
+    end
+
     def parse_xml_attributes!(xml)
-     @name = (xml/'name').first.text
-     @mac = (xml/'mac').first[:address]
+     @mac = (xml/'mac').first[:address] rescue nil #template interfaces doesn't have MAC address.
      @interface = (xml/'interface').first.text
      @network = (xml/'network').first[:id]
-     @vm = Link::new(@client, (xml/'vm').first[:id], (xml/'vm').first[:href])
+     @vm = Link::new(@client, (xml/'vm').first[:id], (xml/'vm').first[:href]) if (xml/'vm') rescue nil
+     @template = Link::new(@client, (xml/'template').first[:id], (xml/'template').first[:href]) rescue nil
     end
 
   end

data/lib/ovirt/template.rb

@@ -19,10 +19,16 @@ module OVIRT
       Nokogiri::XML(builder.to_xml).root.to_s
     end
 
-    private
+    def interfaces
+      @interfaces ||= @client.template_interfaces(id)
+    end
 
-    def parse_xml_attributes!(xml)
+    def volumes
+      @volumes ||= @client.send(:volumes, "/templates/%s/disks" % id)
+    end
 
+    private
+    def parse_xml_attributes!(xml)
       @description = ((xml/'description').first.text rescue '')
       @status = ((xml/'status').first.text rescue 'unknown')
       @memory = (xml/'memory').first.text

data/lib/ovirt/vm.rb

@@ -18,11 +18,11 @@ module OVIRT
     end
 
     def interfaces
-      @interfaces ||= @client.interfaces(id)
+      @interfaces ||= @client.vm_interfaces(id)
     end
 
     def volumes
-      @volumes ||= @client.disks(id)
+      @volumes ||= @client.vm_volumes(id)
     end
 
     def self.to_xml( opts={})

data/lib/rbovirt.rb

@@ -9,6 +9,13 @@ require "ovirt/volume"
 require "ovirt/interface"
 require "ovirt/network"
 
+require "client/vm_api"
+require "client/template_api"
+require "client/cluster_api"
+require "client/host_api"
+require "client/datacenter_api"
+require "client/storage_domain_api"
+
 require "nokogiri"
 require "rest_client"
 
@@ -37,44 +44,6 @@ module OVIRT
       @api_entrypoint = api_entrypoint
     end
 
-    def vm(vm_id, opts={})
-      headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
-      vm = OVIRT::VM::new(self,  http_get("/vms/%s" % vm_id, headers).root)
-      # optional eager loading
-      vm.interfaces = interfaces(vm_id) if opts[:include] && opts[:include].include?(:interfaces)
-      vm.volumes = volumes(vm_id) if opts[:include] && opts[:include].include?(:volumes)
-      vm
-    end
-
-    def interfaces vm_id
-      http_get("/vms/%s/nics" % vm_id, http_headers).xpath('/nics/nic').collect do |nic|
-        OVIRT::Interface::new(self, nic)
-      end
-    end
-
-    def volumes vm_id
-      http_get("/vms/%s/disks" % vm_id, http_headers).xpath('/disks/disk').collect do |disk|
-        OVIRT::Volume::new(self, disk)
-      end
-    end
-
-    def vms(opts={})
-      headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
-      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
-      http_get("/vms?search=%s" % CGI.escape(search), headers).xpath('/vms/vm').collect do |vm|
-        OVIRT::VM::new(self, vm)
-      end
-    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"
-    end
-
-    def destroy_vm(id)
-      http_delete("/vms/%s" % id)
-    end
-
     def api_version
       xml = http_get("/")/'/api/product_info/version'
       (xml/'version').first[:major] +"."+ (xml/'version').first[:minor]
@@ -84,83 +53,7 @@ module OVIRT
       api_version.split('.')[0] == major
     end
 
-    def cluster_version?(cluster_id, major)
-      c = cluster(cluster_id)
-      c.version.split('.')[0] == major
-    end
-
-    def create_vm(opts)
-      opts[:cluster_name] ||= clusters.first.name
-      result_xml = http_post("/vms",OVIRT::VM.to_xml(opts))
-      OVIRT::VM::new(self, result_xml.root)
-    end
-
-    def update_vm(opts)
-      opts[:cluster_name] ||= clusters.first.name
-      result_xml = http_put("/vms/%s" % opts[:id], OVIRT::VM.to_xml(opts))
-      OVIRT::VM::new(self, result_xml.root)
-    end
-
-    def add_volume(vm_id, opts={})
-      storage_domain_id = opts[:storage_domain] || storagedomains.first.id
-      result_xml = http_post("/vms/%s/disks" % vm_id, OVIRT::Volume.to_xml(storage_domain_id, opts))
-    end
-
-
-    def add_interface(vm_id, opts={})
-      http_post("/vms/%s/nics" % vm_id, OVIRT::Interface.to_xml( opts))
-    end
-
-    def create_template(opts)
-      template = http_post("/templates", Template.to_xml(opts))
-      OVIRT::Template::new(self, template.root)
-    end
-
-    def destroy_template(id)
-      http_delete("/templates/%s" % id)
-    end
-
-    def templates(opts={})
-      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
-      http_get("/templates?search=%s" % CGI.escape(search)).xpath('/templates/template').collect do |t|
-        OVIRT::Template::new(self, t)
-      end.compact
-    end
-
-    def template(template_id)
-      template = http_get("/templates/%s" % template_id)
-      OVIRT::Template::new(self, template.root)
-    end
-
-    def datacenters(opts={})
-      search = opts[:search] ||""
-      datacenters = http_get("/datacenters?search=%s" % CGI.escape(search))
-      datacenters.xpath('/data_centers/data_center').collect do |dc|
-        OVIRT::DataCenter::new(self, dc)
-      end
-    end
-
-    def clusters(opts={})
-      headers = {:accept => "application/xml; detail=datacenters"}
-      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
-      http_get("/clusters?search=%s" % CGI.escape(search), headers).xpath('/clusters/cluster').collect do |cl|
-        OVIRT::Cluster.new(self, cl)
-      end
-    end
-
-    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.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
-
+    private
     def current_datacenter
       @current_datacenter ||= self.datacenter_id ? datacenter(self.datacenter_id) : datacenters.first
     end
@@ -169,41 +62,6 @@ module OVIRT
       @current_cluster ||= self.cluster_id ? cluster(self.cluster_id) : clusters.first
     end
 
-    def datacenter(datacenter_id)
-      begin
-        datacenter = http_get("/datacenters/%s" % datacenter_id)
-        OVIRT::DataCenter::new(self, datacenter.root)
-      rescue
-        handle_fault $!
-      end
-    end
-
-    def host(host_id, opts={})
-      xml_response = http_get("/hosts/%s" % host_id)
-      OVIRT::Host::new(self, xml_response.root)
-    end
-    
-    def hosts(opts={})
-      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
-      http_get("/hosts?search=%s" % CGI.escape(search)).xpath('/hosts/host').collect do |h|
-        OVIRT::Host::new(self, h)
-      end
-    end
-
-    def storagedomain(sd_id)
-      sd = http_get("/storagedomains/%s" % sd_id)
-      OVIRT::StorageDomain::new(self, sd.root)
-    end
-    
-    def storagedomains(opts={})
-      search= opts[:search] ||''
-      http_get("/storagedomains?search=%s" % CGI.escape(search)).xpath('/storage_domains/storage_domain').collect do |sd|
-        OVIRT::StorageDomain::new(self, sd)
-      end
-    end
-
-    private
-
     def http_get(suburl, headers={})
       begin
         Nokogiri::XML(RestClient::Resource.new(@api_entrypoint)[suburl].get(http_headers(headers)))
@@ -287,7 +145,5 @@ module OVIRT
       object_class = ::OVIRT.const_get(xml.root.name.camelize)
       object_class.new(@client, (xml.root))
     end
-
   end
-
 end

data/rbovirt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbovirt}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Benari"]
-  s.date = %q{2012-02-20}
+  s.date = %q{2012-03-12}
   s.description = %q{A Ruby client for oVirt REST API}
   s.email = %q{abenari@redhat.com}
   s.extra_rdoc_files = [
@@ -23,6 +23,12 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "lib/client/cluster_api.rb",
+    "lib/client/datacenter_api.rb",
+    "lib/client/host_api.rb",
+    "lib/client/storage_domain_api.rb",
+    "lib/client/template_api.rb",
+    "lib/client/vm_api.rb",
     "lib/ovirt/base_object.rb",
     "lib/ovirt/cluster.rb",
     "lib/ovirt/datacenter.rb",

data/spec/integration/api_spec.rb

@@ -16,7 +16,7 @@ describe OVIRT, "API" do
   before(:all) do
     user="admin@internal"
     password="123123"
-    hostname = "ovirt.sat.lab.tlv.redhat.com"
+    hostname = "covirt.sat.lab.tlv.redhat.com"
     port = "8080"
     url = "http://#{hostname}:#{port}/api"
     @blank_template_id = "00000000-0000-0000-0000-000000000000"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbovirt
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Amos Benari
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-20 00:00:00 +02:00
+date: 2012-03-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/client/cluster_api.rb
+- lib/client/datacenter_api.rb
+- lib/client/host_api.rb
+- lib/client/storage_domain_api.rb
+- lib/client/template_api.rb
+- lib/client/vm_api.rb
 - lib/ovirt/base_object.rb
 - lib/ovirt/cluster.rb
 - lib/ovirt/datacenter.rb