kitchen-oci 1.18.1 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc3416b97957d72c5262acfed751b388a1387a5e18b85fc02193bc88c2283c72
-  data.tar.gz: 2946ba6f22ac36f50e6699c8d20acbf628ba19ad0d6f80b042d89f3e269aff20
+  metadata.gz: d605c9336d53fbeff2b9b87b00a3c862615d4f46d301ec2fe1deafa43922c39c
+  data.tar.gz: ad8c34ef492edc7b2b6912726cc7978d50ac4a370a624e3640f1fb3931cbbf37
 SHA512:
-  metadata.gz: 5c260f31d16ba17bfdffb4384b93263d7ffe415e45c65a1f6c7b432ca78aa0cc89f14140988cbe9918c01b2c7b2496b2126d3584bc8792e4a31c954b2a6164e0
-  data.tar.gz: d7ba936db2bc7d265bab692250a595b2b94bfe9f5fe85dd9536e5d6b583bb68454c56d5d8240df5042b27b667d5c94063a4f2f3fa14d6ba4db31769e1904ad4c
+  metadata.gz: 27b2cd8c880fd1faff1012abbcaa2a703813841051962c3653c02b2503e07565718a101595dbe1affcba513cd86bd6adcd2a700af97212da9ba420f16cda8921
+  data.tar.gz: 7bc6d52865dd933e2c4fdf896bc11649af610c92e74782821da6bf7cd6525bffabffb0735c9e30261a538d36c82f2c48f5e1e333c356cf1a7712dc6636847d90

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

@@ -57,7 +57,9 @@ module Kitchen
             )
           end
 
-          def instance_source_details
+          def instance_source_via_image
+            return if config[:boot_volume_id]
+
             launch_details.source_details = OCI::Core::Models::InstanceSourceViaImageDetails.new(
               sourceType: "image",
               imageId: image_id,
@@ -65,6 +67,15 @@ module Kitchen
             )
           end
 
+          def instance_source_via_boot_volume
+            return unless config[:boot_volume_id]
+
+            launch_details.source_details = OCI::Core::Models::InstanceSourceViaBootVolumeDetails.new(
+              boot_volume_id: clone_boot_volume,
+              sourceType: "bootVolume"
+            )
+          end
+
           def instance_metadata
             launch_details.metadata = metadata
           end

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

@@ -22,6 +22,12 @@ module Kitchen
       class Instance
         # setter methods that populate the details of OCI::Database::Models::CreateDatabaseDetails
         module DatabaseDetails
+          def database_software_image
+            return unless config[:dbaas][:db_software_image_id]
+
+            database_details.database_software_image_id = config[:dbaas][:db_software_image_id]
+          end
+
           def character_set
             database_details.character_set = config[:dbaas][:character_set] ||= "AL32UTF8"
           end

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

@@ -35,6 +35,12 @@ module Kitchen
           def db_home_display_name
             db_home_details.display_name = ["dbhome", random_number(10)].compact.join
           end
+
+          def db_home_software_image
+            return unless config[:dbaas][:db_software_image_id]
+
+            db_home_details.database_software_image_id = config[:dbaas][:db_software_image_id]
+          end
         end
       end
     end

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

@@ -29,7 +29,6 @@ module Kitchen
           include DbHomeDetails
           #
           # TODO: add support for the #domain property
-          #       add support for #database_software_image_id property
           #
           def db_home
             launch_details.db_home = db_home_details

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

@@ -42,7 +42,7 @@ module Kitchen
             process_windows_options
             response = api.compute.launch_instance(launch_instance_details)
             instance_id = response.data.id
-            api.compute.get_instance(instance_id).wait_until(:lifecycle_state, OCI::Core::Models::Instance::LIFECYCLE_STATE_RUNNING )
+            api.compute.get_instance(instance_id).wait_until(:lifecycle_state, OCI::Core::Models::Instance::LIFECYCLE_STATE_RUNNING)
             final_state(state, instance_id)
           end
 
@@ -51,6 +51,11 @@ module Kitchen
             api.compute.get_instance(state[:server_id]).wait_until(:lifecycle_state, OCI::Core::Models::Instance::LIFECYCLE_STATE_TERMINATING)
           end
 
+          def reboot
+            api.compute.instance_action(state[:server_id], "SOFTRESET")
+            api.compute.get_instance(state[:server_id]).wait_until(:lifecycle_state, OCI::Core::Models::Instance::LIFECYCLE_STATE_RUNNING)
+          end
+
           private
 
           def image_id
@@ -88,6 +93,28 @@ module Kitchen
             image_list.flatten
           end
 
+          def clone_boot_volume
+            info("Cloning boot volume...")
+            cbv = api.blockstorage.create_boot_volume(clone_boot_volume_details)
+            api.blockstorage.get_boot_volume(cbv.data.id).wait_until(:lifecycle_state, OCI::Core::Models::BootVolume::LIFECYCLE_STATE_AVAILABLE)
+            info("Finished cloning boot volume.")
+            cbv.data.id
+          end
+
+          def clone_boot_volume_details
+            OCI::Core::Models::CreateBootVolumeDetails.new(
+              source_details: OCI::Core::Models::BootVolumeSourceFromBootVolumeDetails.new(
+                id: config[:boot_volume_id]
+              ),
+              display_name: boot_volume_display_name,
+              compartment_id: oci.compartment
+            )
+          end
+
+          def boot_volume_display_name
+            "#{api.blockstorage.get_boot_volume(config[:boot_volume_id]).data.display_name} (Clone)"
+          end
+
           def instance_ip(instance_id)
             vnic = vnics(instance_id).select(&:is_primary).first
             if public_ip_allowed?
