rbovirt 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 176f8a221ec21197b316ac5b673573649353db2e
-  data.tar.gz: b0d2e1cd49e4013cd1a22cd0f1dac7ad5ce599f1
+  metadata.gz: af1cb013363d659b947761e3e38126834c084042
+  data.tar.gz: c4ac3c8988f2951bd0eb99e38a5a4db7e219be60
 SHA512:
-  metadata.gz: 6646f08fe9c3faba1af5234a7807f315198cc76fc32d5ed2355f7c27ee042a6a08a94f4f729d18fe7e4e70cefdb7e83667ebe2a6560810bb3d99e23544722ff0
-  data.tar.gz: f91d2c1333728938ec6fdb47eab1c6c262cea1196bf60ba5c7165ebcc2f2ba1024226ce8aa1b4eac660308bff10292f2d8b8f60bab1948029834768b1964ae25
+  metadata.gz: 46c76b24ab5c95762920ddea7c1a44fee65df4fe951b1a4e1fbc9307d3993178e8f7cf87d63c8e87e9ccf8a7da318905a7b8d10ad80c72e0ca754b8d457fb6fd
+  data.tar.gz: 751efa86aebe75dda8afd43dca666ad23ba1d1958734ff7d9f7715a1c22685ea06387e4f262195d63f02b65ada7b246625099b80c2499656791ec76a4ce04b06

data/lib/ovirt/network.rb

@@ -1,6 +1,6 @@
 module OVIRT
  class Network < BaseObject
-    attr_reader :description, :datacenter, :cluster, :stp, :status
+    attr_reader :description, :datacenter, :cluster, :vlan_id, :mtu, :stp, :usages, :status
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
@@ -13,6 +13,9 @@ module OVIRT
     def parse_xml_attributes!(xml)
       @description = ((xml/'description').first.text rescue nil)
       @stp = ((xml/'stp').first.text rescue false)
+      @mtu = ((xml/'mtu').first.text rescue nil)
+      @vlan_id = ((xml/'vlan').first[:id] rescue nil)
+      @usages = ((xml/'usages/usage').collect{ |usage| usage.text } rescue [])
       @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?
       @status = ((xml/'status/state').first.text rescue nil)

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module OVIRT
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/ovirt/vm.rb

@@ -4,7 +4,7 @@ module OVIRT
     FILEINJECT_PATH = "user-data.txt"
 
   class VM < BaseObject
-    attr_reader :description, :status, :memory, :profile, :display, :host, :cluster, :template
+    attr_reader :description, :status, :memory, :profile, :display, :host, :cluster, :template, :instance_type
     attr_reader :storage, :cores, :creation_time, :os, :ha, :ha_priority, :ips, :vnc, :quota, :clone
     attr_accessor :comment, :interfaces, :volumes
 
@@ -61,6 +61,9 @@ module OVIRT
           else
             template_{name_('Blank')}
           end
+          if opts[:instance_type] && !opts[:instance_type].empty?
+            instance_type( :id => opts[:instance_type])
+          end
           if opts[:quota]
             quota_( :id => opts[:quota])
           end
@@ -260,15 +263,15 @@ module OVIRT
                     }
                   end
                   dns { 
-                    unless dns.nil? 
-                      servers {
-                        dns.each do |dnsentry|
-                          host {  address dnsentry }
-                        end
-                      }
+                    if dns.is_a?(String)
+                      servers { host { address dns }}
+                    elsif dns.is_a?(Array) && dns.all? {|n| n.is_a?(String) }
+                      servers { host { address dns.join(' ') }}
                     end
-                    unless domain.nil? 
+                    if domain.is_a?(String)
                       search_domains { host {  address domain }}
+                    elsif domain.is_a?(Array) && domain.all? {|n| n.is_a?(String) }
+                      search_domains { host { address domain.join(' ')}}
                     end
                   }
                 }
@@ -308,6 +311,7 @@ module OVIRT
       @memory = (xml/'memory').first.text
       @profile = (xml/'type').first.text
       @template = Link::new(@client, (xml/'template').first[:id], (xml/'template').first[:href])
