vagrant-softlayer 0.3.1 → 0.3.2

data/lib/vagrant-softlayer/util/warden.rb

@@ -1,38 +1,38 @@
-module VagrantPlugins
-  module SoftLayer
-    module Util
-      module Warden
-        # Handles gracefully SoftLayer API calls.
-        #
-        # The block code is executed, catching both common
-        # connection errors and API exceptions.
-        #
-        # Optionally, in the not-so-uncommon case when
-        # the object (e.g. the SoftLayer instance) is not
-        # found, executes a proc and/or retry the API call
-        # after some seconds.
-        #
-        # A future version of the method will add a retry timeout.
-        def sl_warden(rescue_proc = nil, retry_interval = 0, &block)
-          begin
-            yield
-          rescue ::OpenSSL::SSL::SSLError
-            raise Errors::SLCertificateError
-          rescue SocketError, ::SoftLayer::SoftLayerAPIException => e
-            if e.class == ::SoftLayer::SoftLayerAPIException && (e.message.start_with?("Unable to find object") || e.message.start_with?("Object does not exist"))
-              out = rescue_proc.call if rescue_proc
-              if retry_interval > 0
-                sleep retry_interval
-                retry
-              else
-                return out
-              end
-            else
-              raise Errors::SLApiError, :class => e.class, :message => e.message
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Util
+      module Warden
+        # Handles gracefully SoftLayer API calls.
+        #
+        # The block code is executed, catching both common
+        # connection errors and API exceptions.
+        #
+        # Optionally, in the not-so-uncommon case when
+        # the object (e.g. the SoftLayer instance) is not
+        # found, executes a proc and/or retry the API call
+        # after some seconds.
+        #
+        # A future version of the method will add a retry timeout.
+        def sl_warden(rescue_proc = nil, retry_interval = 0, &block)
+          begin
+            yield
+          rescue ::OpenSSL::SSL::SSLError
+            raise Errors::SLCertificateError
+          rescue SocketError, ::SoftLayer::SoftLayerAPIException => e
+            if e.class == ::SoftLayer::SoftLayerAPIException && (e.message.start_with?("Unable to find object") || e.message.start_with?("Object does not exist"))
+              out = rescue_proc.call if rescue_proc
+              if retry_interval > 0
+                sleep retry_interval
+                retry
+              else
+                return out
+              end
+            else
+              raise Errors::SLApiError, :class => e.class, :message => e.message
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/version.rb

@@ -1,5 +1,5 @@
-module VagrantPlugins
-  module SoftLayer
-    VERSION = "0.3.1"
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    VERSION = "0.3.2"
+  end
+end

data/locales/en.yml

@@ -123,6 +123,12 @@ en:
       ssh_key_not_found: |-
         The SSH key you're trying to set (%{key}) does not exists in the
         SoftLayer account's keychain.
+      vlan_id_not_found: |-
+        The vlan id for the %{vlan_space} vlan name or qualified name
+        provided (%{vlan_name}) could not be found.
+
+        Please check the configuration parameter for vlan name against
+        acceptable values shown using the vagrant-softlayer-vlans tool.
     states:
       short_not_created: |-
         not created

data/spec/vagrant-softlayer/config_spec.rb

@@ -19,6 +19,7 @@ describe VagrantPlugins::SoftLayer::Config do
     its("dedicated")        { should be_false }
     its("disk_capacity")    { should be_nil }
     its("domain")           { should be_nil }
+    its("force_private_ip") { should be_false }
     its("hostname")         { should be_nil }
     its("hourly_billing")   { should be_true }
     its("image_guid")       { should be_nil }
@@ -41,7 +42,7 @@ describe VagrantPlugins::SoftLayer::Config do
   describe "overriding defaults" do
     context "booleans" do
       [true, false].each do |bool|
-        [:dedicated, :hourly_billing, :local_disk, :manage_dns, :private_only].each do |attribute|
+        [:dedicated, :force_private_ip, :hourly_billing, :local_disk, :manage_dns, :private_only].each do |attribute|
           it "should accept both true and false for #{attribute}" do
             config.send("#{attribute}=".to_sym, bool)
             config.finalize!
@@ -62,7 +63,7 @@ describe VagrantPlugins::SoftLayer::Config do
     end
 
     context "strings" do
-      [:api_key, :datacenter, :endpoint_url, :username, :domain, :hostname, :image_guid, :operating_system, :post_install, :ssh_key, :user_data].each do |attribute|
+      [:api_key, :datacenter, :endpoint_url, :username, :domain, :hostname, :image_guid, :operating_system, :post_install, :ssh_key, :user_data, :vlan_private, :vlan_public].each do |attribute|
         it "should not default #{attribute} if overridden" do
           config.send("#{attribute}=".to_sym, "foo")
           config.finalize!
@@ -134,6 +135,7 @@ describe VagrantPlugins::SoftLayer::Config do
       config.dedicated        = false
       config.domain           = "example.com"
       config.disk_capacity    = { 0 => 25 }
+      config.force_private_ip = false
       config.hostname         = "vagrant"
       config.hourly_billing   = true
       config.image_guid       = nil

data/vagrant-softlayer.gemspec

@@ -1,55 +1,55 @@
-$:.unshift File.expand_path("../lib", __FILE__)
-require "vagrant-softlayer/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "vagrant-softlayer"
-  spec.version       = VagrantPlugins::SoftLayer::VERSION
-  spec.authors       = "Audiolize GmbH"
-  spec.email         = ""
-  spec.homepage      = "https://github.com/audiolize/vagrant-softlayer"
-  spec.description   = "Enables Vagrant to manages SoftLayer CCI."
-  spec.summary       = "Enables Vagrant to manages SoftLayer CCI."
-  spec.license       = "MIT"
-
-  # The following block of code determines the files that should be included
-  # in the gem. It does this by reading all the files in the directory where
-  # this gemspec is, and parsing out the ignored files from the gitignore.
-  # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
-  root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
-  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, ".gitignore")
-  gitignore      = File.readlines(gitignore_path)
-  gitignore.map!    { |line| line.chomp.strip }
-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  unignored_files = all_files.reject do |file|
-    # Ignore any directories, the gemspec only cares about files
-    next true if File.directory?(file)
-
-    # Ignore any paths that match anything in the gitignore. We do
-    # two tests here:
-    #
-    #   - First, test to see if the entire path matches the gitignore.
-    #   - Second, match if the basename does, this makes it so that things
-    #     like '.DS_Store' will match sub-directories too (same behavior
-    #     as git).
-    #
-    gitignore.any? do |ignore|
-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-    end
-  end
-
-  spec.files        = unignored_files
-  spec.executables  = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files   = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_path = "lib"
-
-  spec.add_dependency "softlayer_api", "~> 1.0"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-end
+$:.unshift File.expand_path("../lib", __FILE__)
+require "vagrant-softlayer/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "vagrant-softlayer"
+  spec.version       = VagrantPlugins::SoftLayer::VERSION
+  spec.authors       = "Audiolize GmbH"
+  spec.email         = ""
+  spec.homepage      = "https://github.com/audiolize/vagrant-softlayer"
+  spec.description   = "Enables Vagrant to manages SoftLayer CCI."
+  spec.summary       = "Enables Vagrant to manages SoftLayer CCI."
+  spec.license       = "MIT"
+
+  # The following block of code determines the files that should be included
+  # in the gem. It does this by reading all the files in the directory where
+  # this gemspec is, and parsing out the ignored files from the gitignore.
+  # Note that the entire gitignore(5) syntax is not supported, specifically
+  # the "!" syntax, but it should mostly work correctly.
+  root_path      = File.dirname(__FILE__)
+  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
+  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
+  gitignore_path = File.join(root_path, ".gitignore")
+  gitignore      = File.readlines(gitignore_path)
+  gitignore.map!    { |line| line.chomp.strip }
+  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
+
+  unignored_files = all_files.reject do |file|
+    # Ignore any directories, the gemspec only cares about files
+    next true if File.directory?(file)
+
+    # Ignore any paths that match anything in the gitignore. We do
+    # two tests here:
+    #
+    #   - First, test to see if the entire path matches the gitignore.
+    #   - Second, match if the basename does, this makes it so that things
+    #     like '.DS_Store' will match sub-directories too (same behavior
+    #     as git).
+    #
+    gitignore.any? do |ignore|
+      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
+        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+    end
+  end
+
+  spec.files        = unignored_files
+  spec.executables  = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files   = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_path = "lib"
+
+  spec.add_dependency "softlayer_api", "~> 1.0"
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Audiolize GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: softlayer_api
@@ -75,6 +75,74 @@ files:
 - CHANGELOG.md
 - contrib/README.md
 - contrib/vagrant-softlayer-boxes
