fog-libvirt 0.12.2 → 0.13.1

data/lib/fog/libvirt/requests/compute/destroy_network.rb

@@ -1,16 +1,18 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def destroy_network(uuid)
           client.lookup_network_by_uuid(uuid).destroy
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def destroy_network(uuid)
-          true
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/dhcp_leases.rb

@@ -10,6 +10,7 @@ module Fog
       end
 
       class Mock
+        # Not implemented by the test driver
         def dhcp_leases(uuid, mac, flags = 0)
           leases1 = {
             'aa:bb:cc:dd:ee:ff' => [
@@ -23,13 +24,11 @@ module Fog
             ]
           }
           networks = {
-            # should match mock net uuid from list_networks.rb
-            'a29146ea-39b2-412d-8f53-239eef117a32' => leases1,
+            # should match the default network from the test connection
+            'dd8fe884-6c02-601e-7551-cca97df1c5df' => leases1,
             'fbd4ac68-cbea-4f95-86ed-22953fd92384' => leases2
           }
-          if !networks[uuid].nil?
-            return networks[uuid][mac]
-          end
+          networks.dig(uuid, mac)
         end
       end
     end

data/lib/fog/libvirt/requests/compute/get_node_info.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def get_node_info
           node_hash = Hash.new
           node_info = client.node_get_info
@@ -28,9 +28,12 @@ module Fog
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def get_node_info
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/libversion.rb

@@ -2,16 +2,18 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def libversion()
           client.libversion
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def libversion()
-          return 1002009
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/list_domains.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def list_domains(filter = { })
           data=[]
 
@@ -25,9 +25,7 @@ module Fog
         rescue ::Libvirt::RetrieveError, ::Libvirt::Error
           nil
         end
-      end
 
-      module Shared
         private
 
         def domain_display xml
@@ -48,6 +46,24 @@ module Fog
           xml_elements(xml, "domain/os/boot", "dev")
         end
 
+        def firmware(xml)
+          firmware_from_loader = xml_elements(xml, "domain/os/loader", "type").first
+
+          case firmware_from_loader
+          when 'pflash'
+            'efi'
+          when 'rom'
+            'bios'
+          else
+            xml_elements(xml, "domain/os", "firmware").first || 'bios'
+          end
+        end
+
+        # we rely on the fact that the secure attribute is only present when secure boot is enabled
+        def secure_boot_enabled?(xml)
+          xml_elements(xml, "domain/os/loader", "secure").first == 'yes'
+        end
+
         def domain_interfaces xml
           ifs = xml_elements(xml, "domain/devices/interface")
           ifs.map { |i|
@@ -80,7 +96,9 @@ module Fog
               :boot_order      => boot_order(dom.xml_desc),
               :nics            => domain_interfaces(dom.xml_desc),
               :volumes_path    => domain_volumes(dom.xml_desc),
-              :state           => states[dom.info.state]
+              :state           => states[dom.info.state],
+              :firmware        => firmware(dom.xml_desc),
+              :secure_boot     => secure_boot_enabled?(dom.xml_desc),
             }
           rescue ::Libvirt::RetrieveError, ::Libvirt::Error
             # Catch libvirt exceptions to avoid race conditions involving
@@ -90,34 +108,12 @@ module Fog
         end
       end
 
-      class Mock
-        def list_domains(filter = { })
-          dom1 = mock_domain 'fog-dom1'
-          dom2 = mock_domain 'fog-dom2'
-          dom3 = mock_domain 'a-fog-dom3'
-          [dom1, dom2, dom3]
-        end
+      class Real
+        include Shared
+      end
 
-        def mock_domain name
-          xml = read_xml 'domain.xml'
-          {
-              :id              => "dom.uuid",
-              :uuid            => "dom.uuid",
-              :name            => name,
-              :max_memory_size => 8,
-              :cputime         => 7,
-              :memory_size     => 6,
-              :cpus            => 5,
-              :autostart       => false,
-              :os_type         => "hvm",
-              :active          => false,
-              :vnc_port        => 5910,
-              :boot_order      => boot_order(xml),
-              :nics            => domain_interfaces(xml),
-              :volumes_path    => domain_volumes(xml),
-              :state           => 'shutoff'
-          }
-        end
+      class Mock
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/list_interfaces.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def list_interfaces(filter = { })
           data=[]
           if filter.keys.empty?
@@ -37,20 +37,12 @@ module Fog
         end
       end
 
-      class Mock
-        def list_interfaces(filters={ })
-          if1 = mock_interface 'if1'
-          if2 = mock_interface 'if2'
-          [if1, if2]
-        end
+      class Real
+        include Shared
+      end
 
