vagrant-skytap 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0757cee969cf049f5c8b7f42dcf7f9978be8fc11
-  data.tar.gz: d720698c9e19f5b3a525dbcfb0d6c71052f52e1e
+  metadata.gz: ceceed9ec84e4a2e257efda672066914f42565b6
+  data.tar.gz: 8e6d45f0509e3c3e20869a13c94f3911b17badf3
 SHA512:
-  metadata.gz: 2a1c985b045c6a0df803225d69ed95dc4e0566436c439b39a9700078e3cb569529f2aa1c925e465e090856e36d7de81d1e817a2894314691760be2e0e4dfdf8b
-  data.tar.gz: 11c49679f051fee536a7f3bd64a76bb6ee258098285d10c18183035e92342dacca496e6d7901041567a19f22bd0afa65ef158ca51e06439e16e21842d8f607ec
+  metadata.gz: 78b09574cd57c6f4db5f4a1ce3fcb2e387835e46b2144fa155ec2a32579b077dd16be073c9200ae343fb3a89d183281721c0e2f148726e0ed4b4ccb407f3d992
+  data.tar.gz: 63eadbcf913068240b787bc8e787ae8877650f99627ad56beff65de94a1de06010ba205a70b707107eccfe41a98fd3d9dc31a6704bdda648e24d8f75881cb742

data/README.md

@@ -33,7 +33,8 @@ Before you begin, make sure you have:
     `vagrant plugin install vagrant-skytap`
 1. Create a new directory.
 1. Create a file called Vagrantfile (with no file extension) containing the following. This Vagrantfile describes a Skytap environment containing a single VM, using the source VM indicated by the `vm_url` setting (a generic Ubuntu 14.04 server in the US-West region) and upgrading it to 2 CPUs.
-    ```
+
+    ```ruby
     Vagrant.configure(2) do |config|
       config.vm.box = "skytap/empty"
 
@@ -50,6 +51,7 @@ Before you begin, make sure you have:
       end
     end
     ```
+
 1. Update the `username` and `api_token` settings and save the file.
     If you don't want to store your username and API token in the Vagrantfile, you can set them in the environment variables `VAGRANT_SKYTAP_USERNAME` and `VAGRANT_SKYTAP_API_TOKEN`.
 1. Navigate to the directory containing the Vagrantfile and enter the following at the command line:
@@ -106,39 +108,42 @@ Notes:
 ### Sync Local Folders with the VM's Folders using NFS
 
 The Skytap Vagrant provider supports Vagrant's built-in NFS sharing facility. In the following example, a local directory `~/web_files` will be visible on the VM at the path `/synced`.
-```
-  config.vm.define "web" do |server|
-    server.vm.provider :skytap do |box|
-      box.vm_url = "https://cloud.skytap.com/vms/3157858"
-      # ...
-    end
-    server.vm.synced_folder "~/web_files", "/synced", type: :nfs
+
+```ruby
+config.vm.define "web" do |server|
+  server.vm.provider :skytap do |box|
+    box.vm_url = "https://cloud.skytap.com/vms/3157858"
+    # ...
   end
+  server.vm.synced_folder "~/web_files", "/synced", type: :nfs
+end
 ```
+
 For more information, see Vagrant's documentation at [https://docs.vagrantup.com/v2/synced-folders/index.html](https://docs.vagrantup.com/v2/synced-folders/index.html).
 
 ## Multi-machine Example
 The following defines two VMs in a single environment. Both are based on the same Ubuntu template as above, but have different hardware settings. Since the source VM in the public library template is connected to a network, both of the VMs in the new environment will be connected to a single network.
