vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160112/eng-12235-override-refactor

@@ -0,0 +1,140 @@
+# HG changeset patch
+# Parent 1325e55248225f2602b39dc54aa9a3b820e65174
+# Parent  1325e55248225f2602b39dc54aa9a3b820e65174
+ENG-12235 Refactoring: OverriddenCommand class.
+* * *
+imported patch eng-12235-noodling
+
+diff -r 1325e5524822 lib/vagrant-skytap/command/overridden_command.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/command/overridden_command.rb	Wed Dec 16 12:26:58 2015 -0800
+@@ -0,0 +1,91 @@
++# Parent class for commands that need to dispatch to existing
++# implementations. Registering a command with the same name
++# as an existing command overwrites it, which can inadvertently
++# break things for other providers.
++
++require 'vagrant'
++
++module VagrantPlugins
++  module Skytap
++    module Command
++      class OverriddenCommand < Vagrant.plugin("2", :command)
++
++        class MixedProvidersError ; end
++
++        def command_name
++          self.class.to_s.split("::").last.downcase
++        end
++
++        # Look for command inside specified plugin, rather than the
++        # command registry
++        def command_class(plugin, name)
++          if command = plugin.components.commands[name.to_sym].try(:first)
++            command.call
++          else
++            raise "Command '#{name}' not found in plugin"
++          end
++        end
++
++        def default_command_plugin
++          raise NotImplementedError
++        end
++
++        def provider_to_use
++          options = {}
++          opts = OptionParser.new do |o|
++            build_start_options(o, options)
++            o.on("--provider PROVIDER", String) do |provider|
++              options[:provider] = provider
++            end
++          end
++
++          if parse_options(opts) && options[:provider]
++            # Provider on command line
++            options[:provider].to_sym
++          elsif @env.active_machines.empty?
++            # No machines yet, and no provider specified
++            @env.default_provider
++          else
++            # Inspect machines which have already been created.
++            providers = @env.active_machines.collect(&:last).uniq
++            if providers.count > 1
++              # If the Vagrant project is heterogeneous (not all machines have
++              # the same provider), give up.
++              @logger.debug("This environment has active machines for multiple providers! Active machines: #{@env.active_machines}")
++              raise MixedProvidersError
++            else
++              providers.first
++            end
++          end
++        end
++
++        def execute
++          begin
++            provider = provider_to_use
++          rescue MixedProvidersError
++            # Fall back to the default implementation, which might still be
++            # able to perform the requested operation, and if not, it will use
++            # the default error handling.
++          end
++
++          if provider == :skytap
++            @logger.info("Calling Skytap overridden implementation of '#{command_name}' command.")
++            skytap_implementation
++          else
++            @logger.info("Calling default implementation of '#{command_name}' command.")
++            default_implementation
++          end
++        end
++
++        def default_implementation
++          command_class(default_command_plugin, command_name).new(@argv, @env).execute
++        end
++
++        def skytap_implementation
++          raise NotImplementedError
++        end
++      end
++    end
++  end
++end
++
+diff -r 1325e5524822 lib/vagrant-skytap/command/up.rb
+--- a/lib/vagrant-skytap/command/up.rb	Wed Dec 16 12:25:57 2015 -0800
++++ b/lib/vagrant-skytap/command/up.rb	Wed Dec 16 12:26:58 2015 -0800
+@@ -1,25 +1,19 @@
+-# We've subclassed the builtin "up" command to alter how
+-# parallelization is implemented. Instead of making concurrent requests to run
+-# individual VMs, we make a single REST call to update the runstates of
+-# multiple VMs within the containing Skytap environment.
++# Modified "up" implementation which runs VMs in parallel using the Skytap REST API.
+ 
+-require Vagrant.source_root.join("plugins/commands/up/command")
++require_relative 'overridden_command'
++require Vagrant.source_root.join("plugins/commands/up/start_mixins")
+ 
+ module VagrantPlugins
+   module Skytap
+     module Command
+-      class Up < VagrantPlugins::CommandUp::Command
++      class Up < OverriddenCommand
++        include VagrantPlugins::CommandUp::StartMixins
+ 
+-        def execute
+-          # This implementation of the "up" command overrides
+-          # the default implementation due to load order.
+-          if @env.default_provider == :skytap
+-            @logger.debug("Executing Skytap 'Up' implementation.")
+-          else
+-            @logger.debug("Calling default 'Up' implementation.")
+-            return super
+-          end
++        def default_command_plugin
++          VagrantPlugins::CommandUp::Plugin
++        end
+ 
++        def skytap_implementation
+           options = {}
+           options[:destroy_on_error] = true
+           options[:parallel] = true

