vagrant-skytap 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae76ca9f326fc61d315aed14516cb4d62a03276
-  data.tar.gz: c26500f1f04d28b9325f3487369ea89106788437
+  metadata.gz: 3ad66d0732292fb4e3eade24cdcc614b00b18869
+  data.tar.gz: 193d5678f30a527277f1bd04816c41d6857a2e2f
 SHA512:
-  metadata.gz: 1fc8c6e878f55c34c81e6475ad67dbd3a3c759c28eeb9ca678b1db2e8599061d79263787837fdc9217c2eff6bf738c2dd5d26d8c03a6b0c0d7ff3555110030ae
-  data.tar.gz: afa804091a15ffda3cf6478ef6def6d5527fb958dc7daf908109265f347f4c707792aa9a2cea147e046d3630cb3cfe7a537d2f7f27d8bd846ddaa7f7beb15459
+  metadata.gz: 27195d6fe141492a6979a4995ea2ba7aa20f0245a4e3409786f9bb65a58b3e1620cf9ef085221a2d00d13af7bf327d1f65bcdda13e831a15440adf45e07b39d2
+  data.tar.gz: d05d051aaf236112118c65d4ffeef8193ce29ec2fc2e2508622a0f8014ded4718d4be620abb5bf1224a01b2ae2f71641866bec76ecb72544b4c73a1aaa436b70

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+# 0.3.2 (April 19, 2016)
+
+* Retry all operations on 423 response (previously this was not happening when attaching to a VPN).
+
 # 0.3.1 (April 15, 2016)
 
 * Add support for running in a Skytap VM when the VM's network is using a custom DNS.
+* Clean up SSH tunnels on `vagrant destroy` (port forwarding bug).
 
 # 0.3.0 (April 13, 2016)
 

data/lib/vagrant-skytap/action.rb

@@ -97,6 +97,7 @@ module VagrantPlugins
             end
             b1.use Call, DestroyConfirm do |env2, b2|
               if env2[:result]
+                b2.use ClearForwardedPorts
                 case existence_state
                 when :one_of_many_vms
                   b2.use DeleteVm
@@ -109,7 +110,6 @@ module VagrantPlugins
               end
             end
           end
-          b.use ClearForwardedPorts
           b.use PrepareNFSValidIds
           b.use SyncedFolderCleanup
         end

data/lib/vagrant-skytap/action/set_hostname.rb

@@ -42,7 +42,7 @@ module VagrantPlugins
               if nic = vm.interfaces.first
                 if hostname != nic.get_api_attribute('hostname')
                   @logger.info("Updating hostname: #{hostname}")
-                  nic.update_with_retry(hostname: hostname)
+                  nic.update(hostname: hostname)
                 end
               end
             end

data/lib/vagrant-skytap/action/update_hardware.rb

@@ -50,7 +50,7 @@ module VagrantPlugins
 
             if hardware_info.present?
               @logger.info("Updating hardware properties: #{hardware_info}")
-              vm.update_with_retry(hardware: hardware_info)
+              vm.update(hardware: hardware_info)
             end
           end
 

data/lib/vagrant-skytap/api/client.rb

@@ -22,6 +22,7 @@
 
 require 'base64'
 require "vagrant-skytap/version"
+require 'timeout'
 
 module VagrantPlugins
   module Skytap
@@ -29,8 +30,9 @@ module VagrantPlugins
       class Client
         attr_reader :config, :http
 
+        DEFAULT_TIMEOUT = 120
         MAX_RATE_LIMIT_RETRIES = 3
-        DEFAULT_RETRY_AFTER_SECONDS = 10
+        DEFAULT_RETRY_AFTER_SECONDS = 5
 
         def initialize(config)
           @logger = Log4r::Logger.new("vagrant_skytap::api_client")
@@ -83,35 +85,47 @@ module VagrantPlugins
           end
 
           headers = default_headers.merge(options[:extra_headers] || {})
-          tries = 0
           retry_after = DEFAULT_RETRY_AFTER_SECONDS
+          most_recent_exception = nil
+
           begin
