kitchen-wpar 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc5d5dad8775cc12ebafa5c7b8f8bade76c6ea9
-  data.tar.gz: f87faf35366c26e37576b2573d222f66a91d8d3d
+  metadata.gz: afa57801e169dc52a54a101f9c69be57b242d551
+  data.tar.gz: 03096da58cdb37af094edb4eaa60b905ea6d5cb3
 SHA512:
-  metadata.gz: 0bc98b8659d9982d968a78d38464cb5b706ae36514eb32fce71d685fe0637e1df59158e125161516e94f6ad06f26a13c574f4f9e92e1f68e45558af89a51a1d7
-  data.tar.gz: 5e962a0f2600595b12e81e10197db82d969dfa4729cd687d9b9425a80961cbf02eb8b812e18ee0c36561cf66fa06c47f506ed5b28598801d26ac9f80655b4339
+  metadata.gz: 66ee5dc1546e8fbbe217d08e51ba23a21ae7ed3eeec073d88b1cd80a73f50e182ad83765afb05d0455479c41b9aebd2c005dd18cc59c93a04398cec1e1dc1011
+  data.tar.gz: 50da5618019029bb93c305355faf619e6c592a6f17025d691336477c8ec1e95df08914788809dfb18cd1703d21595a01888d4970bddea1df3d8cd4b8006586e1

data/README.md

@@ -16,9 +16,13 @@ Please read the [Driver usage][driver_usage] page for more details.
 * **wpar_name**     wpar name on AIX global system. Default to **kitchenwpar**.
 * **aix_host**	    aix global partition name. Default to **localhost**.
 * **aix_user**	    aix global partition username. Default to **root**.
+* **aix_key**	      Specify a path to the ssh key to create a connection.
 * **wpar_address**	wpar IP address to use. Not needed if an entry already exists in `/etc/hosts` on Global partition.
 * **wpar_vg**	      Volume group to use to store shared wpar filesystems. Default to **rootvg**.
 * **wpar_rootvg**	  Specify the `hdisk` to use to create a rootvg system wpar.
+* **wpar_mksysb**	  uses a wpar backup. Specify a path to a backup to save time.
+* **isVersioned**         create a versioned wpar. Used only with **wpar_mksysb**.
+* **isWritable**	  adds the option ' -l' to have a non-shared, writable /usr file system and /opt file system. 
 
 
 ### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus

data/kitchen-wpar.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Kitchen::Driver::WPAR_VERSION
   spec.authors       = ['Alain Dejoux']
   spec.email         = ['adejoux@djouxtech.net']
-  spec.date          = Time.now.utc.strftime("%Y-%m-%d")
+  spec.date          = Time.now.utc.strftime('%Y-%m-%d')
   spec.description   = %q{A Test Kitchen Driver for Wpar}
-  spec.summary       = "test kitchen driver using AIX wpar"
+  spec.summary       = 'test kitchen driver using AIX wpar'
   spec.homepage      = 'https://github.com/adejoux/kitchen-wpar'
   spec.license       = 'Apache-2.0'
 
@@ -19,12 +19,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.0', '>= 1.0.0'
-
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
 
   spec.add_development_dependency 'cane', '~> 3.0', '>= 3.0.0'
   spec.add_development_dependency 'tailor', '~> 1.4', '>= 1.4.1'
   spec.add_development_dependency 'countloc', '~> 0.4', '>= 0.4.0'
+  spec.add_development_dependency 'rspec'
+  spec.add_dependency 'test-kitchen', '~> 1.4'
+
+  spec.add_development_dependency 'simplecov', '~> 0.9'
+
+  spec.add_development_dependency 'chefstyle'
 end

data/lib/kitchen/driver/wpar.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 
 require 'kitchen'
-require "kitchen/driver/wpar_version"
+require 'kitchen/driver/wpar_version'
 require 'net/ssh'
 
 module Kitchen
@@ -27,28 +27,32 @@ module Kitchen
     # Wpar driver for Kitchen.
     #
     # @author Alain Dejoux <adejoux@djouxtech.net>
