vagrant_abiquo 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9204419a82ee1a7ad3e2b447e2ae7cdc0be0ac34
-  data.tar.gz: 8ba5d4eacb15ee24ee8cbab7ac993244c10a523d
+  metadata.gz: ebfd2778cc1f2fb46b9f4a67a98f74ba6894bf47
+  data.tar.gz: 3b7c3adc0ff0d1762dded68cb7716cc79b42bf73
 SHA512:
-  metadata.gz: b166481d7d44b0113d595693909bf28bfc409377458989796e6baf3283ea98606cfe4e0e706e750f7101ec47f284ed189fbfd2cb686bb448c6a01de07b1ea44b
-  data.tar.gz: 26132721e2f649d26c1f317e0e6785915d5364129c90983cab9c3180cb7ceca056c94d91d82ab5749408562001e9a3c8a8ce8e0f91a9d8b8089db723b97b3d60
+  metadata.gz: fd47d96785ed490c9f545506af10ae21d61467b3bb6136cddb2bd4a02d4690b413eb9cd6f1452951a7d705b95feaea382666d2905e2ea2d8370c04eff63aec19
+  data.tar.gz: 25d3b0caecfe86e5b688356a0cf2e5260e86eabedda3bfb4dd11eb14f7544a1bdccd0beadade8512256eaed8f51b155004bc7710ddb18a1eada686379d204516

data/Gemfile.lock

@@ -1,18 +1,17 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 96368d8a1f778761e74433b83502f119610a6647
+  revision: 40d5c28f3f16d446b9bb57153fc6bc5ee8522d77
   specs:
-    vagrant (1.9.2.dev)
-      childprocess (~> 0.5.0)
+    vagrant (1.9.8.dev)
+      childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
       i18n (>= 0.6.0, <= 0.8.0)
       listen (~> 3.1.5)
       log4r (~> 1.1.9, < 1.1.11)
-      net-scp (~> 1.1.0)
+      net-scp (~> 1.2.0)
       net-sftp (~> 2.1)
-      net-ssh (~> 3.0.1)
-      nokogiri (= 1.6.7.1)
+      net-ssh (~> 4.1.0)
       rb-kqueue (~> 0.2.0)
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
@@ -24,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant_abiquo (0.0.8)
+    vagrant_abiquo (0.1.0)
       abiquo-api (~> 0.1.2)
       log4r
 
@@ -39,22 +38,22 @@ GEM
       formatador (~> 0.2, >= 0.2.5)
       json
       simple_oauth (~> 0.3.1, >= 0.3.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     builder (3.2.3)
     byebug (9.0.6)
-    childprocess (0.5.9)
+    childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
-    domain_name (0.5.20161129)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    excon (0.55.0)
+    excon (0.58.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.17)
+    ffi (1.9.18)
     formatador (0.2.5)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -65,31 +64,28 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (0.8.0)
-    json (2.0.3)
+    json (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     little-plugger (1.1.4)
     log4r (1.1.10)
-    logging (2.1.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.0.0)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    net-scp (1.1.2)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
+    net-ssh (4.1.0)
     netrc (0.11.0)
-    nokogiri (1.6.7.1)
-      mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -100,25 +96,25 @@ GEM
       pry (~> 0.10)
     public_suffix (2.0.5)
     rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.4)
-      ffi (>= 0.5.0)
-    rest-client (2.0.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     ruby_dep (1.3.1)
-    rubyntlm (0.6.1)
+    rubyntlm (0.6.2)
     rubyzip (1.2.1)
     simple_oauth (0.3.1)
     slop (3.6.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.4)
     wdm (0.1.1)
-    winrm (2.1.2)
+    winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)

data/Rakefile

@@ -15,8 +15,3 @@ task :test do
   end
 end
 
-def env
-  ['ABIQUO_API_USER', 'ABIQUO_API_PASSWORD', 'VAGRANT_LOG'].inject('') do |acc, key|
-    acc += "#{key}=#{ENV[key] || 'error'} "
-  end
-end

data/Vagrantfile

@@ -3,10 +3,16 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder ".", "/vagrant", type: "rsync"
 
-  config.vm.define "abiquosingle"
+  config.vm.define "abiquosingle" do |abq|
+    abq.vm.provision "shell",
+      inline: "echo Hello, World"
+  end
 
-  #(1..10).each do |ind|
-  #  config.vm.define "abiquotesting-#{ind}"
+  #(1..3).each do |ind|
+  #  config.vm.define "abiquotesting-#{ind}" do |vm|
+  #    vm.vm.provision "shell",
+  #      inline: "echo Hello, $(hostname)"
+  #  end
   #end
 
   config.vm.provider :abiquo do |provider, override|
@@ -15,7 +21,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     override.vm.hostname = 'abiquotesting'
 
     provider.abiquo_connection_data = {
-      abiquo_api_url: 'https://chirauki40.bcn.abiquo.com/api',
+      abiquo_api_url: 'https://chirauki401.bcn.abiquo.com/api',
       abiquo_username: 'admin',
       abiquo_password: 'xabiquo',
       connection_options: {
@@ -24,14 +30,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         }
       }
     }
