From 90dddcbbcf9b7645d80d349513ed4725ff7c6175 Mon Sep 17 00:00:00 2001
From: Elizabeth Ashurov <eashurov@redhat.com>
Date: Wed, 17 Jun 2026 17:24:20 +0300
Subject: [PATCH 1/2] lib/rtoolsHCK: Add no_studio mode support

Introduce a `no_studio` initialization option that allows creating an
RToolsHCK instance without connecting to the HLK studio. In this mode,
WinRM and toolsHCK setup is skipped on initialize and teardown, while
studio-only methods (run_on_studio, reconnect, connection_check,
close_and_shutdown) raise a clear error if called.

Signed-off-by: Elizabeth Ashurov <eashurov@redhat.com>
---
 lib/rtoolsHCK.rb | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/lib/rtoolsHCK.rb b/lib/rtoolsHCK.rb
index c118f92..a7cab4f 100755
--- a/lib/rtoolsHCK.rb
+++ b/lib/rtoolsHCK.rb
@@ -157,6 +157,20 @@ def initialize(init_opts)
 
   private
 
+  # Actions that can be performed in no_studio mode (client-only actions)
+  CLIENT_ACTIONS = %i[
+    start_client_services
+    get_machine_system_info
+    machine_shutdown
+    run_on_machine
+    upload_to_machine
+    download_from_machine
+    exists_on_machine?
+    delete_on_machine
+    install_machine_driver_package
+    close
+  ].freeze
+
   # init_opts initialization defaults
   INIT_OPTS_DEFAULTS = {
     addr: '192.168.100.1',
@@ -173,7 +187,8 @@ def initialize(init_opts)
     logger: nil,
     log_to_stdout: false,
     outp_dir: nil,
-    r_script_file: 'C:\\toolsHCK.ps1'
+    r_script_file: 'C:\\toolsHCK.ps1',
+    no_studio: false
   }.freeze
 
   def validate_init_opts(init_opts)
@@ -233,11 +248,15 @@ def start_client_services(machine)
   def do_initialize(init_opts)
     load_outp_dir(init_opts[:outp_dir])
     load_instance_variables(init_opts)
-    logger('debug', 'initialize') { "#{@user}:#{@pass}@#{@addr}" }
-    load_winrm_ps
-    load_winrm_fs
-    start_studio_services
-    load_toolshck
+    if @no_studio
+      logger('debug', 'initialize') { "no-studio mode: clients=#{@clients_addrs.keys}" }
+    else
+      logger('debug', 'initialize') { "#{@user}:#{@pass}@#{@addr}" }
+      load_winrm_ps
+      load_winrm_fs
+      start_studio_services
+      load_toolshck
+    end
     @closed = false
   end
 
@@ -263,6 +282,7 @@ def load_instance_variables(init_opts)
     @timeout = init_opts[:timeout]
     @json = init_opts[:json]
     @r_script_file = init_opts[:r_script_file]
+    @no_studio = init_opts[:no_studio]
   end
 
   def winrm_options_factory(addr, port, user, pass)
@@ -408,6 +428,9 @@ def action_exception_handler(exception)
 
   def handle_action_exceptions(action, &block)
     raise RToolsHCKError.new('action'), 'instance is closed.' if @closed
+    if @no_studio && !CLIENT_ACTIONS.include?(action)
+      raise RToolsHCKError.new(action.to_s), 'not supported in no_studio mode.'
+    end
 
     log_action_call(action, block.binding)
     handle_exceptions do
@@ -1465,6 +1488,8 @@ def reconnect
   private
 
   def priv_close
+    return if @no_studio
+
     unload_toolshck
     unload_winrm_ps
   end

From a34122a052fdcf26f04b930ed963d6dc05136b22 Mon Sep 17 00:00:00 2001
From: Elizabeth Ashurov <eashurov@redhat.com>
Date: Wed, 17 Jun 2026 17:27:50 +0300
Subject: [PATCH 2/2] lib/rtoolsHCK: Always include content key in
 run_on_machine JSON response

Fix run_on_machine to always include the content key in the JSON
response, even when the command produces no output.

Signed-off-by: Elizabeth Ashurov <eashurov@redhat.com>
---
 lib/rtoolsHCK.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/rtoolsHCK.rb b/lib/rtoolsHCK.rb
index a7cab4f..2ba14ee 100755
--- a/lib/rtoolsHCK.rb
+++ b/lib/rtoolsHCK.rb
@@ -1199,8 +1199,6 @@ def machine_shutdown(machine, restart: false)
   def run_on_machine(machine, cmd)
     handle_action_exceptions(__method__) do
       ret = machine_run(machine, cmd)
-      return (@json ? { 'result' => 'Success' } : true) if ret.empty?
-
       @json ? { 'result' => 'Success', 'content' => ret } : true
     end
   end