knife-softlayer 0.4.0 → 0.4.1

data/lib/chef/knife/softlayer_vlan_create.rb

@@ -1,37 +1,37 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require 'chef/knife/softlayer_base'
-
-class Chef
-  class Knife
-    class SoftlayerVlanCreate < Knife
-
-      include Knife::SoftlayerBase
-
-      banner 'knife softlayer vlan create'
-
-      def run
-
-        $stdout.sync = true
-
-        opts = {
-          :name => ui.ask_question("Enter a vlan name: "),
-          :datacenter => connection(:network).datacenters.by_name(ui.ask_question("Enter a datacenter name: ")),
-          :router => {'hostname' => ui.ask_question("Enter a router hostname: ")},
-          :network_space => ui.ask_question("Enter a network space: ", :default => 'PUBLIC'),
-        }
-
-        vlan = connection(:network).networks.create(opts)
-
-        !!vlan and puts "#{ui.color("VLAN successfully created.  Provisioning may take a few minutes to complete.", :green)}"
-
-      end
-
-    end
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerVlanCreate < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer vlan create'
+
+      def run
+
+        $stdout.sync = true
+
+        opts = {
+          :name => ui.ask_question("Enter a vlan name: "),
+          :datacenter => connection(:network).datacenters.by_name(ui.ask_question("Enter a datacenter name: ")),
+          :router => {'hostname' => ui.ask_question("Enter a router hostname: ")},
+          :network_space => ui.ask_question("Enter a network space: ", :default => 'PUBLIC'),
+        }
+
+        vlan = connection(:network).networks.create(opts)
+
+        !!vlan and puts "#{ui.color("VLAN successfully created.  Provisioning may take a few minutes to complete.", :green)}"
+
+      end
+
+    end
+  end
+end

data/lib/chef/knife/softlayer_vlan_list.rb

@@ -1,28 +1,28 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require 'chef/knife/softlayer_base'
-
-class Chef
-  class Knife
-    class SoftlayerVlanList < Knife
-
-      include Knife::SoftlayerBase
-
-      banner 'knife softlayer vlan list (options)'
-
-      def run
-        $stdout.sync = true
-        table_data = connection(:network).networks.map do |net|
-          {:id => net.id, :name => net.name ? net.name : '[none]', :datacenter => net.datacenter.long_name, :network_space => net.network_space, :router => net.router['hostname'] }
-        end
-        puts Formatador.display_table(table_data, [:id, :name, :datacenter, :network_space, :router])
-      end
-
-    end
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerVlanList < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer vlan list (options)'
+
+      def run
+        $stdout.sync = true
+        table_data = connection(:network).networks.map do |net|
+          {:id => net.id, :name => net.name ? net.name : '[none]', :datacenter => net.datacenter.long_name, :network_space => net.network_space, :router => net.router['hostname'] }
+        end
+        puts Formatador.display_table(table_data, [:id, :name, :datacenter, :network_space, :router])
+      end
+
+    end
+  end
+end

data/lib/chef/knife/softlayer_vlan_show.rb

