vagrant-ovirt4 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5342f00fbaebdf678cce7ea4125f40cc213d140
-  data.tar.gz: 385cdb34732539203b0bbd03d7ff414dffa79a7a
+  metadata.gz: 0b8c1cd730a6bacebee4a3d70f292d9ef35659c1
+  data.tar.gz: c64545a65291800a1fb26baf1e0fd89279493d5b
 SHA512:
-  metadata.gz: 582d275b8b01fb98e8997b3defb9a79b68ea1f01122c54771439afdc14c8bacdd7b6876cc48c921d6df7f90b3bc025112d328222b8ebb6c8e5f3a216ae3d0335
-  data.tar.gz: 23b28cef56c3423fca1f70cd956e507afa650d1b015acdb75d0d95d0c4a314b39ac9c7a907d44ba4a54cff346660bd0057b60ff407c3a63aa992bad8fcdb6a7d
+  metadata.gz: 1da606c06286e4b174287e0257b567cddca4b3502fc68bee92f6f25bf7ec3f3322507184f3ce0b3f703af297cf742ed0af04ea7c980467e712b2d6b63119c53f
+  data.tar.gz: d56917a0ec347772998a048ec7f6830d8d96e1cdc0fa315c2e99a612437527226fffddfc9dd71e7ae92cf99b5d7b8ac2fe9a3dafa284091ac187198157ee4d44

data/.gitignore

@@ -3,6 +3,5 @@
 *.log
 /Vagrantfile
 .vagrant
-example_box/*.box
 /.idea
 *.gem

data/Gemfile

@@ -11,6 +11,7 @@ end
 
 group :testing do
   gem 'rspec-its'
+  gem 'rake'
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (0.0.1)
+    vagrant-ovirt4 (1.0.0)
       ovirt-engine-sdk (~> 4.0, >= 4.0.6)
 
 GEM
@@ -9,9 +9,11 @@ GEM
   specs:
     byebug (9.0.6)
     coderay (1.1.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
+    json (2.0.3)
     method_source (0.8.2)
-    ovirt-engine-sdk (4.0.6)
+    ovirt-engine-sdk (4.1.1)
+      json
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -20,10 +22,6 @@ GEM
       byebug (~> 9.0)
       pry (~> 0.10)
     rake (0.9.6)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -32,9 +30,6 @@ GEM
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     slop (3.6.0)
 
@@ -45,8 +40,7 @@ DEPENDENCIES
   byebug
   pry
   pry-byebug
-  rake (~> 0)
-  rspec (~> 3.4)
+  rake
   rspec-its
   vagrant-ovirt4!
 

data/README.md

@@ -47,6 +47,9 @@ $ vagrant up --provider=ovirt4
 1. `vagrant status`
 1. `vagrant suspend`
 1. `vagrant resume`
+1. `vagrant snapshot list`
+1. `vagrant snapshot delete [id]`
+1. `vagrant snapshot save [description]`
 
 ### Configuration example
 

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

@@ -43,8 +43,9 @@ module VagrantPlugins
           begin
             server = env[:vms_service].add(attr) 
           rescue OvirtSDK4::Error => e
+            fault_message = /Fault detail is \"\[?(.*)\]?\".*/.match(e.message)[1] rescue e.message
             raise Errors::CreateVMError,
-              :error_message => /Fault detail is \"\[(.*)\]\".*/.match(e.message)[1]
+              :error_message => fault_message
           end
 
           # Immediately save the ID since it is created at this point.

data/lib/vagrant-ovirt4/action/wait_till_up.rb

@@ -48,16 +48,19 @@ module VagrantPlugins
             end
           end
           terminate(env) if env[:interrupted]
-          @logger.info("Got IP address #{env[:ip_address]}")
-          @logger.info("Time for getting IP: #{env[:metrics]["instance_ip_time"]}")
-          
-         terminate(env) if env[:interrupted]
-          @logger.info("Time for SSH ready: #{env[:metrics]["instance_ssh_time"]}")
+          if env[:ip_address].nil?
+            raise NoIPError
+          else
+            @logger.info("Got IP address #{env[:ip_address]}")
+            @logger.info("Time for getting IP: #{env[:metrics]["instance_ip_time"]}")
+            
+            @logger.info("Time for SSH ready: #{env[:metrics]["instance_ssh_time"]}")
 
-          # Booted and ready for use.
-          env[:ui].info(I18n.t("vagrant_ovirt4.ready"))
-          
-          @app.call(env)
+            # Booted and ready for use.
+            env[:ui].info(I18n.t("vagrant_ovirt4.ready"))
+            
+            @app.call(env)
+          end
         end
 
         def recover(env)

data/lib/vagrant-ovirt4/plugin.rb

@@ -8,8 +8,9 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < '1.1.0'
-  raise "The Vagrant oVirt v4 plugin is only compatible with Vagrant 1.1+"
+# Note: snapshots only available in 1.8+
+if Vagrant::VERSION < '1.8.0'
+  raise "The Vagrant oVirt v4 plugin is only compatible with Vagrant 1.8+"
 end
 
 module VagrantPlugins

data/lib/vagrant-ovirt4/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end
 

data/locales/en.yml

@@ -57,7 +57,7 @@ en:
       no_vm_error: |-
         No VM %{vm_name} found.
       create_vm_error: |-
-        %{error_message}
+        Creation failed. oVirt error message was '%{error_message}'
       start_vm_error: |-
         Unable to start VM: %{error_message}
       no_network_error: |-

data/vagrant-ovirt4.gemspec

@@ -18,9 +18,4 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4.0', '>= 4.0.6'
 
-  gem.add_development_dependency 'rake', '~> 0'
-
-  # rspec 3.4 to mock File
-  gem.add_development_dependency "rspec", "~> 3.4"
-  gem.add_development_dependency 'rspec-its', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -30,48 +30,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.6
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Vagrant provider for oVirt and RHEV v4
 email:
 - myoung34@my.apsu.edu
@@ -87,6 +45,7 @@ files:
 - Rakefile
 - example_box/README.md
 - example_box/Vagrantfile
+- example_box/dummy.box
 - example_box/metadata.json
 - lib/vagrant-ovirt4.rb
 - lib/vagrant-ovirt4/action.rb