-        def mock_interface name
-          {
-              :mac    => 'aa:bb:cc:dd:ee:ff',
-              :name   => name,
-              :active => true
-          }
-        end
+      class Mock
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/list_networks.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def list_networks(filter = { })
           data=[]
           if filter.keys.empty?
@@ -43,30 +43,12 @@ module Fog
         end
       end
 
-      class Mock
-        def list_networks(filter={ })
-          networks = [ {
-              :uuid        => 'a29146ea-39b2-412d-8f53-239eef117a32',
-              :name        => 'net1',
-              :bridge_name => 'virbr0'
-            },
-            {
-              :uuid        => 'fbd4ac68-cbea-4f95-86ed-22953fd92384',
-              :name        => 'net2',
-              :bridge_name => 'virbr1'
-            }
-          ]
-          return networks if filter.empty?
+      class Real
+        include Shared
+      end
 
-          case filter.keys.first
-            when :uuid
-              [networks.find(:uuid => filter[:uuid]).first]
-            when :name
-              [networks.find(:name => filter[:name]).first]
-            else
-              networks
-          end
-        end
+      class Mock
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/list_pool_volumes.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def list_pool_volumes(uuid)
           pool = client.lookup_storage_pool_by_uuid uuid
           pool.list_volumes.map do |volume_name|
@@ -10,9 +10,12 @@ module Fog
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def list_pool_volumes(uuid)
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/list_pools.rb

@@ -2,29 +2,6 @@ module Fog
   module Libvirt
     class Compute
       module Shared
-        private
-
-        def pool_to_attributes(pool, include_inactive = nil)
-          return nil unless pool.active? || include_inactive
-
-          states=[:inactive, :building, :running, :degrated, :inaccessible]
-          {
-            :uuid           => pool.uuid,
-            :persistent     => pool.persistent?,
-            :autostart      => pool.autostart?,
-            :active         => pool.active?,
-            :name           => pool.name,
-            :allocation     => pool.info.allocation,
-            :capacity       => pool.info.capacity,
-            :num_of_volumes => pool.active? ? pool.num_of_volumes : nil,
-            :state          => states[pool.info.state]
-          }
-        end
-      end
-
-      class Real
-        include Shared
-
         def list_pools(filter = { })
           data=[]
           if filter.key?(:name)
@@ -52,31 +29,32 @@ module Fog
         rescue ::Libvirt::RetrieveError
           nil
         end
-      end
 
-      class Mock
-        include Shared
-
-        def list_pools(filter = { })
-          pool1 = mock_pool 'pool1'
-          pool2 = mock_pool 'pool1'
-          [pool1, pool2]
-        end
+        def pool_to_attributes(pool, include_inactive = nil)
+          return nil unless pool.active? || include_inactive
 
-        def mock_pool name
+          states=[:inactive, :building, :running, :degrated, :inaccessible]
           {
-              :uuid           => 'pool.uuid',
-              :persistent     => true,
-              :autostart      => true,
-              :active         => true,
-              :name           => name,
-              :allocation     => 123456789,
-              :capacity       => 123456789,
-              :num_of_volumes => 3,
-              :state          => :running
+            :uuid           => pool.uuid,
+            :persistent     => pool.persistent?,
+            :autostart      => pool.autostart?,
+            :active         => pool.active?,
+            :name           => pool.name,
+            :allocation     => pool.info.allocation,
+            :capacity       => pool.info.capacity,
+            :num_of_volumes => pool.active? ? pool.num_of_volumes : nil,
+            :state          => states[pool.info.state]
           }
         end
       end
+
+      class Real
+        include Shared
+      end
+
+      class Mock
+        include Shared
+      end
     end
   end
 end

data/lib/fog/libvirt/requests/compute/list_volumes.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def list_volumes(filter = { })
           data = []
           if filter.keys.empty?
@@ -29,16 +29,16 @@ module Fog
           return nil if format_type == "dir"
 
           begin
-              {
-                :pool_name   => vol.pool.name,
-                :key         => vol.key,
-                :id          => vol.key,
-                :path        => vol.path,
-                :name        => vol.name,
-                :format_type => format_type,
-                :allocation  => bytes_to_gb(vol.info.allocation),
-                :capacity    => bytes_to_gb(vol.info.capacity),
-              }
+            {
+              :pool_name   => vol.pool.name,
+              :key         => vol.key,
+              :id          => vol.key,
+              :path        => vol.path,
+              :name        => vol.name,
+              :format_type => format_type,
+              :allocation  => bytes_to_gb(vol.info.allocation),
+              :capacity    => bytes_to_gb(vol.info.capacity),
+            }
           rescue ::Libvirt::RetrieveError, ::Libvirt::Error
             return nil # If there are issues during stat of volume file
           end
