vagrant_abiquo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e84c1cada8bf45ee196f4eff05307c2dbf2da31a
-  data.tar.gz: b4a7b2e211ac6b4e481b1d274e8f39a811f7a62e
+  metadata.gz: 3d52459a5932c1be97b7e5d6197e5735f1b432d6
+  data.tar.gz: 8acfc9a0a156761871e17abecd1b459efe643e1e
 SHA512:
-  metadata.gz: 2e93e8bf38d815fc94c4ed68669c7db0a9b48b2b397c02ed7d4e88512eb8efa4d1acf39e9dcac099cb623e58e3591693b6fe6cdc29f2c7c99d863028ef081ccf
-  data.tar.gz: 573c0fefd59d85790c4606511d3636760e9c2b050bbbd08f6720c7ca06c90ea89d8b2d82648e4b48fceb9eca511093205edd236a392f7ee9a0b79dfbb3ddaff8
+  metadata.gz: 3272327a7463373c99f6f40bc97e5055d7a4ded18a3faa51ca747613003bca49e8d1ee4a5e5d5d32d012f43cd16257249e68238b27256ecd64fb1c1b6118c9df
+  data.tar.gz: 9452f08c3feb41347fca22b822b88dd07bbf0d0313345e0dd936e384692e3c17e1c284c1ff3d968e9a5ebca370dccb604b6813ecdab8d57b8f3e631a69d8765c

data/Gemfile.lock

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

data/Vagrantfile

@@ -3,8 +3,10 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder ".", "/vagrant", type: "rsync"
 
-  config.vm.define "abiquotesting"
-  
+  (1..10).each do |ind|
+    config.vm.define "abiquotesting-#{ind}"
+  end
+
   config.vm.provider :abiquo do |provider, override|
     override.vm.box = 'abiquo'
     override.vm.box_url = "https://github.com/abiquo/vagrant_abiquo/raw/master/box/abiquo.box"
@@ -20,12 +22,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         }
       }
     }
-    #provider.cpu_cores = 2
-    #provider.ram_mb = 2048
-    provider.hwprofile = '4gb'
-    provider.virtualdatacenter = 'VDC'
+    provider.cpu_cores = 1
+    provider.ram_mb = 512
+    #provider.hwprofile = '4gb'
+    provider.virtualdatacenter = 'esx'
     provider.virtualappliance = 'Vagrant Tests'
-    provider.template = 'CentOS 7.3.1611 x64'
+    provider.template = 'Alpine'
 
     override.ssh.private_key_path = '~/.ssh/id_rsa'
   end

data/lib/vagrant_abiquo/actions.rb

@@ -1,5 +1,6 @@
 require 'vagrant_abiquo/actions/check_state'
 require 'vagrant_abiquo/actions/create'
+require 'vagrant_abiquo/actions/deploy'
 require 'vagrant_abiquo/actions/destroy'
 require 'vagrant_abiquo/actions/power_off'
 require 'vagrant_abiquo/actions/power_on'
@@ -42,6 +43,11 @@ module VagrantPlugins
               b.use SyncedFolders
             when :not_created
               b.use Create
+              b.use Deploy
+              b.use Provision
+              b.use SyncedFolders
+            when :NOT_ALLOCATED
+              b.use Deploy
               b.use Provision
               b.use SyncedFolders
             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.enabledHardwareProfiles
+          if lim.respond_to? :enabledHardwareProfiles
             if @machine.provider_config.hwprofile.nil?
               raise Abiquo::Errors::HWprofileEnabled, vdc: @machine.provider_config.virtualdatacenter
             end
@@ -47,7 +47,7 @@ module VagrantPlugins
           vm_definition = {}
           
           # Configured CPU and RAM
-          if lim.enabledHardwareProfiles
+          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
@@ -61,6 +61,7 @@ module VagrantPlugins
             ram_mb = @machine.provider_config.ram_mb
             vm_definition['cpu'] = cpu_cores || template.cpuRequired
             vm_definition['ram'] = ram_mb || template.ramRequired
+            vm_definition['links'] = [ tmpl_link ]
           end
 
           vm_definition['label'] = @machine.name
@@ -88,30 +89,7 @@ module VagrantPlugins
             raise Abiquo::Errors::NetworkError if vm.nil?
           end
           vm = vm.link(:edit).get
-
-          # Deploying VM
-          env[:ui].info I18n.t('vagrant_abiquo.info.deploy')
-          task = deploy(vm)
-
-          if task.state == 'FINISHED_SUCCESSFULLY'
-            # Deploy successfully completed
-            env[:ui].info I18n.t('vagrant_abiquo.info.deploycompleted')
-
-            # Give time to the OS to boot.
-            retryable(:tries => 20, :sleep => 5) do
-              next if env[:interrupted]
-              raise 'not ready' if !@machine.communicate.ready?
-            end
-
-            # Find its IP
-            vm = vm.link(:edit).get
-            ip = vm.link(:nic0).title
-            env[:ui].info I18n.t('vagrant_abiquo.info.vm_ip', :ip => ip)
-            @machine.id = vm.url
-          else
-            # Deploy failed
-            env[:ui].error I18n.t('vagrant_abiquo.info.deployfailed')
-          end
+          @machine.id = vm.url
 
           @app.call(env)
         end

data/lib/vagrant_abiquo/actions/create_vapp.rb

@@ -15,7 +15,10 @@ module VagrantPlugins
         end
 
         def call(env)
-          pconfig = env[:env].vagrantfile.config.finalize![:vm].get_provider_config(:abiquo)
+          if env[:env].vagrantfile.config.finalize![:vm].respond_to? :get_provider_config
+            pconfig = env[:env].vagrantfile.config.finalize![:vm].get_provider_config(:abiquo)
+            return if pconfig.abiquo_connection_data.nil?
+          end
           @client ||= AbiquoAPI.new(pconfig.abiquo_connection_data)
 
           @logger.info "Checking vApp '#{pconfig.virtualappliance}'"

data/lib/vagrant_abiquo/actions/delete_vapp.rb

@@ -0,0 +1,41 @@
+require 'vagrant_abiquo/helpers/client'
+require 'vagrant_abiquo/helpers/abiquo'
+
+module VagrantPlugins
+  module Abiquo
+    module Actions
+      class DeletevApp
+        include Helpers::Client
+        include Helpers::Abiquo
+        
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @logger = Log4r::Logger.new('vagrant::abiquo::delete_vapp')
+        end
+
+        def call(env)
+          if env[:env].vagrantfile.config.finalize![:vm].respond_to? :get_provider_config
+            pconfig = env[:env].vagrantfile.config.finalize![:vm].get_provider_config(:abiquo)
+            return if pconfig.abiquo_connection_data.nil?
+          end
+          @client ||= AbiquoAPI.new(pconfig.abiquo_connection_data)
+
+          @logger.info "Checking vApp '#{pconfig.virtualappliance}'"
+
+          @logger.info "Looking up VDC '#{pconfig.virtualdatacenter}'"
+          vdc = get_vdc(pconfig.virtualdatacenter)
+          raise Abiquo::Errors::VDCNotFound, vdc: pconfig.virtualdatacenter if vdc.nil?
+
+          vapp = get_vapp(vdc, pconfig.virtualappliance)
+          if vapp.link(:virtualmachines).get.count == 0
+            @logger.info "vApp '#{pconfig.virtualappliance}' is empty, deleting."
+            vapp.delete
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant_abiquo/actions/deploy.rb

@@ -0,0 +1,70 @@
+require 'vagrant_abiquo/helpers/client'
+require 'vagrant_abiquo/helpers/abiquo'
+
+module VagrantPlugins
+  module Abiquo
+    module Actions
+      class Deploy
+        include Helpers::Client
+        include Helpers::Abiquo
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @client = client
+          @env = env
+          @logger = Log4r::Logger.new('vagrant::abiquo::deploy')
+        end
+
+        def call(env)
+          vm = get_vm(@machine.id)
+          
+          # Deploying VM
+          env[:ui].info I18n.t('vagrant_abiquo.info.deploy')
+          task = deploy(vm)
+
+          if task.state == 'FINISHED_SUCCESSFULLY'
+            # Deploy successfully completed
+            env[:ui].info I18n.t('vagrant_abiquo.info.deploycompleted')
+
+            # Give time to the OS to boot.
+            retryable(:tries => 20, :sleep => 5) do
+              next if env[:interrupted]
+              raise 'not ready' if !@machine.communicate.ready?
+            end
+
+            # Find its IP
+            vm = vm.link(:edit).get
+            ip = vm.link(:nic0).title
+            env[:ui].info I18n.t('vagrant_abiquo.info.vm_ip', :ip => ip)
+            @machine.id = vm.url
+          else
+            # Deploy failed
+            env[:ui].error I18n.t('vagrant_abiquo.info.deployfailed')
+          end
+
+          @app.call(env)
+        end
+
+        # Both the recover and terminate are stolen almost verbatim from
+        # the Vagrant AWS provider up action
+        def recover(env)
+          return if env['vagrant.error'].is_a?(Vagrant::Errors::VagrantError)
+
+          if @machine.state.id != :not_created
+            terminate(env)
+          end
+        end
+
+        def terminate(env)
+          destroy_env = env.dup
+          destroy_env.delete(:interrupted)
+          destroy_env[:config_validate] = false
+          destroy_env[:force_confirm_destroy] = true
+          env[:action_runner].run(Actions.destroy, destroy_env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant_abiquo/config.rb

@@ -24,9 +24,11 @@ module VagrantPlugins
       end
 
       def finalize!
+        @abiquo_connection_data = {} if @abiquo_connection_data == UNSET_VALUE
         @abiquo_connection_data[:abiquo_api_url] = ENV['ABQ_URL'] if @abiquo_connection_data[:abiquo_api_url].nil?
         @abiquo_connection_data[:abiquo_username] = ENV['ABQ_USER'] if @abiquo_connection_data[:abiquo_username].nil?
         @abiquo_connection_data[:abiquo_password] = ENV['ABQ_PASS'] if @abiquo_connection_data[:abiquo_password].nil?
+        @abiquo_connection_data = nil if @abiquo_connection_data[:abiquo_api_url].nil?
 
         @virtualdatacenter = ENV['ABQ_VDC'] if @virtualdatacenter == UNSET_VALUE
         @virtualappliance = ENV['ABQ_VAPP'] if @virtualappliance == UNSET_VALUE

data/lib/vagrant_abiquo/plugin.rb

@@ -21,6 +21,11 @@ module VagrantPlugins
         require_relative 'actions/create_vapp.rb'
         hook.prepend(Actions::CreatevApp)
       end
+
+      action_hook(:delete_vapp, :environment_unload) do |hook|
+        require_relative 'actions/delete_vapp.rb'
+        hook.prepend(Actions::DeletevApp)
+      end
     end
   end
 end

data/lib/vagrant_abiquo/provider.rb

@@ -42,9 +42,11 @@ module VagrantPlugins
 
       def ssh_info
         return nil if state.id != :ON
-
-        @vm ||= Provider.virtualmachine(@machine)
-        @ip ||= @vm.link(:nics).get.first.ip
+        begin
+          @ip ||= @vm.link(:nics).get.first.ip
+        rescue Exception
+          return nil
+        end
         
         template = @vm.link(:virtualmachinetemplate).get unless @username
         @username = template.loginUser if template.respond_to? :loginUser
@@ -57,7 +59,7 @@ module VagrantPlugins
       end
 
       def state
-        @vm ||= Provider.virtualmachine(@machine)
+        @vm = Provider.virtualmachine(@machine)
         state = @vm.nil? ? :not_created : @vm.state.to_sym
         long = short = state.to_s
         Vagrant::MachineState.new(state, short, long)

data/lib/vagrant_abiquo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_abiquo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Beneyto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abiquo-api
@@ -64,6 +64,8 @@ files:
 - lib/vagrant_abiquo/actions/check_state.rb
 - lib/vagrant_abiquo/actions/create.rb
 - lib/vagrant_abiquo/actions/create_vapp.rb
+- lib/vagrant_abiquo/actions/delete_vapp.rb
+- lib/vagrant_abiquo/actions/deploy.rb
 - lib/vagrant_abiquo/actions/destroy.rb
 - lib/vagrant_abiquo/actions/power_off.rb
 - lib/vagrant_abiquo/actions/power_on.rb