HeterogeneousCore/SonicTriton: add RetryActionDiffServer; expose connectToServer; update tests

HeterogeneousCore/SonicTriton/interface/RetryActionDiffServer.h

@@ -25,8 +25,8 @@ class RetryActionDiffServer : public RetryActionBase {
   void start() override;
 
 private:
-  std::string diff_server_url_;
-  std::string diff_server_token_;
+  std::string alt_server_url_;
+  std::string alt_server_token_;
 }; 
 
 #endif

HeterogeneousCore/SonicTriton/src/RetryActionDiffServer.cc

@@ -2,44 +2,44 @@
 #include "HeterogeneousCore/SonicTriton/interface/TritonClient.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-RetryActionDiffServer::RetryActionDiffServer( const edm::ParameterSet& conf, SonicClientBase* client) 
-: RetryActionBase(conf, client),
-  diff_server_url_(conf.getUntrackedParameter<std::string>("diffServerUrl", "")),
-  diff_server_token_(conf.getUntrackedParameter<std::string>("diffServerToken", ""))
-{
-  if (this->diff_server_url_.empty()) {
-    edm::LogWarning("RetryActionDiffServer") << "No alternative server URL provided. This retry action will be disabled.";
-    this->shouldRetry_ = false;
-  }
+RetryActionDiffServer::RetryActionDiffServer(
+  const edm::ParameterSet& conf, 
+  SonicClientBase* client
+): RetryActionBase(conf, client) {
+    alt_server_url_ = conf.getUntrackedParameter<std::string>("altServerUrl", "");
+    alt_server_token_ = conf.getUntrackedParameter<std::string>("altServerToken", "");
+
+    if (this->alt_server_url_.empty()) {
+      edm::LogWarning("RetryActionDiffServer") 
+        << "No alternative server URL provided. "
+        << "This retry action will be disabled.";
+      this->shouldRetry_ = false;
+    }
 }
 
 void RetryActionDiffServer::start() {
   this->shouldRetry_ = true;
 }
 
 void RetryActionDiffServer::retry() {
-  if (!this->shouldRetry_ || this->diff_server_url_.empty()) {
+  if (!this->shouldRetry_ || this->alt_server_url_.empty()) {
     this->shouldRetry_ = false;
     edm::LogInfo("RetryActionDiffServer") << "No alternative server available for retry.";
     return;
   }
 
   try {
     TritonClient* tritonClient = static_cast<TritonClient*>(client_);
-
     edm::LogInfo("RetryActionDiffServer") 
       << "Attempting retry by switching to server: " 
-      << this->diff_server_url_;
-
-    tritonClient->connectToServer(this->diff_server_url_);
+      << this->alt_server_url_;
+    tritonClient->connectToServer(this->alt_server_url_);
     eval();
-
   } catch (const std::exception& e) {
     edm::LogError("RetryActionDiffServer") 
       << "Failed to retry with alternative server: "
       << e.what();
   }
-
   this->shouldRetry_ = false;
 }
 

HeterogeneousCore/SonicTriton/test/RetryActionDiffServer.cc

@@ -7,9 +7,7 @@
 
 #include <string>
 
-// Anonymous namespace to hold our mock object, keeping it local to this test file.
 namespace {
-    // Mock TritonClient to intercept and verify method calls without needing a real server or CMSSW services.
     class MockTritonClient : public TritonClient {
     public:
         // Use the protected, testing-only constructor from the base class.