rbovirt 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7991aae185eb77ee7fbe2f7a371ec001e8467b32
-  data.tar.gz: 9b07677921a2e7acab03aebe8cbcf5a990323a5e
+  metadata.gz: 56b1a09fa531efef2e54dd5c404ba08ce97a9c74
+  data.tar.gz: fa387d78d334b399cf9ddbb22396bb332f9ddf38
 SHA512:
-  metadata.gz: f5b2f8246ad14e6bff574b11a9192fe55180fe5cea6a28377783296f6db6e9919873ff853f3a74fb2213cda72d93d3c57d21fd31621fdff2c36c0284cfb8f742
-  data.tar.gz: afbca20bf62bd4e45f45734723cbd7ef84a50f85c24ed5c2360843d547a2ef99bea3de9b9146e91bf37369a78b463e55c090e2a2569463f722c53e765984ccd9
+  metadata.gz: 0e18435aa8392a306e9fab8e37896c6d1f352ec29997443e1ae5bdef29bb919c1fc2921687a718bf9527b0d3e99590f83c1f7a49363393b7c9d649e6b0de92b3
+  data.tar.gz: 5ca4da6f911d4eddb41b1f49343989abb0338c85cc77bcb08ed5b41465e158e8a7615fff99bd8277f785f35b8d745943fe67fd21f60cbcb823e8b530639d0ce5

data/lib/client/disk_api.rb

@@ -0,0 +1,15 @@
+module OVIRT
+  class Client
+    def disks(opts={})
+      path = "/disks" + search_url(opts)
+      http_get(path).xpath('/disks/disk').collect do |d|
+        OVIRT::Volume.new(self, d)
+      end
+    end
+
+    def disk(disk_id)
+      disk_xml = http_get("/disks/%s" % disk_id)
+      OVIRT::Volume.new(self, disk_xml.root)
+    end
+  end
+end

data/lib/client/vm_api.rb

@@ -30,7 +30,6 @@ module OVIRT
           raise BackendVersionUnsupportedException.new
         end
       end
-
       opts[:cluster_name] ||= clusters.first.name unless opts[:cluster]
       OVIRT::VM::new(self, http_post("/vms",OVIRT::VM.to_xml(opts)).root)
     end
@@ -92,6 +91,29 @@ module OVIRT
       http_put("/vms/%s/disks/%s" % [vm_id, vol_id], OVIRT::Volume.to_xml(opts))
     end
 
+    def volume_active?(vm_id, vol_id)
+      http_response = http_get("/vms/%s/disks/%s" % [vm_id, vol_id, http_headers])
+      http_response.xpath("/disk/active").first.text.upcase == "TRUE"
+    end
+
+    def activate_volume(vm_id, vol_id)
+      http_post("/vms/%s/disks/%s/activate" % [vm_id, vol_id], '<action/>') unless volume_active?(vm_id, vol_id)
+    end
+
+    def deactivate_volume(vm_id, vol_id)
+      http_post("/vms/%s/disks/%s/deactivate" % [vm_id, vol_id], '<action/>') if volume_active?(vm_id, vol_id)
+    end
+
+    def attach_volume(vm_id, vol_id, activate=true)
+      http_post("/vms/%s/disks" % vm_id, "<disk id='%s'/>" % vol_id)
+      activate_volume(vm_id, vol_id) if activate
+    end
+
+    def detach_volume(vm_id, vol_id)
+      deactivate_volume(vm_id, vol_id)
+      http_delete("/vms/%s/disks/%s" % [vm_id, vol_id], '<action><detach>true</detach></action>')
+    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/version.rb

@@ -1,3 +1,3 @@
 module OVIRT
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

data/lib/rbovirt.rb

@@ -19,10 +19,12 @@ require "client/host_api"
 require "client/datacenter_api"
 require "client/storage_domain_api"
 require "client/quota_api"
+require "client/disk_api"
 
 require "nokogiri"
 require "rest_client"
 require "restclient_ext/request"
+require "restclient_ext/resource"
 
 module OVIRT
 
@@ -131,10 +133,11 @@ module OVIRT
       end
     end
 
-    def http_delete(suburl)
+    def http_delete(suburl, body=nil, headers={})
       begin
-        headers = {:accept => 'application/xml'}.merge(auth_header).merge(filter_header)
-        res = rest_client(suburl).delete(headers)
+        headers = body ? http_headers(headers) :
+          {:accept => 'application/xml'}.merge(auth_header).merge(filter_header)
+        res = rest_client(suburl).delete(body, headers)
         puts "#{res}\n" if ENV['RBOVIRT_LOG_RESPONSE']
         Nokogiri::XML(res)
       rescue

data/lib/restclient_ext/resource.rb

@@ -0,0 +1,12 @@
+module RestClient
+  class Resource
+    def delete(payload, additional_headers={}, &block)
+      headers = (options[:headers] || {}).merge(additional_headers)
+      Request.execute(options.merge(
+        :method => :delete,
+        :url => url,
+        :payload => payload,
+        :headers => headers), &(block || @block))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -99,6 +99,7 @@ files:
 - Rakefile
 - lib/client/cluster_api.rb
 - lib/client/datacenter_api.rb
+- lib/client/disk_api.rb
 - lib/client/host_api.rb
 - lib/client/quota_api.rb
 - lib/client/storage_domain_api.rb
@@ -119,6 +120,7 @@ files:
 - lib/ovirt/volume.rb
 - lib/rbovirt.rb
 - lib/restclient_ext/request.rb
+- lib/restclient_ext/resource.rb
 - rbovirt.gemspec
 - spec/endpoint.yml.example
 - spec/integration/api_spec.rb