ovirt 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82f2d658955528e5e35c3c3eceafa20d0757168
-  data.tar.gz: 73b2a0d08d55af23d29d8cda5efc7d2a942b78ef
+  metadata.gz: 3724f18a89bdd277ad1a7cb8da15f55ef3ae65c3
+  data.tar.gz: a99bfba080edfd9a0413ae5f03a3318df1b27475
 SHA512:
-  metadata.gz: 64f341695af226e85a2ed87d237e5481ace077c554f2180219665b523d27ed2148d21dfda1182189bb476c3f353f3f71a48a6063a361290af3852ed5e97db025
-  data.tar.gz: 7e181ac7fbdd65a6a0a123d4dabb41d55733df29b6d0850a8b3577a3e0eb04ee24e5f134e88f2d28b3b7ac8c6284698390b221f9e516e838b72fe253edb6b813
+  metadata.gz: 4fd4402bbbe81b263372b324ddbf01ce20a9966b9c14f1732a24a3c4fca74995bdb5bf1263e4bdcca9fdb44f6ed9055357aa8bb6cb762ef4ae9977475b3bec98
+  data.tar.gz: b7441b0506e7b99680bcdbf6f1fa72b3d78c91be9a1b7731b361fc8039bd5684f913f15ddf656d94c687176286abaf5a6026f16a642a3e9c6554b445f1efd569

data/lib/ovirt/base.rb

@@ -307,20 +307,21 @@ module Ovirt
       self[:href] || "#{self.class.api_endpoint}/#{self[:id]}"
     end
 
-    def update!(&block)
-      response = update(&block)
+    def update!(matrix = {}, &block)
+      response = update(matrix, &block)
 
       obj = self.class.create_from_xml(@service, response)
       replace(obj)
     end
 
-    def update
+    def update(matrix = {})
       builder = Nokogiri::XML::Builder.new do |xml|
         xml.send(self.class.namespace.last.downcase) { yield xml if block_given? }
       end
       data = builder.doc.root.to_xml
+      suffix = build_matrix_suffix(matrix)
 
-      @service.resource_put(api_endpoint, data)
+      @service.resource_put(api_endpoint + suffix, data)
     end
 
     def keys
@@ -330,5 +331,19 @@ module Ovirt
     def [](key)
       @attributes[key]
     end
+
+    private
+
+    #
+    # Builds the string to be added to the request path for the given matrix parameters. For example, if the given
+    # parameters contain the `next_run` key with the value `true` and the `max` key with the value `10`, then the
+    # resulting string will be `;next_run=true;max=10`.
+    #
+    # @param parameters [Hash] A hash containing the names and values of the matrix parameters.
+    # @return [String] The string to add to the request path.
+    #
+    def build_matrix_suffix(parameters)
+      parameters.map { |key, value| value.nil? ? '' : ";#{key}=#{value}" }.join
+    end
   end
 end

data/lib/ovirt/event.rb

@@ -306,7 +306,7 @@ module Ovirt
       529  => "USER_EJECT_VM_FLOPPY",
       530  => "HOST_MANUAL_FENCE_FAILED_CALL_FENCE_SPM",
       531  => "HOST_LOW_MEM",
-      533  => "HOST_FAILED_CONNECTION_TO_DATA_CENTER",
+      533  => "VDS_HIGH_NETWORK_USE",
       555  => "USER_MOVE_TAG",
       556  => "USER_MOVE_TAG_FAILED",
       600  => "USER_HOST_MAINTENANCE",

data/lib/ovirt/service.rb

@@ -21,6 +21,16 @@ module Ovirt
       '/ovirt-engine/api',
     ].freeze
 
+    # The list of absolute URI paths where the engine SSH public key can be available (this is used only to detect if
+    # the engine is installed or not):
+    CANDIDATE_SSH_PUBLIC_KEY_PATHS = [
+      # This will work for newer versions of the engine, including 3.5, 3.6 and 4.0:
+      '/ovirt-engine/services/pki-resource?resource=engine-certificate&format=OPENSSH-PUBKEY',
+
+      # This will work for older versions of the engine older thatn 3.5:
+      '/engine.ssh.key.txt',
+    ].freeze
+
     attr_accessor :session_id
 
     def self.name_to_class(name)