-```
-  config.vm.define "web" do |server|
-    server.vm.provider :skytap do |box|
-      box.vm_url = "https://cloud.skytap.com/vms/3157858"
-      box.cpus = 2
-      box.cpuspersocket = 1
-      box.ram = 1024
-    end
-    server.vm.synced_folder "~/web_files", "/synced", type: :nfs
-  end
 
-  config.vm.define "db" do |server|
-    server.vm.provider :skytap do |box|
-      box.vm_url = "https://cloud.skytap.com/vms/3157858"
-      box.cpus = 8
-      box.cpuspersocket = 4
-      box.ram = 8192
-    end
-    server.vm.synced_folder "~/db_files", "/synced", type: :nfs
+```ruby
+config.vm.define "web" do |server|
+  server.vm.provider :skytap do |box|
+    box.vm_url = "https://cloud.skytap.com/vms/3157858"
+    box.cpus = 2
+    box.cpuspersocket = 1
+    box.ram = 1024
+  end
+  server.vm.synced_folder "~/web_files", "/synced", type: :nfs
+end
+
+config.vm.define "db" do |server|
+  server.vm.provider :skytap do |box|
+    box.vm_url = "https://cloud.skytap.com/vms/3157858"
+    box.cpus = 8
+    box.cpuspersocket = 4
+    box.ram = 8192
   end