data/_patches-20160112/eng-12240

@@ -0,0 +1,103 @@
+# HG changeset patch
+# Parent 8722732470b5a0c961d7e764f64cd20410c240db
+ENG-12240 no tty present
+
+diff -r 8722732470b5 Vagrantfile
+--- a/Vagrantfile	Thu Dec 03 15:09:16 2015 -0800
++++ b/Vagrantfile	Thu Dec 03 18:21:47 2015 -0800
+@@ -1,87 +1,17 @@
+ Vagrant.configure(2) do |config|
+   config.vm.box = "skytap/empty"
+-  config.vm.synced_folder ".", "/vagrant", disabled: true
++  #rsync
+ 
+   config.vm.provider :skytap do |skytap, override|
+-    skytap.username = "etrue"
+-    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
+-    #skytap.base_url = "https://cloud.skytap.com/"
+-    skytap.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
+-    #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/"
++    #skytap.username = "<username>"
++    #skytap.api_token = "<api_token>"
+   end
+ 
+-  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
+-  # for test user
+-  #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
+-  # local user
+-  #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
+-
+-  UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
+-  UBUNTU2 = "https://cloud.skytap.com/vms/7285846"
+-  UBUNTU_WITH_VAGRANT = "https://cloud.skytap.com/vms/7397734"
+-  FROM_US_EAST = "https://cloud.skytap.com/vms/6232386"
+-  FROM_EMEA = "https://cloud.skytap.com/vms/4153172"
+-  ENG11490 = "https://cloud.skytap.com/templates/696065"
+-  NO_DISK = "https://cloud.skytap.com/vms/7500356"
+-
+-  # may be gone by the time you see this
+-  ENVIRONMENT_VM = "https://cloud.skytap.com/vms/7457184"
+-  UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A = "https://cloud.skytap.com/vms/7457184"
+-  UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B = "https://cloud.skytap.com/vms/7468766"
+-
+-  # separate template
+-  # another ubuntu  = 'https://cloud.skytap.com/vms/7242466'
+-  WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
+-
+-  config.vm.define "vm1" do |ubuntu|
+-    ubuntu.vm.hostname = "vm1"
+-    ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU1#GENERIC_UBUNTU
+-      #box.cpus = 1
+-      #box.cpuspersocket = 1
+-      #box.ram = 1024
+-      #box.guestos = "ubuntu"
+-      #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
++  config.vm.define "web" do |server|
++    server.vm.provider :skytap do |box|
++      box.vm_url = "https://cloud.skytap.com/vms/7285844"
++      #box.cpus = 2
+     end
+-    ubuntu.vm.synced_folder "vm1", "/synced", type: :nfs
+-    #ubuntu.vm.synced_folder "vm1", "/home/skytap/app", type: :nfs, :mount_options => ['actimeo=1']
+-    ubuntu.vm.communicator = :ssh
+-    ubuntu.ssh.username = "skytap"
+-    ubuntu.ssh.password = "ChangeMe!"
+-
+-    ubuntu.vm.provision "shell", path: "provisioning/trivial.sh"
+-    #ubuntu.vm.provision "shell", path: "provisioning/apache.sh"
+-    #ubuntu.vm.provision "rails",  type: "shell", path: "provisioning/rails.sh"
+-  end
+-
+-  config.vm.define "vm2" do |windows|
+-    windows.vm.provider :skytap do |box, override|
+-      box.vm_url = WINDOWS_WINRM_CONFIGURED
+-      override.vm.guest = "windows"
+-    end
+-    windows.vm.communicator = :winrm
+-  end
+-  config.winrm.username = 'Administrator'
+-  config.winrm.password = 'admin'
+-
+-  config.vm.define "vm3" do |ubuntu|
+-    ubuntu.vm.hostname = "vm3"
+-    ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU2#GENERIC_UBUNTU
+-      #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
+-    end
+-    ubuntu.vm.communicator = :ssh
+-    ubuntu.ssh.username = "skytap"
+-    ubuntu.ssh.password = "CarpYe$$$"
+-    ubuntu.vm.synced_folder "vm3", "/synced", type: :nfs
+-    ubuntu.vm.provision "shell", path: "provisioning/trivial.sh"
+-    #ubuntu.vm.provision "shell", path: "provisioning/mysql.sh"
++    server.vm.synced_folder "vm1", "/synced", type: :nfs
+   end
+ end
+-
+-

