vagrant-softlayer 0.3.1 → 0.3.2

data/lib/vagrant-softlayer/action.rb

@@ -15,17 +15,17 @@ module VagrantPlugins
           b.use Call, DestroyConfirm do |env, b2|
             if env[:result]
               b2.use ConfigValidate
-              b.use Call, Is, :not_created do |env2, b3|
+              b2.use Call, Is, :not_created do |env2, b3|
                 if env2[:result]
                   b3.use Message, :error, "vagrant_softlayer.vm.not_created"
-                  next
+                else
+                  b3.use SetupSoftLayer
+                  b3.use UpdateDNS
+                  b3.use DestroyInstance
+                  b3.use LoadBalancerCleanup
+                  b3.use ProvisionerCleanup
                 end
               end
-              b2.use SetupSoftLayer
-              b2.use UpdateDNS
-              b2.use DestroyInstance
-              b2.use LoadBalancerCleanup
-              b2.use ProvisionerCleanup
             else
               b2.use Message, :warn, "vagrant_softlayer.vm.not_destroying"
             end
@@ -93,18 +93,18 @@ module VagrantPlugins
           b.use Call, Confirm, I18n.t("vagrant_softlayer.vm.rebuild_confirmation"), :force_rebuild do |env, b2|
             if env[:result]
               b2.use ConfigValidate
-              b.use Call, Is, :not_created do |env2, b3|
+              b2.use Call, Is, :not_created do |env2, b3|
                 if env2[:result]
                   b3.use Message, :error, "vagrant_softlayer.vm.not_created"
-                  next
+                else
+                  b3.use SetupSoftLayer
+                  b3.use RebuildInstance
+                  b3.use Provision
+                  b3.use SyncFolders
+                  b3.use WaitForRebuild
+                  b3.use WaitForCommunicator
                 end
               end
-              b2.use SetupSoftLayer
-              b2.use RebuildInstance
-              b2.use Provision
-              b2.use SyncFolders
-              b2.use WaitForRebuild
-              b2.use WaitForCommunicator
             else
               b2.use Message, :warn, "vagrant_softlayer.vm.not_rebuilding"
             end
@@ -184,7 +184,11 @@ module VagrantPlugins
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
-          b.use HandleBoxUrl
+          if defined?(HandleBox)
+            b.use HandleBox
+          else
+            b.use HandleBoxUrl
+          end
           b.use ConfigValidate
           b.use SetupSoftLayer
           b.use Call, Is, :not_created do |env1, b1|

data/lib/vagrant-softlayer/action/create_instance.rb

@@ -27,6 +27,22 @@ module VagrantPlugins
           @env[:machine].provider_config.hostname || @env[:machine].config.vm.hostname
         end
 
+        def get_vlan_id(vlan_name, vlan_space)
+          return vlan_name unless vlan_name.kind_of?(String)
+
+          routers = @env[:sl_account].object_mask("mask[routers,routers.datacenter,routers.networkVlans,routers.networkVlans.networkSpace,routers.networkVlans.type]").getObject["routers"]
+
+          routers.each do |router|
+            next if @env[:machine].provider_config.datacenter && router["datacenter"]["name"] != @env[:machine].provider_config.datacenter
+            router["networkVlans"].each do |vlan|
+              vlan_qualified_name = [ router["hostname"].split('.').reverse.join('.'), vlan["vlanNumber"] ].join('.')
+              return vlan["id"] if vlan.has_key?("name") && vlan["type"]["keyName"] == "STANDARD" && vlan["networkSpace"] == vlan_space.to_s.upcase && (vlan["name"] == vlan_name || vlan_qualified_name == vlan_name)
+            end
+          end
+
+          raise Errors::SLVlanIdNotFound, :vlan_space => vlan_space.to_s, :vlan_name => vlan_name.inspect
+        end
+
         def order_template
           template = {
             "dedicatedAccountHostOnlyFlag" => @env[:machine].provider_config.dedicated,
@@ -41,14 +57,14 @@ module VagrantPlugins
             "startCpus"                    => @env[:machine].provider_config.start_cpus
           }
 