@@ -1,40 +1,40 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require 'chef/knife/softlayer_base'
-
-class Chef
-  class Knife
-    class SoftlayerVlanShow < Knife
-
-      include Knife::SoftlayerBase
-
-      banner 'knife softlayer vlan show ID (options)'
-
-      def run
-        unless name_args.size == 1
-          puts ui.color("Specify exactly one vlan to show.", :red)
-          show_usage
-          exit 1
-        end
-
-        $stdout.sync = true
-        vlan = connection(:network).networks.get(name_args[0])
-
-        puts "#{ui.color("ID:", :green)} #{vlan.id}"
-        puts "#{ui.color("Name:", :green)} #{vlan.name ? vlan.name : '[none]'}"
-        puts "#{ui.color("Datacenter:", :green)} #{vlan.datacenter.name}"
-        puts "#{ui.color("Network Space:", :green)} #{vlan.network_space}"
-        puts "#{ui.color("Router:", :green)} #{vlan.router['hostname']}"
-        puts "#{ui.color("Subnets:", :green)}"
-        puts Formatador.display_table(vlan.subnets.map { |s| s.attributes.reject { |k,v| k.is_a?(String) } }, [:id, :cidr, :gateway_ip, :network_id, :broadcast, :type, :datacenter, :ip_version])
-
-      end
-
-    end
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerVlanShow < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer vlan show ID (options)'
+
+      def run
+        unless name_args.size == 1
+          puts ui.color("Specify exactly one vlan to show.", :red)
+          show_usage
+          exit 1
+        end
+
+        $stdout.sync = true
+        vlan = connection(:network).networks.get(name_args[0])
+
+        puts "#{ui.color("ID:", :green)} #{vlan.id}"
+        puts "#{ui.color("Name:", :green)} #{vlan.name ? vlan.name : '[none]'}"
+        puts "#{ui.color("Datacenter:", :green)} #{vlan.datacenter.name}"
+        puts "#{ui.color("Network Space:", :green)} #{vlan.network_space}"
+        puts "#{ui.color("Router:", :green)} #{vlan.router['hostname']}"
+        puts "#{ui.color("Subnets:", :green)}"
+        puts Formatador.display_table(vlan.subnets.map { |s| s.attributes.reject { |k,v| k.is_a?(String) } }, [:id, :cidr, :gateway_ip, :network_id, :broadcast, :type, :datacenter, :ip_version])
+
+      end
+
+    end
+  end
+end

data/lib/knife-softlayer/version.rb

@@ -1,12 +1,12 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-module Knife
-  module Softlayer
-    VERSION = "0.4.0"
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+module Knife
+  module Softlayer
+    VERSION = "0.4.1"
+  end
+end

data/spec/spec_helper.rb

@@ -1,21 +1,21 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'chef'
-require 'chef/knife/winrm_base'
-require 'chef/knife/softlayer_server_create'
-require 'chef/knife/softlayer_server_destroy'
-
-# Clear config between each example
-# to avoid dependencies between examples
-RSpec.configure do |c|
-  c.before(:each) do
-    Chef::Config.reset
-    Chef::Config[:knife] ={}
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'chef'
+require 'chef/knife/winrm_base'
+require 'chef/knife/softlayer_server_create'
+require 'chef/knife/softlayer_server_destroy'
+
+# Clear config between each example
+# to avoid dependencies between examples
+RSpec.configure do |c|
+  c.before(:each) do
+    Chef::Config.reset
+    Chef::Config[:knife] ={}
+  end
+end

data/spec/unit/softlayer_base_spec.rb

@@ -1,26 +1,26 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require File.expand_path('../../spec_helper', __FILE__)
-require 'chef/knife/bootstrap'
-require 'fog/softlayer'
-Fog.mock!
-
-
-describe Chef::Knife::SoftlayerBase do
-
-  describe "connection" do
-    it "should successfully create a connection using fog" do
-      Chef::Config[:knife][:softlayer_username] = 'username'
-      Chef::Config[:knife][:softlayer_api_key] = 'key'
-      Chef::Knife::SoftlayerServerCreate.new.connection
-      Chef::Knife::SoftlayerServerCreate.new.connection.should be_a(Fog::Compute::Softlayer::Mock)
-    end
-  end
-
-
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require File.expand_path('../../spec_helper', __FILE__)
+require 'chef/knife/bootstrap'
+require 'fog/softlayer'
+Fog.mock!
+
+
+describe Chef::Knife::SoftlayerBase do
+
+  describe "connection" do
+    it "should successfully create a connection using fog" do
+      Chef::Config[:knife][:softlayer_username] = 'username'
+      Chef::Config[:knife][:softlayer_api_key] = 'key'
+      Chef::Knife::SoftlayerServerCreate.new.connection
+      Chef::Knife::SoftlayerServerCreate.new.connection.should be_a(Fog::Compute::Softlayer::Mock)
+    end
+  end
+
+
+end

data/spec/unit/softlayer_server_create_spec.rb

