chef-provisioning-vsphere 2.2.2 → 2.3.0

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require 'simplecov'
+# frozen_string_literal: true
+require "simplecov"
 
 SimpleCov.start do
   # add_filter do |source_file|
@@ -15,5 +16,5 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 end

data/spec/unit_tests/VsphereDriver_spec.rb

@@ -1,99 +1,99 @@
 # frozen_string_literal: true
-require 'chef/provisioning/vsphere_driver'
+require "chef/provisioning/vsphere_driver"
 
 describe ChefProvisioningVsphere::VsphereDriver do
   subject do
     Chef::Provisioning.driver_for_url(
-      'vsphere://3.3.3.3:999/crazyapi?use_ssl=false&insecure=true',
+      "vsphere://3.3.3.3:999/crazyapi?use_ssl=false&insecure=true",
       metal_config
     )
   end
 
-  context 'when config does not include the properties included in the url' do
+  context "when config does not include the properties included in the url" do
     let(:metal_config) do
       {
         driver_options: {
-          user: 'vmapi',
-          password: '<password>'
+          user: "vmapi",
+          password: "<password>",
         },
         machine_options: {
           ssh: {
-            password: '<password>',
-            paranoid: false
+            password: "<password>",
+            paranoid: false,
           },
           bootstrap_options: {
-            datacenter: 'QA1',
-            template_name: 'UBUNTU-12-64-TEMPLATE',
-            vm_folder: 'DLAB',
+            datacenter: "QA1",
+            template_name: "UBUNTU-12-64-TEMPLATE",
+            vm_folder: "DLAB",
             num_cpus: 2,
             memory_mb: 4096,
-            resource_pool: 'CLSTR02/DLAB'
-          }
+            resource_pool: "CLSTR02/DLAB",
+          },
         },
-        log_level: :debug
+        log_level: :debug,
       }
     end
 
-    it 'populates the connect options with correct host from the driver url' do
-      expect(subject.connect_options[:host]).to eq('3.3.3.3')
+    it "populates the connect options with correct host from the driver url" do
+      expect(subject.connect_options[:host]).to eq("3.3.3.3")
     end
-    it 'populates the connect options with correct port from the driver url' do
+    it "populates the connect options with correct port from the driver url" do
       expect(subject.connect_options[:port]).to eq(999)
     end
-    it 'populates the connect options with correct path from the driver url' do
-      expect(subject.connect_options[:path]).to eq('/crazyapi')
+    it "populates the connect options with correct path from the driver url" do
+      expect(subject.connect_options[:path]).to eq("/crazyapi")
     end
-    it 'populates the connect options with correct use_ssl setting from the driver url' do
+    it "populates the connect options with correct use_ssl setting from the driver url" do
       expect(subject.connect_options[:use_ssl]).to eq(false)
     end
-    it 'populates the connect options with correct insecure setting from the driver url' do
+    it "populates the connect options with correct insecure setting from the driver url" do
       expect(subject.connect_options[:insecure]).to eq(true)
     end
   end
 
-  context 'when config keys are stringified' do
+  context "when config keys are stringified" do
     let(:metal_config) do
       {
-        'driver_options' => {
-          'user' => 'vmapi',
-          'password' => '<driver_password>'
+        "driver_options" => {
+          "user" => "vmapi",
+          "password" => "<driver_password>",
+        },
+        "bootstrap_options" => {
+          "machine_options" => {
+            "datacenter" => "QA1",
+            "ssh" => {
+              "password" => "<machine_password>",
+            },
+          },
         },
-        'bootstrap_options' => {
-          'machine_options' => {
-            'datacenter' => 'QA1',
-            'ssh' => {
-              'password' => '<machine_password>'
-            }
-          }
-        }
       }
     end
 
-    it 'will symbolize user' do
-      expect(subject.connect_options[:user]).to eq('vmapi')
+    it "will symbolize user" do
+      expect(subject.connect_options[:user]).to eq("vmapi")
     end
-    it 'will symbolize password' do
-      expect(subject.connect_options[:password]).to eq('<driver_password>')
+    it "will symbolize password" do
+      expect(subject.connect_options[:password]).to eq("<driver_password>")
     end
-    it 'will symbolize ssh password' do
-      expect(subject.config[:bootstrap_options][:machine_options][:ssh][:password]).to eq('<machine_password>')
+    it "will symbolize ssh password" do
+      expect(subject.config[:bootstrap_options][:machine_options][:ssh][:password]).to eq("<machine_password>")
     end
-    it 'will symbolize ssh bootstrap options' do
-      expect(subject.config[:bootstrap_options][:machine_options][:datacenter]).to eq('QA1')
+    it "will symbolize ssh bootstrap options" do
+      expect(subject.config[:bootstrap_options][:machine_options][:datacenter]).to eq("QA1")
     end
   end
 
-  describe 'canonicalize_url' do
-    context 'when no url is in the config' do
+  describe "canonicalize_url" do
+    context "when no url is in the config" do
       let(:metal_config) do
         {
-          user: 'vmapi',
-          password: '<password>',
-          host: '4.4.4.4',
+          user: "vmapi",
+          password: "<password>",
+          host: "4.4.4.4",
           port: 888,
-          path: '/yoda',
+          path: "/yoda",
           use_ssl: false,
-          insecure: true
+          insecure: true,
         }
       end
 
@@ -104,17 +104,17 @@ describe ChefProvisioningVsphere::VsphereDriver do
         )
       end
 