-            tries += 1
-            http.send_request(method, URI.encode(path), body, headers).tap do |ret|
-              @logger.debug("REST API response: #{ret.body}")
-              unless ret.code =~ /^2\d\d/
-                raise Errors::DoesNotExist, object_name: "Object '#{path}'" if ret.code == '404'
-                error_class = case ret.code
-                when '403'
-                  Errors::Unauthorized
-                when '422'
-                  Errors::UnprocessableEntity
-                when '423'
-                  Errors::ResourceBusy
-                when '429'
-                  retry_after = ret['Retry-After'] || DEFAULT_RETRY_AFTER_SECONDS
-                  Errors::RateLimited
-                else
-                  Errors::OperationFailed
+            Timeout.timeout(options[:timeout] || DEFAULT_TIMEOUT) do
+              begin
+                http.send_request(method, URI.encode(path), body, headers).tap do |ret|
+                  @logger.debug("REST API response: #{ret.body}")
+                  unless ret.code =~ /^2\d\d/
+                    raise Errors::DoesNotExist, object_name: "Object '#{path}'" if ret.code == '404'
+                    error_class = case ret.code
+                    when '403'
+                      Errors::Unauthorized
+                    when '422'
+                      Errors::UnprocessableEntity
+                    when '423'
+                      Errors::ResourceBusy
+                    when '429'
+                      retry_after = ret['Retry-After'] || DEFAULT_RETRY_AFTER_SECONDS
+                      Errors::RateLimited
+                    else
+                      Errors::OperationFailed
+                    end
+                    raise error_class, err: error_string_from_body(ret)
+                  end
                 end
-                raise error_class, err: error_string_from_body(ret)
+              rescue Errors::RateLimited => ex
+                most_recent_exception = ex
+                @logger.info("Rate limited, wil retry in #{retry_after} seconds")
+                sleep retry_after.to_f + 0.1
+                retry
+              rescue Errors::ResourceBusy => ex
+                most_recent_exception = ex
+                @logger.debug("Resource busy, retrying")
+                sleep DEFAULT_RETRY_AFTER_SECONDS
+                retry
               end
             end
-          rescue Errors::RateLimited => ex
-            raise if tries > MAX_RATE_LIMIT_RETRIES
-            @logger.info("Rate limited, wil retry in #{retry_after} seconds")
-            sleep retry_after.to_f + 0.1
-            retry
+          rescue Timeout::Error => ex
+            raise most_recent_exception if most_recent_exception
+            raise Errors::OperationFailed, "Timeout exceeded"
           end
         end
 

data/lib/vagrant-skytap/api/environment.rb

@@ -144,13 +144,6 @@ module VagrantPlugins
           set_runstate :running, vm_ids: vm_ids
         end
 
-        def delete
-          retry_while_resource_busy do
-            api_client.delete(url)
-            break
-          end
-        end
-
         # Makes the REST call to add VMs to this environment, using
         # the provided VMs as sources.
         #
@@ -169,7 +162,7 @@ module VagrantPlugins
           end
 
           existing_vm_ids = self.vms.collect(&:id)
-          update_with_retry(args)
+          update(args)
           get_vms_by_id(self.vms.collect(&:id) - existing_vm_ids)
         end
 

data/lib/vagrant-skytap/api/interface.rb

@@ -23,14 +23,11 @@
 require 'vagrant-skytap/api/resource'
 require 'vagrant-skytap/api/public_ip'
 require 'vagrant-skytap/api/published_service'
-require_relative 'busyable'
 
 module VagrantPlugins
   module Skytap
     module API
       class Interface < Resource
-        include Busyable
-
         attr_reader :vm
 
         reads :id, :ip, :nat_addresses, :network_id, :public_ips, :services

data/lib/vagrant-skytap/api/publish_set.rb

@@ -52,10 +52,6 @@ module VagrantPlugins
         def vms
           environment.get_vms_by_id(vm_ids)
         end
-
-        def delete
-          api_client.delete(url)
-        end
       end
     end
   end

data/lib/vagrant-skytap/api/resource.rb

@@ -33,12 +33,19 @@ module VagrantPlugins
         attr_reader :attrs, :env
 
         class << self
+          # Last segment of the class name (without the namespace).
+          #
+          # @return [String]
+          def short_name
+            name.split("::").last
+          end
+
           # Resource name suitable for use in URLs. This should be overridden
           # for classes with camel-cased names (e.g., VpnAttachment).
           #
           # @return [String]
           def rest_name
-            name.split("::").last.downcase
+            short_name.downcase
           end
         end
 
@@ -73,6 +80,25 @@ module VagrantPlugins
           self
         end
 
+        # Sets attributes on the Skytap model, then refreshes this resource
+        # from the response.
+        #
+        # @param [Hash] attrs The attributes to update on the resource.
+        # @param [String] path The path to this resource, if different from
+        #   the default.
+        # @return [API::Resource]
+        def update(attrs, path=nil)
+          resp = api_client.put(path || url, JSON.dump(attrs))
+          refresh(JSON.load(resp.body))
+        end
+
+        # Remove this resource from Skytap.
+        #
+        # @return [NilClass]
+        def delete
+          api_client.delete(url)
+        end
+
         private
 
         # Return a reference to the API client which was passed in when

data/lib/vagrant-skytap/api/runstate_operations.rb

@@ -21,13 +21,12 @@
 # DEALINGS IN THE SOFTWARE.
 
 require 'timeout'