+    # noinspection RubyDefParenthesesInspection,SpellCheckingInspection
     class Wpar < Kitchen::Driver::Base
 
       kitchen_driver_api_version 2
       plugin_version Kitchen::Driver::WPAR_VERSION
 
-      default_config :mkwpar,        '/usr/sbin/mkwpar'
-      default_config :startwpar,     '/usr/sbin/startwpar'
-      default_config :rmwpar,        '/usr/sbin/rmwpar'
-      default_config :lswpar,        '/usr/sbin/lswpar'
-      default_config :wpar_name,     'kitchenwpar'
-      default_config :aix_host,      'localhost'
-      default_config :aix_user,      'root'
+      default_config :mkwpar, '/usr/sbin/mkwpar'
+      default_config :startwpar, '/usr/sbin/startwpar'
+      default_config :rmwpar, '/usr/sbin/rmwpar'
+      default_config :lswpar, '/usr/sbin/lswpar'
+      default_config :wpar_name, 'kitchenwpar'
+      default_config :aix_host, 'localhost'
+      default_config :aix_user, 'root'
+      default_config :isWritable, false
+      default_config :isVersioned, false
 
       def create(state)
         if wpar_exists?(state)
-          raise ActionFailed,'wpar already exists !'
+          raise ActionFailed, 'wpar already exists !'
         end
+
         cmd = build_mkwpar_command()
         ssh_command(cmd, :stderr)
 
         unless wpar_exists?(state)
-          raise ActionFailed,'Cannot create wpar !'
+          raise ActionFailed, 'Cannot create wpar !'
         end
         state[:hostname]= config[:wpar_address] || config[:wpar_name]
         copy_key()
@@ -57,12 +61,13 @@ module Kitchen
       def destroy(state)
         ssh_command("#{config[:rmwpar]} -F #{config[:wpar_name]}", :stderr)
         if wpar_exists?(state)
-          raise ActionFailed,"couldn't destroy wpar !"
+          raise ActionFailed, "couldn't destroy wpar !"
         end
       end
 
       protected
       def build_mkwpar_command()
+
         cmd = "#{config[:mkwpar]} -s -n #{config[:wpar_name]}"
         unless config[:wpar_address].nil?
           cmd += " -N address=#{config[:wpar_address]}"
@@ -77,9 +82,17 @@ module Kitchen
         end
 
         unless config[:wpar_mksysb].nil?
-          cmd += " -C -B #{config[:wpar_mksysb]}"
+          if config[:isVersioned]
+            cmd += " -C"
+          end
+          cmd += " -B #{config[:wpar_mksysb]}"
         end
 
+        if config[:isWritable]
+          cmd += ' -l'
+        end
+
+
         cmd
       end
 
@@ -93,14 +106,14 @@ module Kitchen
 
       def wpar_exists?(state)
         output=ssh_command("#{config[:lswpar]} #{config[:wpar_name]}", :stderr)
-        if output.include?("0960-419")
+        if output.include?('0960-419')
           return false
         end
         true
       end
 
       def ssh_command(cmd, stream)
-        out = ""
+        out = ''
         begin
           host = config[:aix_host]
           user = config[:aix_user]
@@ -113,9 +126,10 @@ module Kitchen
             out
           end
         rescue
-          raise ActionFailed,'ssh command failed !'
+          raise ActionFailed, 'ssh command failed !'
         end
       end
+
     end
   end
 end

data/lib/kitchen/driver/wpar_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Wpar Kitchen driver
-    WPAR_VERSION = "0.1.1"
+    WPAR_VERSION = "0.2.0"
   end
 end

data/test/spec_helper.rb

@@ -0,0 +1,4 @@
+
+require 'rake'
+require 'rspec'
+require_relative '../lib/kitchen/driver/wpar'

data/test/wpar_spec.rb

