ovirt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWY4MTRkMzgxNGI4NGZiMDMxYjNjYTE2MTViMTE2ZGNmYzA5ODA5Yg==
-  data.tar.gz: !binary |-
-    ODBlZDRkZWVlZDE3ODAyMGU1MDg3MTIzMGQ0NTNiYTMyNDIwMmEyZA==
+SHA1:
+  metadata.gz: 10b6d10e2dbe6b5ddda171616410385918364b27
+  data.tar.gz: 834f0da7109fcca641fa29fdd0cc816f6cdd22b1
 SHA512:
-  metadata.gz: !binary |-
-    ZjJhYmU3YTQyN2JmOTA3MDAzODQ2OGEyODE5YmQ1OGE4N2UyYzcwMTgzZjkx
-    NmJmNDg5ODMzZTUzYTZlOWI4MDgyMDAxZDM5MGE5YWY2OWM5NjVmMWEwNmM4
-    M2ZlMTc4NzlkMTUzYTBlNmEzY2ViMmQxMTAxNTQ3MGU0YjA5M2Y=
-  data.tar.gz: !binary |-
-    ZTNmNjkyOTU3MWEwMDNiZDFiNjFlYzZkZWI3ZTgyY2EzOTZjMjkyYTk1YTYx
-    ZTcxMmI1M2NiY2I2OGJjNzQyNzUwMmI5OTFiNWJjZjFlY2Q2MjVmYmEyNDgz
-    MGU0NWRmZDBiNzUyYTdmNWU3MDYwMGJlYTQ1OTFjNWY1ODc5ZmM=
+  metadata.gz: b39909442e767c345cacb67097dc90bb52e93da03100357194f5aa61f8fbc2154b9706c6ab03dcac1322f1604b9b301afe0be40a50c8c174307f84e02129e72d
+  data.tar.gz: d7745ad9cd164aac4f8997a665a8ad273998691377e96721b1d4b5ab1d3448d4b204a2cfc64a41945157ffc43d262d9ac44ebab1a1a9e9ab68e4384d8a2f07f7

data/lib/ovirt/service.rb

@@ -250,7 +250,7 @@ module Ovirt
 
     def resource_options
       headers = merge_headers({ 'Prefer' => 'persistent-auth' })
-      options = { :ssl_version => :SSLv3 }
+      options = { :ssl_version => 'TLSv1' }
 
       if self.session_id
         headers[:cookie]     = "#{SESSION_ID_KEY}=#{self.session_id}"

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/ovirt/vm.rb

@@ -180,13 +180,23 @@ module Ovirt
     # types:: A payload type or Array of payload types to detach.
     #         Acceptable types are floppy or cdrom.
     def detach_payload(types)
+      send("detach_payload_#{payload_version}".to_sym, Array(types))
+    end
+
+    def detach_payload_3_0(types)
       # HACK: The removal of payloads is not supported until possibly RHEVM 3.1.1
       #       https://bugzilla.redhat.com/show_bug.cgi?id=882649
       #       For now, just set the payload to blank content.
-      payload = Array(types).each_with_object({}) { |t, h| h[t] = {} }
+      payload = types.each_with_object({}) { |t, h| h[t] = {} }
       attach_payload(payload)
     end
 
+    def detach_payload_3_3(types)
+      update! do |xml|
+        xml.payloads
+      end
+    end
+
     # Attaches the +files+ as a floppy drive payload.
     #
     # files:: Hash of file_name => content that will be attached as a floppy

data/spec/vm_spec.rb

@@ -186,4 +186,76 @@ EOX
       expect { @vm.stop }.to raise_error Ovirt::VmIsNotRunning
     end
   end
+
+  context "payloads" do
+    skip "attach" do
+    end
+
+    context "detach floppy" do
+      it "Ovirt 3.0 should set empty payload" do
+        expected_data = <<-EOX.chomp
+<vm>
+  <payloads>
+    <payload type="floppy"/>
+  </payloads>
+</vm>
+EOX
+        return_data = <<-EOX.chomp
+<vm href="/api/vms/128f9ffd-b82c-41e4-8c00-9742ed173bac" id="128f9ffd-b82c-41e4-8c00-9742ed173bac">
+  <name>bd-skeletal-clone-from-template</name>
+  <cpu>
+    <topology sockets="1" cores="1"/>
+  </cpu>
+  <os type="rhel_6x64">
+    <boot dev="hd"/>
+  </os>
+  <payloads>
+    <payload type="floppy"/>
+  </payloads>
+  <placement_policy>
+    <host id="a3abe9ed-fa52-4a7f-8a9b-1eebc782781f"/>
+    <affinity>migratable</affinity>
+  </placement_policy>
+  <memory_policy>
+    <guaranteed>1073741824</guaranteed>
+    <ballooning>true</ballooning>
+  </memory_policy>
+</vm>
+EOX
+        @service.should_receive(:version).twice.and_return(:major=>"3", :minor=>"0", :build=>"0", :revision=>"0")
+        @service.should_receive(:resource_put).once.with(@vm.attributes[:href], expected_data).and_return(return_data)
+        @vm.detach_floppy
+      end
+
+      it "Ovirt 3.3 should remove payload" do
+        expected_data = <<-EOX.chomp
+<vm>
+  <payloads/>
+</vm>
+EOX
+        return_data = <<-EOX.chomp
+<vm href="/api/vms/128f9ffd-b82c-41e4-8c00-9742ed173bac" id="128f9ffd-b82c-41e4-8c00-9742ed173bac">
+  <name>bd-skeletal-clone-from-template</name>
+  <cpu>
+    <topology sockets="1" cores="1"/>
+  </cpu>
+  <os type="rhel_6x64">
+    <boot dev="hd"/>
+  </os>
+  <placement_policy>
+    <host id="a3abe9ed-fa52-4a7f-8a9b-1eebc782781f"/>
+    <affinity>migratable</affinity>
+  </placement_policy>
+  <memory_policy>
+    <guaranteed>1073741824</guaranteed>
+    <ballooning>true</ballooning>
+  </memory_policy>
+</vm>
+EOX
+        @service.should_receive(:version).and_return(:major=>"3", :minor=>"3", :build=>"0", :revision=>"0")
+        @service.should_receive(:resource_put).once.with(@vm.attributes[:href], expected_data).and_return(return_data)
+        @vm.detach_floppy
+      end
+    end
+  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Frey
 - Brandon Dunne
+- Keenan Brock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -29,14 +30,14 @@ dependencies:
   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'
 - !ruby/object:Gem::Dependency
@@ -57,70 +58,70 @@ dependencies:
   name: coveralls
   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: activesupport
   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: more_core_extensions
   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: 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: parallel
   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
@@ -129,28 +130,24 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42Ljc=
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42Ljc=
+        version: 1.7.2
 description: Ovirt provides a simple Object Oriented interface to the REST API of
   oVirt and RHEV-M servers.
 email:
 - jfrey@redhat.com
 - bdunne@redhat.com
+- keenan@thebrocks.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .rspec
-- LICENSE.txt
-- README.md
 - lib/ovirt.rb
 - lib/ovirt/api.rb
 - lib/ovirt/base.rb
@@ -183,12 +180,15 @@ files:
 - lib/ovirt/version.rb
 - lib/ovirt/vm.rb
 - lib/ovirt/vmpool.rb
+- README.md
+- LICENSE.txt
 - spec/base_spec.rb
 - spec/event_spec.rb
 - spec/service_spec.rb
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/vm_spec.rb
+- .rspec
 homepage: http://github.com/ManageIQ/ovirt
 licenses:
 - Apache
@@ -199,17 +199,17 @@ 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.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ovirt provides a simple Object Oriented interface to the REST API of oVirt