@@ -109,7 +136,7 @@ module Kitchen
           end
 
           def hostname
-            [config[:hostname_prefix], random_string(6)].compact.join("-")
+            %W{#{config[:hostname_prefix]} #{config[:instance_name]} #{random_string(6)}}.uniq.compact.join("-")
           end
 
           def create_vnic_details(name)

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

@@ -69,6 +69,12 @@ module Kitchen
                                                                   max_interval_seconds: 900, max_wait_seconds: 21_600)
           end
 
+          def reboot
+            db_node_id = dbaas_node(state[:server_id]).first.id
+            api.dbaas.db_node_action(db_node_id, "SOFTRESET")
+            api.dbaas.get_db_node(db_node_id).wait_until(:lifecycle_state, OCI::Database::Models::DbNode::LIFECYCLE_STATE_AVAILABLE)
+          end
+
           private
 
           def instance_ip(instance_id)

data/lib/kitchen/driver/oci.rb

@@ -52,10 +52,14 @@ module Kitchen
       default_config :compartment_name, nil
       default_config :instance_type, "compute"
       default_config :image_id, nil
+      default_config :boot_volume_id, nil
       default_config :image_name, nil
       default_config :hostname_prefix do |hnp|
         hnp.instance.name
       end
+      default_config :instance_name do |inst|
+        inst.instance.name
+      end
       default_keypath = File.expand_path(File.join(%w{~ .ssh id_rsa.pub}))
       default_config :ssh_keypath, default_keypath
       default_config :post_create_script, nil
@@ -71,6 +75,7 @@ module Kitchen
       default_config :all_plugins_disabled, false
       default_config :management_disabled, false
       default_config :monitoring_disabled, false
+      default_config :post_create_reboot, false
 
       # compute only configs
       default_config :setup_winrm, false
@@ -112,21 +117,19 @@ module Kitchen
         validate_config!
         oci, api = auth(__method__)
         inst = instance_class(config, state, oci, api, __method__)
-        state_details = inst.launch
-        state.merge!(state_details)
-        instance.transport.connection(state).wait_until_ready
+        launch(state, inst)
         create_and_attach_volumes(config, state, oci, api)
         process_post_script(state)
+        reboot(state, inst)
       end
 
       def destroy(state)
         return unless state[:server_id]
 
         oci, api = auth(__method__)
-        instance.transport.connection(state).close
-        detatch_and_delete_volumes(state, oci, api) if state[:volumes]
         inst = instance_class(config, state, oci, api, __method__)
-        inst.terminate
+        detatch_and_delete_volumes(state, oci, api)
+        terminate(state, inst)
       end
 
       private
@@ -138,6 +141,12 @@ module Kitchen
         [oci, api]
       end
 
+      def launch(state, inst)
+        state_details = inst.launch
+        state.merge!(state_details)
+        instance.transport.connection(state).wait_until_ready
+      end
+
       def create_and_attach_volumes(config, state, oci, api)
         return if config[:volumes].empty?
 
@@ -152,12 +161,6 @@ module Kitchen
         state.merge!(volume_state)
       end
 
-      def detatch_and_delete_volumes(state, oci, api)
-        bls = Blockstorage.new(config, state, oci, api, :destroy)
-        state[:volume_attachments].each { |att| bls.detatch_volume(att) }
-        state[:volumes].each { |vol| bls.delete_volume(vol) }
-      end
-
       def process_post_script(state)
         return if config[:post_create_script].nil?
 
@@ -165,6 +168,27 @@ module Kitchen
         script = config[:post_create_script]
         instance.transport.connection(state).execute(script)
       end
+
+      def reboot(state, inst)
+        return unless config[:post_create_reboot]
+
+        instance.transport.connection(state).close
+        inst.reboot
+        instance.transport.connection(state).wait_until_ready
+      end
+
+      def detatch_and_delete_volumes(state, oci, api)
+        return unless state[:volumes]
+
+        bls = Blockstorage.new(config, state, oci, api, :destroy)
+        state[:volume_attachments].each { |att| bls.detatch_volume(att) }
+        state[:volumes].each { |vol| bls.delete_volume(vol) }
+      end
+
+      def terminate(state, inst)
+        instance.transport.connection(state).close
+        inst.terminate
+      end
     end
   end
 end

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.18.1"
+    OCI_VERSION = "1.20.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.20.0
 platform: ruby
 authors:
 - Stephen Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-06 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -109,7 +109,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Test Kitchen Driver for Oracle OCI
+description: A Test Kitchen Driver for Oracle Cloud Infrastructure
 email:
 - stephen.pearson@oracle.com
 - justin.steele@oracle.com
@@ -157,5 +157,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
-summary: A Test Kitchen Driver for Oracle OCI
+summary: A Test Kitchen Driver for Oracle Cloud Infrastructure
 test_files: []