-      it 'creates the correct driver url from config settings' do
-        expect(subject[0]).to eq('vsphere://4.4.4.4:888/yoda?use_ssl=false&insecure=true')
+      it "creates the correct driver url from config settings" do
+        expect(subject[0]).to eq("vsphere://4.4.4.4:888/yoda?use_ssl=false&insecure=true")
       end
     end
 
-    context 'when no url is in the config and config is missing defaulted values' do
+    context "when no url is in the config and config is missing defaulted values" do
       let(:metal_config) do
         {
-          user: 'vmapi',
-          password: '<password>',
-          host: '4.4.4.4'
+          user: "vmapi",
+          password: "<password>",
+          host: "4.4.4.4",
         }
       end
 
@@ -125,8 +125,8 @@ describe ChefProvisioningVsphere::VsphereDriver do
         )
       end
 
-      it 'creates the correct driver url from default settings' do
-        expect(subject[0]).to eq('vsphere://4.4.4.4/sdk?use_ssl=true&insecure=false')
+      it "creates the correct driver url from default settings" do
+        expect(subject[0]).to eq("vsphere://4.4.4.4/sdk?use_ssl=true&insecure=false")
       end
     end
   end
@@ -151,7 +151,7 @@ describe ChefProvisioningVsphere::VsphereDriver do
 
     let(:port) { 22 }
     let(:bootstrap_conf) { {} }
-    
+
     context "has_static_ip" do
       let(:bootstrap_conf) { { customization_spec: "some spec" } }
       context "customization_spec is named" do
@@ -178,12 +178,12 @@ describe ChefProvisioningVsphere::VsphereDriver do
 
       context "customization_spec has an ip address" do
         let(:bootstrap_conf) do
-          { 
+          {
             customization_spec: {
               ipsettings: {
-                ip: "2.2.2.2"
-              }
-            } 
+                ip: "2.2.2.2",
+              },
+            },
           }
         end
 
@@ -220,4 +220,42 @@ describe ChefProvisioningVsphere::VsphereDriver do
       end
     end
   end
+
+  context "#merge_options!" do
+    let(:metal_config) { {} }
+
+    it "Add tupple with string key" do
+      subject.merge_options! "string_key" => "some string"
+      expect(subject.config).to eq machine_options: {
+        string_key: "some string",
+      }
+    end
+
+    it "Add tupple with symbol key" do
+      subject.merge_options! symbol_key: "some other string"
+      expect(subject.config).to eq machine_options: {
+        symbol_key: "some other string",
+      }
+    end
+
+    it "Add empty MergedConfig" do
+      expect($stderr).not_to receive(:puts)
+
+      item = Cheffish::MergedConfig.new()
+      subject.merge_options! item
+
+      expect(subject.config).to eq machine_options: {}
+    end
+
+    it "Add MergedConfig with 1 tupple" do
+      expect($stderr).not_to receive(:puts)
+
+      item = Cheffish::MergedConfig.new(merged_config: "some merged value")
+      subject.merge_options! item
+
+      expect(subject.config).to eq machine_options: {
+        merged_config: "some merged value",
+      }
+    end
+  end
 end

data/spec/unit_tests/VsphereUrl_spec.rb

@@ -1,65 +1,65 @@
 # frozen_string_literal: true
-require_relative '../../lib/chef/provisioning/vsphere_driver/vsphere_url.rb'
+require_relative "../../lib/chef/provisioning/vsphere_driver/vsphere_url.rb"
 
-describe 'VsphereUrl' do
-  expected_host = '1.1.1.1'
+describe "VsphereUrl" do
+  expected_host = "1.1.1.1"
   expected_port = 1818
