vagrant-skytap 0.1.10 → 0.1.11

data/eng-10369.diff

@@ -1,208 +0,0 @@
-# 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.
-