rbovirt 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a1291d3d0e7c4fbe8f403ab0657c13024014f63
-  data.tar.gz: 8704c58159029cf09e51a7d13bbdab7f207d0ec7
+  metadata.gz: bbf4809e79266592a914373c43ca2c7320f9c30c
+  data.tar.gz: f512616ec7f997cc16e4eb9a5ea88ade0f55dd85
 SHA512:
-  metadata.gz: 732405e0fa15988ec6d9770f394eabcbff7bc8b5c24bc35fb6acfed97f48df2e9d6134a8808e7a0ba376ad65ac9ecaef7c873355716de6ee059c4cd38bcd7878
-  data.tar.gz: 4f7c77886aa636cdfb0b57aa3d457286885645093863f56b1541325c5c8a9b26bf66ddac5f6241ac8adf4956eab762370264dcb2eb7d2afcd0ea0adba03fc3d7
+  metadata.gz: c02b15dde847438cdc88e88fb718afadbd4c8fda3bc68dc40630a25c6ac3732e929afada3c0426b07cf2aeebe8d8a3d06338f6f01378db3a8229e8ba5d77473f
+  data.tar.gz: 417a0b4156d1a9d5c7bfa4cdbe9c7927aa5f0a64afb6572b95ba357811fa524e25ea666c7c57807c08b5ff594bfc6f21c4b588926fe9f669837b7dee7b5ab69d

data/lib/ovirt/interface.rb

@@ -1,13 +1,16 @@
 module OVIRT
 
   class Interface < BaseObject
-    attr_reader :name, :mac, :interface, :network, :vm
+    attr_reader :name, :mac, :interface, :network, :vm, :plugged, :linked
 
     def initialize(client=nil, xml={})
       if xml.is_a?(Hash)
         super(client, xml[:id], xml[:href], xml[:name])
         @network = xml[:network]
         @persisted = xml[:persisted]
+        @interface = xml[:interface]
+        @plugged = xml[:plugged]
+        @linked = xml[:linked]
       else
         super(client, xml[:id], xml[:href], (xml/'name').first.text)
         parse_xml_attributes!(xml)
@@ -24,6 +27,9 @@ module OVIRT
           else
             network{ name_(opts[:network_name] || 'ovirtmgmt') }
           end
+          interface_(opts[:interface]) if opts[:interface]
+          plugged_(opts[:plugged]) if opts[:plugged]
+          linked_(opts[:linked]) if opts[:linked]
         }
       end
       Nokogiri::XML(builder.to_xml).root.to_s
@@ -37,6 +43,8 @@ module OVIRT
      @mac = (xml/'mac').first[:address] rescue nil #template interfaces doesn't have MAC address.
      @interface = (xml/'interface').first.text
      @network = ((xml/'network').first[:id] rescue nil)
+     @plugged = (xml/'plugged').first.text
+     @linked = (xml/'linked').first.text
      @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

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module OVIRT
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/lib/rbovirt.rb

@@ -172,7 +172,7 @@ module OVIRT
     end
 
     def handle_fault(f)
-      if f.is_a?(RestClient::BadRequest)
+      if f.is_a?(RestClient::BadRequest) || f.is_a?(RestClient::Conflict)
         fault = (Nokogiri::XML(f.http_body)/'//fault/detail')
         fault = fault.text.gsub(/\[|\]/, '') if fault
       end

data/spec/endpoint.yml.example

@@ -2,3 +2,4 @@
 user: "admin@internal"
 password: "secret"
 url: "http://ovirt.example.com/api"
+network: 'ovirtmgmt'

data/spec/integration/vm_crud_spec.rb

@@ -8,7 +8,7 @@ shared_examples_for "Basic VM Life cycle" do
     name = 'vm-'+Time.now.to_i.to_s
     @vm = @client.create_vm(:name => name, :template => @template_id, :cluster => @cluster)
     @client.add_volume(@vm.id)
-    @client.add_interface(@vm.id, :network_name => 'rhevm')
+    @client.add_interface(@vm.id, :network_name => network_name)
     while !@client.vm(@vm.id).ready? do
     end
   end

data/spec/lib/endpoint.rb

@@ -1,13 +1,20 @@
+require 'yaml'
 module OVIRT::RSpec::Endpoint
 
   def endpoint
-    file = File.expand_path("../endpoint.yml", File.dirname(__FILE__))
-    @endpoint ||= YAML.load(File.read(file))
-    return  @endpoint['user'], @endpoint['password'], @endpoint['url'] , @endpoint['datacenter']
+    return  config['user'], config['password'], config['url'] , config['datacenter']
+  end
+
+  def network_name
+    config['network'] || 'ovirtmgmt'
   end
 
   def support_user_level_api
-    @endpoint['version'] && @endpoint['version'] > 3.1
+    config['version'] && config['version'] > 3.1
+  end
+
+  def config
+    @config ||= YAML.load(File.read(File.expand_path("../endpoint.yml", File.dirname(__FILE__))))
   end
 
 end

data/spec/unit/vm_spec.rb

@@ -245,6 +245,8 @@ END_HEREDOC
       interface.name.should eql('nic1')
       interface.mac.should eql('00:11:22:33:44:55')
       interface.interface.should eql('virtio')
+      interface.plugged.should eql('true')
+      interface.linked.should eql('true')
     end
 
     it "should have one volume" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri