vagrant-ovirt3 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb418a1dcb47db6316ed502682775154fa41a468
-  data.tar.gz: 0daaf7c450f4aa512caaca2375058b7120a122bf
+  metadata.gz: 1fb362eeebf30f0e1d109ce52d8bb8a029ab3691
+  data.tar.gz: 198805928ad0a94bd360c73a4f125e9de6788804
 SHA512:
-  metadata.gz: e338380c448b4fc231fca4c5580978657f9c14e8b0aa53707951858402526f3f41802f32698ec6fab7ba4b5bfffbd7053d193e7ca92aca79f0d7d028c7308f0c
-  data.tar.gz: c63e3b5c922a6f6c49d97a8ba5ad1ac8fa666db4ea2565bf51e5a1e9146f3140c2797c6d642245606818b201511d85182f82682e8c4af5d6c57c2a34b6b6c6b2
+  metadata.gz: 6d9cbe468e42a106b64e76ab71560241f4d0f64560fc5cefe0832d464afe73d259caace72c96b1acf28938c9c5a4ffa5e16d35e5cb89c3a78433f37421fbe8e4
+  data.tar.gz: 28e7e1569c41e43a9189adffb96fd918321127aad4db721bf795dcfc62090786e98a530549c79b81b848c48b34bdff96994a841aec8cc239acf5c8c0c5fb0cb9

data/lib/vagrant-ovirt3/action/create_vm.rb

@@ -32,7 +32,7 @@ module VagrantPlugins
             cluster = OVirtProvider::Util::Collection.find_matching(
               env[:ovirt_compute].clusters.all, config.cluster)
           end
-          raise Error::NoClusterError if cluster == nil
+          raise Errors::NoClusterError if cluster == nil
           # TODO fill env also with other ovirtoptions.
           env[:ovirt_cluster] = cluster
 
@@ -47,7 +47,7 @@ module VagrantPlugins
             cv.nil? or (cv.to_i == v.version_number.to_i or cv == v.version_name)
           }
           if template == nil
-            raise Error::NoTemplateError,
+            raise Errors::NoTemplateError,
               :template_name => config.template
           end
           ver = template.raw.version

data/lib/vagrant-ovirt3/cap/nic_mac_addresses.rb

@@ -0,0 +1,15 @@
+# vim: ai ts=2 sts=2 et sw=2 ft=ruby
+module VagrantPlugins
+  module OVirtProvider
+    module Cap
+      module NicMacAddresses
+        def self.nic_mac_addresses(machine)
+          ovirt = OVirtProvider.ovirt_connection
+          interfaces = ovirt.list_vm_interfaces(machine.id.to_s)
+          Hash[interfaces.map{ |i| [i[:name], i[:mac]] }]
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant-ovirt3/config.rb

@@ -71,7 +71,7 @@ module VagrantPlugins
 
       def validate(machine)
         valid_console_types = ['vnc', 'spice']
-        raise Error::InvalidConsoleType,
+        raise Errors::InvalidConsoleType,
           :console => @console unless valid_console_types.include? @console
       end
     end

data/lib/vagrant-ovirt3/errors.rb

@@ -7,6 +7,10 @@ module VagrantPlugins
         error_namespace("vagrant_ovirt3.errors")
       end
 
+      class InvalidConsoleType < VagrantOVirtError
+        error_key(:console_error)
+      end
+
       class RsyncError < VagrantOVirtError
         error_key(:rsync_error)
       end

data/lib/vagrant-ovirt3/plugin.rb

@@ -1,3 +1,4 @@
+# vim: ai ts=2 sts=2 et sw=2 ft=ruby
 begin
   require 'vagrant'
 rescue LoadError
@@ -33,6 +34,11 @@ module VagrantPlugins
         Provider
       end
 
+      provider_capability("ovirt3", :nic_mac_addresses) do
+        require_relative "cap/nic_mac_addresses"
+        Cap::NicMacAddresses
+      end
+
       # This initializes the internationalization strings.
       def self.setup_i18n
         I18n.load_path << File.expand_path("locales/en.yml",

data/lib/vagrant-ovirt3/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end
 

data/locales/en.yml

@@ -40,6 +40,8 @@ en:
     errors:
       fog_ovirt_connection_error: |-
         Error while connecting to oVirt: %{error_message}
+      console_error: |-
+        Invalid console type specified.
       no_datacenter_error: |-
         No usable datacenter found! Please check if datacenter specified in
         configuration is avaliable.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt3
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Marcus Young
@@ -96,6 +96,7 @@ files:
 - lib/vagrant-ovirt3/action/suspend_vm.rb
 - lib/vagrant-ovirt3/action/sync_folders.rb
 - lib/vagrant-ovirt3/action/wait_till_up.rb
+- lib/vagrant-ovirt3/cap/nic_mac_addresses.rb
 - lib/vagrant-ovirt3/config.rb
 - lib/vagrant-ovirt3/errors.rb
 - lib/vagrant-ovirt3/plugin.rb