knife-softlayer 0.1.3 → 0.2.0.pre.f0ba31b95

data/lib/chef/knife/softlayer_vlan_list.rb

@@ -0,0 +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

data/lib/chef/knife/softlayer_vlan_show.rb

@@ -0,0 +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

data/lib/knife-softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Knife
   module Softlayer
-    VERSION = "0.1.3"
+    VERSION = "0.2.0-f0ba31b95"
   end
 end

data/spec/unit/softlayer_base_spec.rb

@@ -7,17 +7,18 @@
 
 require File.expand_path('../../spec_helper', __FILE__)
 require 'chef/knife/bootstrap'
-require 'softlayer_api'
+require 'fog/softlayer'
+Fog.mock!
 
 
 describe Chef::Knife::SoftlayerBase do
 
   describe "connection" do
-    it "should set the user agent string that the softlayer_api gem uses" do
+    it "should successfully create a connection using fog" do
       Chef::Config[:knife][:softlayer_username] = 'username'
       Chef::Config[:knife][:softlayer_api_key] = 'key'
-      sl = Chef::Knife::SoftlayerServerCreate.new
-      sl.connection.user_agent['User-Agent'].should match /Knife Softlayer Plugin/
+      Chef::Knife::SoftlayerServerCreate.new.connection
+      Chef::Knife::SoftlayerServerCreate.new.connection.should be_a(Fog::Compute::Softlayer::Mock)
     end
   end
 

data/spec/unit/softlayer_server_create_spec.rb

@@ -7,128 +7,96 @@
 
 require File.expand_path('../../spec_helper', __FILE__)
 require 'chef/knife/bootstrap'
-require 'softlayer_api'
+require 'fog/softlayer'
+Fog.mock!
 
 
 describe Chef::Knife::SoftlayerServerCreate do
   before(:each) do