+- contrib/vagrant-softlayer-vlans
+- contrib/vagrantcloud/CENTOS_5_32.box
+- contrib/vagrantcloud/CENTOS_5_64.box
+- contrib/vagrantcloud/CENTOS_6_32.box
+- contrib/vagrantcloud/CENTOS_6_64.box
+- contrib/vagrantcloud/CENTOS_LATEST.box
+- contrib/vagrantcloud/CENTOS_LATEST_32.box
+- contrib/vagrantcloud/CENTOS_LATEST_64.box
+- contrib/vagrantcloud/CLOUDLINUX_5_32.box
+- contrib/vagrantcloud/CLOUDLINUX_5_64.box
+- contrib/vagrantcloud/CLOUDLINUX_6_32.box
+- contrib/vagrantcloud/CLOUDLINUX_6_64.box
+- contrib/vagrantcloud/CLOUDLINUX_LATEST.box
+- contrib/vagrantcloud/CLOUDLINUX_LATEST_32.box
+- contrib/vagrantcloud/CLOUDLINUX_LATEST_64.box
+- contrib/vagrantcloud/DEBIAN_5_32.box
+- contrib/vagrantcloud/DEBIAN_5_64.box
+- contrib/vagrantcloud/DEBIAN_6_32.box
+- contrib/vagrantcloud/DEBIAN_6_64.box
+- contrib/vagrantcloud/DEBIAN_7_32.box
+- contrib/vagrantcloud/DEBIAN_7_64.box
+- contrib/vagrantcloud/DEBIAN_LATEST.box
+- contrib/vagrantcloud/DEBIAN_LATEST_32.box
+- contrib/vagrantcloud/DEBIAN_LATEST_64.box
+- contrib/vagrantcloud/REDHAT_5_32.box
+- contrib/vagrantcloud/REDHAT_5_64.box
+- contrib/vagrantcloud/REDHAT_6_32.box
+- contrib/vagrantcloud/REDHAT_6_64.box
+- contrib/vagrantcloud/REDHAT_LATEST.box
+- contrib/vagrantcloud/REDHAT_LATEST_32.box
+- contrib/vagrantcloud/REDHAT_LATEST_64.box
+- contrib/vagrantcloud/SL_GENERIC.box
+- contrib/vagrantcloud/UBUNTU_10_32.box
+- contrib/vagrantcloud/UBUNTU_10_64.box
+- contrib/vagrantcloud/UBUNTU_12_32.box
+- contrib/vagrantcloud/UBUNTU_12_64.box
+- contrib/vagrantcloud/UBUNTU_14_32.box
+- contrib/vagrantcloud/UBUNTU_14_64.box
+- contrib/vagrantcloud/UBUNTU_8_32.box
+- contrib/vagrantcloud/UBUNTU_8_64.box
+- contrib/vagrantcloud/UBUNTU_LATEST.box
+- contrib/vagrantcloud/UBUNTU_LATEST_32.box
+- contrib/vagrantcloud/UBUNTU_LATEST_64.box
+- contrib/vagrantcloud/VYATTACE_6.5_64.box
+- contrib/vagrantcloud/VYATTACE_6.6_64.box
+- contrib/vagrantcloud/VYATTACE_LATEST.box
+- contrib/vagrantcloud/VYATTACE_LATEST_64.box
+- contrib/vagrantcloud/WIN_2003-DC-SP2-1_32.box
+- contrib/vagrantcloud/WIN_2003-DC-SP2-1_64.box
+- contrib/vagrantcloud/WIN_2003-ENT-SP2-5_32.box
+- contrib/vagrantcloud/WIN_2003-ENT-SP2-5_64.box
+- contrib/vagrantcloud/WIN_2003-STD-SP2-5_32.box
+- contrib/vagrantcloud/WIN_2003-STD-SP2-5_64.box
+- contrib/vagrantcloud/WIN_2008-DC-R2_64.box
+- contrib/vagrantcloud/WIN_2008-DC-SP2_32.box
+- contrib/vagrantcloud/WIN_2008-DC-SP2_64.box
+- contrib/vagrantcloud/WIN_2008-ENT-R2_64.box
+- contrib/vagrantcloud/WIN_2008-ENT-SP2_32.box
+- contrib/vagrantcloud/WIN_2008-ENT-SP2_64.box
+- contrib/vagrantcloud/WIN_2008-STD-R2-SP1_64.box
+- contrib/vagrantcloud/WIN_2008-STD-R2_64.box
+- contrib/vagrantcloud/WIN_2008-STD-SP2_32.box
+- contrib/vagrantcloud/WIN_2008-STD-SP2_64.box
+- contrib/vagrantcloud/WIN_2012-DC_64.box
+- contrib/vagrantcloud/WIN_2012-STD_64.box
+- contrib/vagrantcloud/WIN_LATEST.box
+- contrib/vagrantcloud/WIN_LATEST_32.box
+- contrib/vagrantcloud/WIN_LATEST_64.box
 - dummy.box
 - example_box/metadata.json
 - example_box/README.md
@@ -110,6 +178,7 @@ files:
 - lib/vagrant-softlayer.rb
 - LICENSE
 - locales/en.yml
+- QUICKSTART.md
 - Rakefile
 - README.md
 - spec/spec_helper.rb