vagrant-vcloud 0.1.0 → 0.1.1

data/lib/vagrant-vcloud/driver/base.rb

@@ -275,73 +275,54 @@ module VagrantPlugins
         end
 
         private
+
           ##
-          # Sends a synchronous request to the vCloud API and returns the response as parsed XML + headers.
+          # Sends a synchronous request to the vCloud API and returns the response as parsed XML + headers using HTTPClient.
           def send_request(params, payload=nil, content_type=nil)
-            headers = {:accept => "application/*+xml;version=#{@api_version}"}
-            if @auth_key
-              headers.merge!({:x_vcloud_authorization => @auth_key})
-            end
 
-            if content_type
-              headers.merge!({:content_type => content_type})
-            end
+            # Create a new HTTP client
+            clnt = HTTPClient.new
 
-            # FIXME: get rid of RestClient and switch everything to HTTPClient, easier to use and we get rid of another dependency.
+            # Disable SSL cert verification
+            clnt.ssl_config.verify_mode=(OpenSSL::SSL::VERIFY_NONE)
+
+            # Suppress SSL depth message
+            clnt.ssl_config.verify_callback=proc{ |ok, ctx|; true };
+            
+            extheader = {}
 
-            request = RestClient::Request.new(:method => params['method'],
-                                             :user => "#{@username}@#{@org_name}",
-                                             :password => @password,
-                                             :headers => headers,
-                                             :url => "#{@api_url}#{params['command']}",
-                                             :payload => payload)
+            extheader["accept"] = "application/*+xml;version=#{@api_version}"
 
+            if !content_type.nil?
+              extheader['Content-Type'] = content_type
+            end
+
+            if @auth_key
+              extheader['x-vcloud-authorization'] = @auth_key
+            else
+              clnt.set_auth(nil, "#{@username}@#{@org_name}", @password)
+            end
+
+            url = "#{@api_url}#{params['command']}"
 
             begin
-              response = request.execute
-              if ![200, 201, 202, 204].include?(response.code)
-                puts "Warning: unattended code #{response.code}"
+              response = clnt.request(params['method'], url, nil, payload, extheader)
+              if !response.ok?
+                raise "Warning: unattended code #{response.status} #{response.reason}"
               end
 
-              # TODO: handle asynch properly, see TasksList
-              [Nokogiri.parse(response), response.headers]
-            rescue RestClient::ResourceNotFound => e
-              raise Errors::ObjectNotFound
-            rescue RestClient::Unauthorized => e
-              raise Errors::UnauthorizedAccess
-            rescue RestClient::BadRequest => e
-              body = Nokogiri.parse(e.http_body)
-              message = body.css("Error").first["message"]
-
-              case message
-              when /The request has invalid accept header/
-                raise WrongAPIVersion, "Invalid accept header. Please verify that the server supports v.#{@api_version} or specify a different API Version."
-              when /validation error on field 'id': String value has invalid format or length/
-                raise WrongItemIDError, "Invalid ID specified. Please verify that the item exists and correctly typed."
-              when /The requested operation could not be executed on vApp "(.*)". Stop the vApp and try again/
-                raise Errors::InvalidStateError, :message => "Invalid request because vApp is running. Stop vApp '#{$1}' and try again."
-              when /The requested operation could not be executed since vApp "(.*)" is not running/
-                raise Errors::InvalidStateError, :message => "Invalid request because vApp is stopped. Start vApp '#{$1}' and try again."
-              when /The administrator password cannot be empty when it is enabled and automatic password generation is not selected/
-                raise Errors::InvalidConfigError
-              when /The reference "(.*)" cannot be parsed correctly/   # FIXME: doesn't work
-                raise Errors::InvalidNetSpecification
-              else
-                raise UnhandledError, "BadRequest - unhandled error: #{message}.\nPlease report this issue."
-              end
-            rescue RestClient::Forbidden => e
-              body = Nokogiri.parse(e.http_body)
-              message = body.css("Error").first["message"]
-              raise Errors::UnauthorizedAccess
-            rescue RestClient::InternalServerError => e
-              body = Nokogiri.parse(e.http_body)
-              message = body.css("Error").first["message"]
-              raise InternalServerError, "Internal Server Error: #{message}."
-            rescue RestClient::Found => e
-              raise Errors::HostRedirect
+              [Nokogiri.parse(response.body), response.headers]
+
+            rescue SocketError
+              raise "Impossible to connect, verify endpoint"
+            rescue Errno::EADDRNOTAVAIL
+              raise "Impossible to connect, verify endpoint"
             end