+      @instance_type = Link::new(@client, (xml/'instance_type').first[:id], (xml/'instance_type').first[:href]) rescue nil
       @host = Link::new(@client, (xml/'host').first[:id], (xml/'host').first[:href]) rescue nil
       @cluster = Link::new(@client, (xml/'cluster').first[:id], (xml/'cluster').first[:href])
       @display = {

data/spec/integration/vm_crud_spec.rb

@@ -119,6 +119,30 @@ shared_examples_for "VM Life cycle without template" do
   end
 end
 
+describe "Basic VM creation with instance type" do
+  before(:all) do
+    setup_client
+    @name = 'vm-'+Time.now.to_i.to_s
+    @cluster = @client.clusters.select{|c| c.name == cluster_name}.first.id
+    if @config['instance_type']
+      @instance_type = @client.instance_type(@config['instance_type'])
+    else
+      @instance_type = @client.instance_types.first
+    end
+  end
+
+  it "test_should_create_vm_with_instance_type" do
+    if @instance_type
+      @vm = @client.create_vm(:name => @name, :instance_type => @instance_type.id, :cluster => @cluster)
+      @vm.should_not be_nil
+      while !@client.vm(@vm.id).ready? do
+      end
+      @client.destroy_vm(@vm.id) if @vm
+    else
+      skip "No instance type found, skip VM creation based on instance type"
+    end
+  end
+end
 
 describe "Admin API VM Life cycle" do
 

data/spec/unit/vm_spec.rb

@@ -107,6 +107,68 @@ describe OVIRT::VM do
 </vm>
 END_HEREDOC
 
+      @min_instance_type_xml = <<END_HEREDOC
+<vm id="76d29095-bc27-4cd0-8178-07e942aea549" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549">
+<name>c-1326980484</name>
+<actions>
+<link rel="shutdown" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/shutdown"/>
+<link rel="start" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/start"/>
+<link rel="stop" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/stop"/>
+<link rel="suspend" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/suspend"/>
+<link rel="detach" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/detach"/>
+<link rel="export" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/export"/>
+<link rel="move" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/move"/>
+<link rel="ticket" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/ticket"/>
+<link rel="migrate" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/migrate"/>
+<link rel="cancelmigration" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/cancelmigration"/>
+</actions>
+<link rel="disks" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/disks"/>
+<link rel="nics" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics"/>
+<link rel="cdroms" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/cdroms"/>
+<link rel="snapshots" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/snapshots"/>
+<link rel="tags" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/tags"/>
+<link rel="permissions" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/permissions"/>
+<link rel="statistics" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/statistics"/>
+<type>server</type>
+<status>
+<state>up</state>
+</status>
+<memory>536870912</memory>
+<cpu>
+<topology cores="1" sockets="1"/>
+</cpu>
+<os type="unassigned">
+<boot dev="network"/>
+<boot dev="hd"/>
+</os>
+<high_availability>
+<enabled>false</enabled>
+<priority>0</priority>
+</high_availability>
+<display>
+<type>vnc</type>
+<monitors>1</monitors>
+</display>
+<cluster id="b68980dc-3ab8-11e1-bcbf-5254005f0f6f" href="/api/clusters/b68980dc-3ab8-11e1-bcbf-5254005f0f6f"/>
+<template id="00000000-0000-0000-0000-000000000000" href="/api/templates/00000000-0000-0000-0000-000000000000"/>
+<instance_type id="00000000-0000-0000-0000-000000000001" href="/api/instancetypes/00000000-0000-0000-0000-000000000001"/>
+<start_time>2012-01-19T14:41:58.428Z</start_time>
+<creation_time>2012-01-19T13:41:24.405Z</creation_time>
+<origin>rhev</origin>
+<stateless>false</stateless>
+<placement_policy>
+<affinity>migratable</affinity>
+</placement_policy>
+<memory_policy>
+<guaranteed>536870912</guaranteed>
+</memory_policy>
+<usb>
+<enabled>true</enabled>
+</usb>
+</vm>
+END_HEREDOC
+
+
       @min_xml = <<END_HEREDOC
 <vm id="76d29095-bc27-4cd0-8178-07e942aea549" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549">
 <name>c-1326980484</name>
@@ -276,6 +338,24 @@ END_HEREDOC
       Nokogiri::XML(xml).xpath("//disks/disk/storage_domains/storage_domain[contains(@id,'#{storagedomain}')]").length.should eql(1)
     end
 
+    it "create vm xml without instance_type" do
+      opts = {:cluster_name=>'cluster'}
+      xml = OVIRT::VM.to_xml(opts)
+      xml.nil?.should eql(false)
+      Nokogiri::XML(xml).xpath("//instance_type").length.should eql(0)
+    end
+
+    it "create vm xml with instance_type" do
+      instance_type = "00000000-0000-0000-0000-000000000001"
+      opts = {:cluster_name => 'cluster', :instance_type => instance_type}
+      xml = OVIRT::VM.to_xml(opts)
+      puts xml
+      xml.nil?.should eql(false)
+      Nokogiri::XML(xml).xpath("//instance_type").length.should eql(1)
+      Nokogiri::XML(xml).xpath("//instance_type[contains(@id,'#{instance_type}')]").length.should eql(1)
+    end
+
+
     it "should be running" do
       vm = OVIRT::VM.new(nil, Nokogiri::XML(@xml).xpath('/').first)
       vm.running?.should eql(true)
@@ -303,6 +383,11 @@ END_HEREDOC
       disk.interface.should eql('virtio')
     end
 
+    it "should have instance_type" do
+      vm = OVIRT::VM.new(nil, Nokogiri::XML(@min_instance_type_xml).xpath('/').first)
+      vm.instance_type.id.should eql('00000000-0000-0000-0000-000000000001')
+    end
+
     it "should still fallback to the client" do
       vm = OVIRT::VM.new(@mock_client, Nokogiri::XML(@min_xml).xpath('/').first)
       vm.volumes.length.should eql(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri