kitchen-nodes 0.2.0.dev.1 → 0.2.0.dev.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 104ed45d9735c996dab66e5d6fe766f89d26de83
-  data.tar.gz: ee67dc85d6d846ad09d596d836c958c07e0ac272
+  metadata.gz: df104b8a9c65cb392ef99bd85e28f14ee62cfdb3
+  data.tar.gz: 65a34cfe56147e033cff2a1f26462951ed57a3ac
 SHA512:
-  metadata.gz: 69183b471a5fde3866af9c03795cefd17d4b69a165fb8a7352cdae1c52c7a2b90c991f17cf68aaa4c12e6002134cf97e7b4b8685d306ba78bce353b06074ff03
-  data.tar.gz: bd99980e604067db6be768f536a2dc736f1bb1b24e81d897e5a38f5a12f5db51aa82c4a69188dbf822dcee0e8eab81125aec69ea7ff5777eb7253f7db81d5062
+  metadata.gz: f2be4f05d1f32d5b176a5c5249da504df90c14e65e77b1799822ac95f45f83dc623dda05d28ad8a0aae913496f796884e07aaaa1cf55f8532aaf9740420636df
+  data.tar.gz: abf853c558c37e6ba34a88562d99835d5bff52f4f6bc6ba1452e0d06debc39c1162a96422bb4f1eda7ddad099b5304dc1b6a2e223abe577a57d724b2bc18e625

data/kitchen-nodes.gemspec

@@ -20,7 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'net-ping'
   spec.add_dependency 'win32-security'
+  spec.add_dependency 'test-kitchen', '1.4.0.rc.1'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency "fakefs",    "~> 0.4"
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.2'
 end

data/lib/kitchen/provisioner/ip_finder.rb

@@ -0,0 +1,16 @@
+module Kitchen
+  module Provisioner
+    module IpFinder
+
+      def self.for_transport(transport, state)
+        transport_string = transport.class.name.split('::').last
+        require("kitchen/provisioner/ip_finder/#{transport_string.downcase}")
+
+        connection = transport.connection(state)
+        klass = const_get(transport_string)
+        object = klass.new(connection)
+        object
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/ip_finder/ssh.rb

@@ -0,0 +1,93 @@
+module Kitchen
+  module Transport
+    class Ssh < Kitchen::Transport::Base
+      class Connection < Kitchen::Transport::Base::Connection
+        def node_execute(command, &block)
+          return if command.nil?
+          out, exit_code = node_execute_with_exit_code(command, &block)
+
+          if exit_code != 0
+            raise Transport::SshFailed,
+              "SSH exited (#{exit_code}) for command: [#{command}]"
+          end
+          out
+        rescue Net::SSH::Exception => ex
+          raise SshFailed, "SSH command failed (#{ex.message})"
+        end
+
+        def node_execute_with_exit_code(command, &block)
+          exit_code = nil
+          out = []
+          session.open_channel do |channel|
+
+            channel.request_pty
+            channel.exec(command) do |_ch, _success|
+
+              channel.on_data do |_ch, data|
+                out << data
+                yield data if block_given?
+              end
+
+              channel.on_extended_data do |_ch, _type, data|
+                out << data
+                yield data if block_given?
+              end
+
+              channel.on_request("exit-status") do |_ch, data|
+                exit_code = data.read_long
+              end
+            end
+          end
+          session.loop
+          [out.join("\n"), exit_code]
+        end
+      end
+    end
+  end
+
+  module Provisioner
+    module IpFinder
+      class Ssh
+        def initialize(connection)
+          @connection = connection
+        end
+
+        def find_ips
+          run_ifconfig
+        rescue Kitchen::Transport::TransportFailed
+          run_ip_addr
+        end
+
+        def run_ifconfig
+          response = @connection.node_execute("ifconfig -a")
+          ips = []
+          start_token = "inet addr:"
+          response.split(/^\S+/).each do |device|
+            if device.include?("RUNNING") && !device.include?("LOOPBACK")
+              start_idx = device.index(start_token)
+              start_idx += start_token.length unless start_idx.nil?
+              end_idx = device.index(" ", start_idx) unless start_idx.nil?
+              ips << device[start_idx,end_idx - start_idx] unless end_idx.nil?
+            end
+          end
+          ips
+        end
+
+        def run_ip_addr
+          response = @connection.node_execute("ip -4 addr show")
+          ips = []
+          start_token = "inet "
+          response.split(/[0-9]+: /).each do |device|
+            unless device.include?("LOOPBACK") || device.include?("NO-CARRIER")
+              start_idx = device.index(start_token)
+              start_idx += start_token.length unless start_idx.nil?
+              end_idx = device.index("/", start_idx) unless start_idx.nil?
+              ips << device[start_idx,end_idx - start_idx] unless end_idx.nil?
+            end
+          end
+          ips
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/ip_finder/winrm.rb