data/_patches-20160112/eng-12249

@@ -0,0 +1,40 @@
+# HG changeset patch
+# Parent 7474cf487118146a0f4fa1a2a796efffd9d0e603
+ENG-12249 insecure public key, etc. for base box
+
+diff -r 7474cf487118 vm1/vagrant
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/vm1/vagrant	Mon Dec 14 12:57:19 2015 -0800
+@@ -0,0 +1,27 @@
++-----BEGIN RSA PRIVATE KEY-----
++MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
++w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
++kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
++hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
++Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
++yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
++ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
++Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
++TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
++iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
++sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
++4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
++cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
++EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
++CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
++3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
++YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
++3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
++dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
++6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
++P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
++llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
++kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
+++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
++NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
++-----END RSA PRIVATE KEY-----
+diff -r 7474cf487118 vm1/vagrant.pub
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/vm1/vagrant.pub	Mon Dec 14 12:57:19 2015 -0800
+@@ -0,0 +1,1 @@
++ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key

data/_patches-20160112/eng-12301

@@ -0,0 +1,50 @@
+# HG changeset patch
+# Parent 7bf28b483ba4495c173d9316aee2d8482d9705ab
+ENG-12301 release machine lock
+
+diff -r 7bf28b483ba4 lib/vagrant-skytap/action/mixin_machine_index.rb
+--- a/lib/vagrant-skytap/action/mixin_machine_index.rb	Thu Dec 03 19:36:57 2015 -0800
++++ b/lib/vagrant-skytap/action/mixin_machine_index.rb	Mon Dec 07 14:42:07 2015 -0800
+@@ -14,6 +14,7 @@
+         # NOTE: #get locks the machine. Make sure to #release(entry)
+         # when finished.
+         def machine_index_entry
++          @logger.debug("Locking machine #{index_uuid}") if @logger
+           entry = machine_index.get(env[:machine].index_uuid)
+         end
+       end
+diff -r 7bf28b483ba4 lib/vagrant-skytap/action/store_extra_data.rb
+--- a/lib/vagrant-skytap/action/store_extra_data.rb	Thu Dec 03 19:36:57 2015 -0800
++++ b/lib/vagrant-skytap/action/store_extra_data.rb	Mon Dec 07 14:42:07 2015 -0800
+@@ -17,6 +17,7 @@
+ 
+         def call(env)
+           entry = machine_index_entry
++          puts  "Machine locked. Pausing 5 seconds so you can kill me"
+           entry.extra_data.merge!(provider_extra_data)
+           entry = machine_index.set(entry)
+           machine_index.release(entry)
+diff -r 7bf28b483ba4 lib/vagrant-skytap/provider.rb
+--- a/lib/vagrant-skytap/provider.rb	Thu Dec 03 19:36:57 2015 -0800
++++ b/lib/vagrant-skytap/provider.rb	Mon Dec 07 14:42:07 2015 -0800
+@@ -6,6 +6,7 @@
+     class Provider < Vagrant.plugin("2", :provider)
+       def initialize(machine)
+         @machine = machine
++        @logger = Log4r::Logger.new("vagrant_skytap::plugin::provider")
+       end
+ 
+       def action(name)
+@@ -26,10 +27,11 @@
+       end
+ 
+       def state
++        @logger.debug("Entered Provider#state")
+         # Run a custom action we define called "read_state" which does
+         # what it says. It puts the state in the `:machine_state_id`
+         # key in the environment.
+-        env = @machine.action("read_state")
++        env = @machine.action("read_state", lock: false) # can't be this easy
+ 
+         state_id = env[:machine_state_id]
+ 