@@ -74,32 +74,12 @@ module Fog
         end
       end
 
-      class Mock
-        def list_volumes(filters={ })
-          vol1 = mock_volume 'vol1'
-          vol2 = mock_volume 'vol2'
-          vols = [vol1, vol2]
-
-          if filters.keys.empty?
-            return vols
-          end
-
-          key = filters.keys.first
-          vols.select { |v| v[key] == filters[key] }
-        end
+      class Real
+        include Shared
+      end
 
-        def mock_volume name
-          {
-              :pool_name   => 'vol.pool.name',
-              :key         => "vol.#{name}", # needs to match id
-              :id          => "vol.#{name}",
-              :path        => "path/to/disk", # used by in mock_files/domain.xml
-              :name        => name,
-              :format_type => 'raw',
-              :allocation  => 123,
-              :capacity    => 123,
-          }
-        end
+      class Mock
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/pool_action.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def pool_action(uuid, action)
           pool = client.lookup_storage_pool_by_uuid uuid
           pool.send(action)
@@ -9,10 +9,12 @@ module Fog
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def pool_action(uuid, action)
-          true
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/update_autostart.rb

@@ -1,17 +1,19 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def update_autostart(uuid, value)
           domain = client.lookup_domain_by_uuid(uuid)
           domain.autostart = value
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def update_autostart(uuid, value)
-          value
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/update_display.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def update_display(options = { })
           raise ArgumentError, "uuid is a required parameter" unless options.key? :uuid
 
@@ -25,11 +25,12 @@ module Fog
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def update_display(options = { })
-          raise ArgumentError, "uuid is a required parameter" unless options.key? :uuid
-          true
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/upload_volume.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def upload_volume(pool_name, volume_name, file_path)
           volume = client.lookup_storage_pool_by_name(pool_name).lookup_volume_by_name(volume_name)
           stream = client.stream
@@ -22,9 +22,12 @@ module Fog
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def upload_volume(pool_name, volume_name, file_path)
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/vm_action.rb

@@ -1,7 +1,7 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def vm_action(uuid, action, *params)
           domain = client.lookup_domain_by_uuid(uuid)
           domain.send(action, *params)
@@ -9,10 +9,12 @@ module Fog
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def vm_action(uuid, action, *params)
-          true
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/requests/compute/volume_action.rb

@@ -1,17 +1,19 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
+      module Shared
         def volume_action(key, action, options={})
           get_volume({:key => key}, true).send(action)
           true
         end
       end
 
+      class Real
+        include Shared
+      end
+
       class Mock
-        def volume_action(action, options={})
-          true
-        end
+        include Shared
       end
     end
   end

data/lib/fog/libvirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Libvirt
-    VERSION = '0.12.2'
+    VERSION = '0.13.1'
   end
 end

data/minitests/test_helper.rb

@@ -14,5 +14,5 @@ require 'fog/libvirt'
 
 Fog.mock!
 Fog.credentials = {
-    :libvirt_uri => 'qemu://libvirt/system',
+    :libvirt_uri => 'test:///default',
 }.merge(Fog.credentials)

data/tests/helper.rb

@@ -3,7 +3,7 @@ ENV['FOG_CREDENTIAL'] = ENV['FOG_CREDENTIAL'] || 'default'
 
 require 'fog/libvirt'
 
-Excon.defaults.merge!(debug_request: true, debug_response: true)
+Excon.defaults.merge!(:debug_request => true, :debug_response => true)
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper'))
 

data/tests/helpers/formats_helper.rb

@@ -7,6 +7,7 @@ require 'fog/schema/data_validator'
 # allows both nil.is_a?(Fog::Nullable::String) and ''.is_a?(Fog::Nullable::String)
 module Fog
   module Boolean; end
+
   module Nullable
     module Boolean; end
     module Integer; end
@@ -86,9 +87,9 @@ module Shindo
     def formats(format, strict = true)
       test('has proper format') do
         if strict
-          options = { allow_extra_keys: false, allow_optional_rules: true }
+          options = { :allow_extra_keys => false, :allow_optional_rules => true }
         else
-          options = { allow_extra_keys: true, allow_optional_rules: true }
+          options = { :allow_extra_keys => true, :allow_optional_rules => true }
         end
         validator = Fog::Schema::DataValidator.new
         valid = validator.validate(yield, format, options)