-require_relative 'busyable'
 
 module VagrantPlugins
   module Skytap
     module API
       module RunstateOperations
-        include Busyable
+        RUNSTATE_RETRY = 5
 
         def run!
           set_runstate :running
@@ -51,7 +50,7 @@ module VagrantPlugins
           params = {runstate: new_runstate}.tap do |ret|
             ret[:multiselect] = opts[:vm_ids] if opts[:vm_ids]
           end
-          update_with_retry(params)
+          update(params)
 
           wait_for_runstate(completed_runstate) unless runstate == completed_runstate
         end
@@ -62,10 +61,17 @@ module VagrantPlugins
 
         def wait_for_runstate(expected_runstate)
           expected_runstate = expected_runstate.to_s
-          retry_while_resource_busy do
-            unless reload.busy?
-              break if runstate == expected_runstate || expected_runstate == 'ready'
+          begin
+            Timeout.timeout(provider_config.instance_ready_timeout) do
+              loop do
+                unless reload.busy?
+                  break if runstate == expected_runstate || expected_runstate == 'ready'
+                end
+                sleep RUNSTATE_RETRY
+              end
             end
+          rescue Timeout::Error => ex
+            raise Errors::InstanceReadyTimeout, timeout: provider_config.instance_ready_timeout
           end
         end
 

data/lib/vagrant-skytap/api/vm.rb

@@ -105,17 +105,6 @@ module VagrantPlugins
         def region
           @region ||= parent.region
         end
-
-        def delete
-          begin
-            retry_while_resource_busy do
-              api_client.delete(url)
-              break
-            end
-          rescue Errors::OperationFailed => ex
-            raise Errors::OperationFailed, err: 'Failed to delete VM'
-          end
-        end
       end
     end
   end

data/lib/vagrant-skytap/api/vpn_attachment.rb

@@ -21,14 +21,11 @@
 # DEALINGS IN THE SOFTWARE.
 
 require 'vagrant-skytap/api/resource'
-require_relative 'busyable'
 
 module VagrantPlugins
   module Skytap
     module API
       class VpnAttachment < Resource
-        include Busyable
-
         attr_reader :network
 
         reads :connected, :network, :vpn
@@ -65,7 +62,7 @@ module VagrantPlugins
         end
 
         def connect!
-          update_with_retry(connected: true)
+          update(connected: true)
           raise Errors::VpnConnectionFailed unless connected?
         end
 

data/lib/vagrant-skytap/version.rb

@@ -22,6 +22,6 @@
 
 module VagrantPlugins
   module Skytap
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/spec/unit/actions/update_hardware_spec.rb

@@ -39,7 +39,7 @@ describe VagrantPlugins::Skytap::Action::UpdateHardware do
   describe "#call" do
     it "filters out unchanged hardware properties" do
       allow(subject).to receive(:current_vm).and_return(vm)
-      expect(vm).to receive(:update_with_retry).with(hardware: {cpus: 4, cpus_per_socket: 2, guestOS: "linux"})
+      expect(vm).to receive(:update).with(hardware: {cpus: 4, cpus_per_socket: 2, guestOS: "linux"})
       subject.call(env)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eric True
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -167,7 +167,6 @@ files:
 - lib/vagrant-skytap/action/update_hardware.rb
 - lib/vagrant-skytap/action/wait_for_communicator.rb
 - lib/vagrant-skytap/action.rb
-- lib/vagrant-skytap/api/busyable.rb
 - lib/vagrant-skytap/api/client.rb
 - lib/vagrant-skytap/api/connectable.rb
 - lib/vagrant-skytap/api/credentials.rb

data/lib/vagrant-skytap/api/busyable.rb

@@ -1,59 +0,0 @@
-# Copyright (c) 2014-2016 Skytap, Inc.
-#
-# The MIT License (MIT)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-require 'timeout'
-
-module VagrantPlugins
-  module Skytap
-    module API
-      module Busyable
-        WAIT_TIMEOUT = 300
-        WAIT_ITERATION_PERIOD = 2
-
-        def update_with_retry(attrs, path=nil)
-          retry_while_resource_busy do
-            resp = api_client.put(path || url, JSON.dump(attrs))
-            refresh(JSON.load(resp.body))
-            break
-          end
-        end
-
-        def retry_while_resource_busy(timeout=WAIT_TIMEOUT, &block)
-          begin
-            Timeout.timeout(timeout) do
-              loop do
-                break if env[:interrupted]
-                begin
-                  yield
-                rescue Errors::ResourceBusy
-                end
-                sleep WAIT_ITERATION_PERIOD
-              end
-            end
-          rescue Timeout::Error => ex
-            raise Errors::InstanceReadyTimeout, timeout: timeout
-          end
-        end
-      end
-    end
-  end
-end