kitchen-oci 1.20.2 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f48ec8dd3ad22c465333f13ada4460021473e7724ef39cf2069e87136c66ee7b
-  data.tar.gz: 39a699346ae44ca5cef24788bc3e8313cc3665a7d72cf12f77e44e61b9066be8
+  metadata.gz: f91045fdb0ff064f83385b240480320087e7b37d65998bfac58992f029979626
+  data.tar.gz: 05c3559342b40ddb201123ef8be3769b12adac2dbbcce79c957f0caa187a5d22
 SHA512:
-  metadata.gz: 15033fffadf3a1b0d9f53b51cb06085a55af0a4e395362b63e93a7be12557ac52f9fedf47faf259ccaaaccb829baccb3c5aa1264f25f13086a5a9f42a550329c
-  data.tar.gz: 39ecbf8d16c0cda53559b2a103a59e0611d92805807bb62a755291e1e7b72d8d486474e198ee9f202850cce3e7357abf67a4e2e79e3d2be0e60ae243b0fe9f26
+  metadata.gz: 344ddb1169b34e6e40dad70d5d60fa5d848af6d20d7cf2175f011a97f2248b9e530664a09103b16bcc4249088fb8464fd4e280e4f1368f91de15aeb66a4e8ae1
+  data.tar.gz: 63d6b2ec541e4253e8ac5b46b293196e3ef981898147129b5f8439e4449046af947861e2d4526f6b796a50c4b10a6398658c8babbe1db95b03d9169ed43dc7c4

data/lib/kitchen/driver/oci/blockstorage.rb

@@ -20,7 +20,7 @@ module Kitchen
   module Driver
     class Oci
       # generic class for blockstorage
-      class Blockstorage < Oci
+      class Blockstorage < Oci # rubocop:disable Metrics/ClassLength
         require_relative "api"
         require_relative "config"
         require_relative "models/iscsi"
@@ -85,9 +85,18 @@ module Kitchen
           [response, final_state(response)]
         end
 
-        def attach_volume(volume_details, server_id)
+        def create_clone_volume(volume)
+          clone_volume_name = clone_volume_display_name(volume[:volume_id])
+          info("Creating <#{clone_volume_name}>...")
+          result = api.blockstorage.create_volume(volume_clone_details(volume, clone_volume_name))
+          response = volume_response(result.data.id)
+          info("Finished creating <#{clone_volume_name}>.")
+          [response, final_state(response)]
+        end
+
+        def attach_volume(volume_details, server_id, volume_config)
           info("Attaching <#{volume_details.display_name}>...")
-          attach_volume = api.compute.attach_volume(attachment_details(volume_details, server_id))
+          attach_volume = api.compute.attach_volume(attachment_details(volume_details, server_id, volume_config))
           response = attachment_response(attach_volume.data.id)
           info("Finished attaching <#{volume_details.display_name}>.")
           final_state(response)
@@ -141,15 +150,36 @@ module Kitchen
           )
         end
 
+        def volume_clone_details(volume, clone_volume_name)
+          OCI::Core::Models::CreateVolumeDetails.new(
+            compartment_id: oci.compartment,
+            availability_domain: config[:availability_domain],
+            display_name: clone_volume_name,
+            defined_tags: config[:defined_tags],
+            size_in_gbs: volume[:size_in_gbs],
+            vpus_per_gb: volume[:vpus_per_gb],
+            source_details: OCI::Core::Models::VolumeSourceFromVolumeDetails.new(id: volume[:volume_id])
+          )
+        end
+
         def attachment_name(attachment)
           attachment[:display_name].gsub(/(?:paravirtual|iscsi)-/, "")
         end
 
+        def server_os(server_id)
+          image_id = api.compute.get_instance(server_id).data.image_id
+          api.compute.get_image(image_id).data.operating_system
+        end
+
         def final_volume_state(response)
           volume_state.store(:id, response.id)
           volume_state.store(:display_name, response.display_name)
           volume_state
         end
+
+        def clone_volume_display_name(volume_id)
+          "#{api.blockstorage.get_volume(volume_id).data.to_hash[:displayName]} (Clone)"
+        end
       end
     end
   end