-    provider.cpu_cores = 1
-    provider.ram_mb = 512
-    #provider.hwprofile = '4gb'
-    provider.virtualdatacenter = 'esx'
+    #provider.cpu_cores = 1
+    #provider.ram_mb = 512
+    provider.hwprofile = 'A0'
+    provider.virtualdatacenter = 'ESX'
     provider.virtualappliance = 'Vagrant Tests'
     provider.template = 'Centos 7 x86_64'
 
     override.ssh.private_key_path = '~/.ssh/id_rsa'
-    override.ssh.username = 'centos'
   end
 end

data/lib/vagrant_abiquo.rb

@@ -1,6 +1,5 @@
 require 'pathname'
 require 'vagrant_abiquo/plugin'
-require 'vagrant_abiquo/helpers/client'
 
 module VagrantPlugins
   module Abiquo
@@ -11,8 +10,5 @@ module VagrantPlugins
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
-
-    I18n.load_path << File.expand_path('locales/en.yml', source_root)
-    I18n.reload!
   end
 end

data/lib/vagrant_abiquo/actions.rb

@@ -1,63 +1,67 @@
-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'
-require 'vagrant_abiquo/actions/reset'
-
 module VagrantPlugins
   module Abiquo
     module Actions
       include Vagrant::Action::Builtin
 
-      def self.destroy
+      def self.action_destroy
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
+          builder.use Connect
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
             when :not_created
               env[:ui].info I18n.t('vagrant_abiquo.info.not_created')
-            else
+            when :ON, :OFF
               b.use Call, DestroyConfirm do |env2, b2|
                 if env2[:result]
                   b2.use ProvisionerCleanup, :before if defined?(ProvisionerCleanup)
                   b2.use Destroy
+                  b2.use DeletevApp
                 end
               end
+            else
+              raise Abiquo::Errors::InvalidStateError, vm: env[:machine].name.to_s, state: env[:machine_state]
             end
           end
         end
       end
 
-      def self.up
+      def self.action_up
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
+          builder.use Connect
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
             when :ON
               env[:ui].info I18n.t('vagrant_abiquo.info.already_active')
             when :OFF
               b.use PowerOn
+              b.use WaitForCommunicator
               b.use Provision
               b.use SyncedFolders
             when :not_created
+              b.use CreatevApp
               b.use Create
               b.use Deploy
+              b.use WaitForCommunicator
               b.use Provision
               b.use SyncedFolders
             when :NOT_ALLOCATED
               b.use Deploy
+              b.use WaitForCommunicator
               b.use Provision
               b.use SyncedFolders
+            else
+              raise Abiquo::Errors::InvalidStateError, vm: env[:machine].name.to_s, state: env[:machine_state]
             end
           end
         end
       end
 
-      def self.reload
+      def self.action_reload
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
+          builder.use Connect
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
             when :not_created
@@ -69,9 +73,10 @@ module VagrantPlugins
         end
       end
 
-      def self.halt
+      def self.action_halt
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
+          builder.use Connect
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
             when :ON
@@ -85,9 +90,10 @@ module VagrantPlugins
         end
       end
 
-      def self.ssh
+      def self.action_ssh
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
+          builder.use Connect
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
             when :ON
@@ -101,9 +107,10 @@ module VagrantPlugins
         end
       end
 
-      def self.ssh_run
+      def self.action_ssh_run
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
+          builder.use Connect
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
             when :ON
@@ -117,23 +124,53 @@ module VagrantPlugins
         end
       end
 