@@ -1,105 +1,105 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require File.expand_path('../../spec_helper', __FILE__)
-require 'chef/knife/bootstrap'
-require 'fog/softlayer'
-Fog.mock!
-
-
-describe Chef::Knife::SoftlayerServerCreate do
-  before(:each) do
-    Chef::Config[:knife][:softlayer_username] = 'username'
-    Chef::Config[:knife][:softlayer_api_key] = 'key'
-
-    @server_create = Chef::Knife::SoftlayerServerCreate.new
-    @server_create.stub(:tcp_test_ssh).and_return(true)
-
-    @server_create.config[:ram] = 4096
-    @server_create.config[:cores] = 4
-    @server_create.config[:hostname] = 'test'
-    @server_create.config[:domain] = 'ibm.com'
-    @server_create.config[:datacenter] = 'hkg02'
-    @server_create.config[:os_code] = 'UBUNTU_LATEST'
-    @server_create.config[:block_storage] = '0:100'
-  end
-
-  describe "go-wrong cases for .run" do
-    it "should raise an exception if we try to create/bootstrap a windows instance" do
-      @server_create.config[:os_code] = 'WIN_2012-STD_64'
-      expect { @server_create.run }.to raise_exception(Chef::Knife::SoftlayerServerCreateError)
-    end
-
-
-    [':ram', ':cores', ':hostname', ':domain', ':datacenter', ':os_code', ':block_storage'].each do |opt|
-    class_eval <<EOS, __FILE__, __LINE__
-    it "should should raise an exception if missing #{opt} option" do
-      @server_create.config.delete(#{opt})
-      expect { @server_create.run }.to raise_exception
-    end
-EOS
-    end
-  end
-
-  describe "go-right cases for .run" do
-    before do
-      @server_create.stub(:apply_tags).and_return(Proc.new{})
-      Chef::Knife::Bootstrap.any_instance.stub(:run)
-      Fog::Compute::Softlayer::Server.any_instance.stub(:ready?).and_return(true)
-      Fog::Compute::Softlayer::Server.any_instance.stub(:sshable?).and_return(true)
-    end
-
-    it "defaults to a distro of 'chef-full' for a linux instance" do
-      @server_create.config[:distro] = @server_create.options[:distro][:default]
-      bootstrap = @server_create.linux_bootstrap(double('instance', :id => 42, :ssh_ip_address => '3.3.3.3', :private_ip_address => '3.3.3.3'))
-      bootstrap.config[:distro].should == 'chef-full'
-    end
-
-    it "creates an VM instance and bootstraps it" do
-      @server_create.run
-      @server_create.connection.virtual_guests.count.should == 1
-    end
-
-    it "sets ssh_user value by using -x option" do
-      #default value of config[:ssh_user] is root
-      @server_create.config[:ssh_user] = "tim-eah!"
-
-      @server_create.run
-      @server_create.config[:ssh_user].should == "tim-eah!"
-      @server_create.connection.virtual_guests.count.should == 1
-    end
-
-    it "sets ssh_password value by using -P option" do
-      # default value of config[:ssh_password] is nil
-      @server_create.config[:ssh_password] = "passw0rd"
-
-      @server_create.run
-      @server_create.config[:ssh_password].should == "passw0rd"
-      @server_create.connection.virtual_guests.count.should == 1
-    end
-
-    it "sets ssh_port value by using -p option" do
-      # default value of config[:ssh_port] is 22
-      @server_create.config[:ssh_port] = "86"
-
-      @server_create.run
-      @server_create.config[:ssh_port].should == "86"
-      @server_create.connection.virtual_guests.count.should == 1
-    end
-
-    it "sets identity_file value by using -i option for ssh bootstrap protocol or linux image" do
-      # default value of config[:identity_file] is nil
-      @server_create.config[:identity_file] = "~/.ssh/mah_key_file.pem"
-
-      @server_create.run
-      @server_create.config[:identity_file].should == "~/.ssh/mah_key_file.pem"
-      @server_create.connection.virtual_guests.count.should == 1
-    end
-
-  end
-
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require File.expand_path('../../spec_helper', __FILE__)
+require 'chef/knife/bootstrap'
+require 'fog/softlayer'
+Fog.mock!
+
+
+describe Chef::Knife::SoftlayerServerCreate do
+  before(:each) do
+    Chef::Config[:knife][:softlayer_username] = 'username'
+    Chef::Config[:knife][:softlayer_api_key] = 'key'
+
+    @server_create = Chef::Knife::SoftlayerServerCreate.new
+    @server_create.stub(:tcp_test_ssh).and_return(true)
+
+    @server_create.config[:ram] = 4096
+    @server_create.config[:cores] = 4
+    @server_create.config[:hostname] = 'test'
+    @server_create.config[:domain] = 'ibm.com'
+    @server_create.config[:datacenter] = 'hkg02'
+    @server_create.config[:os_code] = 'UBUNTU_LATEST'
+    @server_create.config[:block_storage] = '0:100'
+  end
+
+  describe "go-wrong cases for .run" do
+    it "should raise an exception if we try to create/bootstrap a windows instance" do
+      @server_create.config[:os_code] = 'WIN_2012-STD_64'
+      expect { @server_create.run }.to raise_exception(Chef::Knife::SoftlayerServerCreateError)
+    end
+
+
+    [':ram', ':cores', ':hostname', ':domain', ':datacenter', ':os_code', ':block_storage'].each do |opt|
+    class_eval <<EOS, __FILE__, __LINE__
+    it "should should raise an exception if missing #{opt} option" do
+      @server_create.config.delete(#{opt})
+      expect { @server_create.run }.to raise_exception
+    end
+EOS
+    end
+  end
+
+  describe "go-right cases for .run" do
+    before do
+      @server_create.stub(:apply_tags).and_return(Proc.new{})
+      Chef::Knife::Bootstrap.any_instance.stub(:run)
+      Fog::Compute::Softlayer::Server.any_instance.stub(:ready?).and_return(true)
+      Fog::Compute::Softlayer::Server.any_instance.stub(:sshable?).and_return(true)
+    end
+
+    it "defaults to a distro of 'chef-full' for a linux instance" do
+      @server_create.config[:distro] = @server_create.options[:distro][:default]
+      bootstrap = @server_create.linux_bootstrap(double('instance', :id => 42, :ssh_ip_address => '3.3.3.3', :private_ip_address => '3.3.3.3'))
+      bootstrap.config[:distro].should == 'chef-full'
+    end
+
+    it "creates an VM instance and bootstraps it" do
+      @server_create.run
+      @server_create.connection.virtual_guests.count.should == 1
+    end
+
+    it "sets ssh_user value by using -x option" do
+      #default value of config[:ssh_user] is root
+      @server_create.config[:ssh_user] = "tim-eah!"
+
+      @server_create.run
+      @server_create.config[:ssh_user].should == "tim-eah!"
+      @server_create.connection.virtual_guests.count.should == 1
+    end
+
+    it "sets ssh_password value by using -P option" do
+      # default value of config[:ssh_password] is nil
+      @server_create.config[:ssh_password] = "passw0rd"
+
+      @server_create.run
+      @server_create.config[:ssh_password].should == "passw0rd"
+      @server_create.connection.virtual_guests.count.should == 1
+    end
+
+    it "sets ssh_port value by using -p option" do
+      # default value of config[:ssh_port] is 22
+      @server_create.config[:ssh_port] = "86"
+
+      @server_create.run
+      @server_create.config[:ssh_port].should == "86"
+      @server_create.connection.virtual_guests.count.should == 1
+    end
+
+    it "sets identity_file value by using -i option for ssh bootstrap protocol or linux image" do
+      # default value of config[:identity_file] is nil
+      @server_create.config[:identity_file] = "~/.ssh/mah_key_file.pem"
+
+      @server_create.run
+      @server_create.config[:identity_file].should == "~/.ssh/mah_key_file.pem"
+      @server_create.connection.virtual_guests.count.should == 1
+    end
+
+  end
+
+end