-          template["blockDevices"] =  @env[:machine].provider_config.disk_capacity.map{ |key,value| { "device"=> key.to_s, "diskImage" => { "capacity" => value.to_s } } } if @env[:machine].provider_config.disk_capacity
-          template["datacenter"] = { :name => @env[:machine].provider_config.datacenter } if @env[:machine].provider_config.datacenter
-          template["blockDeviceTemplateGroup"] = { :globalIdentifier => @env[:machine].provider_config.image_guid } if @env[:machine].provider_config.image_guid
-          template["operatingSystemReferenceCode"] = @env[:machine].provider_config.operating_system if !@env[:machine].provider_config.image_guid
-          template["postInstallScriptUri"] = @env[:machine].provider_config.post_install if @env[:machine].provider_config.post_install
-          template["primaryNetworkComponent"] = { :networkVlan => { :id => @env[:machine].provider_config.vlan_public } } if @env[:machine].provider_config.vlan_public
-          template["primaryBackendNetworkComponent"] = { :networkVlan => { :id => @env[:machine].provider_config.vlan_private } } if @env[:machine].provider_config.vlan_private
-          template["userData"] = [ { :value => @env[:machine].provider_config.user_data } ] if @env[:machine].provider_config.user_data
+          template["blockDevices"]                   =  @env[:machine].provider_config.disk_capacity.map{ |key,value| { "device"=> key.to_s, "diskImage" => { "capacity" => value.to_s } } } if @env[:machine].provider_config.disk_capacity
+          template["blockDeviceTemplateGroup"]       = { :globalIdentifier => @env[:machine].provider_config.image_guid } if @env[:machine].provider_config.image_guid
+          template["datacenter"]                     = { :name => @env[:machine].provider_config.datacenter } if @env[:machine].provider_config.datacenter
+          template["operatingSystemReferenceCode"]   = @env[:machine].provider_config.operating_system if !@env[:machine].provider_config.image_guid
+          template["postInstallScriptUri"]           = @env[:machine].provider_config.post_install if @env[:machine].provider_config.post_install
+          template["primaryBackendNetworkComponent"] = { :networkVlan => { :id => get_vlan_id(@env[:machine].provider_config.vlan_private, :private) } } if @env[:machine].provider_config.vlan_private
+          template["primaryNetworkComponent"]        = { :networkVlan => { :id => get_vlan_id(@env[:machine].provider_config.vlan_public,  :public) } } if @env[:machine].provider_config.vlan_public
+          template["userData"]                       = [ { :value => @env[:machine].provider_config.user_data } ] if @env[:machine].provider_config.user_data
 
           return template
         end

data/lib/vagrant-softlayer/action/setup_softlayer.rb

@@ -22,8 +22,9 @@ module VagrantPlugins
             :username     => env[:machine].provider_config.username
           }
 
-          env[:sl_virtual_guest] = ::SoftLayer::Service.new("SoftLayer_Virtual_Guest", env[:sl_credentials])
+          env[:sl_account]       = ::SoftLayer::Service.new("SoftLayer_Account",       env[:sl_credentials])
           env[:sl_product_order] = ::SoftLayer::Service.new("SoftLayer_Product_Order", env[:sl_credentials])
+          env[:sl_virtual_guest] = ::SoftLayer::Service.new("SoftLayer_Virtual_Guest", env[:sl_credentials])
 
           unless env[:machine].id.nil? || env[:machine].id.empty?
             env[:sl_machine] = env[:sl_virtual_guest].object_with_id(env[:machine].id.to_i)

data/lib/vagrant-softlayer/action/sync_folders.rb