data/_patches-20160112/eng-12843

@@ -0,0 +1,95 @@
+# HG changeset patch
+# Parent d12ff92a5f45243523ff63f49b559dd3793fe41e
+ENG-12843 make Up command work without hacking a copy of the command
+
+diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/action.rb
+--- a/lib/vagrant-skytap/action.rb	Mon Dec 28 10:54:14 2015 -0800
++++ b/lib/vagrant-skytap/action.rb	Tue Jan 05 13:21:52 2016 -0800
+@@ -190,6 +190,16 @@
+       # and initial states for all machines to be run, potentially
+       # with a single REST call.
+ 
++      def self.action_up
++        Vagrant::Action::Builder.new.tap do |b|
++          b.use HandleBox
++          #b.use action_fetch_environment
++          b.use ConfigValidate
++#          b.use InitializeAPIClient
++#          b.use FetchEnvironment
++        end
++      end
++
+       def self.action_create
+         Vagrant::Action::Builder.new.tap do |b|
+           b.use HandleBox
+@@ -320,6 +330,7 @@
+       autoload :MessageEnvironmentUrl, action_root.join("message_environment_url")
+       autoload :MessageResuming, action_root.join("message_resuming")
+       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
++      autoload :PostActionUp, action_root.join("post_action_up")
+       autoload :PrepareForwardedPortCollisionParams, action_root.join("prepare_forwarded_port_collision_params")
+       autoload :PrepareNFSSettings, action_root.join("prepare_nfs_settings")
+       autoload :PrepareNFSValidIds, action_root.join("prepare_nfs_valid_ids")
+diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/action/post_action_up.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/action/post_action_up.rb	Tue Jan 05 13:21:52 2016 -0800
+@@ -0,0 +1,26 @@
++require 'byebug'
++require_relative "mixin_machine_index"
++
++module VagrantPlugins
++  module Skytap
++    module Action
++      # This can be used with "Call" built-in to check if the action
++      # is being performed as part of a parallel operation.
++      class PostActionUp
++        include MixinMachineIndex
++        def initialize(app, env)
++          @app = app
++          @logger = Log4r::Logger.new("vagrant_skytap::action::post_action_up")
++        end
++
++        def call(env)
++          @logger.info env[:action_name]
++          @logger.info env[:machine].try(:name)
++          debugger
++
++          @app.call(env)
++        end
++      end
++    end
++  end
++end
+diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/plugin.rb
+--- a/lib/vagrant-skytap/plugin.rb	Mon Dec 28 10:54:14 2015 -0800
++++ b/lib/vagrant-skytap/plugin.rb	Tue Jan 05 13:21:52 2016 -0800
+@@ -3,7 +3,7 @@
+ rescue LoadError
+   raise "The Vagrant Skytap plugin must be run within Vagrant."
+ end
+-
++require 'byebug'
+ # This is a sanity check to make sure no one is attempting to install
+ # this into an early Vagrant version.
+ if Vagrant::VERSION < "1.2.0"
+@@ -34,9 +34,17 @@
+         Provider
+       end
+ 
+-      command("up", primary: true) do
+-        require_relative "command/up"
+-        Skytap::Command::Up
++#      command("up", primary: true) do
++#        require_relative "command/up"
++#        Skytap::Command::Up
++#      end
++
++      action_hook(:post_up_behavior1, :environment_unload) do |hook|
++        hook.prepend(VagrantPlugins::Skytap::Action::PostActionUp)
++      end
++
++      action_hook(:post_up_behavior4, :machine_action_up) do |hook|
++        hook.append(VagrantPlugins::Skytap::Action::PostActionUp)
+       end
+ 
+       command("publish-url", primary: true) do

data/_patches-20160112/env-source