@@ -0,0 +1,31 @@
+module Kitchen
+  module Transport
+    class Winrm < Kitchen::Transport::Base
+      class Connection < Kitchen::Transport::Base::Connection
+        def node_execute(command, &block)
+          session.run_powershell_script(command, &block)
+        end
+      end
+    end
+  end
+
+  module Provisioner
+    module IpFinder
+      class Winrm
+        def initialize(connection)
+          @connection = connection
+        end
+
+        def find_ips
+          out = @connection.node_execute("Get-NetIPConfiguration | % { $_.ipv4address.IPAddress}")
+          data = []
+          out[:data].each do |out_data|
+            stdout = out_data[:stdout] 
+            data << stdout.chomp unless stdout.nil?
+          end
+          data
+        end
+      end 
+    end
+  end
+end

data/lib/kitchen/provisioner/nodes.rb

@@ -18,20 +18,10 @@
 
 require "kitchen"
 require "kitchen/provisioner/chef_zero"
+require "kitchen/provisioner/ip_finder"
 require "net/ping"
 
 module Kitchen
-
-  module Transport
-    class Winrm < Kitchen::Transport::Base
-      class Connection < Kitchen::Transport::Base::Connection
-        def node_session(retry_options = {})
-          session(retry_options)
-        end
-      end
-    end
-  end
-
   module Provisioner
 
     # Nodes provisioner for Kitchen.
@@ -45,12 +35,9 @@ module Kitchen
       end
 
       def create_node
-        node_dir = File.join(config[:test_base_path], "nodes")
-        Dir.mkdir(node_dir) unless Dir.exist?(node_dir)
-        node_file = File.join(node_dir, "#{instance.name}.json")
-
         state = Kitchen::StateFile.new(config[:kitchen_root], instance.name).read