-      def self.provision
+      def self.action_provision
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
+          builder.use Connect
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
-            when :ON
-              b.use Provision
-              b.use SyncedFolders
             when :OFF
               env[:ui].info I18n.t('vagrant_abiquo.info.off')
             when :not_created
               env[:ui].info I18n.t('vagrant_abiquo.info.not_created')
+            when :ON
+              b.use Provision
+              b.use SyncedFolders
             end
           end
         end
       end
 
+      def self.action_check_state
+        return Vagrant::Action::Builder.new.tap do |builder|
+          builder.use ConfigValidate
+          builder.use Connect
+          builder.use CheckState 
+        end
+      end
+
+      def self.action_read_ssh_info
+        return Vagrant::Action::Builder.new.tap do |builder|
+          builder.use ConfigValidate
+          builder.use Connect
+          builder.use ReadSSHInfo
+        end
+      end
+
+      # The autoload farm
+      action_root = Pathname.new(File.expand_path("../actions", __FILE__))
+      autoload :Connect, action_root.join("connect")
+      autoload :CheckState, action_root.join("check_state")
+      autoload :CreatevApp, action_root.join("create_vapp")
+      autoload :Create, action_root.join("create")
+      autoload :Deploy, action_root.join("deploy")
+      autoload :Destroy, action_root.join("destroy")
+      autoload :DeletevApp, action_root.join("delete_vapp")
+      autoload :PowerOff, action_root.join("power_off")
+      autoload :PowerOn, action_root.join("power_on")
+      autoload :ReadSSHInfo, action_root.join("read_ssh_info")
+      autoload :Reset, action_root.join("reset")
     end
   end
 end

data/lib/vagrant_abiquo/actions/check_state.rb

@@ -1,12 +1,9 @@
-require 'vagrant_abiquo/helpers/client'
 require 'vagrant_abiquo/helpers/abiquo'
 
 module VagrantPlugins
   module Abiquo
     module Actions
-      class CheckState
-        include Helpers::Client
-        
+      class CheckState        
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
@@ -14,8 +11,29 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_state] = @machine.state.id
-          @logger.info "Machine state is '#{@machine.state.id}'"
+          vapp_name = @machine.provider_config.virtualappliance.nil? ? File.basename(@machine.env.cwd) : @machine.provider_config.virtualappliance
+
+          # If machine ID is nil try to lookup by name
+          if @machine.id.nil?
+            vms_lnk = AbiquoAPI::Link.new :href => 'cloud/virtualmachines',
+                                          :type => 'application/vnd.abiquo.virtualmachines+json',
+                                          :client => env[:abiquo_client]
+            @vm = vms_lnk.get.select {|v| v.label == @machine.name.to_s and 
+              v.link(:virtualappliance).title == vapp_name }.first
+            @machine.id = @vm.url unless @vm.nil?
+          else
+            # ID is the URL of the VM
+            begin
+              vm_lnk = AbiquoAPI::Link.new :href => @machine.id,
+                                           :type => 'application/vnd.abiquo.virtualmachine+json',
+                                           :client => env[:abiquo_client]
+              @vm = vm_lnk.get
+            rescue AbiquoAPIClient::NotFound
+              nil
+            end
+          end
+          env[:machine_state] = @vm.nil? ? :not_created : @vm.state.to_sym
+          @logger.info "Machine state is '#{env[:machine_state]}'"
           @app.call(env)
         end
       end

data/lib/vagrant_abiquo/actions/connect.rb

@@ -0,0 +1,23 @@
+require 'abiquo-api'
+
+module VagrantPlugins
+  module Abiquo
+    module Actions
+      class Connect
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @env = env
+          @logger = Log4r::Logger.new('vagrant::abiquo::connect')
+        end
+        
+        def call(env)
+          client ||= AbiquoAPI.new(@machine.provider_config.abiquo_connection_data)
+          env[:abiquo_client] = client
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant_abiquo/actions/create.rb

@@ -1,25 +1,23 @@
-require 'vagrant_abiquo/helpers/client'
 require 'vagrant_abiquo/helpers/abiquo'
 
 module VagrantPlugins
   module Abiquo
     module Actions
       class Create
-        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::create')
         end
 
         def call(env)
+          client = env[:abiquo_client]
+          
           # Find for selected virtual datacenter
-          vdc = get_vdc(@machine.provider_config.virtualdatacenter)
+          vdc = get_vdc(client, @machine.provider_config.virtualdatacenter)
           raise Abiquo::Errors::VDCNotFound, vdc: @machine.provider_config.virtualdatacenter if vdc.nil?
           
           # Check if we have to use hwprofiles
@@ -69,7 +67,7 @@ module VagrantPlugins
 
           # Create VM
           env[:ui].info I18n.t('vagrant_abiquo.info.create')
-          vm = create_vm(vm_definition, vapp)
+          vm = create_vm(client, vm_definition, vapp)
 
           # User Data
           md = vm.link(:metadata).get
@@ -79,13 +77,13 @@ module VagrantPlugins
           else
             mdhash['metadata']['startup-script'] = @machine.provider_config.user_data
           end
-          @client.put(vm.link(:metadata), mdhash.to_json)
+          client.put(vm.link(:metadata), mdhash.to_json)
 
           # Check network
           unless @machine.provider_config.network.nil?
             # Network config is not nil, so we have
             # to attach a specific net.
-            attach_net(vm, @machine.provider_config.network)
+            attach_net(client, vm, @machine.provider_config.network)
             raise Abiquo::Errors::NetworkError if vm.nil?
           end
           vm = vm.link(:edit).get
@@ -93,24 +91,6 @@ module VagrantPlugins
 
           @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

data/lib/vagrant_abiquo/actions/create_vapp.rb

@@ -1,11 +1,9 @@
-require 'vagrant_abiquo/helpers/client'
 require 'vagrant_abiquo/helpers/abiquo'
 
 module VagrantPlugins
   module Abiquo
     module Actions
       class CreatevApp
-        include Helpers::Client
         include Helpers::Abiquo
         
         def initialize(app, env)
@@ -15,22 +13,23 @@ module VagrantPlugins
         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)
+          if @machine.provider_config.class == VagrantPlugins::Abiquo::Config
+            client = env[:abiquo_client]
+            
+            pconfig = @machine.provider_config
+
+            @logger.info "Checking vApp '#{pconfig.virtualappliance}'"
 
-          @logger.info "Checking vApp '#{pconfig.virtualappliance}'"
+            @logger.info "Looking up VDC '#{pconfig.virtualdatacenter}'"
 
-          @logger.info "Looking up VDC '#{pconfig.virtualdatacenter}'"
-          vdc = get_vdc(pconfig.virtualdatacenter)
-          raise Abiquo::Errors::VDCNotFound, vdc: pconfig.virtualdatacenter if vdc.nil?
+            vdc = get_vdc(client, pconfig.virtualdatacenter)
+            raise Abiquo::Errors::VDCNotFound, vdc: pconfig.virtualdatacenter if vdc.nil?
 
-          vapp = get_vapp(vdc, pconfig.virtualappliance)
-          if vapp.nil?
-            @logger.info "vApp '#{pconfig.virtualappliance}' does not exist, creating."
-            create_vapp(vdc, pconfig.virtualappliance)
+            vapp = get_vapp(vdc, pconfig.virtualappliance)
+            if vapp.nil?
+              @logger.info "vApp '#{pconfig.virtualappliance}' does not exist, creating."
+              create_vapp(client, vdc, pconfig.virtualappliance)
+            end
           end
 
           @app.call(env)

data/lib/vagrant_abiquo/actions/delete_vapp.rb

@@ -1,11 +1,9 @@
-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)
@@ -15,22 +13,22 @@ module VagrantPlugins
         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)
+          if @machine.provider_config.class == VagrantPlugins::Abiquo::Config
+            client = env[:abiquo_client]
+            
+            pconfig = @machine.provider_config
 
-          @logger.info "Checking vApp '#{pconfig.virtualappliance}'"
+            @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?
+            @logger.info "Looking up VDC '#{pconfig.virtualdatacenter}'"
+            vdc = get_vdc(client, pconfig.virtualdatacenter)
+            raise Abiquo::Errors::VDCNotFound, vdc: pconfig.virtualdatacenter if vdc.nil?
 
-          vapp = get_vapp(vdc, pconfig.virtualappliance)
-          unless vapp.nil? || vapp.link(:virtualmachines).get.count > 0
-            @logger.info "vApp '#{pconfig.virtualappliance}' is empty, deleting."
-            vapp.delete
+            vapp = get_vapp(vdc, pconfig.virtualappliance)
+            unless vapp.nil? || vapp.link(:virtualmachines).get.count > 0
+              @logger.info "vApp '#{pconfig.virtualappliance}' is empty, deleting."
+              vapp.delete
+            end
           end
 
           @app.call(env)

data/lib/vagrant_abiquo/actions/deploy.rb

@@ -1,35 +1,33 @@
-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)
+          client = env[:abiquo_client]
+          vm = get_vm(client, @machine.id)
           
           # Deploying VM
           env[:ui].info I18n.t('vagrant_abiquo.info.deploy')
-          task = deploy(vm)
+          task = deploy(client, 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
+            # wait for ssh to be ready
+            retryable(:tries => 120, :sleep => 10) do
               next if env[:interrupted]
               raise 'not ready' if !@machine.communicate.ready?
             end
@@ -62,7 +60,7 @@ module VagrantPlugins
           destroy_env.delete(:interrupted)
           destroy_env[:config_validate] = false
           destroy_env[:force_confirm_destroy] = true
-          env[:action_runner].run(Actions.destroy, destroy_env)
+          env[:action_runner].run(Actions.action_destroy, destroy_env)
         end
       end
     end

data/lib/vagrant_abiquo/actions/destroy.rb

@@ -1,24 +1,22 @@
-require 'vagrant_abiquo/helpers/client'
 require 'vagrant_abiquo/helpers/abiquo'
 
 module VagrantPlugins
   module Abiquo
     module Actions
       class Destroy
-        include Helpers::Client
         include Helpers::Abiquo
         include Vagrant::Util::Retryable
 
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @logger = Log4r::Logger.new('vagrant::abiquo::destroy')
         end
 
         def call(env)
+          client = env[:abiquo_client]
           env[:ui].info I18n.t('vagrant_abiquo.info.destroying', vm: @machine.name)
-          vm = get_vm(@machine.id)
+          vm = get_vm(client, @machine.id)
           vm.delete
 
           # Check when task finishes. This may take a while

data/lib/vagrant_abiquo/actions/power_off.rb

@@ -1,24 +1,20 @@
-require 'vagrant_abiquo/helpers/client'
 require 'vagrant_abiquo/helpers/abiquo'
 
 module VagrantPlugins
   module Abiquo
     module Actions
       class PowerOff
-        include Helpers::Client
         include Helpers::Abiquo
-        include Vagrant::Util::Retryable
         
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = AbiquoAPI.new(@machine.provider_config.abiquo_connection_data)
           @logger = Log4r::Logger.new('vagrant::abiquo::power_off')
         end
 
         def call(env)
-          vm = get_vm(@machine.id)
-          vm = power_off(vm)
+          vm = get_vm(client, @machine.id)
+          vm = power_off(client, vm)
           raise PowerOffError, vm: vm.label, state: vm.state if vm.state != 'OFF'
 
           @app.call(env)

data/lib/vagrant_abiquo/actions/power_on.rb

@@ -1,24 +1,20 @@
-require 'vagrant_abiquo/helpers/client'
 require 'vagrant_abiquo/helpers/abiquo'
 
 module VagrantPlugins
   module Abiquo
     module Actions
       class PowerOn
-        include Helpers::Client
         include Helpers::Abiquo
-        include Vagrant::Util::Retryable
         
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = AbiquoAPI.new(@machine.provider_config.abiquo_connection_data)
-          @logger = Log4r::Logger.new('vagrant::abiquo::power_off')
+          @logger = Log4r::Logger.new('vagrant::abiquo::power_on')
         end
 
         def call(env)
-          vm = get_vm(@machine.id)
-          vm = poweron(vm)
+          vm = get_vm(client, @machine.id)
+          vm = poweron(client, vm)
           raise PowerOnError, vm: vm.label, state: vm.state if vm.state != 'ON'
 
           @app.call(env)

data/lib/vagrant_abiquo/actions/read_ssh_info.rb

@@ -0,0 +1,41 @@
+require 'vagrant_abiquo/helpers/abiquo'
+
+module VagrantPlugins
+  module Abiquo
+    module Actions
+      class ReadSSHInfo
+        include Helpers::Abiquo
+        
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @logger = Log4r::Logger.new('vagrant::abiquo::ssh_info')
+        end
+
+        def call(env)
+          vm = get_vm(env[:abiquo_client], @machine.id)
+          
+          return nil if vm.nil? || vm.state != 'ON'
+          
+          ip ||= vm.link(:nics).get.first.ip
+
+          if @machine.config.ssh.username.nil?
+            template = vm.link(:virtualmachinetemplate).get 
+            username = template.loginUser.nil? ? 'root' : template.loginUser
+          else
+            username = @machine.config.ssh.username
+          end
+
+          env[:machine_ssh_info] = {
+            :host => ip,
+            :port => 22,
+            :username => username
+          }
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant_abiquo/actions/reset.rb

@@ -1,25 +1,22 @@
-require 'vagrant_abiquo/helpers/client'
 require 'vagrant_abiquo/helpers/abiquo'
 
 module VagrantPlugins
   module Abiquo
     module Actions
       class Reset
-        include Helpers::Client
         include Helpers::Abiquo
         include Vagrant::Util::Retryable
 
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = AbiquoAPI.new(@machine.provider_config.abiquo_connection_data)
           @logger = Log4r::Logger.new('vagrant::abiquo::reset')
         end
 
         def call(env)
           env[:ui].info I18n.t('vagrant_abiquo.info.reloading')
-          vm = get_vm(@machine.id)
-          vm = reset(vm)
+          vm = get_vm(client, @machine.id)
+          vm = reset(client, vm)
 
           # Give time to the OS to boot.
           retryable(:tries => 120, :sleep => 10) do

data/lib/vagrant_abiquo/config.rb

@@ -43,7 +43,7 @@ module VagrantPlugins
 
         if @user_data == UNSET_VALUE
           # We will make sure the SSH key is injected.
-          @user_data = '#!/bin/bash\necho "vagrant_abiquo :: making sure SSH key gets injected."'
+          @user_data = "#!/bin/bash\necho \"vagrant_abiquo :: making sure SSH key gets injected.\""
         end
       end
 

data/lib/vagrant_abiquo/errors.rb

@@ -5,6 +5,10 @@ module VagrantPlugins
         error_namespace("vagrant_abiquo.errors")
       end
 
+      class InvalidStateError < AbiquoError
+        error_key(:invalid_state)
+      end
+
       class VDCNotFound < AbiquoError
         error_key(:vdc_not_found)
       end

data/lib/vagrant_abiquo/helpers/abiquo.rb

@@ -1,27 +1,21 @@
 require 'abiquo-api'
-require 'log4r'
-include Log4r
 
 module VagrantPlugins
   module Abiquo
     module Helpers
       module Abiquo
-        include Helpers::Client
-
-        @logger = Log4r::Logger.new('vagrant::abiquo::helper')
-
         def vapp_name(machine)
           machine.provider_config.virtualappliance.nil? ? File.basename(machine.env.cwd) : machine.provider_config.virtualappliance
         end
 
-        def get_vm(vm_url)
+        def get_vm(client, vm_url)
           vm_lnk = AbiquoAPI::Link.new :href => vm_url,
                                        :type => 'application/vnd.abiquo.virtualmachine+json',
                                        :client => client
           vm_lnk.get
         end
 
-        def get_vdc(vdc_name)
+        def get_vdc(client, vdc_name)
           vdcs_lnk = AbiquoAPI::Link.new :href => 'cloud/virtualdatacenters',
                                          :type => "application/vnd.abiquo.virtualdatacenters+json",
                                          :client => client
@@ -32,7 +26,7 @@ module VagrantPlugins
           vdc.link(:virtualappliances).get.select {|va| va.name == name }.first
         end
 
-        def create_vapp(vdc, name)
+        def create_vapp(client, vdc, name)
           vapp_hash = { 'name' => name }
           client.post(vdc.link(:virtualappliances), vapp_hash.to_json,
                     accept: 'application/vnd.abiquo.virtualappliance+json',
@@ -48,18 +42,19 @@ module VagrantPlugins
 
           networks = []
           %w(privatenetworks network externalnetworks).each do |nettype|
-            vdc.link(nettype.to_sym).get.each {|n| networks << n} if vdc.link? nettype.to_sym
+            next if vdc.link(:location).type.include? "publiccloudregion" and nettype == "network"
+            vdc.link(nettype.to_sym).get.each {|n| networks << n} if vdc.has_link? nettype.to_sym
           end
           networks.select {|n| n.name == net_name }.first
         end
 
-        def create_vm(vm_def, vapp)
+        def create_vm(client, vm_def, vapp)
           client.post(vapp.link(:virtualmachines), vm_def.to_json, 
               :content => "application/vnd.abiquo.virtualmachine+json", 
               :accept => "application/vnd.abiquo.virtualmachine+json" )
         end
 
-        def attach_net(vm, net_data)
+        def attach_net(client, vm, net_data)
           net_data.each do |net, ip|
             network = get_network(vm, net)
             return nil if network.nil?
@@ -97,7 +92,7 @@ module VagrantPlugins
           end
         end
 
-        def deploy(vm)
+        def deploy(client, vm)
           task_lnk = client.post(vm.link(:deploy), '').link(:status).href
           task = AbiquoAPI::Link.new(:href => task_lnk,
                                      :type => 'application/vnd.abiquo.task+json',
@@ -112,7 +107,7 @@ module VagrantPlugins
           task
         end
 
-        def apply_state(vm, state)
+        def apply_state(client, vm, state)
           task_lnk = client.put(vm.link(:state), {"state" => state}.to_json,
                         :accept => 'application/vnd.abiquo.acceptedrequest+json',
                         :content => 'application/vnd.abiquo.virtualmachinestate+json').link(:status)
@@ -126,15 +121,15 @@ module VagrantPlugins
           vm.link(:edit).get
         end
 
-        def poweroff(vm)
-          apply_state('OFF')
+        def poweroff(client, vm)
+          apply_state(client, 'OFF')
         end
 
-        def poweron(vm)
-          apply_state('ON')
+        def poweron(client, vm)
+          apply_state(client, 'ON')
         end
 
-        def reset(vm)
+        def reset(client, vm)
           task = client.post(vm.link(:reset), '',
                         :accept => 'application/vnd.abiquo.acceptedrequest+json',
                         :content => 'application/json').link(:status).get
@@ -147,7 +142,7 @@ module VagrantPlugins
           vm.link(:edit).get
         end
 
-        def update(vm)
+        def update(client, vm)
           task = client.put(vm.link(:edit), vm.to_json,
                         :accept => 'application/vnd.abiquo.acceptedrequest+json',
                         :content => vm.link(:edit).type)

data/lib/vagrant_abiquo/plugin.rb

@@ -13,19 +13,26 @@ module VagrantPlugins
       end
 
       provider(:abiquo, parallel: true) do
+        setup_i18n
+
         require_relative 'provider'
         Provider
       end
 
-      action_hook(:create_vapp, :environment_load) do |hook|
-        require_relative 'actions/create_vapp.rb'
-        hook.prepend(Actions::CreatevApp)
+      def self.setup_i18n
+        I18n.load_path << File.expand_path('locales/en.yml', Abiquo.source_root)
+        I18n.reload!
       end
 
-      action_hook(:delete_vapp, :environment_unload) do |hook|
-        require_relative 'actions/delete_vapp.rb'
-        hook.prepend(Actions::DeletevApp)
-      end
+      # action_hook(:create_vapp, :environment_load) do |hook|
+      #   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

@@ -1,66 +1,25 @@
-require 'vagrant_abiquo/helpers/client'
 require 'abiquo-api'
 
 module VagrantPlugins
   module Abiquo
     class Provider < Vagrant.plugin('2', :provider)
-
-      def self.virtualmachine(machine, opts = {})
-        @client ||= AbiquoAPI.new(machine.provider_config.abiquo_connection_data)
-
-        vapp_name = machine.provider_config.virtualappliance.nil? ? File.basename(machine.env.cwd) : machine.provider_config.virtualappliance
-        # If machine ID is nil try to lookup by name
-        if machine.id.nil?
-          vms_lnk = AbiquoAPI::Link.new :href => 'cloud/virtualmachines',
-                                        :type => 'application/vnd.abiquo.virtualmachines+json',
-                                        :client => @client
-          @vm = vms_lnk.get.select {|v| v.label == machine.name.to_s and 
-            v.link(:virtualappliance).title == vapp_name }.first
-          machine.id = @vm.url unless @vm.nil?
-          @vm
-        else
-          # ID is the URL of the VM
-          begin
-            vm_lnk = AbiquoAPI::Link.new :href => machine.id,
-                                         :type => 'application/vnd.abiquo.virtualmachine+json',
-                                         :client => @client
-            @vm = vm_lnk.get
-          rescue AbiquoAPIClient::NotFound
-            nil
-          end
-        end
-      end
-
       def initialize(machine)
         @machine = machine
       end
 
       def action(name)
-        return Actions.send(name) if Actions.respond_to?(name)
+        return Actions.send("action_#{name}") if Actions.respond_to?("action_#{name}")
         nil
       end
 
       def ssh_info
-        return nil if state.id != :ON
-        begin
-          @ip ||= @vm.link(:nics).get.first.ip
-        rescue AbiquoAPIClient::NotFound
-          return nil
-        end
-        
-        template = @vm.link(:virtualmachinetemplate).get unless @username
-        @username = template.loginUser if template.respond_to? :loginUser
-
-        {
-          :host => @ip,
-          :port => 22,
-          :username => @username
-        }
+        env = @machine.action("read_ssh_info")
+        env[:machine_ssh_info]
       end
 
       def state
-        @vm = Provider.virtualmachine(@machine)
-        state = @vm.nil? ? :not_created : @vm.state.to_sym
+        env = @machine.action('check_state')
+        state = env[:machine_state]
         long = short = state.to_s
         Vagrant::MachineState.new(state, short, long)
       end

data/lib/vagrant_abiquo/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Abiquo
-    VERSION = '0.0.8'
+    VERSION = '0.1.0'
   end
 end

data/locales/en.yml

@@ -31,6 +31,7 @@ en:
       template: Abiquo template not found in config!
       cpuhwprofile: Either hardware profile or cpu core count is required!
     errors:
+      invalid_state: Operation cannot be performed. VM '%{vm}' is currently in state '%{state}'.
       vdc_not_found: Virtual datacenter '%{vdc}' not found
       template_not_found: Template %{template} not found in VDC '%{vdc}'
       poweroff: Error powering off VM %{vm}. Current state is %{state}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_abiquo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Beneyto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abiquo-api
@@ -62,6 +62,7 @@ files:
 - lib/vagrant_abiquo.rb
 - lib/vagrant_abiquo/actions.rb
 - lib/vagrant_abiquo/actions/check_state.rb
+- lib/vagrant_abiquo/actions/connect.rb
 - lib/vagrant_abiquo/actions/create.rb
 - lib/vagrant_abiquo/actions/create_vapp.rb
 - lib/vagrant_abiquo/actions/delete_vapp.rb
@@ -69,12 +70,11 @@ files:
 - lib/vagrant_abiquo/actions/destroy.rb
 - lib/vagrant_abiquo/actions/power_off.rb
 - lib/vagrant_abiquo/actions/power_on.rb
+- lib/vagrant_abiquo/actions/read_ssh_info.rb
 - lib/vagrant_abiquo/actions/reset.rb
 - lib/vagrant_abiquo/config.rb
 - lib/vagrant_abiquo/errors.rb
 - lib/vagrant_abiquo/helpers/abiquo.rb
-- lib/vagrant_abiquo/helpers/client.rb
-- lib/vagrant_abiquo/helpers/result.rb
 - lib/vagrant_abiquo/plugin.rb
 - lib/vagrant_abiquo/provider.rb
 - lib/vagrant_abiquo/version.rb

data/lib/vagrant_abiquo/helpers/client.rb

@@ -1,15 +0,0 @@
-require 'abiquo-api'
-require 'log4r'
-include Log4r
-
-module VagrantPlugins
-  module Abiquo
-    module Helpers
-      module Client
-        def client
-          @client ||= AbiquoAPI.new(@machine.provider_config.abiquo_connection_data)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant_abiquo/helpers/result.rb

@@ -1,40 +0,0 @@
-module VagrantPlugins
-  module Abiquo
-    module Helpers
-      class Result
-        def initialize(body)
-          @result = body
-        end
-
-        def [](key)
-          @result[key.to_s]
-        end
-
-        def find_id(sub_obj, search)
-          find(sub_obj, search)["id"]
-        end
-
-        def find(sub_obj, search)
-          key = search.keys.first
-          value = search[key].to_s
-          key = key.to_s
-
-          result = @result[sub_obj.to_s].inject(nil) do |result, obj|
-            obj[key] == value ? obj : result
-          end
-
-          result || error(sub_obj, key, value)
-        end
-
-        def error(sub_obj, key, value)
-          raise(Errors::ResultMatchError, {
-           :key => key,
-           :value => value,
-           :collection_name => sub_obj.to_s,
-           :sub_obj => @result[sub_obj.to_s]
-          })
-        end
-      end
-    end
-  end
-end