-  expected_path = '/path'
+  expected_path = "/path"
 
   let(:url) { URI("vsphere://#{expected_host}:#{expected_port}#{expected_path}") }
 
-  it 'has the vsphere scheme' do
-    expect(url.scheme).to eq('vsphere')
+  it "has the vsphere scheme" do
+    expect(url.scheme).to eq("vsphere")
   end
-  it 'has the expected host' do
+  it "has the expected host" do
     expect(url.host).to eq(expected_host)
   end
-  it 'has the expected port' do
+  it "has the expected port" do
     expect(url.port).to eq(expected_port)
   end
-  it 'has the expected path' do
+  it "has the expected path" do
     expect(url.path).to eq(expected_path)
   end
-  it 'has the the default ssl setting' do
+  it "has the the default ssl setting" do
     expect(url.use_ssl).to eq(true)
   end
-  it 'has the the default insecure setting' do
+  it "has the the default insecure setting" do
     expect(url.insecure).to eq(false)
   end
 
-  context 'when setting from a hash' do
+  context "when setting from a hash" do
     let(:url) do
-      URI::VsphereUrl.from_config(host: '2.2.2.2',
+      URI::VsphereUrl.from_config(host: "2.2.2.2",
                                   port: 2345,
-                                  path: '/hoooo',
+                                  path: "/hoooo",
                                   use_ssl: false,
                                   insecure: true)
     end
 
-    it 'asigns the correct url' do
-      expect(url.to_s).to eq('vsphere://2.2.2.2:2345/hoooo?use_ssl=false&insecure=true')
+    it "asigns the correct url" do
+      expect(url.to_s).to eq("vsphere://2.2.2.2:2345/hoooo?use_ssl=false&insecure=true")
     end
   end
-  context 'when ssl is enabled' do
-    it 'retuns an ssl value of true' do
+  context "when ssl is enabled" do
+    it "retuns an ssl value of true" do
       url = URI("vsphere://#{expected_host}:#{expected_port}#{expected_path}?use_ssl=true")
       expect(url.use_ssl).to eq(true)
     end
   end
-  context 'when ssl is disabled' do
-    it 'retuns an ssl value of true' do
+  context "when ssl is disabled" do
+    it "retuns an ssl value of true" do
       url = URI("vsphere://#{expected_host}:#{expected_port}#{expected_path}?use_ssl=false")
       expect(url.use_ssl).to eq(false)
     end
   end
-  context 'when insecure is enabled' do
-    it 'retuns an insecure value of true' do
+  context "when insecure is enabled" do
+    it "retuns an insecure value of true" do
       url = URI("vsphere://#{expected_host}:#{expected_port}#{expected_path}?insecure=true")
       expect(url.insecure).to eq(true)
     end
   end
-  context 'when insecure is disabled' do
-    it 'retuns an insecure value of true' do
+  context "when insecure is disabled" do
+    it "retuns an insecure value of true" do
       url = URI("vsphere://#{expected_host}:#{expected_port}#{expected_path}?insecure=false")
       expect(url.insecure).to eq(false)
     end

data/spec/unit_tests/clone_spec_builder_spec.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
-require 'chef/provisioning/vsphere_driver'
-require_relative 'support/fake_action_handler'
-require_relative 'support/vsphere_helper_stub'
+require "chef/provisioning/vsphere_driver"
+require_relative "support/fake_action_handler"
+require_relative "support/vsphere_helper_stub"
 
 describe ChefProvisioningVsphere::CloneSpecBuilder do
   let(:options) { Hash.new }
-  let(:vm_template) { double('template') }
+  let(:vm_template) { double("template") }
 
   before do
     allow(vm_template).to receive_message_chain(:config, :guestId)
-      .and_return('guest')
+      .and_return("guest")
     allow(vm_template).to receive_message_chain(:config, :template)
       .and_return(false)
   end
@@ -19,142 +19,142 @@ describe ChefProvisioningVsphere::CloneSpecBuilder do
       ChefProvisioningVsphereStubs::VsphereHelperStub.new,
       ChefProvisioningVsphereStubs::FakeActionHandler.new
     )
-    builder.build(vm_template, 'machine_name', options)
+    builder.build(vm_template, "machine_name", options)
   end
 
-  context 'using linked clones' do
+  context "using linked clones" do
     before { options[:use_linked_clone] = true }
 
-    it 'sets the disk move type of the relocation spec' do
+    it "sets the disk move type of the relocation spec" do
       expect(subject.location.diskMoveType).to be :moveChildMostDiskBacking
     end
   end
 
-  context 'using linked clone on a template source' do
+  context "using linked clone on a template source" do
     before do
       options[:use_linked_clone] = true