+
+
           end
 
+
           ##
           # Upload a large file in configurable chunks, output an optional progressbar
           def upload_file(uploadURL, uploadFile, vAppTemplate, config={})

data/lib/vagrant-vcloud/driver/meta.rb

@@ -17,8 +17,8 @@
 
 require "forwardable"
 require "log4r"
-require "rest-client"
 require "nokogiri"
+require "httpclient"
 
 
 require File.expand_path("../base", __FILE__)
@@ -51,7 +51,8 @@ module VagrantPlugins
           # Instantiate the proper version driver for vCloud
           @logger.debug("Finding driver for vCloud version: #{@version}")
           driver_map   = {
-            "5.1" => Version_5_1
+            "5.1" => Version_5_1,
+            "5.5" => Version_5_1 # Binding vCloud 5.5 API on our current 5.1 implementation
           }
 
           if @version.start_with?("0.9") || @version.start_with?("1.0") || @version.start_with?("1.5")
@@ -121,30 +122,40 @@ module VagrantPlugins
 
         def get_api_version(host_url)
 
-          request = RestClient::Request.new(
-            :method => "GET",
-            :url => "#{host_url}/api/versions"
-          )
+          # Create a new HTTP client
+          clnt = HTTPClient.new
+
+          # Disable SSL cert verification
+          clnt.ssl_config.verify_mode=(OpenSSL::SSL::VERIFY_NONE)
+
+          # Suppress SSL depth message
+          clnt.ssl_config.verify_callback=proc{ |ok, ctx|; true };
           
+          url = "#{host_url}/api/versions"
+
           begin
-            response = request.execute
-            if ![200, 201, 202, 204].include?(response.code)
-              puts "Warning: unattended code #{response.code}"
+            response = clnt.request("GET", url, nil, nil, nil)
+            if !response.ok?
+              raise "Warning: unattended code #{response.status} #{response.reason}"
             end
 
-          versionInfo = Nokogiri.parse(response)
-          # FIXME: Find a smarter way to check for vCloud API version
-          # Changed from .first to .last because that's the way it's defined
-          # in the request answer.
-          apiVersion = versionInfo.css("VersionInfo Version")
-          
-          apiVersion.last.text
+            versionInfo = Nokogiri.parse(response.body)
+            # FIXME: Find a smarter way to check for vCloud API version
+            # Changed from .first to .last because that's the way it's defined
+            # in the request answer.
+            apiVersion = versionInfo.css("VersionInfo Version")
+            
+            apiVersion.last.text
 
-          rescue SocketError, Errno::ECONNREFUSED, RestClient::ResourceNotFound
+
+          rescue SocketError
+            raise Errors::HostNotFound, :message => host_url
+          rescue Errno::EADDRNOTAVAIL
             raise Errors::HostNotFound, :message => host_url
           end
 
         end
+
       end
     end
   end

data/lib/vagrant-vcloud/driver/version_5_1.rb

@@ -15,9 +15,6 @@
 #  limitations under the License.
 #
 
-require "rest-client"
-require "nokogiri"
-require "httpclient"
 require "ruby-progressbar"
 require "set"
 require "netaddr"
@@ -54,11 +51,11 @@ module VagrantPlugins
 
           response, headers = send_request(params)
 