+  server.vm.synced_folder "~/db_files", "/synced", type: :nfs
+end
 ```
 
 ##  Skytap-specific Vagrantfile Settings
@@ -168,10 +173,10 @@ To enable logging while troubleshooting, see [https://docs.vagrantup.com/v2/othe
 
 ### Known issues
 
-*   Vagrant must be able to connect to the new VM over the selected Skytap VPN.
-*   The source VM must have an SSH service configured to run on startup, or (for Windows VMs) be configured for WinRM access. For more information about WinRM configuration, see [https://docs.vagrantup.com/v2/boxes/base.html](https://docs.vagrantup.com/v2/boxes/base.html), under "Windows Boxes".
-*   At this time, WinRM credentials stored in Skytap VMs will be ignored. The username and password for WinRM connections must be stored in the Vagrantfile (`config.winrm.username` and `config.winrm.password`).
-*   Running, reloading, or destroying a Skytap VM can result in "stale NFS file handle" errors on other providers' VMs. This is a known issue when using multiple providers on the same host machine.  The workaround is to use `vagrant reload` on the affected VM to refresh that VM's NFS mount(s).
+* Vagrant must be able to connect to the new VM over the selected Skytap VPN.
+* The source VM must have an SSH service configured to run on startup, or (for Windows VMs) be configured for WinRM access. For more information about WinRM configuration, see [https://docs.vagrantup.com/v2/boxes/base.html](https://docs.vagrantup.com/v2/boxes/base.html), under "Windows Boxes".
+* At this time, WinRM credentials stored in Skytap VMs will be ignored. The username and password for WinRM connections must be stored in the Vagrantfile (`config.winrm.username` and `config.winrm.password`).
+* Running, reloading, or destroying a Skytap VM can result in "stale NFS file handle" errors on other providers' VMs. This is a known issue when using multiple providers on the same host machine.  The workaround is to use `vagrant reload` on the affected VM to refresh that VM's NFS mount(s).
 * At this time, `vagrant share` is not supported.
 * Private networks are currently unsupported.
 * Although several Skytap public library VMs include credentials for the `root` login, its use is not recommended.

data/boxes/README.md

@@ -0,0 +1,13 @@
+# Vagrant Skytap Example Box
+
+Vagrant providers each require a custom provider-specific box format.
+This folder shows the example contents of a box for the `skytap` provider.
+To turn this into a box:
+
+```
+$ tar cvzf skytap.box ./metadata.json ./Vagrantfile
+```
+
+This box works by using Vagrant's built-in Vagrantfile merging to setup
+defaults for Skytap. These defaults can easily be overwritten by higher-level
+Vagrantfiles (such as project root Vagrantfiles).

data/boxes/metadata.json

@@ -0,0 +1,3 @@
+{
+    "provider": "skytap"
+}

data/eng-10369.diff

@@ -0,0 +1,208 @@
+# HG changeset patch
+# Parent d55067c6de25d1b7ff712f9a8a934dc122e82e14
+# Parent  d55067c6de25d1b7ff712f9a8a934dc122e82e14
+ENG-10369 Detect errors in 200 response. Assume all are fatal.
+
+diff -r d55067c6de25 Vagrantfile
+--- a/Vagrantfile	Mon Nov 09 18:52:55 2015 -0800
++++ b/Vagrantfile	Mon Nov 09 19:28:06 2015 -0800
+@@ -3,20 +3,20 @@
+   config.vm.synced_folder ".", "/vagrant", disabled: true
+ 
+   config.vm.provider :skytap do |skytap, override|
+-    skytap.username = "etrue"
+-    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
+-    skytap.base_url = "https://cloud.skytap.com/"
+-    #skytap.username = "vagrant_provider_admin"
+-    #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
+-    #skytap.base_url = "https://test.skytap.com/"
++#    skytap.username = "etrue"
++#    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
++#    skytap.base_url = "https://cloud.skytap.com/"
++    skytap.username = "vagrant_provider_admin"
++    skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
++    skytap.base_url = "https://test.skytap.com/"
+     #skytap.username = "jsmith"
+     #skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
+     #skytap.base_url = "https://cloud.skytap.dev/"
+   end
+ 
+-  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
++#  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
+   # for test user
+-  #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
++  GENERIC_UBUNTU = 'https://test.skytap.com/vms/4840008'
+   # local user
+   #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
+ 
+@@ -33,6 +33,8 @@
+   UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A = "https://cloud.skytap.com/vms/7457184"
+   UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B = "https://cloud.skytap.com/vms/7468766"
+ 
++  VAGRANT_CUSTOMER_VPN = "https://cloud.skytap.com/vpns/vpn-3195669"
++
+   # separate template
+   # another ubuntu  = 'https://cloud.skytap.com/vms/7242466'
+   WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
+@@ -40,12 +42,13 @@
+   config.vm.define "vm1" do |ubuntu|
+     ubuntu.vm.hostname = "vm1"
+     ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU1#GENERIC_UBUNTU
++      box.vm_url = GENERIC_UBUNTU
+       #box.cpus = 1
+       #box.cpuspersocket = 1
+       #box.ram = 1024
+       #box.guestos = "ubuntu"
+       #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
++      box.vpn_url = VAGRANT_CUSTOMER_VPN
+     end
+     ubuntu.vm.synced_folder "vm1", "/synced", type: :nfs
+     ubuntu.vm.communicator = :ssh
+diff -r d55067c6de25 lib/vagrant-skytap/api/client.rb
+--- a/lib/vagrant-skytap/api/client.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/api/client.rb	Mon Nov 09 19:28:06 2015 -0800
+@@ -67,7 +67,11 @@
+             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/
++              if ret.code =~ /^2\d\d/
++                if options[:raise_on_error_field] && err = error_string_from_body(ret)
++                  raise Errors::OperationSucceededWithErrors, err: err
++                end
++              else
+                 raise Errors::DoesNotExist, object_name: "Object '#{path}'" if ret.code == '404'
+                 error_class = case ret.code
+                 when '403'
+@@ -96,7 +100,7 @@
+         def error_string_from_body(resp)
+           resp = resp.body if resp.respond_to?(:body)
+           begin
+-            resp = JSON.load(resp)
++            resp = JSON.load(resp) unless resp.is_a?(Hash)
+             errors = resp['error'] || resp['errors']
+             errors = errors.join('; ') if errors.respond_to? :join
+           rescue
+diff -r d55067c6de25 lib/vagrant-skytap/api/resource.rb
+--- a/lib/vagrant-skytap/api/resource.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/api/resource.rb	Mon Nov 09 19:28:06 2015 -0800
+@@ -23,8 +23,8 @@
+           "/#{self.class.resource_name.downcase}s/#{id}"
+         end
+ 
+-        def reload
+-          resp = api_client.get(url)
++        def reload(options={})
++          resp = api_client.get(url, options)
+           refresh(JSON.load(resp.body))
+         end
+ 
+diff -r d55067c6de25 lib/vagrant-skytap/api/runstate_operations.rb
+--- a/lib/vagrant-skytap/api/runstate_operations.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/api/runstate_operations.rb	Mon Nov 09 19:28:06 2015 -0800
+@@ -36,12 +36,16 @@
+         def wait_for_runstate(expected_runstate)
+           expected_runstate = expected_runstate.to_s
+           retry_while_resource_busy do
+-            unless reload.busy?
++            unless reload_with_error_handling.busy?
+               break if runstate == expected_runstate || expected_runstate == 'ready'
+             end
+           end
+         end
+ 
++        def reload_with_error_handling
++          reload(raise_on_error_field: true)
++        end
++
+         def runstate
+           get_api_attribute('runstate')
+         end
+diff -r d55067c6de25 lib/vagrant-skytap/api/vm.rb
+--- a/lib/vagrant-skytap/api/vm.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/api/vm.rb	Mon Nov 09 19:28:06 2015 -0800
+@@ -1,4 +1,4 @@
+-require 'vagrant-skytap/api/resource'
++  require 'vagrant-skytap/api/resource'
+ require 'vagrant-skytap/api/interface'
+ require 'vagrant-skytap/api/credentials'
+ require_relative 'runstate_operations'
+@@ -20,12 +20,6 @@
+             resp = env[:api_client].get(url)
+             new(JSON.load(resp.body), env[:environment], env)
+           end
+-
+-          def current_vm(env)
+-            if (environment = env[:environment]) && (machine = env[:machine]) && machine.id
+-              environment.get_vm_by_id(machine.id)
+-            end
+-          end
+         end
+ 
+         def initialize(attrs, environment, env)
+@@ -40,6 +34,19 @@
+           super
+         end
+ 
++        def refresh_from_environment
++          raise VmVanished, name: machine.name unless vm = environment.get_vm_by_id(id)
++          refresh(vm.attrs)
++        end
++
++        def reload_with_error_handling
++          environment.reload_with_error_handling
++          refresh_from_environment.tap do |ret|
++            err = api_client.error_string_from_body(ret.attrs)
++            raise Errors::OperationSucceededWithErrors, err: err if err
++          end
++        end
++
+         def interfaces
+           @interfaces ||= (get_api_attribute('interfaces') || []).collect do |iface_attrs|
+             Interface.new(iface_attrs, self, env)
+diff -r d55067c6de25 lib/vagrant-skytap/errors.rb
+--- a/lib/vagrant-skytap/errors.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/errors.rb	Mon Nov 09 19:28:06 2015 -0800
+@@ -27,6 +27,10 @@
+         error_key(:does_not_exist)
+       end
+ 
++      class VmVanished < VagrantSkytapError
++        error_key(:vm_vanished)
++      end
++
+       class BadVmUrl < VagrantSkytapError
+         error_key(:bad_vm_url)
+       end
+@@ -51,6 +55,11 @@
+         error_key(:operation_failed)
+       end
+ 
++      # Raised when a 200 response contains errors
++      class OperationSucceededWithErrors < VagrantSkytapError
++        error_key(:operation_succeeded_with_errors)
++      end
++
+       class VpnConnectionFailed < VagrantSkytapError
+         error_key(:vpn_connection_failed)
+       end
+diff -r d55067c6de25 locales/en.yml
+--- a/locales/en.yml	Mon Nov 09 18:52:55 2015 -0800
++++ b/locales/en.yml	Mon Nov 09 19:28:06 2015 -0800
+@@ -76,9 +76,15 @@
+       does_not_exist: |-
+         %{object_name} was not found.
+ 
++      vm_vanished: |-
++        The VM '%{name}' no longer exists on Skytap.
++
+       operation_failed: |-
+         The operation failed: %{err}
+ 
++      operation_succeeded_with_errors: |-
++        An error occurred: %{err}
++
+       vpn_connection_failed: |-
+         Could not connect to the VPN.
+ 

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

@@ -0,0 +1,49 @@
+require 'timeout'
+require "log4r"
+
+module VagrantPlugins
+  module Skytap
+    module Action
+      # Extends the builtin WaitForCommunicator action to retry on
+      # "network unreachable" errors, which can sometimes occur when
+      # a Skytap environment is started.
+      class WaitForCommunicator < Vagrant::Action::Builtin::WaitForCommunicator
+
+        def initialize(app, env, states=nil)
+          super
+          @logger = Log4r::Logger.new("vagrant_skytap::action::wait_for_communicator")
+        end
+
+        alias_method :builtin_action_call, :call
+
+        def call(env)
+          # The SSH communicator handles certain exceptions by raising a
+          # corresponding VagrantError which can be handled gracefully,
+          # i.e. by the #wait_for_ready method, which continues to retry
+          # until the boot_timeout expires.
+          #
+          # The communicator does a limited number of retries for
+          # Errno::ENETUNREACH, but then allows the exception to bubble up
+          # to the user. Here we swallow this exception and essentially
+          # retry the original WaitForCommunicator action.
+          begin
+            Timeout.timeout(env[:machine].config.vm.boot_timeout) do
+              while true do
+                begin
+                  # TODO Is there a clean way to just invoke the built-in action?
+                  break builtin_action_call(env)
+                rescue Errno::ENETUNREACH
+                  @logger.info("Rescued Errno::ENETUNREACH and retrying original WaitForCommunicator action.")
+                  env[:ui].detail("Warning: The network was unreachable. Retrying...")
+                end
+                return if env[:interrupted]
+              end
+            end
+          rescue Timeout::Error
+            raise Errors::VMBootTimeout
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-skytap/action.rb

@@ -271,6 +271,7 @@ module VagrantPlugins
       autoload :SuspendVm, action_root.join("suspend_vm")
       autoload :TimedProvision, action_root.join("timed_provision") # some plugins now expect this action to exist
       autoload :UpdateHardware, action_root.join("update_hardware")
+      autoload :WaitForCommunicator, action_root.join("wait_for_communicator")
     end
   end
 end

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

@@ -32,6 +32,7 @@ module VagrantPlugins
           end
 
           def check_vm_before_adding(env, vm)
+            raise Errors::NotTemplateVm, url: vm.url unless vm.from_template?
             raise Errors::SourceVmNotStopped, name: env[:machine].name, url: vm.url unless vm.stopped?
           end
         end
@@ -67,6 +68,10 @@ module VagrantPlugins
           end
         end
 
+        def region
+          get_api_attribute('region')
+        end
+
         def refresh(attrs)
           @vms = nil
           @networks = nil
@@ -82,7 +87,7 @@ module VagrantPlugins
 
         def add_vm(vm_url)
           vm = Vm.fetch(env, vm_url)
-          self.class.check_vm_before_adding(env, vm)
+          check_vm_before_adding(env, vm)
           vm_ids = vms.collect(&:id)
 
           update_with_retry(template_id: vm.template_id, vm_ids: [vm.id])
@@ -90,6 +95,11 @@ module VagrantPlugins
           get_vm_by_id(new_vm_ids.last)
         end
 
+        def check_vm_before_adding(env, vm)
+          raise Errors::RegionMismatch, environment_region: region, vm_region: vm.region unless vm.region == region
+          self.class.check_vm_before_adding(env, vm)
+        end
+
         def properties
           @properties ||= EnvironmentProperties.new(env[:machine].env.local_data_path)
         end

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

@@ -56,11 +56,22 @@ module VagrantPlugins
           get_api_attribute('hardware')
         end
 
+        def from_template?
+          !!get_api_attribute('template_url')
+        end
+
         def template_id
           get_api_attribute('template_url') =~ /templates\/(\d+)/
           $1
         end
 
+        def region
+          return @region if @region
+          resp = env[:api_client].get(get_api_attribute('template_url'))
+          template_attrs = JSON.load(resp.body)
+          @region = template_attrs['region']
+        end
+
         def delete
           begin
             retry_while_resource_busy do

data/lib/vagrant-skytap/config.rb

@@ -23,6 +23,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :vm_url
 
+      # The url of the VPN to use for connecting to the VM.
+      #
+      # @return [String]
+      attr_accessor :vpn_url
+
       # The timeout to wait for a VM to become ready.
       #
       # @return [Fixnum]
@@ -53,6 +58,7 @@ module VagrantPlugins
         @api_token              = UNSET_VALUE
         @base_url               = UNSET_VALUE
         @vm_url                 = UNSET_VALUE
+        @vpn_url                = UNSET_VALUE
         @instance_ready_timeout = UNSET_VALUE
         @region                 = UNSET_VALUE
 
@@ -78,6 +84,9 @@ module VagrantPlugins
         # Source VM url must be set.
         @vm_url = nil if @vm_url == UNSET_VALUE
 
+        # VPN to use for connection to VM
+        @vpn_url = nil if @vpn_url == UNSET_VALUE
+
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
 

data/lib/vagrant-skytap/errors.rb

@@ -31,6 +31,10 @@ module VagrantPlugins
         error_key(:bad_vm_url)
       end
 
+      class RegionMismatch < VagrantSkytapError
+        error_key(:region_mismatch)
+      end
+
       class ResourceBusy < VagrantSkytapError
         error_key(:resource_busy)
       end
@@ -55,6 +59,10 @@ module VagrantPlugins
         error_key(:source_vm_not_stopped)
       end
 
+      class NotTemplateVm < VagrantSkytapError
+        error_key(:not_template_vm)
+      end
+
       class NoConnectionOptions < VagrantSkytapError
         error_key(:no_connection_options)
       end

data/lib/vagrant-skytap/setup_helper.rb

@@ -97,6 +97,15 @@ module VagrantPlugins
         choices = connection_choices(iface).select(&:valid?)
         raise Errors::NoConnectionOptions unless choices.present?
 
+        if vpn_url = @provider_config.vpn_url
+          choice = choices.detect do |choice|
+            choice.vpn && vpn_url.include?(choice.vpn.id)
+          end
+          raise Errors::DoesNotExist, object_name: vpn_url unless choice
+          @host, @port = choice.choose
+          return
+        end
+
         question = "How do you want to connect to machine '#{@machine.name}'?"
         ask_from_list(question, choices, 0) do |i, choice|
           @host, @port = choice.choose

data/lib/vagrant-skytap/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Skytap
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/locales/en.yml

@@ -101,6 +101,12 @@ en:
       bad_vm_url: |-
         The specified vm_url was invalid: %{url}
 
+      not_template_vm: |-
+        The specified VM %{url} belongs to an environment, not a template. Using environment VMs is not currently supported.
+
+      region_mismatch: |-
+        A VM from the '%{vm_region}' region cannot be added to an environment in the '%{environment_region}' region.
+
     states:
       short_not_created: |-
         not created

data/spec/unit/base.rb

@@ -23,6 +23,11 @@ require "unit/support/shared/capability_helpers_context"
 require "unit/support/shared/plugin_command_context"
 require "unit/support/shared/skytap_context"
 
+require "vagrant-skytap/core_ext/object/blank"
+require "vagrant-skytap/core_ext/object/tap"
+require "vagrant-skytap/core_ext/try"
+require "vagrant-skytap/plugin"
+
 # Do not buffer output
 $stdout.sync = true
 $stderr.sync = true

data/spec/unit/config_spec.rb

@@ -19,6 +19,7 @@ describe VagrantPlugins::Skytap::Config do
     its("api_token")              { should be_nil }
     its("base_url")               { should == "https://cloud.skytap.com/" }
     its("vm_url")                 { should be_nil }
+    its("vpn_url")                { should be_nil }
     its("instance_ready_timeout") { should == 120 }
     its("cpus")                   { should be_nil }
     its("cpuspersocket")          { should be_nil }
@@ -32,7 +33,7 @@ describe VagrantPlugins::Skytap::Config do
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
     [:username, :api_token, :base_url, :vm_url,
-      :instance_ready_timeout,
+      :vpn_url, :instance_ready_timeout,
       :cpus, :cpuspersocket, :ram, :guestos].each do |attribute|
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")