@@ -0,0 +1,103 @@
+require_relative '../test/spec_helper'
+require 'logger'
+require 'stringio'
+
+require 'kitchen/provisioner/dummy'
+require 'kitchen/transport/dummy'
+require 'kitchen/verifier/dummy'
+
+describe Kitchen::Driver::Wpar do
+
+  let(:logged_output) { StringIO.new }
+  let(:logger) { Logger.new(logged_output) }
+  let(:config) { {} }
+  let(:platform) { Kitchen::Platform.new(:name => 'fooos-99') }
+  let(:suite) { Kitchen::Suite.new(:name => 'suitey') }
+  let(:verifier) { Kitchen::Verifier::Dummy.new }
+  let(:provisioner) { Kitchen::Provisioner::Dummy.new }
+  let(:transport) { Kitchen::Transport::Dummy.new }
+  let(:state_file) { double('state_file') }
+  let(:state) { Hash.new }
+  let(:env) { Hash.new }
+
+  let(:driver_object) { Kitchen::Driver::Wpar.new(config) }
+
+  let(:instance) do
+    Kitchen::Instance.new(
+        :verifier => verifier,
+        :driver => driver_object,
+        :logger => logger,
+        :suite => suite,
+        :platform => platform,
+        :provisioner => provisioner,
+        :transport => transport,
+        :state_file => state_file
+    )
+  end
+
+  let(:driver) do
+    d = driver_object
+    instance
+    d
+  end
+
+  let(:driver_with_no_instance) do
+    driver_object
+  end
+
+
+  module RunCommandStub
+    def run_command(_cmd, options = {})
+      options
+    end
+  end
+
+  before(:all) do
+    Kitchen::Driver::Wpar.instance_eval { include RunCommandStub }
+  end
+
+  describe 'configuration' do
+
+    it 'sets :mkwpar name by default' do
+      expect(driver[:mkwpar]).to eq('/usr/sbin/mkwpar')
+    end
+
+    it 'sets a mkwpar to nil' do
+      config[:mkwpar] = nil
+
+      expect(driver[:mkwpar]).to eq(nil)
+    end
+
+    it 'sets isWritable to true' do
+      config[:isWritable] = true
+      default_string = '/usr/sbin/mkwpar -s -n kitchenwpar -l'
+
+      expect(driver.send(:build_mkwpar_command)).to eq(default_string)
+    end
+
+    it 'sets isWritable to false' do
+      config[:isWritable] = false
+      default_string = '/usr/sbin/mkwpar -s -n kitchenwpar'
+
+      expect(driver.send(:build_mkwpar_command)).to eq(default_string)
+    end
+
+
+    it 'sets isVersioned to true' do
+      config[:isVersioned] = true
+      config[:wpar_mksysb] = 'aix.mksysb'
+      default_string = '/usr/sbin/mkwpar -s -n kitchenwpar -C -B aix.mksysb'
+
+      expect(driver.send(:build_mkwpar_command)).to eq(default_string)
+    end
+
+    it 'sets isVersioned to false' do
+      config[:isVersioned] = false
+      config[:wpar_mksysb] = 'aix.mksysb'
+      default_string = '/usr/sbin/mkwpar -s -n kitchenwpar -B aix.mksysb'
+
+      expect(driver.send(:build_mkwpar_command)).to eq(default_string)
+    end
+
+  end
+end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-wpar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Alain Dejoux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-kitchen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +104,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: chefstyle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Test Kitchen Driver for Wpar
 email:
 - adejoux@djouxtech.net
@@ -143,6 +179,8 @@ files:
 - kitchen-wpar.gemspec
 - lib/kitchen/driver/wpar.rb
 - lib/kitchen/driver/wpar_version.rb
+- test/spec_helper.rb
+- test/wpar_spec.rb
 homepage: https://github.com/adejoux/kitchen-wpar
 licenses:
 - Apache-2.0
@@ -163,8 +201,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: test kitchen driver using AIX wpar
-test_files: []
+test_files:
+- test/spec_helper.rb
+- test/wpar_spec.rb