-      options[:host] = 'host'
+      options[:host] = "host"
       allow(vm_template).to receive_message_chain(:config, :template)
         .and_return(true)
     end
 
-    it 'does not set the disk move type of the relocation spec' do
+    it "does not set the disk move type of the relocation spec" do
       expect(subject.location.diskMoveType).to be nil
     end
   end
 
-  context 'not using linked clones' do
+  context "not using linked clones" do
     before { options[:use_linked_clone] = false }
 
-    it 'does not set the disk move type of the relocation spec' do
+    it "does not set the disk move type of the relocation spec" do
       expect(subject.location.diskMoveType).to be nil
     end
   end
 
-  context 'specifying a host' do
-    before { options[:host] = 'host' }
+  context "specifying a host" do
+    before { options[:host] = "host" }
 
-    it 'sets the host' do
+    it "sets the host" do
       expect(subject.location.host).to_not be nil
     end
   end
 
-  context 'not specifying a host' do
-    it 'does not set the host' do
+  context "not specifying a host" do
+    it "does not set the host" do
       expect(subject.location.host).to be nil
     end
   end
 
-  context 'specifying a pool' do
-    before { options[:resource_pool] = 'pool' }
+  context "specifying a pool" do
+    before { options[:resource_pool] = "pool" }
 
-    it 'sets the pool' do
+    it "sets the pool" do
       expect(subject.location.pool).to_not be nil
     end
   end
 
-  context 'not specifying a pool' do
-    it 'does not set the pool' do
+  context "not specifying a pool" do
+    it "does not set the pool" do
       expect(subject.location.pool).to be nil
     end
   end
 
-  context 'not specifying a pool but specifying a host on a template' do
+  context "not specifying a pool but specifying a host on a template" do
     before do
-      options[:host] = 'host'
+      options[:host] = "host"
       allow(vm_template).to receive_message_chain(:config, :template)
         .and_return(true)
     end
 
-    it 'sets the pool to the hosts parent root pool' do
+    it "sets the pool to the hosts parent root pool" do
       expect(subject.location.pool).to be subject.location.host.parent.resourcePool
     end
   end
 
-  context 'not specifying a pool or host when cloning from a template' do
+  context "not specifying a pool or host when cloning from a template" do
     before do
       allow(vm_template).to receive_message_chain(:config, :template)
         .and_return(true)
     end
 
-    it 'raises an error' do
+    it "raises an error" do
       expect { subject }.to raise_error(RuntimeError)
     end
   end
 
-  context 'specifying a hostname' do
+  context "specifying a hostname" do
     before do
       options[:customization_spec] = {
         ipsettings: {},
         hostname: hostname,
-        domain: 'local'
+        domain: "local",
       }
     end
 
-    context 'alpha characters only' do
-      let(:hostname) { 'myhost' }
+    context "alpha characters only" do
+      let(:hostname) { "myhost" }
 
-      it 'sets the spec hostname' do
+      it "sets the spec hostname" do
         expect(subject.customization.identity.hostName.name).to eq hostname
       end
     end
 
-    context 'alpha numeric characters only' do
-      let(:hostname) { 'myhost01' }
+    context "alpha numeric characters only" do
+      let(:hostname) { "myhost01" }
 
-      it 'sets the spec hostname' do
+      it "sets the spec hostname" do
         expect(subject.customization.identity.hostName.name).to eq hostname
       end
     end
 
-    context 'containing a dash' do
-      let(:hostname) { 'my-host01' }
+    context "containing a dash" do
+      let(:hostname) { "my-host01" }
 
-      it 'sets the spec hostname' do
+      it "sets the spec hostname" do
         expect(subject.customization.identity.hostName.name).to eq hostname
       end
     end
 
-    context 'containing an underscore' do
-      let(:hostname) { 'my_host' }
+    context "containing an underscore" do
+      let(:hostname) { "my_host" }
 
-      it 'raises an error' do
+      it "raises an error" do
         expect { subject }.to raise_error(RuntimeError)
       end
     end
 
-    context 'starting with a dash' do
-      let(:hostname) { '-myhost' }
+    context "starting with a dash" do
+      let(:hostname) { "-myhost" }
 
-      it 'raises an error' do
+      it "raises an error" do
         expect { subject }.to raise_error(RuntimeError)
       end
     end
 
-    context 'ending with a dash' do
-      let(:hostname) { 'myhost-' }
+    context "ending with a dash" do
+      let(:hostname) { "myhost-" }
 
-      it 'raises an error' do
+      it "raises an error" do
         expect { subject }.to raise_error(RuntimeError)
       end
     end