-          if !headers.has_key?(:x_vcloud_authorization)
+          if !headers.has_key?("x-vcloud-authorization")
             raise "Unable to authenticate: missing x_vcloud_authorization header"
           end
 
-          @auth_key = headers[:x_vcloud_authorization]
+          @auth_key = headers["x-vcloud-authorization"]
         end
 
         ##
@@ -391,7 +388,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -412,7 +409,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml,
                           "application/vnd.vmware.vcloud.undeployVAppParams+xml")
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -425,7 +422,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -441,7 +438,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -456,7 +453,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -469,7 +466,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -484,7 +481,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -507,7 +504,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml,
                           "application/vnd.vmware.vcloud.undeployVAppParams+xml")
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -528,7 +525,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml,
                           "application/vnd.vmware.vcloud.undeployVAppParams+xml")
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -544,7 +541,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -559,7 +556,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -572,7 +569,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -589,7 +586,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -653,7 +650,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml")
 
-          vapp_id = headers[:location].gsub("#{@api_url}/vApp/vapp-", "")
+          vapp_id = headers["Location"].gsub("#{@api_url}/vApp/vapp-", "")
 
           task = response.css("VApp Task[operationName='vdcInstantiateVapp']").first
           task_id = task["href"].gsub("#{@api_url}/task/", "")
@@ -748,7 +745,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.composeVAppParams+xml")
 
-          vapp_id = headers[:location].gsub("#{@api_url}/vApp/vapp-", "")
+          vapp_id = headers["Location"].gsub("#{@api_url}/vApp/vapp-", "")
 
           task = response.css("VApp Task[operationName='vdcComposeVapp']").first
           task_id = task["href"].gsub("#{@api_url}/task/", "")
@@ -808,7 +805,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.recomposeVAppParams+xml")
 
-          vapp_id = headers[:location].gsub("#{@api_url}/vApp/vapp-", "")
+          vapp_id = headers["Location"].gsub("#{@api_url}/vApp/vapp-", "")
 
           task = response.css("Task [operationName='vdcRecomposeVapp']").first
           task_id = task["href"].gsub("#{@api_url}/task/", "")
@@ -903,7 +900,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.networkConfigSection+xml")
 
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -933,8 +930,7 @@ module VagrantPlugins
                     xml.Policy(config[:nat_policy_type] || "allowTraffic")
 
                     preExisting = get_vapp_port_forwarding_rules(vappid)
-                    @logger.debug("This is the PREEXISTING RULE BLOCK: #{preExisting.inspect}")
-
+                    
                     config[:nat_rules].concat(preExisting)
 
                     config[:nat_rules].each do |nat_rule|
@@ -962,7 +958,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.networkConfigSection+xml")
 
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -1082,23 +1078,27 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params)
-
           response.css("EdgeGateway Configuration GatewayInterfaces GatewayInterface").each do |gw|
-            
-            if gw.css("InterfaceType").text == "internal"
-              next
+ 
+            # Only check uplinks, avoid another check           
+            if gw.css("InterfaceType").text == "uplink"
+              
+              # Loop on all sub-allocation pools
+              gw.css("SubnetParticipation IpRanges IpRange").each do |currentRange|
+
+                lowip = currentRange.css("StartAddress").first.text
+                highip = currentRange.css("EndAddress").first.text
+
+                rangeIpLow = NetAddr.ip_to_i(lowip)
+                rangeIpHigh = NetAddr.ip_to_i(highip)
+                testIp = NetAddr.ip_to_i(edge_gateway_ip)
+
+                if (rangeIpLow..rangeIpHigh) === testIp
+                  return gw.css("Network").first[:href]
+                end
+              end
             end
 
-            lowip = gw.css("SubnetParticipation IpRanges IpRange StartAddress").first.text
-            highip = gw.css("SubnetParticipation IpRanges IpRange EndAddress").first.text
-
-            rangeIpLow = NetAddr.ip_to_i(lowip)
-            rangeIpHigh = NetAddr.ip_to_i(highip)
-            testIp = NetAddr.ip_to_i(edge_gateway_ip)
-
-            if (rangeIpLow..rangeIpHigh) === testIp
-              return gw.css("Network").first[:href]
-            end
           end
 
         end
@@ -1139,6 +1139,7 @@ module VagrantPlugins
 
               interface = Nokogiri::XML::Node.new 'Interface', response
               interface["href"] = edge_network_id
+
               gatewayNatRule.add_child interface
 
               originalIp = Nokogiri::XML::Node.new 'OriginalIp', response
@@ -1161,9 +1162,12 @@ module VagrantPlugins
               protocol.content = "any"
               gatewayNatRule.add_child protocol
 
-              icmpSubType = Nokogiri::XML::Node.new 'IcmpSubType', response
-              icmpSubType.content = "any"
-              gatewayNatRule.add_child icmpSubType
+              # FIXME: frapposelli/tsugliani we should be able to remove this
+              # FIXME: test this against a vCloud Director 5.1.x installation
+              #icmpSubType = Nokogiri::XML::Node.new 'IcmpSubType', response
+              #icmpSubType.content = "any"
+              #gatewayNatRule.add_child icmpSubType
+
 
           natRule2 = Nokogiri::XML::Node.new 'NatRule', response
 
@@ -1180,6 +1184,7 @@ module VagrantPlugins
 
               interface = Nokogiri::XML::Node.new 'Interface', response
               interface["href"] = edge_network_id
+ 
               gatewayNatRule.add_child interface
 
               originalIp = Nokogiri::XML::Node.new 'OriginalIp', response
@@ -1249,7 +1254,6 @@ module VagrantPlugins
           nat_rules << natRule2
 
           fw_rules = set_edge_rules.at_css("FirewallService")
-
           fw_rules << firewallRule1
 
           xml1 = set_edge_rules.at_css "EdgeGatewayServiceConfiguration"
@@ -1261,11 +1265,9 @@ module VagrantPlugins
           'command' => "/admin/edgeGateway/#{edge_gateway_id}/action/configureServices"
         }
 
-        @logger.debug("OUR XML: #{set_edge_rules.to_xml(:indent => 2)}")
-
         response, headers = send_request(params, set_edge_rules.to_xml(:indent => 2), "application/vnd.vmware.admin.edgeGatewayServiceConfiguration+xml")
 
-        task_id = headers[:location].gsub("#{@api_url}/task/", "")
+        task_id = headers["Location"].gsub("#{@api_url}/task/", "")
         task_id
 
       end
@@ -1311,11 +1313,9 @@ module VagrantPlugins
             'command' => "/admin/edgeGateway/#{edge_gateway_id}/action/configureServices"
           }
 
-          @logger.debug("OUR XML: #{remove_edge_rules.to_xml}")
-
           response, headers = send_request(params, remove_edge_rules.to_xml, "application/vnd.vmware.admin.edgeGatewayServiceConfiguration+xml")
 
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
       end
 
@@ -1398,7 +1398,7 @@ module VagrantPlugins
           )
 
           # Get vAppTemplate Link from location        
-          vAppTemplate = headers[:location].gsub("#{@api_url}/vAppTemplate/vappTemplate-", "")
+          vAppTemplate = headers["Location"].gsub("#{@api_url}/vAppTemplate/vappTemplate-", "")
           @logger.debug("Getting vAppTemplate ID: #{vAppTemplate}")
           descriptorUpload = response.css("Files Link [rel='upload:default']").first[:href].gsub("#{@host_url}/transfer/", "")
           transferGUID = descriptorUpload.gsub("/descriptor.ovf", "")
@@ -1524,7 +1524,7 @@ module VagrantPlugins
             task = get_task(taskid)
             @logger.debug("Evaluating taskid: #{taskid}, current status #{task[:status]}")
             break if task[:status] != 'running'
