vagrant_abiquo 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d52459a5932c1be97b7e5d6197e5735f1b432d6
-  data.tar.gz: 8acfc9a0a156761871e17abecd1b459efe643e1e
+  metadata.gz: eb4e419f31ba7254fd0f0285c7aa50bc92fe66b1
+  data.tar.gz: 245dbe7474ea7e9a8cade186555fa3b407b73b8b
 SHA512:
-  metadata.gz: 3272327a7463373c99f6f40bc97e5055d7a4ded18a3faa51ca747613003bca49e8d1ee4a5e5d5d32d012f43cd16257249e68238b27256ecd64fb1c1b6118c9df
-  data.tar.gz: 9452f08c3feb41347fca22b822b88dd07bbf0d0313345e0dd936e384692e3c17e1c284c1ff3d968e9a5ebca370dccb604b6813ecdab8d57b8f3e631a69d8765c
+  metadata.gz: fdd2327cedf70864d8747ef649ec02500baeabfafee98a4b311524b18d30eceafb5ac11d2da4675c5e35baacd7337115a511e02a109510a47e4ada333a9a6f3f
+  data.tar.gz: 8d33d3d389ec4725e2895c524e6ff5bf99a1e3a45b2902e40c511aa0541d0327d0192b0a161388f927423ee90888f3edd92982389322d124c65fabdb9e9449bc

data/Gemfile.lock

@@ -24,7 +24,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant_abiquo (0.0.5)
+    vagrant_abiquo (0.0.6)
       abiquo-api (~> 0.1.2)
       log4r
 

data/Vagrantfile

@@ -3,9 +3,11 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder ".", "/vagrant", type: "rsync"
 
-  (1..10).each do |ind|
-    config.vm.define "abiquotesting-#{ind}"
-  end
+  config.vm.define "abiquosingle"
+
+  #(1..10).each do |ind|
+  #  config.vm.define "abiquotesting-#{ind}"
+  #end
 
   config.vm.provider :abiquo do |provider, override|
     override.vm.box = 'abiquo'
@@ -27,8 +29,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     #provider.hwprofile = '4gb'
     provider.virtualdatacenter = 'esx'
     provider.virtualappliance = 'Vagrant Tests'
-    provider.template = 'Alpine'
+    provider.template = 'Centos 7 x86_64'
 
     override.ssh.private_key_path = '~/.ssh/id_rsa'
+    override.ssh.username = 'centos'
   end
 end

data/lib/vagrant_abiquo/actions/create.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
           
           # Check if we have to use hwprofiles
           lim = vdc.link(:enterprise).get.link(:limits).get.select {|l| l.link(:location).title == vdc.link(:location).title }.first
-          if lim.respond_to? :enabledHardwareProfiles
+          if lim.respond_to?(:enabledHardwareProfiles) && lim.enabledHardwareProfiles
             if @machine.provider_config.hwprofile.nil?
               raise Abiquo::Errors::HWprofileEnabled, vdc: @machine.provider_config.virtualdatacenter
             end
@@ -47,15 +47,15 @@ module VagrantPlugins
           vm_definition = {}
           
           # Configured CPU and RAM
-          if lim.respond_to? :enabledHardwareProfiles
-            # lookup the hwprofile link
-            hwprofile = vdc.link(:location).get.link(:hardwareprofiles).get
-                              .select {|h| h.name == @machine.provider_config.hwprofile }.first
-            raise Abiquo::Errors::HWProfileNotFound, hwprofile: @machine.provider_config.hwprofile, vdc: vdc.name if hwprofile.nil?
-            hwprofile_lnk = hwprofile.link(:self).clone.to_hash
-            hwprofile_lnk['rel'] = 'hardwareprofile'
+          if lim.respond_to?(:enabledHardwareProfiles) && lim.enabledHardwareProfiles
+              # lookup the hwprofile link
+              hwprofile = vdc.link(:location).get.link(:hardwareprofiles).get
+                                .select {|h| h.name == @machine.provider_config.hwprofile }.first
+              raise Abiquo::Errors::HWProfileNotFound, hwprofile: @machine.provider_config.hwprofile, vdc: vdc.name if hwprofile.nil?
+              hwprofile_lnk = hwprofile.link(:self).clone.to_hash
+              hwprofile_lnk['rel'] = 'hardwareprofile'
 
-            vm_definition['links'] = [ tmpl_link, hwprofile_lnk ]
+              vm_definition['links'] = [ tmpl_link, hwprofile_lnk ]
           else
             cpu_cores = @machine.provider_config.cpu_cores
             ram_mb = @machine.provider_config.ram_mb

data/lib/vagrant_abiquo/actions/delete_vapp.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
           raise Abiquo::Errors::VDCNotFound, vdc: pconfig.virtualdatacenter if vdc.nil?
 
           vapp = get_vapp(vdc, pconfig.virtualappliance)
-          if vapp.link(:virtualmachines).get.count == 0
+          unless vapp.nil? || vapp.link(:virtualmachines).get.count > 0
             @logger.info "vApp '#{pconfig.virtualappliance}' is empty, deleting."
             vapp.delete
           end

data/lib/vagrant_abiquo/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Abiquo
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_abiquo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Daniel Beneyto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abiquo-api