-        ipaddress = get_reachable_guest_address(state) || state[:hostname]
+        ip = state[:hostname]
+        ipaddress = (ip == "127.0.0.1" || ip == "localhost") ? get_reachable_guest_address(state) : ip
 
         node = {
           :id => instance.name,
@@ -65,14 +52,26 @@ module Kitchen
         end
       end
 
+      def node_file
+        node_dir = File.join(config[:test_base_path], "nodes")
+        Dir.mkdir(node_dir) unless Dir.exist?(node_dir)
+        File.join(node_dir, "#{instance.name}.json")
+      end
+
       def get_reachable_guest_address(state)
-        instance.transport.connection(state).node_session.run_powershell_script("Get-NetIPConfiguration | % { $_.ipv4address.IPAddress}") do |address, _|
-          address = address.chomp unless address.nil?
-          next if address.nil? || address == "127.0.0.1"
+        active_ips(instance.transport, state).each do |address|
+          next if address == "127.0.0.1"
           return address if Net::Ping::External.new.ping(address)
         end
         return nil
-      end      
+      end
+
+      def active_ips(transport, state)
+        # inject creds into state for legacy drivers
+        state[:password] = instance.driver[:password] if instance.driver[:password]
+        state[:username] = instance.driver[:username] if instance.driver[:username]
+        IpFinder.for_transport(transport, state).find_ips
+      end
     end
   end
 end

data/lib/kitchen/provisioner/nodes_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Provisioner
 
     # Version string for Nodes Kitchen driver
-    NODES_VERSION = "0.2.0.dev.1"
+    NODES_VERSION = "0.2.0.dev.2"
   end
 end

data/spec/unit/nodes_spec.rb

@@ -0,0 +1,176 @@
+require "fakefs/safe"
+require "kitchen"
+require "kitchen/driver/dummy"
+require "kitchen/provisioner/nodes"
+require "kitchen/transport/dummy"
+require "kitchen/transport/winrm"
+require "kitchen/transport/ssh"
+
+describe Kitchen::Provisioner::Nodes do
+
+  let(:config) { { 
+    :test_base_path => "/b",
+    :kitchen_root => "/r",
+    :run_list => "cookbook:recipe" 
+  } }
+  let(:instance) { double(
+    "instance",
+    :name => "test_suite",
+    :suite => suite,
+    :platform => platform,
+    :transport => transport,
+    :driver => Kitchen::Driver::Dummy.new
+  ) }
+  let(:transport) { Kitchen::Transport::Dummy.new }
+  let(:platform) { double("platform", :os_type => nil) }
+  let(:suite) { double("suite", :name => "suite") }
+  let(:state) { { :hostname => "192.168.1.10" } }
+  let(:node) { JSON.parse(File.read(subject.node_file), :symbolize_names => true) }
+
+  before {
+    FakeFS.activate!
+    FileUtils.mkdir_p(config[:test_base_path])
+    allow_any_instance_of(Kitchen::StateFile).to receive(:read).and_return(state)
+  }
+  after {
+    FakeFS.deactivate!
+    FakeFS::FileSystem.clear
+  }
+
+  subject { Kitchen::Provisioner::Nodes.new(config).finalize_config!(instance) }
+
+  it "creates node" do
+    subject.create_node
+
+    expect(File).to exist(subject.node_file)
+  end
+
+  it "sets the id" do
+    subject.create_node
+
+    expect(node[:id]).to eq instance.name
+  end
+
+  it "sets the runlist" do
+    subject.create_node
+
+    expect(node[:run_list]).to eq config[:run_list]
+  end
+
+  it "sets the ip address" do
+    subject.create_node
+
+    expect(node[:automatic][:ipaddress]).to eq state[:hostname]
+  end
+
+  context "instance is localhost" do
+    let(:state) { { :hostname => "127.0.0.1" } }
+    let(:machine_ips) { [ "192.168.1.1", "192.168.1.2", "192.168.1.3" ] }
+    
+    before {
+      allow_any_instance_of(Net::Ping::External).to receive(:ping).and_return(true)
+      allow(transport).to receive(:connection).and_return(Kitchen::Transport::Base::Connection.new)
+    }
+    context "platform is windows" do
+      let(:transport) { Kitchen::Transport::Winrm.new }
+
+      before {
+        data = machine_ips.map {|ip| { :stdout => "#{ip}\r\n" }}
+        allow_any_instance_of(Kitchen::Transport::Base::Connection).to(
+          receive(:node_execute).and_return({ :data => data })
+        )
+      }
+
+      it "sets the ip address to the first reachable IP" do
+        subject.create_node
+
+        expect(node[:automatic][:ipaddress]).to eq machine_ips.first
+      end
+
+      context "only the last ip is reachable" do
+        before {
+          allow_any_instance_of(Net::Ping::External).to receive(:ping).and_return(false)
+          allow_any_instance_of(Net::Ping::External).to receive(:ping).with(machine_ips.last).and_return(true)
+        }
+
+        it "sets the ip address to the last IP" do
+          subject.create_node
+
+          expect(node[:automatic][:ipaddress]).to eq machine_ips.last
+        end
+      end
+    end
+
+    context "platform is *nix" do
+      let(:transport) { Kitchen::Transport::Ssh.new }
+
+      before {
+        allow_any_instance_of(Kitchen::Transport::Base::Connection).to receive(:node_execute) do
+          <<-EOS
+docker0   Link encap:Ethernet  HWaddr 56:84:7a:fe:97:99  
+          inet addr:#{machine_ips[0]}  Bcast:0.0.0.0  Mask:255.255.0.0
+          UP BROADCAST MULTICAST  MTU:1500  Metric:1
+          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+
+eth0      Link encap:Ethernet  HWaddr 08:00:27:88:0c:a6  
+          inet addr:#{machine_ips[1]}  Bcast:10.0.2.255  Mask:255.255.255.0
+          inet6 addr: fe80::a00:27ff:fe88:ca6/64 Scope:Link
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:10262 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:7470 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:1497781 (1.4 MB)  TX bytes:1701791 (1.7 MB)
+
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          inet6 addr: ::1/128 Scope:Host
+          UP LOOPBACK RUNNING  MTU:65536  Metric:1
+          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+
+          EOS
+        end
+      }
+
+      it "sets the ip address to the RUNNING IP that is not localhost" do
+        subject.create_node
+
+        expect(node[:automatic][:ipaddress]).to eq machine_ips[1]
+      end
+
+      context "ifconfig not supported" do
+        before {
+          allow_any_instance_of(Kitchen::Transport::Base::Connection)
+          .to receive(:node_execute).with("ifconfig -a")
+          .and_raise(Kitchen::Transport::TransportFailed.new(""))
+
+          allow_any_instance_of(Kitchen::Transport::Base::Connection)
+          .to receive(:node_execute).with("ip -4 addr show") do
+            <<-EOS
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default 
+    inet 127.0.0.1/8 scope host lo
+       valid_lft forever preferred_lft forever
+3: wlan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP group default qlen 1000
+    inet #{machine_ips[0]}/24 brd 192.168.1.255 scope global wlan0
+       valid_lft forever preferred_lft forever
+5: docker0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN group default 
+    inet #{machine_ips[1]}/16 scope global docker0
+       valid_lft forever preferred_lft forever
+            EOS
+          end
+        }
+
+        it "sets the ip address to the connected IP that is not localhost" do
+          subject.create_node
+
+          expect(node[:automatic][:ipaddress]).to eq machine_ips[0]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.2.0.dev.1
+  version: 0.2.0.dev.2
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.0.rc.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: A Test Kitchen Provisioner for Chef Nodes
 email:
 - matt@mattwrock.com
@@ -81,8 +123,12 @@ files:
 - README.md
 - Rakefile
 - kitchen-nodes.gemspec
+- lib/kitchen/provisioner/ip_finder.rb
+- lib/kitchen/provisioner/ip_finder/ssh.rb
+- lib/kitchen/provisioner/ip_finder/winrm.rb
 - lib/kitchen/provisioner/nodes.rb
 - lib/kitchen/provisioner/nodes_version.rb
+- spec/unit/nodes_spec.rb
 homepage: ''
 licenses:
 - Apache 2.0
@@ -107,5 +153,6 @@ rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Provisioner for Chef Nodes
-test_files: []
+test_files:
+- spec/unit/nodes_spec.rb
 has_rdoc: