lib/vagrant-skytap/api/vpn.rb in vagrant-skytap-0.2.10 vs lib/vagrant-skytap/api/vpn.rb in vagrant-skytap-0.3.0

@@ -21,117 +21,17 @@
 # DEALINGS IN THE SOFTWARE.
 
 require 'vagrant-skytap/util/subnet'
 require 'vagrant-skytap/api/resource'
 require 'vagrant-skytap/api/vpn_attachment'
+require 'vagrant-skytap/api/connectable'
 
-class VpnChoice
-  attr_reader :env, :vpn, :vm, :iface, :attachment, :execution
-
-  def initialize(env, vpn, vm)
-    @env = env
-    @vpn = vpn
-    @vm = vm
-    @iface = vm.interfaces.select(&:network).tap do |ifaces|
-      unless vpn.nat_enabled?
-        ifaces.select! {|i| vpn.subsumes?(i.network) }
-      end
-    end.first
-    @execution = AttachmentExecution.make(env, vpn, iface)
-  end
-
-  def to_s
-    "#{execution.verb} VPN: #{vpn.name}".tap do |ret|
-      if vpn.nat_enabled?
-        ret << " (NAT-enabled)"
-      else
-        ret << " (local subnet: #{vpn.local_subnet})"
-      end
-    end
-  end
-
-  def choose
-    execution.execute
-
-    @iface = vm.reload.interfaces.detect{|i| i.id == iface.id }
-    host = iface.address_for(vpn)
-    port = 22
-
-    [host, port]
-  end
-
-  def valid?
-    true
-  end
-
-  class AttachmentExecution
-    attr_reader :env, :vpn, :iface, :attachment
-
-    def self.make(env, vpn, iface)
-      attachment = iface.attachment_for(vpn)
-
-      if attachment.try(:connected?)
-        UseAttachmentExecution.new(env, vpn, iface, attachment)
-      elsif attachment
-        ConnectAttachmentExecution.new(env, vpn, iface, attachment)
-      else
-        CreateAttachmentExecution.new(env, vpn, iface)
-      end
-    end
-
-    def initialize(env, vpn, iface, attachment=nil)
-      @env = env
-      @vpn = vpn
-      @iface = iface
-      @attachment = attachment
-    end
-
-    def verb
-      raise NotImplementedError.new('Must override')
-    end
-
-    def execute
-      raise NotImplementedError.new('Must override')
-    end
-  end
-
-  class UseAttachmentExecution < AttachmentExecution
-    def verb
-      'Use'
-    end
-
-    def execute
-      # No-op
-    end
-  end
-
-  class ConnectAttachmentExecution < AttachmentExecution
-    def verb
-      'Connect to and use'
-    end
-
-    def execute
-      attachment.connect!
-    end
-  end
-
-  class CreateAttachmentExecution < AttachmentExecution
-    def verb
-      'Attach to and use'
-    end
-
-    def execute
-      @attachment = VagrantPlugins::Skytap::API::VpnAttachment.create(iface.network, vpn, env)
-      @attachment.connect!
-    end
-  end
-end
-
 module VagrantPlugins
   module Skytap
     module API
       class Vpn < Resource
+        include Connectable
 
         class << self
           def all(env, options = {})
             resp = env[:api_client].get('/vpns', options)
             vpn_attrs = JSON.load(resp.body)
@@ -143,13 +43,9 @@
             new(JSON.load(resp.body), env)
           end
         end
 
         reads :id, :local_subnet, :name, :nat_local_subnet
-
-        def choice_for_setup(vm)
-          VpnChoice.new(env, self, vm)
-        end
 
         def nat_enabled?
           !!nat_local_subnet
         end