From 1a5336afe1dc1300f40a923d749e28bcaec68b0c Mon Sep 17 00:00:00 2001
From: Dominik Gedon <dominik.gedon@suse.com>
Date: Thu, 19 Oct 2023 14:59:28 +0200
Subject: [PATCH] Revert update_ca method for the controller

Signed-off-by: Dominik Gedon <dominik.gedon@suse.com>
---
 .../step_definitions/command_steps.rb         |  2 +-
 testsuite/features/support/commonlib.rb       | 19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb
index d5c85d74076c..9702eef9b0e6 100644
--- a/testsuite/features/step_definitions/command_steps.rb
+++ b/testsuite/features/step_definitions/command_steps.rb
@@ -1537,7 +1537,7 @@
   end
 
   # Update the server CA certificate since it changed, otherwise all API and browser uses will fail
-  update_ca('controller')
+  update_controller_ca
 
   # Reset the API client to take the new CA into account
   reset_api_client
diff --git a/testsuite/features/support/commonlib.rb b/testsuite/features/support/commonlib.rb
index 459c674d6047..15fc36aa5f07 100644
--- a/testsuite/features/support/commonlib.rb
+++ b/testsuite/features/support/commonlib.rb
@@ -432,21 +432,12 @@ def file_inject(node, local_file, remote_file)
 end
 
 # This function updates the server certificate on the controller node
-def update_ca(node)
+def update_controller_ca
   server_ip = get_target('server').public_ip
   server_name = get_target('server').full_hostname
 
-  case node
-  when 'proxy'
-    command = "wget http://#{server_ip}/pub/RHN-ORG-TRUSTED-SSL-CERT -O /etc/pki/trust/anchors/RHN-ORG-TRUSTED-SSL-CERT; " \
-      'update-ca-certificates;'
-    get_target('proxy').run('rm /etc/pki/trust/anchors/RHN-ORG-TRUSTED-SSL-CERT', verbose: true)
-    get_target('proxy').run(command, verbose: true)
-  else
-    # controller
-    puts `rm /etc/pki/trust/anchors/*;
-    wget http://#{server_ip}/pub/RHN-ORG-TRUSTED-SSL-CERT -O /etc/pki/trust/anchors/#{server_name}.cert &&
-    update-ca-certificates &&
-    certutil -d sql:/root/.pki/nssdb -A -t TC -n "susemanager" -i  /etc/pki/trust/anchors/#{server_name}.cert`
-  end
+  puts `rm /etc/pki/trust/anchors/*;
+  wget http://#{server_ip}/pub/RHN-ORG-TRUSTED-SSL-CERT -O /etc/pki/trust/anchors/#{server_name}.cert &&
+  update-ca-certificates &&
+  certutil -d sql:/root/.pki/nssdb -A -t TC -n "susemanager" -i  /etc/pki/trust/anchors/#{server_name}.cert`
 end