@@ -0,0 +1,112 @@
+# HG changeset patch
+# Parent 2d0352ab9e88823add32c339d95d9782c00fba51
+ENG-11604 support using environment vms (this is impossible without an API change)
+
+diff -r 2d0352ab9e88 Vagrantfile
+--- a/Vagrantfile	Wed Nov 04 16:26:46 2015 -0800
++++ b/Vagrantfile	Wed Nov 04 16:28:24 2015 -0800
+@@ -39,7 +39,7 @@
+   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 = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A#GENERIC_UBUNTU
+       #box.cpus = 1
+       #box.cpuspersocket = 1
+       #box.ram = 1024
+@@ -64,7 +64,7 @@
+   config.vm.define "vm3" do |ubuntu|
+     ubuntu.vm.hostname = "vm3"
+     ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU2#GENERIC_UBUNTU
++      box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B#GENERIC_UBUNTU
+     end
+     ubuntu.vm.communicator = :ssh
+     ubuntu.ssh.username = "skytap"
+diff -r 2d0352ab9e88 lib/vagrant-skytap/api/environment.rb
+--- a/lib/vagrant-skytap/api/environment.rb	Wed Nov 04 16:26:46 2015 -0800
++++ b/lib/vagrant-skytap/api/environment.rb	Wed Nov 04 16:28:24 2015 -0800
+@@ -18,8 +18,27 @@
+             vm = Vm.fetch(env, vm_url)
+             check_vm_before_adding(env, vm)
+ 
+-            resp = env[:api_client].post(RESOURCE_ROOT, JSON.dump(template_id: vm.template_id, vm_ids: [vm.id]))
+-            fetch(env, resp['Location'])
++            params = {
++              vm_ids: [vm.id]
++            }.tap do |params|
++              if vm.from_template?
++                params[:template_id] = vm.template_id
++              else
++                params[:configuration_id] = vm.environment_id
++              end
++            end
++
++            puts params
++            debugger
++
++            resp = env[:api_client].post(RESOURCE_ROOT, JSON.dump(params))#_for_add(vm)))
++            if resp['Location']
++              puts "Redirected to #{resp['Location']}"
++              fetch(env, resp['Location'])
++            else
++              puts "call returned #{resp.body}"
++              new(JSON.load(resp.body), env)
++            end
+           end
+ 
+           def fetch(env, url)
+@@ -31,6 +50,16 @@
+             EnvironmentProperties.read(env[:machine].env.local_data_path)
+           end
+ 
++          def params_for_add(vm)
++            {
++              vm_ids: [vm.id]
++            }.tap do |params|
++              unless params[:merge_configuration] = vm.environment_id
++                params[:template_id] = vm.template_id
++              end
++            end
++          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?
+@@ -90,7 +119,20 @@
+           check_vm_before_adding(env, vm)
+           vm_ids = vms.collect(&:id)
+ 
+-          update_with_retry(template_id: vm.template_id, vm_ids: [vm.id])
++          params = {
++            vm_ids: [vm.id]
++          }.tap do |params|
++            if vm.from_template?
++              params[:template_id] = vm.template_id
++            else
++              params[:merge_configuration] = vm.environment_id
++            end
++          end
++
++
++          puts params
++          debugger
++          update_with_retry(params)#self.class.params_for_add(vm))
+           new_vm_ids = vms.collect(&:id) - vm_ids
+           get_vm_by_id(new_vm_ids.last)
+         end
+diff -r 2d0352ab9e88 lib/vagrant-skytap/api/vm.rb
+--- a/lib/vagrant-skytap/api/vm.rb	Wed Nov 04 16:26:46 2015 -0800
++++ b/lib/vagrant-skytap/api/vm.rb	Wed Nov 04 16:28:24 2015 -0800
+@@ -60,6 +60,11 @@
+           !!get_api_attribute('template_url')
+         end
+ 
++        def environment_id
++          get_api_attribute('configuration_url') =~ /configurations\/(\d+)/
++          $1
++        end
++
+         def template_id
+           get_api_attribute('template_url') =~ /templates\/(\d+)/
+           $1