Merge branch 'hotfix/v0.4.1'

README.md

@@ -1,7 +1,7 @@
 [Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director®
 =============
 
-[Version 0.4.0](../../releases/tag/v0.4.0) has been released!
+[Version 0.4.1](../../releases/tag/v0.4.1) has been released!
 -------------
 
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
@@ -23,6 +23,15 @@ Vagrant will download all the required gems during the installation process.
 
 After the install has completed a ```vagrant up --provider=vcloud``` will trigger the newly installed provider.
 
+Upgrade
+-------------
+
+If you already have vagrant-vcloud installed you can update to the latest version available by issuing:
+
+```vagrant plugin update vagrant-vcloud```
+
+Vagrant will take care of the upgrade process.
+
 Configuration
 -------------
 

lib/vagrant-vcloud/action.rb

@@ -21,6 +21,7 @@ def self.action_boot
  b2.use ForwardPorts
  end
  end
+ b.use WaitForCommunicator, [:starting, :running]
  b.use Provision
  b.use SyncFolders
  end

lib/vagrant-vcloud/driver/base.rb

@@ -297,7 +297,7 @@ def send_request(params, payload = nil, content_type = nil)
  extheader = {}
  extheader['accept'] = "application/*+xml;version=#{@api_version}"
 
- if !content_type.nil?
+ unless content_type.nil?
  extheader['Content-Type'] = content_type
  end
 
@@ -331,9 +331,16 @@ def send_request(params, payload = nil, content_type = nil)
  extheader
  )
 
- if !response.ok?
- raise "Warning: unattended code #{response.status}" +
- " #{response.reason}"
+ unless response.ok?
+ if response.code == 400
+ error_message = Nokogiri.parse(response.body)
+ error = error_message.css('Error')
+ fail Errors::InvalidRequestError,
+ :message => error.first['message'].to_s
+ else
+ fail Errors::UnattendedCodeError,
+ :message => response.status
+ end
  end
 
  nicexml = Nokogiri.XML(response.body)
@@ -343,7 +350,7 @@ def send_request(params, payload = nil, content_type = nil)
  if @logger.level == 1
  ap "[#{Time.now.ctime}] <- RECV #{response.status}"
  # Just avoid the task spam.
- if !url.index('/task/')
+ unless url.index('/task/')
  ap 'RECV HEADERS'
  ap response.headers
  ap 'RECV BODY'
@@ -352,10 +359,8 @@ def send_request(params, payload = nil, content_type = nil)
  end
 
  [Nokogiri.parse(response.body), response.headers]
- rescue SocketError
- raise 'Impossible to connect, verify endpoint'
- rescue Errno::EADDRNOTAVAIL
- raise 'Impossible to connect, verify endpoint'
+ rescue SocketError, Errno::EADDRNOTAVAIL
+ raise Errors::EndpointUnavailable, :endpoint => @api_url
  end
  end
 
@@ -432,8 +437,20 @@ def upload_file(upload_url, upload_file, vapp_template, config = {})
  'Content-Length' => range_len.to_s
  }
 
+ upload_request = "#{@host_url}#{upload_url}"
+
+ # Massive debug when LOG=DEBUG
+ # Using awesome_print to get nice XML output for better readability
+ if @logger.level == 1
+ ap "[#{Time.now.ctime}] -> SEND PUT #{upload_request}"
+ ap 'SEND HEADERS'
+ ap extheader
+ ap 'SEND BODY'
+ ap '<data omitted>'
+ end
+
  begin
- upload_request = "#{@host_url}#{upload_url}"
+
  # FIXME: Add debug on the return status of "connection"
  # to enhance troubleshooting for this upload process.
  # (tsugliani)

lib/vagrant-vcloud/driver/meta.rb

@@ -129,13 +129,14 @@ def get_api_version(host_url)
  # Suppress SSL depth message
  clnt.ssl_config.verify_callback = proc { |ok, ctx|; true }
 
- url = "#{host_url}/api/versions"
+ uri = URI(host_url)
+ url = "#{uri.scheme}://#{uri.host}:#{uri.port}/api/versions"
 
  begin
  response = clnt.request('GET', url, nil, nil, nil)
- if !response.ok?
- raise "Warning: unattended code #{response.status} " +
-  "#{response.reason}"
+ unless response.ok?
+ fail Errors::UnattendedCodeError,
+ :message => response.status + ' ' + response.reason
  end
 
  version_info = Nokogiri.parse(response.body)
@@ -154,10 +155,9 @@ def get_api_version(host_url)
 
  api_version_supported
 
- rescue SocketError
- raise Errors::HostNotFound, :message => host_url
- rescue Errno::EADDRNOTAVAIL
- raise Errors::HostNotFound, :message => host_url
+ rescue SocketError, Errno::EADDRNOTAVAIL
+ raise Errors::EndpointUnavailable,
+ :endpoint => "#{uri.scheme}://#{uri.host}:#{uri.port}/api"
  end
  end
  end