data/lib/kitchen/driver/oci/instance/compute.rb

@@ -23,7 +23,7 @@ module Kitchen
         # setter methods that populate the details of OCI::Core::Models::LaunchInstanceDetails
         module ComputeLaunchDetails
           def hostname_display_name
-            display_name = hostname
+            display_name = config[:display_name] || hostname
             launch_details.display_name = display_name
             launch_details.create_vnic_details = create_vnic_details(display_name)
           end

data/lib/kitchen/driver/oci/models/iscsi.rb

@@ -35,11 +35,13 @@ module Kitchen
           #
           attr_reader :attachment_type
 
-          def attachment_details(volume_details, server_id)
+          def attachment_details(volume_details, server_id, volume_config)
+            device = volume_config[:device] unless server_os(server_id).downcase =~ /windows/
             OCI::Core::Models::AttachIScsiVolumeDetails.new(
               display_name: "#{attachment_type}-#{volume_details.display_name}",
               volume_id: volume_details.id,
-              instance_id: server_id
+              instance_id: server_id,
+              device: device
             )
           end
 

data/lib/kitchen/driver/oci/models/paravirtual.rb

@@ -35,11 +35,13 @@ module Kitchen
           #
           attr_reader :attachment_type
 
-          def attachment_details(volume_details, server_id)
+          def attachment_details(volume_details, server_id, volume_config)
+            device = volume_config[:device] unless server_os(server_id).downcase =~ /windows/
             OCI::Core::Models::AttachParavirtualizedVolumeDetails.new(
               display_name: "#{attachment_type}-#{volume_details.display_name}",
               volume_id: volume_details.id,
-              instance_id: server_id
+              instance_id: server_id,
+              device: device
             )
           end
 

data/lib/kitchen/driver/oci.rb

@@ -60,6 +60,7 @@ module Kitchen
       default_config :instance_name do |inst|
         inst.instance.name
       end
+      default_config :display_name, nil
       default_keypath = File.expand_path(File.join(%w{~ .ssh id_rsa.pub}))
       default_config :ssh_keypath, default_keypath
       default_config :post_create_script, nil
@@ -152,15 +153,28 @@ module Kitchen
       def create_and_attach_volumes(config, state, oci, api)
         return if config[:volumes].empty?
 
+        volume_state = process_volumes(config, state, oci, api)
+        state.merge!(volume_state)
+      end
+
+      def process_volumes(config, state, oci, api)
         volume_state = { volumes: [], volume_attachments: [] }
         config[:volumes].each do |volume|
           vol = volume_class(volume[:type], config, state, oci, api)
-          volume_details, vol_state = vol.create_volume(volume)
-          attach_state = vol.attach_volume(volume_details, state[:server_id])
+          volume_details, vol_state = create_volume(vol, volume)
+          attach_state = vol.attach_volume(volume_details, state[:server_id], volume)
           volume_state[:volumes] << vol_state
           volume_state[:volume_attachments] << attach_state
         end
-        state.merge!(volume_state)
+        volume_state
+      end
+
+      def create_volume(vol, volume)
+        if volume.key?(:volume_id)
+          vol.create_clone_volume(volume)
+        else
+          vol.create_volume(volume)
+        end
       end
 
       def process_post_script(state)

data/lib/kitchen/driver/oci_version.rb

@@ -20,6 +20,6 @@
 module Kitchen
   module Driver
     # Version string for Oracle OCI Kitchen driver
-    OCI_VERSION = "1.20.2"
+    OCI_VERSION = "1.22.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.20.2
+  version: 1.22.0
 platform: ruby
 authors:
 - Stephen Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -135,7 +135,7 @@ files:
 - lib/kitchen/driver/oci/models/paravirtual.rb
 - lib/kitchen/driver/oci_version.rb
 - tpl/setup_winrm.ps1.erb
-homepage: ''
+homepage: https://github.com/stephenpearson/kitchen-oci
 licenses:
 - Apache-2.0
 metadata: {}