-    @knife_softlayer_create = Chef::Knife::SoftlayerServerCreate.new
-    @knife_softlayer_create.stub(:tcp_test_ssh).and_return(true)
-
-    @softlayer_connection = double("connection", :createObject => {
-        'accountId' => 000001,
-        'createDate' => '2014-03-24T18:03:27-04:00',
-        'dedicatedAccountHostOnlyFlag' => false,
-        'domain' => 'example.com',
-        'fullyQualifiedDomainName' => 'test',
-        'hostname' =>"test",
-        'id' => 0000001,
-        'lastPowerStateId' => nil,
-        'lastVerifiedDate' => nil,
-        'maxCpu' => 4,
-        'maxCpuUnits' => 'CORE',
-        'maxMemory' => 4096,
-        'metricPollDate' => nil,
-        'modifyDate' => nil,
-        'startCpus' => 4,
-        'statusId' => 1001,
-        'globalIdentifier' => '93f3bfb6-3f48-4e9c-82ab-25e8b5dd14ce'
-    })
-
-    @softlayer_servers = double("servers")
-    @cci = double("cci")
-
-    @softlayer_server_attribs = { :id => '1234567',
-      :public_ip_address => '33.33.33.33',
-      :private_dns_name => 'example.com',
-      :private_ip_address => '10.10.10.10',
-    }
-
-    @softlayer_server_attribs.each_pair do |attrib, value|
-      @cci.stub(attrib).and_return(value)
-    end
+    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
-      @knife_softlayer_create.config[:os_code] = 'WIN_2012-STD_64'
-      expect { @knife_softlayer_create.run }.to raise_exception(Chef::Knife::SoftlayerServerCreateError)
+      @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 ArgumentError if missing #{opt} option" do
+      @server_create.config.delete(#{opt})
+      expect { @server_create.run }.to raise_exception(ArgumentError)
+    end
+EOS
     end
   end
 
   describe "go-right cases for .run" do
     before do
-      @softlayer_connection.should_receive(:object_mask).with('mask.operatingSystem.passwords.password').and_return(@softlayer_servers)
-      @softlayer_servers.should_receive(:object_with_id).with(1).and_return(@softlayer_servers)
-      @softlayer_servers.should_receive(:getObject).and_return(@cci)
-      @cci.should_receive(:[]).exactly(3).times.with('operatingSystem').and_return({'passwords' => ['foobar']})
-      @cci.should_receive(:[]).with('primaryIpAddress').and_return('33.33.33.33')
-
-      @public_ip = "33.33.33.33"
-      SoftLayer::Service.should_receive(:new).twice.and_return(@softlayer_connection)
-
-
-      @knife_softlayer_create.stub(:puts)
-      @knife_softlayer_create.stub(:print)
-      {
-          :domain => 'example.com',
-          :hostname => 'test',
-          :flavor => 'medium',
-          :chef_node_name => 'test.example.com',
-      }.each do |key, value|
-        @knife_softlayer_create.config[key] = value
-      end
-
-      @bootstrap = Chef::Knife::Bootstrap.new
-      Chef::Knife::Bootstrap.stub(:new).and_return(@bootstrap)
-      @bootstrap.should_receive(:run)
+      @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
-      @knife_softlayer_create.config[:distro] = @knife_softlayer_create.options[:distro][:default]
-      @knife_softlayer_create.run
-      @bootstrap.config[:distro].should == 'chef-full'
+      @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
-      @knife_softlayer_create.run
-      @knife_softlayer_create.cci.should_not == nil
+      @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
-      @knife_softlayer_create.config[:ssh_user] = "tim-eah!"
+      #default value of config[:ssh_user] is root
+      @server_create.config[:ssh_user] = "tim-eah!"
 
-      @knife_softlayer_create.run
-      @knife_softlayer_create.config[:ssh_user].should == "tim-eah!"
-      @knife_softlayer_create.cci.should_not == nil
+      @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
-      @knife_softlayer_create.config[:ssh_password] = "passw0rd"
+      @server_create.config[:ssh_password] = "passw0rd"
 
-      @knife_softlayer_create.run
-      @knife_softlayer_create.config[:ssh_password].should == "passw0rd"
-      @knife_softlayer_create.cci.should_not == nil
+      @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
-      @knife_softlayer_create.config[:ssh_port] = "86"
+      @server_create.config[:ssh_port] = "86"
 
-      @knife_softlayer_create.run
-      @knife_softlayer_create.config[:ssh_port].should == "86"
-      @knife_softlayer_create.cci.should_not == nil
+      @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
-      @knife_softlayer_create.config[:identity_file] = "~/.ssh/mah_key_file.pem"
+      @server_create.config[:identity_file] = "~/.ssh/mah_key_file.pem"
 
-      @knife_softlayer_create.run
-      @knife_softlayer_create.config[:identity_file].should == "~/.ssh/mah_key_file.pem"
-      @knife_softlayer_create.cci.should_not == nil
+      @server_create.run
+      @server_create.config[:identity_file].should == "~/.ssh/mah_key_file.pem"
+      @server_create.connection.virtual_guests.count.should == 1
     end
 
   end

data/spec/unit/softlayer_server_destroy_spec.rb

@@ -7,65 +7,41 @@
 
 require File.expand_path('../../spec_helper', __FILE__)
 require 'chef/knife/bootstrap'
-require 'softlayer_api'
-
+require 'fog/softlayer'
+Fog.mock!
 
 
 describe Chef::Knife::SoftlayerServerDestroy do
-  before do
-  end
+  before(:each) do
+    Chef::Config[:knife][:softlayer_username] = 'username'
+    Chef::Config[:knife][:softlayer_api_key] = 'key'
+
 
-  describe "run" do
-    before(:each) do
-      Chef::Config[:client_key] = nil
-      @cci_attributes = {
-          :id => '1000001',
-          :flavor_id => 'medium',
-          :fqdn => 'test.example.com',
-          :public_ip_address => '33.33.33.33',
-          :private_ip_address => '10.10.10.10'
-      }
+    @attributes = {
+        :id => '1000001',
+        :name => '1000001',
+        :flavor_id => 'medium',
+        :fqdn => 'test.example.com',
+        :public_ip_address => '33.33.33.33',
+        :private_ip_address => '10.10.10.10',
+        :tags => ['slid=1000001']
+    }
 
-      @knife_softlayer_destroy = Chef::Knife::SoftlayerServerDestroy.new
-      @knife_softlayer_destroy.stub(:destroy_item).and_return(true)
-      @softlayer_servers = double()
-      @knife_softlayer_destroy.ui.stub(:confirm)
-      @knife_softlayer_destroy.stub(:msg_pair)
-      @cci = double(@cci_attributes)
-      @softlayer_connection =  double("connection", :createObject => {
-          'accountId' => 000001,
-          'createDate' => '2014-03-24T18:03:27-04:00',
-          'dedicatedAccountHostOnlyFlag' => false,
-          'domain' => 'example.com',
-          'fullyQualifiedDomainName' => 'test',
-          'hostname' =>"test",
-          'id' => 0000001,
-          'lastPowerStateId' => nil,
-          'lastVerifiedDate' => nil,
-          'maxCpu' => 4,
-          'maxCpuUnits' => 'CORE',
-          'maxMemory' => 4096,
-          'metricPollDate' => nil,
-          'modifyDate' => nil,
-          'startCpus' => 4,
-          'statusId' => 1001,
-          'globalIdentifier' => '93f3bfb6-3f48-4e9c-82ab-25e8b5dd14ce'
-      })
-      @softlayer_connection.stub(:findByIpAddress).and_return({ 'id' => 100001 })
-      @softlayer_connection.stub(:object_with_id).and_return(@softlayer_connection)
-      @softlayer_connection.stub(:deleteObject).and_return(true)
-      @knife_softlayer_destroy.ui.stub(:warn)
-      @knife_softlayer_destroy.node = double("node", :name => 'foo')
-      SoftLayer::Service.should_receive(:new).twice.and_return(@softlayer_connection)
-    end
+    @knife_softlayer_destroy = Chef::Knife::SoftlayerServerDestroy.new
+    @knife_softlayer_destroy.connection.virtual_guests = @vm_attributes
+    @knife_softlayer_destroy.node = double("node", @attributes)
+    @knife_softlayer_destroy.stub(:destroy_item)
+    instance = double(@attributes)
+    @knife_softlayer_destroy.stub_chain(:connection, :servers, :get).and_return(instance)
 
-    it "should be talking to the softlayer api and the chef server" do
-      Chef::Search::Query.stub(:new).and_return(double("query", :search => {}))
-      @knife_softlayer_destroy.config[:ip_address] = '33.33.33.33'
-      @softlayer_connection.should_receive(:findByIpAddress).with('33.33.33.33')
-      @softlayer_connection.should_receive(:deleteObject)
-      @knife_softlayer_destroy.run
-    end
 
   end
+
+  it "should be talking to the softlayer api and the chef server" do
+    Chef::Search::Query.stub(:new).and_return(double("query", :search => {}))
+    @knife_softlayer_destroy.config[:ip_address] = '33.33.33.33'
+    @knife_softlayer_destroy.connection.servers.get.should_receive(:destroy)
+    @knife_softlayer_destroy.run
+  end
+
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0.pre.f0ba31b95
 platform: ruby
 authors:
 - Matt Eldridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: softlayer_api
+  name: fog-softlayer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 0.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 0.3.14
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
@@ -157,11 +157,18 @@ files:
 - lib/chef/knife/flavor/base.rb
 - lib/chef/knife/softlayer.rb
 - lib/chef/knife/softlayer_base.rb
+- lib/chef/knife/softlayer_datacenter_list.rb
+- lib/chef/knife/softlayer_datacenter_show.rb
 - lib/chef/knife/softlayer_delete.rb
 - lib/chef/knife/softlayer_flavor_list.rb
+- lib/chef/knife/softlayer_global_ip_list.rb
+- lib/chef/knife/softlayer_image_list.rb
 - lib/chef/knife/softlayer_list.rb
 - lib/chef/knife/softlayer_server_create.rb
 - lib/chef/knife/softlayer_server_destroy.rb
+- lib/chef/knife/softlayer_vlan_create.rb
+- lib/chef/knife/softlayer_vlan_list.rb
+- lib/chef/knife/softlayer_vlan_show.rb
 - lib/knife-softlayer/version.rb
 - spec/spec_helper.rb
 - spec/unit/softlayer_base_spec.rb
@@ -182,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2