-            sleep 1
+            sleep 5
           end
 
           if task[:status] == 'error'
@@ -1562,7 +1562,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.networkConfigSection+xml")
 
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -1591,7 +1591,7 @@ module VagrantPlugins
 
           response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.networkConnectionSection+xml")
 
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 
@@ -1617,7 +1617,7 @@ module VagrantPlugins
           }
 
           response, headers = send_request(params, builder.to_xml, "application/vnd.vmware.vcloud.guestCustomizationSection+xml")
-          task_id = headers[:location].gsub("#{@api_url}/task/", "")
+          task_id = headers["Location"].gsub("#{@api_url}/task/", "")
           task_id
         end
 

data/lib/vagrant-vcloud/errors.rb

@@ -6,6 +6,13 @@ module VagrantPlugins
       class VCloudError < Vagrant::Errors::VagrantError
         error_namespace("vagrant_vcloud.errors")
       end
+      class RsyncError < VCloudError
+        error_key(:rsync_error)
+      end
+
+      class MkdirError < VCloudError
+        error_key(:mkdir_error)
+      end
       class VCloudOldVersion < VCloudError
         error_key(:vcloud_old_version)
       end

data/lib/vagrant-vcloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VCloud
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/locales/en.yml

@@ -4,9 +4,15 @@ en:
     will_not_destroy: "VM will not be destroyed"
     vm_already_running: "VM is already running"
     vm_halted_cannot_suspend: "VM is not running or already suspended, cannot suspend it."
+    rsync_not_found_warning: |-
+      Warning! Folder sync disabled because the rsync binary is missing.
+      Make sure rsync is installed and the binary can be found in the PATH.
+    rsync_folder: |-
+      Rsyncing folder: %{hostpath} => %{guestpath}
     config: 
       api_version: "Configuration must specify a vCloud API version (default=5.1)"
       catalog_name: "Configuration must specify a vCloud Director Catalog (for the VM templates images)"
+      ip_dns: "DNS configuration must be specified as an Array type"
       compute_resource: "Configuration must specify a compute resource name"
       hostname: "Configuration must specify a vCloud Director hostname"
       name: "Configuration must specify a VM name"
@@ -37,6 +43,20 @@ en:
       subnet_errors:
         invalid_subnet: "The specified subnet is invalid: %{message}"
         subnet_too_small: "The specified subnet is too small: %{message}, must contain at least 2 usable IPs (/30 or 255.255.255.252)"
+      rsync_error: |-
+        There was an error when attempting to rsync a share folder.
+        Please inspect the error message below for more info.
+
+        Host path: %{hostpath}
+        Guest path: %{guestpath}
+        Error: %{stderr}
+      mkdir_error: |-
+        There was an error when attempting to create a shared host folder.
+        Please inspect the error message below for more info.
+
+        Host path: %{hostpath}
+        Error: %{err}
+
     states: 
       not_created: |-
         The environment has not yet been created. Run `vagrant up` to

data/vagrant-vcloud.gemspec

@@ -13,11 +13,8 @@ Gem::Specification.new do |s|
   s.description = 'Enables Vagrant to manage machines with VMware vCloud Director®.'
   
   s.add_runtime_dependency 'i18n', '~> 0.6.4'
-  s.add_runtime_dependency 'ruby-unison', '~> 0.0.3'
   s.add_runtime_dependency 'log4r', '~> 1.1.10'
-  s.add_runtime_dependency 'awesome_print', '~> 1.1.0'
   s.add_runtime_dependency 'nokogiri', '~> 1.6.0'
-  s.add_runtime_dependency 'rest-client', '~> 1.6.7'
   s.add_runtime_dependency 'httpclient', '~> 2.3.4.1'
   s.add_runtime_dependency 'ruby-progressbar', '~> 1.1.1'
   s.add_runtime_dependency 'netaddr', '~> 1.5.0'