@@ -217,13 +227,19 @@ module Ovirt
 
     def self.ovirt?(options)
       options[:username] = options[:password] = "_unused"
-      !new(options).engine_ssh_public_key.to_s.blank?
-    rescue RestClient::ResourceNotFound, NoMethodError
-      false
+      !new(options).engine_ssh_public_key.blank?
     end
 
     def engine_ssh_public_key
-      RestClient::Resource.new("#{base_uri}/engine.ssh.key.txt", resource_options).get
+      CANDIDATE_SSH_PUBLIC_KEY_PATHS.each do |path|
+        begin
+          key = RestClient::Resource.new("#{base_uri}#{path}", resource_options).get
+          return key unless key.blank?
+        rescue RestClient::ResourceNotFound, NoMethodError
+          # Do nothing, just try the next candidate.
+        end
+      end
+      nil
     end
 
     def paginate_resource_get(path = nil, sort_by = :name, direction = :asc)

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.13.0"
+  VERSION = "0.14.0".freeze
 end

data/lib/ovirt/vm.rb

@@ -122,18 +122,36 @@ module Ovirt
       end
     end
 
-    def memory=(value)
-      update! do |xml|
-        xml.memory value
+    #
+    # Updates the memory of the virtual machine.
+    #
+    # @param memory [Integer] The virtual memory assigned to the virtual machine, in bytes. If it is `nil` then
+    #   the virtual memory won't be updated.
+    #
+    # @param guaranteed [Integer] The amount of physical memory reserved for the virtual machine, in bytes. If
+    #   it is `nil` then the guaranteed memory won't be updated.
+    #
+    # @param matrix [Hash] Optional matrix parameters to pass to the update operation, for example `next_run => true`.
+    #
+    def update_memory(memory, guaranteed, matrix = {})
+      update!(matrix) do |xml|
+        if memory
+          xml.memory memory
+        end
+        if guaranteed
+          xml.memory_policy do
+            xml.guaranteed guaranteed
+          end
+        end
       end
     end
 
+    def memory=(value)
+      update_memory(value, nil)
+    end
+
     def memory_reserve=(value)
-      update! do |xml|
-        xml.memory_policy do
-          xml.guaranteed(value)
-        end
-      end
+      update_memory(nil, value)
     end
 
     def cloud_init=(content)

data/spec/service_spec.rb

@@ -147,17 +147,62 @@ EOX
     end
   end
 
-  context ".ovirt?" do
-    it "false when ResourceNotFound" do
-      expect_any_instance_of(described_class).to receive(:engine_ssh_public_key).and_raise(RestClient::ResourceNotFound)
-      expect(described_class.ovirt?(:server => "127.0.0.1")).to be false
+  context "#ssh_public_key" do
+    let(:base_uri) { "https://nobody.com" }
+    let(:old_path) { "/engine.ssh.key.txt" }
+    let(:new_path) { "/ovirt-engine/services/pki-resource?resource=engine-certificate&format=OPENSSH-PUBKEY" }
+    let(:ssh_key) { "ssh-rsa " + ("A" * 372) + " ovirt-engine\n" }
+
+    before do
+      allow(service).to receive(:base_uri).and_return(base_uri)
     end
 