@@ -1,99 +1,99 @@
-require "log4r"
-
-require "vagrant/util/scoped_hash_override"
-require "vagrant/util/subprocess"
-require "vagrant/util/which"
-
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This middleware uses `rsync` to sync the folders over to the
-      # SoftLayer instance.
-      class SyncFolders
-        include Vagrant::Util::ScopedHashOverride
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_softlayer::action::sync_folders")
-        end
-
-        def call(env)
-          @app.call(env)
-
-          ssh_info = env[:machine].ssh_info
-
-          unless Vagrant::Util::Which.which("rsync")
-            env[:ui].warn(I18n.t("vagrant_softlayer.sync_folders.rsync_not_found", :side => "host"))
-            return
-          end
-
-          if env[:machine].communicate.execute("which rsync", :error_check => false) != 0
-            env[:ui].warn(I18n.t("vagrant_softlayer.sync_folders.rsync_not_found", :side => "guest"))
-            return
-          end
-
-          env[:machine].config.vm.synced_folders.each do |id, data|
-            data = scoped_hash_override(data, :softlayer)
-
-            # Ignore disabled shared folders
-            next if data[:disabled]
-
-            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-            guestpath = data[:guestpath]
-
-            # Make sure there is a trailing slash on the host path to
-            # avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-
-            # on windows rsync.exe requires cygdrive-style paths
-            if Vagrant::Util::Platform.windows?
-              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
-            end
-
-            env[:ui].info(I18n.t("vagrant_softlayer.sync_folders.rsync_folder",
-                                :hostpath => hostpath,
-                                :guestpath => guestpath))
-
-            # Create the host path if it doesn't exist and option flag is set
-            if data[:create]
-              begin
-                FileUtils::mkdir_p(hostpath)
-              rescue => err
-                raise Errors::MkdirError,
-                  :hostpath => hostpath,
-                  :err => err
-              end
-            end
-
-            # Create the guest path
-            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
-            env[:machine].communicate.sudo(
-              "chown #{ssh_info[:username]} '#{guestpath}'")
-
-            # Rsync over to the guest path using the SSH info
-            command = [
-              "rsync", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path].join("' -i '")}'",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
-
-            # we need to fix permissions when using rsync.exe on windows, see
-            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
-            if Vagrant::Util::Platform.windows?
-              command.insert(1, "--chmod", "ugo=rwX")
-            end
-
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require "log4r"
+
+require "vagrant/util/scoped_hash_override"
+require "vagrant/util/subprocess"
+require "vagrant/util/which"
+
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This middleware uses `rsync` to sync the folders over to the
+      # SoftLayer instance.
+      class SyncFolders
+        include Vagrant::Util::ScopedHashOverride
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_softlayer::action::sync_folders")
+        end
+
+        def call(env)
+          @app.call(env)
+
+          ssh_info = env[:machine].ssh_info
+
+          unless Vagrant::Util::Which.which("rsync")
+            env[:ui].warn(I18n.t("vagrant_softlayer.sync_folders.rsync_not_found", :side => "host"))
+            return
+          end
+
+          if env[:machine].communicate.execute("which rsync", :error_check => false) != 0
+            env[:ui].warn(I18n.t("vagrant_softlayer.sync_folders.rsync_not_found", :side => "guest"))
+            return
+          end
+
+          env[:machine].config.vm.synced_folders.each do |id, data|
+            data = scoped_hash_override(data, :softlayer)
+
+            # Ignore disabled shared folders
+            next if data[:disabled]
+
+            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
+            guestpath = data[:guestpath]
+
+            # Make sure there is a trailing slash on the host path to
+            # avoid creating an additional directory with rsync
+            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
+
+            # on windows rsync.exe requires cygdrive-style paths
+            if Vagrant::Util::Platform.windows?
+              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+            end
+
+            env[:ui].info(I18n.t("vagrant_softlayer.sync_folders.rsync_folder",
+                                :hostpath => hostpath,
+                                :guestpath => guestpath))
+
+            # Create the host path if it doesn't exist and option flag is set
+            if data[:create]
+              begin
+                FileUtils::mkdir_p(hostpath)
+              rescue => err
+                raise Errors::MkdirError,
+                  :hostpath => hostpath,
+                  :err => err
+              end
+            end
+
+            # Create the guest path
+            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
+            env[:machine].communicate.sudo(
+              "chown #{ssh_info[:username]} '#{guestpath}'")
+
+            # Rsync over to the guest path using the SSH info
+            command = [
+              "rsync", "--verbose", "--archive", "-z",
+              "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path].join("' -i '")}'",
+              hostpath,
+              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+
+            # we need to fix permissions when using rsync.exe on windows, see
+            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
+            if Vagrant::Util::Platform.windows?
+              command.insert(1, "--chmod", "ugo=rwX")
+            end
+
+            r = Vagrant::Util::Subprocess.execute(*command)
+            if r.exit_code != 0
+              raise Errors::RsyncError,
+                :guestpath => guestpath,
+                :hostpath => hostpath,
+                :stderr => r.stderr
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/wait_for_rebuild.rb

@@ -1,36 +1,36 @@
-require "log4r"
-
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # Waits until the new machine has been rebuilt.
-      class WaitForRebuild
-        include Util::Warden
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_softlayer::action::wait_for_rebuild")
-        end
-
-        def call(env)
-          env[:ui].info I18n.t("vagrant_softlayer.vm.wait_for_rebuild")
-
-          # 20 minutes timeout
-          Timeout::timeout(1200) do
-            @logger.debug("Checking if the instance has been rebuilt.")
-            sl_warden do
-              while env[:sl_machine].object_mask("activeTransactionCount").getObject["activeTransactionCount"] > 0
-                @logger.debug("The machine is still being rebuilt. Retrying in 10 seconds.")
-                sleep 10
-              end
-            end
-          end
-
-          env[:ui].info I18n.t("vagrant_softlayer.vm.rebuilt")
-          
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+require "log4r"
+
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # Waits until the new machine has been rebuilt.
+      class WaitForRebuild
+        include Util::Warden
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_softlayer::action::wait_for_rebuild")
+        end
+
+        def call(env)
+          env[:ui].info I18n.t("vagrant_softlayer.vm.wait_for_rebuild")
+
+          # 20 minutes timeout
+          Timeout::timeout(1200) do
+            @logger.debug("Checking if the instance has been rebuilt.")
+            sl_warden do
+              while env[:sl_machine].object_mask("activeTransactionCount").getObject["activeTransactionCount"] > 0
+                @logger.debug("The machine is still being rebuilt. Retrying in 10 seconds.")
+                sleep 10
+              end
+            end
+          end
+
+          env[:ui].info I18n.t("vagrant_softlayer.vm.rebuilt")
+          
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/config.rb

@@ -24,6 +24,9 @@ module VagrantPlugins
       # The domain of the instance.
       attr_accessor :domain
 
+      # Force the use of the private IP for all communication even if a public IP is available
+      attr_accessor :force_private_ip
+
       # The hostname of the instance.
       attr_accessor :hostname
 
@@ -60,10 +63,10 @@ module VagrantPlugins
       # User defined metadata string.
       attr_accessor :user_data
 
-      # The ID of the private VLAN.
+      # The ID, name or qualified name of the private VLAN.
       attr_accessor :vlan_private
 
-      # The ID of the public VLAN.
+      # The ID, name or qualified name of the public VLAN.
       attr_accessor :vlan_public
 
       # The load balancers service groups to join.
@@ -81,6 +84,7 @@ module VagrantPlugins
         @dedicated        = UNSET_VALUE
         @disk_capacity    = UNSET_VALUE
         @domain           = UNSET_VALUE
+        @force_private_ip = UNSET_VALUE
         @hostname         = UNSET_VALUE
         @image_guid       = UNSET_VALUE
         @hourly_billing   = UNSET_VALUE
@@ -154,6 +158,9 @@ module VagrantPlugins
         # Domain should be specified in Vagrantfile, so we set default to nil.
         @domain = nil if @domain == UNSET_VALUE
 
+        # Disable the use of force private IP so the default selection can take effect
+        @force_private_ip = false if @force_private_ip == UNSET_VALUE
+
         # Hostname should be specified in Vagrantfile, either using `config.vm.hostname`
         # or the provider specific configuration entry.
         @hostname = nil if @hostname == UNSET_VALUE
@@ -205,6 +212,7 @@ module VagrantPlugins
       def ssh_keys=(value)
         @ssh_key = value
       end
+
       alias_method :ssh_key_id=, :ssh_keys=
       alias_method :ssh_key_ids=, :ssh_keys=
       alias_method :ssh_key_name=, :ssh_keys=