vcloud-rest 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 470e97ca321d742340571fff5cbbaa6e5a8fbe2b
-  data.tar.gz: 0460be22738dca2e1b05668a861777d6380dd3d4
+  metadata.gz: 2cd7e1b40d90b0ad7cfbab2d6e749409a23393c8
+  data.tar.gz: 7208fd95232db0ccbf5c0b786d18b7f94c00f42e
 SHA512:
-  metadata.gz: acbace49f0444b3bff99e21ef01c9947597cba62adedf0b4385967627d4898cee59463cfbe1216f9abfdc75312344cd43146dd5608b48cc33eb894313f1e749c
-  data.tar.gz: 813bdcc2737e13da061b0b76d659fe0147275e8d61c80220106dca631dfa5688ae48bbc35e6510cc5016ae3c686b87afd9cccec543f0d62d7def955c88523596
+  metadata.gz: 0489c4ca0013853e07dc5e753512be0ef897d812dbe53976772157e999661f493f804cd59cb8c7d5ad798c3dcdd8e5d486b0bd3c31f2d4840160998a5a23aa70
+  data.tar.gz: b857d5f5205648b1deaedb6416be2046ebb362fc313a8a5913760562d45f0867ff76a60ec227b2765861d493e88d5dcb2dcd86ff11a1722a6312adeb5fa8c729

data/CHANGELOG.md

@@ -1,10 +1,26 @@
-Changes
-==
-2014-06-03 (1.3.0)
+# Changes
+
+### 2015-06-28 (1.4.0)
+
+Note that I don't have enough time anymore to actively maintain this gem and I'm
+looking for a co-maintainer.
+
+**Fixes**
+
+* Fix add network with manually specified IP
+* Fix css selector in get_vapp
+* Fix nil when deleting vapp
+
+**Features**
+
+* Add extensibility capabilities
+* Handle *nat_type* in `compose_vapp_from_vm`
+
+### 2014-06-03 (1.3.0)
 
 Note that starting from this release Ruby 1.8.7+ and 1.9.2 are not explicitly tested against anymore.
 
-FEATURES:
+**Features**
 
 * Add "media" item type management to `get_catalog_item`
 * Add `discard_suspend_state_[vapp|vm]` to discard suspended state of a vApp or VM
@@ -13,7 +29,7 @@ FEATURES:
 * Add `discard_[vm|vapp]_snapshot` to discard snapshots
 * Add `acquire_ticket_vm` that retrieves a screen ticket (VMRC) for a given VM
 
-FIXES:
+**Fixes**
 
 * Fix add network to VM for API v.5.5
 * Fix VM IP address retrieval with different interfaces on same network
@@ -21,9 +37,9 @@ FIXES:
 
 Note that now `get_vm` appends NetworkConnectionIndex to network name to generate a unique hash key.
 
-2014-02-06 (1.2.0)
+### 2014-02-06 (1.2.0)
 
-FEATURES:
+**Features**
 
 * vm
     * actions to control vm snapshots just as vApp snapshots
@@ -31,42 +47,40 @@ FEATURES:
         * revert_vm_snapshot
     * network add/edit handle PrimaryNetworkConnectionIndex
 
-DEPRECATIONS:
+**Deprecations**
 
 * `create_snapshot` is deprecated in favour of create_vapp_snapshot
 * `revert_snapshot` is deprecated in favour of revert_vapp_snapshot
 * remove `set_vm_network_config` deprecated in 1.1.0
 
-FIXES:
+**Fixes**
 
 * OVF: fix upload link retrieval (issue #23)
 * Remove network placeholder when adding a network to a VM
 
-2013-12-31 (1.1.1)
---
+### 2013-12-31 (1.1.1)
+
+**Fixes**
 
-FIXES:
 * Unify IP address retrieval (issue #20)
 
-2013-12-13 (1.1.0)
---
+### 2013-12-13 (1.1.0)
 
-FEATURES:
+**Features**
 
 * Add commands `[add|edit|delete]_vm_network` to manage multiple networks
 
-DEPRECATIONS:
+**Deprecations**
 
 * `set_vm_network_config` is now deprecated
 
-2013-11-29 (1.0.0)
---
+### 2013-11-29 (1.0.0)
 
 This is the first release that leaves beta status.
 It's actively used in production by at least one company and thus it's important
 to offer a more stable interface.
 
-FEATURES:
+**Features**
 
 * General
     * Add proper logging
@@ -100,7 +114,7 @@ FEATURES:
 * Tasks
     * Add methods to list/cancel Tasks
 
-CHANGES:
+**Changes**
 
 * vApp clone returns an hash to provide also the new vApp's ID
 * retrieve VM's name directly instead of using the GuestCustomization section
@@ -108,7 +122,7 @@ CHANGES:
 * Relax nokogiri version to >= 1.5.10
 * set_vapp_network_config requires different parameters
 
-FIXES:
+**Fixes**
 
 * Reset auth token when a session is destroyed
 * Fix wait_task_completion
@@ -118,10 +132,9 @@ FIXES:
 * set_vapp_network_config to ensure existing configs are not lost
 * Better error handling for upload OVF
 
-2013-07-25 (0.3.0)
---
+### 2013-07-25 (0.3.0)
 
-FEATURES:
+**Features**
 
 * Add ```compose_vapp_from_vm``` to compose a vapp using VMs in a catalog
 * Add ```get_vapp_template``` to get information on VMs inside a vapp template
@@ -133,40 +146,36 @@ FEATURES:
 * Add ``reboot_vapp/suspend_vapp/reset_vapp``
 * Add ```upload_ovf``` to upload an OVF Package
 
-CHANGES:
+**Changes**
 
 * ```RetainNetInfoAcrossDeployments``` now defaults to false (fenced deployments)
 
-FIXES:
+**Fixes**
 
 * Better handling of 500 errors
 
-REMARKS:
-A big thanks to Fabio Rapposelli and Timo Sugliani for the great work done!
+*Remarks:* A big thanks to Fabio Rapposelli and Timo Sugliani for the great work done!
 
-2013-05-13 (0.2.2)
---
+### 2013-05-13 (0.2.2)
 
-FIXES:
+**Fixes**
 
 * Fix retrieving of 'ipAddress' attribute of VMs inside VAPP
 
-VARIOUS:
+**Various**
 
 * Add license field to gemspec
 * Bump nokogiri dependency to 1.5.9
 
-2012-12-27 (0.2.1)
---
+### 2012-12-27 (0.2.1)
 
-FIXES:
+**Fixes**
 
 * Fix VM's admin password retrieval
 
-2012-12-21 (0.2.0)
---
+### 2012-12-21 (0.2.0)
 
-FEATURES:
+**Features**
 
 * Allow Task tracking for vApp startup & shutdown
 * Improve error message for operations on vApp not running
@@ -177,21 +186,19 @@ FEATURES:
 * Basic VM network configuration
 * Basic Guest Customization configuration
 
-FIXES:
+**Fixes**
 
 * Show catalog item: fix ID parsing
 
-2012-12-19 (0.1.1)
---
+### 2012-12-19 (0.1.1)
 
-FIXES:
+**Fixes**
 
 * Fix gemspec URL
 
-2012-12-19 (0.1.0)
---
+### 2012-12-19 (0.1.0)
 
-FEATURES:
+**Features**
 
 * Add support for main operations:
  * login/logout
@@ -201,7 +208,6 @@ FEATURES:
  * catalog item _show_
  * vapp _create/delete/startup/shutdown_
 
-2012-12-14 (0.0.1)
---
+### 2012-12-14 (0.0.1)
 
 * Initial release

data/README.md

@@ -1,6 +1,10 @@
-vcloud-rest [![Build Status](https://secure.travis-ci.org/astratto/vcloud-rest.png?branch=master)](http://travis-ci.org/astratto/vcloud-rest) [![Dependency Status](https://gemnasium.com/astratto/vcloud-rest.png)](https://gemnasium.com/astratto/vcloud-rest)
+vcloud-rest
 ===========
 
+[![Build Status](https://secure.travis-ci.org/astratto/vcloud-rest.png?branch=master)](http://travis-ci.org/astratto/vcloud-rest)
+[![Dependency Status](https://gemnasium.com/astratto/vcloud-rest.png)](https://gemnasium.com/astratto/vcloud-rest)
+[![Coverage Status](https://coveralls.io/repos/astratto/vcloud-rest/badge.png?branch=master)](https://coveralls.io/r/astratto/vcloud-rest?branch=master)
+
 DESCRIPTION
 --
 Unofficial ruby bindings for VMware® vCloud Director's rest APIs.
@@ -64,9 +68,9 @@ USAGE
 --
 
     require 'vcloud-rest/connection'
-    conn = VCloudClient::Connection.new(HOST, USER, PASSWORD, ORG_NAME)
+    conn = VCloudClient::Connection.new(HOST, USER, PASSWORD, ORG_NAME, VERSION)
     conn.login
-    conn.list_organizations
+    conn.get_organizations
 
 EXAMPLE
 --
@@ -78,7 +82,7 @@ DEBUGGING
 --
 Debug can be enabled setting the following environment variables:
 
-* *VCLOUD_REST_DEBUG_LEVEL*: to specify the log level (e.g., INFO)
+* *VCLOUD_REST_DEBUG_LEVEL*: to specify the log level (e.g., INFO, DEBUG)
 * *VCLOUD_REST_LOG_FILE*: to specify the output file (defaults to STDOUT)
 
 TESTING
@@ -138,7 +142,7 @@ LICENSE
 
 Author:: Stefano Tortarolo <stefano.tortarolo@gmail.com>
 
-Copyright:: Copyright (c) 2012-2014
+Copyright:: Copyright (c) 2012-2015
 License:: Apache License, Version 2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/lib/vcloud-rest/connection.rb

@@ -32,6 +32,7 @@ require 'vcloud-rest/vcloud/ovf'
 require 'vcloud-rest/vcloud/media'
 require 'vcloud-rest/vcloud/network'
 require 'vcloud-rest/vcloud/disk'
+require 'vcloud-rest/vcloud/extensibility'
 
 module VCloudClient
   class UnauthorizedAccess < StandardError; end
@@ -46,6 +47,7 @@ module VCloudClient
   # Main class to access vCloud rest APIs
   class Connection
     attr_reader :api_url, :auth_key
+    attr_reader :extensibility
 
     def initialize(host, username, password, org_name, api_version)
       @host = host
@@ -73,6 +75,9 @@ module VCloudClient
         raise "Unable to authenticate: missing x_vcloud_authorization header"
       end
 
+      extensibility_link = response.css("Link[rel='down:extensibility']")
+      @extensibility = extensibility_link.first['href'] unless extensibility_link.empty?
+
       @auth_key = headers[:x_vcloud_authorization]
     end
 
@@ -133,51 +138,44 @@ module VCloudClient
       ##
       # Sends a synchronous request to the vCloud API and returns the response as parsed XML + headers.
       def send_request(params, payload=nil, content_type=nil)
-        headers = {:accept => "application/*+xml;version=#{@api_version}"}
-        invocation_params = {:method => params['method'],
-                             :headers => headers,
-                             :url => "#{@api_url}#{params['command']}",
-                             :payload => payload}
-
-        if @auth_key
-          headers.merge!({:x_vcloud_authorization => @auth_key})
-        else
-          invocation_params.merge!({:user => "#{@username}@#{@org_name}",
-                                    :password => @password })
-        end
+        req_params = setup_request(params, payload, content_type)
 
-        headers.merge!({:content_type => content_type}) if content_type
+        handled_request(req_params) do
+          request = RestClient::Request.new(req_params)
 
-        request = RestClient::Request.new(invocation_params)
-
-        begin
           response = request.execute
           if ![200, 201, 202, 204].include?(response.code)
             @logger.warn "Warning: unattended code #{response.code}"
           end
 
-          @logger.debug "Send request result: #{Nokogiri.parse(response)}"
-
-          [Nokogiri.parse(response), response.headers]
-        rescue RestClient::Unauthorized => e
-          raise UnauthorizedAccess, "Client not authorized. Please check your credentials."
-        rescue RestClient::BadRequest => e
-          body = Nokogiri.parse(e.http_body)
-          message = body.css("Error").first["message"]
-          humanize_badrequest(message)
-        rescue RestClient::Forbidden => e
-          body = Nokogiri.parse(e.http_body)
-          message = body.css("Error").first["message"]
-          raise UnauthorizedAccess, "Operation not permitted: #{message}."
-        rescue RestClient::InternalServerError => e
-          body = Nokogiri.parse(e.http_body)
-          message = body.css("Error").first["message"]
-          raise InternalServerError, "Internal Server Error: #{message}."
-        rescue RestClient::MethodNotAllowed => e
-          body = Nokogiri.parse(e.http_body)
-          message = body.css("Error").first["message"]
-          raise MethodNotAllowed, "#{params['method']} to #{params['command']} not allowed: #{message}."
+          parsed_response = Nokogiri::XML(response)
+          @logger.debug "Send request result: #{parsed_response}"
+
+          [parsed_response, response.headers]
+        end
+      end
+
+      def parse_error_body(error)
+        body = Nokogiri.parse(error.http_body)
+        body.css("Error").first["message"]
+      end
+
+      def setup_request(params, payload=nil, content_type=nil)
+        req_params = {:method => params['method'],
+                      :headers => {:accept => "application/*+xml;version=#{@api_version}"},
+                      :url => "#{@api_url}#{params['command']}",
+                      :payload => payload}
+
+        req_params[:headers].merge!({:content_type => content_type}) if content_type
+
+        if @auth_key
+          req_params[:headers].merge!({:x_vcloud_authorization => @auth_key})
+        else
+          req_params.merge!({:user => "#{@username}@#{@org_name}",
+                             :password => @password })
         end
+
+        req_params
       end
 
       ##
@@ -224,168 +222,197 @@ module VCloudClient
         end
       end
 
-    ##
-    # Generic method to send power actions to vApp/VM
-    #
-    # i.e., 'suspend', 'powerOn'
-    def power_action(id, action, type=:vapp)
-      target = "#{type}-#{id}"
+      def handled_request(params, &block)
+        fail InternalServerError, 'A block is required' unless block_given?
+
+        block.call(params)
+      rescue RestClient::Unauthorized => e
+        @logger.debug "Send request error: #{e.http_body}"
+        raise UnauthorizedAccess, "Client not authorized. Please check your credentials."
+      rescue RestClient::BadRequest => e
+        @logger.debug "Send request error: #{e.http_body}"
+        humanize_badrequest(parse_error_body(e))
+      rescue RestClient::Forbidden => e
+        @logger.debug "Send request error: #{e.http_body}"
+        raise UnauthorizedAccess, "Operation not permitted: #{parse_error_body(e)}."
+      rescue RestClient::InternalServerError => e
+        @logger.debug "Send request error: #{e.http_body}"
+        raise InternalServerError, "Internal Server Error: #{parse_error_body(e)}."
+      rescue RestClient::MethodNotAllowed => e
+        @logger.debug "Send request error: #{e.http_body}"
+        raise MethodNotAllowed,
+          "#{params['method']} to #{params['command']} not allowed: #{parse_error_body(e)}."
+      rescue SocketError => e
+        @logger.error "Failed to connect to #{params[:url]}: #{e}"
+        raise
+      end
 
-      params = {
-        'method' => :post,
-        'command' => "/vApp/#{target}/power/action/#{action}"
-      }
+      def parse_error_body(error)
+        body = Nokogiri.parse(error.http_body)
+        body.css("Error").first["message"]
+      end
 
-      response, headers = send_request(params)
-      task_id = headers[:location].gsub(/.*\/task\//, "")
-      task_id
-    end
+      ##
+      # Generic method to send power actions to vApp/VM
+      #
+      # i.e., 'suspend', 'powerOn'
+      def power_action(id, action, type=:vapp)
+        target = "#{type}-#{id}"
+
+        params = {
+          'method' => :post,
+          'command' => "/vApp/#{target}/power/action/#{action}"
+        }
 
-    ##
-    # Discard suspended state of a vApp/VM
-    def discard_suspended_state_action(id, type=:vapp)
-      params = {
-          "method" => :post,
-          "command" => "/vApp/#{type}-#{id}/action/discardSuspendedState"
-      }
-      response, headers = send_request(params)
-      task_id = headers[:location].gsub(/.*\/task\//, "")
-      task_id
-    end
+        response, headers = send_request(params)
+        task_id = headers[:location].gsub(/.*\/task\//, "")
+        task_id
+      end
 
-    ##
-    # Create a new vapp/vm snapshot (overwrites any existing)
-    def create_snapshot_action(id, description="New Snapshot", type=:vapp)
-      params = {
-          "method" => :post,
-          "command" => "/vApp/#{type}-#{id}/action/createSnapshot"
-      }
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.CreateSnapshotParams(
-            "xmlns" => "http://www.vmware.com/vcloud/v1.5") {
-          xml.Description description
+      ##
+      # Discard suspended state of a vApp/VM
+      def discard_suspended_state_action(id, type=:vapp)
+        params = {
+            "method" => :post,
+            "command" => "/vApp/#{type}-#{id}/action/discardSuspendedState"
         }
+        response, headers = send_request(params)
+        task_id = headers[:location].gsub(/.*\/task\//, "")
+        task_id
       end
-      response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.createSnapshotParams+xml")
-      task_id = headers[:location].gsub(/.*\/task\//, "")
-      task_id
-    end
-
-    ##
-    # Revert to an existing snapshot (vapp/vm)
-    def revert_snapshot_action(id, type=:vapp)
-      params = {
-          "method" => :post,
-          "command" => "/vApp/#{type}-#{id}/action/revertToCurrentSnapshot"
-      }
-      response, headers = send_request(params)
-      task_id = headers[:location].gsub(/.*\/task\//, "")
-      task_id
-    end
 
-    ##
-    # Discard all existing snapshots (vapp/vm)
-    def discard_snapshot_action(id, type=:vapp)
-      params = {
-          "method" => :post,
-          "command" => "/vApp/#{type}-#{id}/action/removeAllSnapshots"
-      }
-      response, headers = send_request(params)
-      task_id = headers[:location].gsub(/.*\/task\//, "")
-      task_id
-    end
-
-    ##
-    # Upload a large file in configurable chunks, output an optional progressbar
-    def upload_file(uploadURL, uploadFile, progressUrl, config={})
-      raise ::IOError, "#{uploadFile} not found." unless File.exists?(uploadFile)
-
-      # Set chunksize to 10M if not specified otherwise
-      chunkSize = (config[:chunksize] || 10485760)
-
-      # Set progress bar to default format if not specified otherwise
-      progressBarFormat = (config[:progressbar_format] || "%e <%B> %p%% %t")
-
-      # Set progress bar length to 120 if not specified otherwise
-      progressBarLength = (config[:progressbar_length] || 120)
-
-      # Open our file for upload
-      uploadFileHandle = File.new(uploadFile, "rb" )
-      fileName = File.basename(uploadFileHandle)
-
-      progressBarTitle = "Uploading: " + uploadFile.to_s
-
-      # Create a progressbar object if progress bar is enabled
-      if config[:progressbar_enable] == true && uploadFileHandle.size.to_i > chunkSize
-        progressbar = ProgressBar.create(
-          :title => progressBarTitle,
-          :starting_at => 0,
-          :total => uploadFileHandle.size.to_i,
-          :length => progressBarLength,
-          :format => progressBarFormat
-        )
-      else
-        @logger.info progressBarTitle
+      ##
+      # Create a new vapp/vm snapshot (overwrites any existing)
+      def create_snapshot_action(id, description="New Snapshot", type=:vapp)
+        params = {
+            "method" => :post,
+            "command" => "/vApp/#{type}-#{id}/action/createSnapshot"
+        }
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.CreateSnapshotParams(
+              "xmlns" => "http://www.vmware.com/vcloud/v1.5") {
+            xml.Description description
+          }
+        end
+        response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.createSnapshotParams+xml")
+        task_id = headers[:location].gsub(/.*\/task\//, "")
+        task_id
       end
-      # Create a new HTTP client
-      clnt = HTTPClient.new
 
-      # Disable SSL cert verification
-      clnt.ssl_config.verify_mode=(OpenSSL::SSL::VERIFY_NONE)
+      ##
+      # Revert to an existing snapshot (vapp/vm)
+      def revert_snapshot_action(id, type=:vapp)
+        params = {
+            "method" => :post,
+            "command" => "/vApp/#{type}-#{id}/action/revertToCurrentSnapshot"
+        }
+        response, headers = send_request(params)
+        task_id = headers[:location].gsub(/.*\/task\//, "")
+        task_id
+      end
 
-      # Suppress SSL depth message
-      clnt.ssl_config.verify_callback=proc{ |ok, ctx|; true };
+      ##
+      # Discard all existing snapshots (vapp/vm)
+      def discard_snapshot_action(id, type=:vapp)
+        params = {
+            "method" => :post,
+            "command" => "/vApp/#{type}-#{id}/action/removeAllSnapshots"
+        }
+        response, headers = send_request(params)
+        task_id = headers[:location].gsub(/.*\/task\//, "")
+        task_id
+      end
 
-      # Perform ranged upload until the file reaches its end
-      until uploadFileHandle.eof?
+      ##
+      # Upload a large file in configurable chunks, output an optional progressbar
+      def upload_file(uploadURL, uploadFile, progressUrl, config={})
+        raise ::IOError, "#{uploadFile} not found." unless File.exists?(uploadFile)
+
+        # Set chunksize to 10M if not specified otherwise
+        chunkSize = (config[:chunksize] || 10485760)
+
+        # Set progress bar to default format if not specified otherwise
+        progressBarFormat = (config[:progressbar_format] || "%e <%B> %p%% %t")
+
+        # Set progress bar length to 120 if not specified otherwise
+        progressBarLength = (config[:progressbar_length] || 120)
+
+        # Open our file for upload
+        uploadFileHandle = File.new(uploadFile, "rb" )
+        fileName = File.basename(uploadFileHandle)
+
+        progressBarTitle = "Uploading: " + uploadFile.to_s
+
+        # Create a progressbar object if progress bar is enabled
+        if config[:progressbar_enable] == true && uploadFileHandle.size.to_i > chunkSize
+          progressbar = ProgressBar.create(
+            :title => progressBarTitle,
+            :starting_at => 0,
+            :total => uploadFileHandle.size.to_i,
+            :length => progressBarLength,
+            :format => progressBarFormat
+          )
+        else
+          @logger.info progressBarTitle
+        end
+        # Create a new HTTP client
+        clnt = HTTPClient.new
 
-        # Create ranges for this chunk upload
-        rangeStart = uploadFileHandle.pos
-        rangeStop = uploadFileHandle.pos.to_i + chunkSize
+        # Disable SSL cert verification
+        clnt.ssl_config.verify_mode=(OpenSSL::SSL::VERIFY_NONE)
 
-        # Read current chunk
-        fileContent = uploadFileHandle.read(chunkSize)
+        # Suppress SSL depth message
+        clnt.ssl_config.verify_callback=proc{ |ok, ctx|; true };
 
-        # If statement to handle last chunk transfer if is > than filesize
-        if rangeStop.to_i > uploadFileHandle.size.to_i
-          contentRange = "bytes #{rangeStart.to_s}-#{uploadFileHandle.size.to_s}/#{uploadFileHandle.size.to_s}"
-          rangeLen = uploadFileHandle.size.to_i - rangeStart.to_i
-        else
-          contentRange = "bytes #{rangeStart.to_s}-#{rangeStop.to_s}/#{uploadFileHandle.size.to_s}"
-          rangeLen = rangeStop.to_i - rangeStart.to_i
-        end
+        # Perform ranged upload until the file reaches its end
+        until uploadFileHandle.eof?
 
-        # Build headers
-        extheader = {
-          'x-vcloud-authorization' => @auth_key,
-          'Content-Range' => contentRange,
-          'Content-Length' => rangeLen.to_s
-        }
+          # Create ranges for this chunk upload
+          rangeStart = uploadFileHandle.pos
+          rangeStop = uploadFileHandle.pos.to_i + chunkSize
 
-        begin
-          uploadRequest = "#{@host_url}#{uploadURL}"
-          connection = clnt.request('PUT', uploadRequest, nil, fileContent, extheader)
+          # Read current chunk
+          fileContent = uploadFileHandle.read(chunkSize)
 
-          if config[:progressbar_enable] == true && uploadFileHandle.size.to_i > chunkSize
-            params = {
-              'method' => :get,
-              'command' => progressUrl
-            }
-            response, headers = send_request(params)
+          # If statement to handle last chunk transfer if is > than filesize
+          if rangeStop.to_i > uploadFileHandle.size.to_i
+            contentRange = "bytes #{rangeStart.to_s}-#{uploadFileHandle.size.to_s}/#{uploadFileHandle.size.to_s}"
+            rangeLen = uploadFileHandle.size.to_i - rangeStart.to_i
+          else
+            contentRange = "bytes #{rangeStart.to_s}-#{rangeStop.to_s}/#{uploadFileHandle.size.to_s}"
+            rangeLen = rangeStop.to_i - rangeStart.to_i
+          end
 
-            response.css("Files File [name='#{fileName}']").each do |file|
-              progressbar.progress=file[:bytesTransferred].to_i
+          # Build headers
+          extheader = {
+            'x-vcloud-authorization' => @auth_key,
+            'Content-Range' => contentRange,
+            'Content-Length' => rangeLen.to_s
+          }
+
+          begin
+            uploadRequest = "#{@host_url}#{uploadURL}"
+            connection = clnt.request('PUT', uploadRequest, nil, fileContent, extheader)
+
+            if config[:progressbar_enable] == true && uploadFileHandle.size.to_i > chunkSize
+              params = {
+                'method' => :get,
+                'command' => progressUrl
+              }
+              response, headers = send_request(params)
+
+              response.css("Files File [name='#{fileName}']").each do |file|
+                progressbar.progress=file[:bytesTransferred].to_i
+              end
             end
+          rescue
+            retryTime = (config[:retry_time] || 5)
+            @logger.warn "Range #{contentRange} failed to upload, retrying the chunk in #{retryTime.to_s} seconds, to stop the action press CTRL+C."
+            sleep retryTime.to_i
+            retry
           end
-        rescue
-          retryTime = (config[:retry_time] || 5)
-          @logger.warn "Range #{contentRange} failed to upload, retrying the chunk in #{retryTime.to_s} seconds, to stop the action press CTRL+C."
-          sleep retryTime.to_i
-          retry
         end
+        uploadFileHandle.close
       end
-      uploadFileHandle.close
-    end
-
   end # class
 end

data/lib/vcloud-rest/vcloud/extensibility.rb

@@ -0,0 +1,22 @@
+module VCloudClient
+  class Connection
+    def get_extensibility
+      params = {
+        'method' => :get,
+        'command' => "/extensibility"
+      }
+
+      response, headers = send_request(params)
+
+      down_service = response.css("Link[@rel='down:service']").first['href']
+      down_apidefinitions = response.css("Link[@rel='down:apidefinitions']").first['href']
+      down_files = response.css("Link[@rel='down:files']").first['href']
+
+      {
+        :down_service => down_service,
+        :down_apidefinitions => down_apidefinitions,
+        :down_files => down_files,
+      }
+    end
+  end
+end

data/lib/vcloud-rest/vcloud/vapp.rb

@@ -34,8 +34,8 @@ module VCloudClient
 
       networks = response.css('NetworkConfig').reject{|n| n.attribute('networkName').text == 'none'}.
         collect do |network|
-          net_id = network.css('Link [rel=repair]')
-          net_id = net_id.attribute('href').text.gsub(/.*\/network\/(.*)\/action.*/, '\1') unless net_id.nil?
+          net_id = network.css('Link[rel="repair"]')
+          net_id = net_id.attribute('href').text.gsub(/.*\/network\/(.*)\/action.*/, '\1') unless net_id.empty?
 
           net_name = network.attribute('networkName').text
 
@@ -276,6 +276,13 @@ module VCloudClient
                   xml.FirewallService {
                     xml.IsEnabled(network_config[:enable_firewall] || "false")
                   }
+                  if network_config.has_key? :nat_type
+                    xml.NatService {
+                      xml.IsEnabled "true"
+                      xml.NatType network_config[:nat_type]
+                      xml.Policy(network_config[:nat_policy_type] || "allowTraffic")
+                    }
+                  end
                 }
               }
             }

data/lib/vcloud-rest/vcloud/vm.rb

@@ -11,7 +11,7 @@ module VCloudClient
       response, headers = send_request(params)
 
       result = {}
-      response.css("ovf|Item [vcloud|href]").each do |item|
+      response.css("ovf|Item[vcloud|href]").each do |item|
         item_name = item.attribute('href').text.gsub(/.*\/vApp\/vm\-(\w+(-?))+\/virtualHardwareSection\//, "")
         name = item.css("rasd|ElementName")
         name = name.text unless name.nil?
@@ -207,6 +207,12 @@ module VCloudClient
       idx_node.content = config[:network_index] || networks_count
       new_network.add_child(idx_node)
 
+      if config[:ip]
+        ip_node = Nokogiri::XML::Node.new "IpAddress", new_network
+        ip_node.content = config[:ip]
+        new_network.add_child(ip_node)
+      end
+
       is_connected_node = Nokogiri::XML::Node.new "IsConnected", new_network
       is_connected_node.content = config[:is_connected] || true
       new_network.add_child(is_connected_node)
@@ -215,12 +221,6 @@ module VCloudClient
       allocation_node.content = config[:ip_allocation_mode] || "POOL"
       new_network.add_child(allocation_node)
 
-      if config[:ip]
-        ip_node = Nokogiri::XML::Node.new "IpAddress", new_network
-        ip_node.content = config[:ip]
-        new_network.add_child(ip_node)
-      end
-
       parent_section.add_child(new_network)
 
       params = {
@@ -574,4 +574,4 @@ module VCloudClient
         send_request(params)
       end
   end
-end
+end

data/lib/vcloud-rest/version.rb

@@ -1,3 +1,3 @@
 module VCloudClient
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,177 +1,177 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-rest
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Stefano Tortarolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   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: Ruby bindings to create, list and manage vCloud servers
@@ -187,6 +187,7 @@ files:
 - lib/vcloud-rest/connection.rb
 - lib/vcloud-rest/vcloud/catalog.rb
 - lib/vcloud-rest/vcloud/disk.rb
+- lib/vcloud-rest/vcloud/extensibility.rb
 - lib/vcloud-rest/vcloud/media.rb
 - lib/vcloud-rest/vcloud/network.rb
 - lib/vcloud-rest/vcloud/org.rb
@@ -200,23 +201,24 @@ homepage: https://github.com/astratto/vcloud-rest
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message: 'NOTICE: vcloud-rest needs a co-maintainer! Feel free to ping
+  me at stefano.tortarolo@gmail.com'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Unofficial ruby bindings for VMWare vCloud's API