-    it "false when invalid content encoding returned" do
-      expect_any_instance_of(described_class).to receive(:engine_ssh_public_key).and_raise(NoMethodError)
-      expect(described_class.ovirt?(:server => "127.0.0.1")).to be false
+    it "returns valid key for engine older than 3.5" do
+      old_resource = double("RestClient::Resource")
+      expect(old_resource).to receive(:get).and_return(ssh_key)
+      expect(RestClient::Resource).to receive(:new).with("#{base_uri}#{old_path}", anything).and_return(old_resource)
+
+      new_resource = double("RestClient::Resource")
+      expect(new_resource).to receive(:get).and_raise(RestClient::ResourceNotFound)
+      expect(RestClient::Resource).to receive(:new).with("#{base_uri}#{new_path}", anything).and_return(new_resource)
+
+      expect(service.engine_ssh_public_key).to eql(ssh_key)
+    end
+
+    it "returns valid key for engine 3.5 or newer" do
+      new_resource = double("RestClient::Resource")
+      expect(new_resource).to receive(:get).and_return(ssh_key)
+      expect(RestClient::Resource).to receive(:new).with("#{base_uri}#{new_path}", anything).and_return(new_resource)
+
+      expect(service.engine_ssh_public_key).to eql(ssh_key)
+    end
+
+    it "returns nil if there is no engine" do
+      old_resource = double("RestClient::Resource")
+      expect(old_resource).to receive(:get).and_raise(RestClient::ResourceNotFound)
+      expect(RestClient::Resource).to receive(:new).with("#{base_uri}#{old_path}", anything).and_return(old_resource)
+
+      new_resource = double("RestClient::Resource")
+      expect(new_resource).to receive(:get).and_raise(RestClient::ResourceNotFound)
+      expect(RestClient::Resource).to receive(:new).with("#{base_uri}#{new_path}", anything).and_return(new_resource)
+
+      expect(service.engine_ssh_public_key).to be nil
+    end
+
+    it "returns nil when using a wrong REST client method" do
+      old_resource = double("RestClient::Resource")
+      expect(old_resource).to receive(:get).and_raise(NoMethodError)
+      expect(RestClient::Resource).to receive(:new).with("#{base_uri}#{old_path}", anything).and_return(old_resource)
+
+      new_resource = double("RestClient::Resource")
+      expect(new_resource).to receive(:get).and_raise(NoMethodError)
+      expect(RestClient::Resource).to receive(:new).with("#{base_uri}#{new_path}", anything).and_return(new_resource)
+
+      expect(service.engine_ssh_public_key).to be nil
     end
+  end
 
+  context ".ovirt?" do
     it "true when key non-empty" do
       fake_key = "ssh-rsa " + ("A" * 372) + " ovirt-engine\n"
       expect_any_instance_of(described_class).to receive(:engine_ssh_public_key).and_return(fake_key)
@@ -169,6 +214,12 @@ EOX
       expect_any_instance_of(described_class).to receive(:engine_ssh_public_key).and_return(fake_key)
       expect(described_class.ovirt?(:server => "127.0.0.1")).to be false
     end
+
+    it "false when key nil" do
+      fake_key = nil
+      expect_any_instance_of(described_class).to receive(:engine_ssh_public_key).and_return(fake_key)
+      expect(described_class.ovirt?(:server => "127.0.0.1")).to be false
+    end
   end
 
   context "#base_uri" do
@@ -207,24 +258,24 @@ EOX
   end
 
   context "#api_uri" do
-    BASE_URI = "https://nobody.com"
-    API_PATH = "/ovirt-engine/api"
+    let(:base_uri) { "https://nobody.com" }
+    let(:api_path) { "/ovirt-engine/api" }
 
     before do
-      expect(service).to receive(:base_uri).and_return(BASE_URI)
-      expect(service).to receive(:api_path).and_return(API_PATH)
+      expect(service).to receive(:base_uri).and_return(base_uri)
+      expect(service).to receive(:api_path).and_return(api_path)
     end   
 
     it "removes slash" do
-      expect(service.api_uri("/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
+      expect(service.api_uri("/vms/123")).to eq("#{base_uri}#{api_path}/vms/123")
     end
 
     it "removes /api" do
-      expect(service.api_uri("/api/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
+      expect(service.api_uri("/api/vms/123")).to eq("#{base_uri}#{api_path}/vms/123")
     end
 
     it "removes /ovirt-engine/api" do
-      expect(service.api_uri("/ovirt-engine/api/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
+      expect(service.api_uri("/ovirt-engine/api/vms/123")).to eq("#{base_uri}#{api_path}/vms/123")
     end
 
   end

data/spec/vm_spec.rb

@@ -112,7 +112,7 @@ EOX
   context "#boot_order" do
     it "with a single string, updates the boot order" do
       devices = 'hd'
-      expected_data  = <<-EOX.chomp
+      expected_data = <<-EOX.chomp
 <vm>
   <os>
     <boot dev="hd"/>
@@ -139,7 +139,7 @@ EOX
 
     it "with an array of strings, updates the boot order" do
       devices = ['network', 'hd']
-      expected_data  = <<-EOX.chomp
+      expected_data = <<-EOX.chomp
 <vm>
   <os>
     <boot dev="network"/>
@@ -167,10 +167,35 @@ EOX
     end
   end
 
+  context '#memory=' do
+    it 'updates the memory' do
+      memory = 1_073_741_824 # 1.gigabyte
+      expected_data = <<-EOX.chomp
+<vm>
+  <memory>#{memory}</memory>
+</vm>
+EOX
+
+      return_data = <<-EOX.chomp
+<vm>
+  <os type='dummy'/>
+  <placement_policy>
+    <affinity>dummy</affinity>
+  </placement_policy>
+</vm>
+EOX
+
+      expect(service).to receive(:resource_put).once.with(
+        vm.attributes[:href],
+        expected_data).and_return(return_data)
+      vm.memory = memory
+    end
+  end
+
   context "#memory_reserve" do
     it "updates the memory policy guarantee" do
       memory_reserve = 1_073_741_824 # 1.gigabyte
-      expected_data  = <<-EOX.chomp
+      expected_data = <<-EOX.chomp
 <vm>
   <memory_policy>
     <guaranteed>#{memory_reserve}</guaranteed>
@@ -194,6 +219,110 @@ EOX
     end
   end
 
+  context '#update_memory' do
+    it 'updates only "memory" if "guaranteed" is nil' do
+      memory = 1_073_741_824 # 1.gigabyte
+      guaranteed = nil
+      expected_data = <<-EOX.chomp
+<vm>
+  <memory>#{memory}</memory>
+</vm>
+EOX
+
+      return_data = <<-EOX.chomp
+<vm>
+  <os type='dummy'/>
+  <placement_policy>
+    <affinity>dummy</affinity>
+  </placement_policy>
+</vm>
+EOX
+
+      expect(service).to receive(:resource_put).once.with(
+        vm.attributes[:href],
+        expected_data).and_return(return_data)
+      vm.update_memory(memory, guaranteed)
+    end
+
+    it 'updates only "guaranteed" if "memory" is nil' do
+      memory = nil
+      guaranteed = 1_073_741_824 # 1.gigabyte
+      expected_data = <<-EOX.chomp
+<vm>
+  <memory_policy>
+    <guaranteed>#{guaranteed}</guaranteed>
+  </memory_policy>
+</vm>
+EOX
+
+      return_data = <<-EOX.chomp
+<vm>
+  <os type='dummy'/>
+  <placement_policy>
+    <affinity>dummy</affinity>
+  </placement_policy>
+</vm>
+EOX
+
+      expect(service).to receive(:resource_put).once.with(
+        vm.attributes[:href],
+        expected_data).and_return(return_data)
+      vm.update_memory(memory, guaranteed)
+    end
+
+    it 'updates both if both are not nil' do
+      memory = 1_073_741_824 # 1.gigabyte
+      guaranteed = 1_073_741_824 # 1.gigabyte
+      expected_data = <<-EOX.chomp
+<vm>
+  <memory>#{memory}</memory>
+  <memory_policy>
+    <guaranteed>#{guaranteed}</guaranteed>
+  </memory_policy>
+</vm>
+EOX
+
+      return_data = <<-EOX.chomp
+<vm>
+  <os type='dummy'/>
+  <placement_policy>
+    <affinity>dummy</affinity>
+  </placement_policy>
+</vm>
+EOX
+
+      expect(service).to receive(:resource_put).once.with(
+        vm.attributes[:href],
+        expected_data).and_return(return_data)
+      vm.update_memory(memory, guaranteed)
+    end
+
+    it 'adds the "next_run=true" matrix parameter correctly' do
+      memory = 1_073_741_824 # 1.gigabyte
+      guaranteed = nil
+      expected_data = <<-EOX.chomp
+<vm>
+  <memory>#{memory}</memory>
+</vm>
+EOX
+
+      return_data = <<-EOX.chomp
+<vm>
+  <os type='dummy'/>
+  <placement_policy>
+    <affinity>dummy</affinity>
+  </placement_policy>
+</vm>
+</vm>
+EOX
+
+      expect(service).to receive(:resource_put).once.with(
+        vm.attributes[:href] + ';next_run=true',
+        expected_data).and_return(return_data)
+      vm.update_memory(memory, guaranteed, :next_run => true)
+    end
+  end
+
   context "#stop" do
     it "should raise Ovirt::VmIsNotRunning if the VM is not running" do
       return_data = <<-EOX.chomp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jason Frey
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport