Fixed #2577

Author: vertigo17

source/src/main/java/org/cerberus/core/engine/execution/impl/ExecutionRunService.java

@@ -1610,9 +1610,9 @@ private TestCaseExecution stopExecutionRobotAndProxy(TestCaseExecution execution
         // Stopping remote proxy.
         try {
             this.executorService.stopRemoteProxy(execution);
-            LOG.debug("Stop Cerberus Executor Proxy for execution {}", execution.getId());
+            LOG.debug("Stop Cerberus Robot Proxy for execution {}", execution.getId());
         } catch (Exception exception) {
-            LOG.warn("Exception on Cerberus Executor Proxy stop for execution {}", execution.getId(), exception);
+            LOG.warn("Exception on Cerberus Robot Proxy stop for execution {}", execution.getId(), exception);
         }
 
         // Websocket --> we refresh the corresponding Detail Execution pages attached to this execution.

source/src/main/java/org/cerberus/core/engine/execution/impl/ExecutionStartService.java

@@ -621,7 +621,7 @@ public TestCaseExecution startExecution(TestCaseExecution execution) throws Cerb
             execution.setExecutor(execution.getTestCaseObj().getExecutor());
         }
 
-        //Stop the Cerberus Executor Proxy
+        //Define websocket parameter
         execution.setCerberus_featureflipping_activatewebsocketpush(parameterService.getParameterBooleanByKey("cerberus_featureflipping_activatewebsocketpush", "", false));
         execution.setCerberus_featureflipping_websocketpushperiod(parameterService.getParameterLongByKey("cerberus_featureflipping_websocketpushperiod", "", 5000));
 

source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java

@@ -245,13 +245,13 @@ public void startServer(TestCaseExecution execution) throws CerberusException {
             LOG.debug("Session is set.");
 
             /*
-             * Starting Cerberus Executor Proxy if it has been activated at
+             * Starting Cerberus Robot Proxy if it has been activated at
              * robot level.
              */
             if (execution.getRobotExecutorObj() != null && RobotExecutor.PROXY_TYPE_NETWORKTRAFFIC.equals(execution.getRobotExecutorObj().getExecutorProxyType())) {
-                LOG.debug("Start Remote Proxy");
+                LOG.debug("Start Remote Cerberus Proxy");
                 executorService.startRemoteProxy(execution);
-                LOG.debug("Started Remote Proxy on port: {}", execution.getRemoteProxyPort());
+                LOG.debug("Started Remote Cerberus Robot Proxy on port: {}", execution.getRemoteProxyPort());
             }
 
             // SetUp Capabilities
@@ -1142,7 +1142,7 @@ public boolean stopServer(TestCaseExecution tce) {
                 default:
             }
             try {
-                // Get Har File when Cerberus Executor is activated.
+                // Get Har File when Cerberus Robot Proxy is activated.
                 // If proxy started and parameter verbose >= 1 activated
                 if (RobotExecutor.PROXY_TYPE_NETWORKTRAFFIC.equals(tce.getRobotExecutorObj().getExecutorProxyType())
                         && tce.getVerbose() >= 1 && (parameterService.getParameterBooleanByKey("cerberus_networkstatsave_active", tce.getSystem(), false))) {
@@ -1176,7 +1176,7 @@ public boolean stopServer(TestCaseExecution tce) {
                     }
                 }
             } catch (Exception ex) {
-                LOG.error("Exception Getting Har File from Cerberus Executor {}", tce.getId(), ex);
+                LOG.error("Exception Getting Har File from Cerberus Robot Proxy for execution id {}", tce.getId(), ex);
             }
 
             // We Stop the Robot Session (Selenium or Appium).

source/src/main/java/org/cerberus/core/enums/MessageGeneralEnum.java

@@ -66,7 +66,7 @@ public enum MessageGeneralEnum {
     VALIDATION_FAILED_TEST_NOT_FOUND(87, "FA", "Test '%TEST%' does not exist."),
     VALIDATION_FAILED_TEST_NOTACTIVE(88, "FA", "The test '%TEST%' isn't active."),
     VALIDATION_FAILED_USERAGENTDIFFERENT(90, "FA", "User Agent has been specified at robot and TestCase level with different values. TestCase : '%UATESTCASE%' Robot : '%UAROBOT%'"),
-    VALIDATION_FAILED_CERBERUSEXECUTORNOTAVAILABLE(90, "FA", "Could not connect to Cerberus Executor host %HOST% on port %PORT%. Check the Cerberus Executor is up and running, or unselect the Proxy flag at robot executor level (robot : %ROBOT%, executor : %ROBOTEXE%)."),
+    VALIDATION_FAILED_CERBERUSEXECUTORNOTAVAILABLE(90, "FA", "Could not connect to Cerberus Robot Proxy host '%HOST%' on port %PORT%. Check the Cerberus Robot Proxy is up and running, or unselect the Proxy flag at robot executor level (robot : %ROBOT%, executor : %ROBOTEXE%)."),
     VALIDATION_FAILED_KAFKACONSUMERSEEK(90, "FA", "Could not start execution because failed when trying to retreive Kafka topics latest offsets on Service %SERVICE%. %DETAIL%"),
     VALIDATION_FAILED_INSTANCE_INACTIVE(91, "FA", "This Cerberus Instance has been temporary disabled. Please try again later."),
     VALIDATION_SUCCEEDED(89, "PE", "The validation succeeded"),

source/src/main/java/org/cerberus/core/service/robotproxy/impl/RobotProxyService.java

@@ -77,7 +77,7 @@ public void startRemoteProxy(TestCaseExecution tce) {
             url += "&bsKey=" + tce.getRobotExecutorObj().getHostPassword();
             url += "&bsLocalIdentifier=" + tce.getExecutionUUID();
         }
-        LOG.debug("Starting Proxy on Cerberus Executor calling : " + url);
+        LOG.debug("Starting Cerberus Robot Proxy calling : '{}'", url);
 
         try (InputStream is = new URL(url).openStream()) {
             BufferedReader rd = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
@@ -93,7 +93,7 @@ public void startRemoteProxy(TestCaseExecution tce) {
             tce.setRemoteProxyUUID(json.getString("uuid"));
             tce.setRemoteProxyStarted(true);
 
-            LOG.debug("Cerberus Executor Proxy extention started on port : " + tce.getRemoteProxyPort() + " (uuid : " + tce.getRemoteProxyUUID() + ")");
+            LOG.debug("Cerberus Robot Proxy started on port : " + tce.getRemoteProxyPort() + " (uuid : " + tce.getRemoteProxyUUID() + ")");
 
         } catch (Exception ex) {
             logEventService.createForPrivateCalls("", "EXEC", LogEvent.STATUS_ERROR, "Error when trying to open a remote proxy on Cerberus Robot Proxy. " + ex.toString());
@@ -108,25 +108,25 @@ public void stopRemoteProxy(TestCaseExecution tce) {
         if (tce.isRemoteProxyStarted()) {
             tce.setRemoteProxyStarted(false);
             /**
-             * We Stop the Proxy on Cerberus Executor.
+             * We Stop the Cerberus Robot Proxy.
              */
             try {
                 // Ask the Proxy to stop.
                 if (tce.getRobotExecutorObj() != null && RobotExecutor.PROXY_TYPE_NETWORKTRAFFIC.equals(tce.getRobotExecutorObj().getExecutorProxyType())) {
 
                     String urlStop = "http://" + tce.getRobotExecutorObj().getExecutorExtensionHost() + ":" + tce.getRobotExecutorObj().getExecutorExtensionPort() + "/stopProxy?uuid=" + tce.getRemoteProxyUUID();
 
-                    LOG.debug("Shutting down of Proxy on Cerberus Executor calling : " + urlStop);
+                    LOG.debug("Shutting down of Cerberus Robot Proxy calling : '{}'", urlStop);
 
                     InputStream is = new URL(urlStop).openStream();
                     is.close();
 
-                    LOG.debug("Cerberus Executor Proxy extention shutdown done (uuid : " + tce.getRemoteProxyUUID() + ").");
+                    LOG.debug("Cerberus Robot Proxy shutdown done (uuid : " + tce.getRemoteProxyUUID() + ").");
 
                 }
 
             } catch (Exception ex) {
-                LOG.error("Exception when asking Cerberus Executor proxy to stop " + tce.getId(), ex);
+                LOG.error("Exception when asking Cerberus Robot proxy to stop " + tce.getId(), ex);
             }
         }
 

source/src/main/resources/documentation/D1/include/en/testmanagement_tcactions_en.adoc

@@ -811,7 +811,7 @@ Will allow you to calculate a *[red]#Property#* defined in the property section
 | *[green]#GUI#* | *[red]#SRV#* | *[green]#APK#* | *[green]#IPA#* | *[green]#FAT#* | *[red]#BAT#*
 
 |=== 
-Retrieve the network traffic from Cerberus Executor (when activated at robot level) and calculate a json message that can be used for direct controls on all attached controls. If Robot Executor is not activated, Action will end in NE Status and all attached controls ignored. Once all controls of that action are finished, current content are set back to normal value (could be an html or app page or another service).
+Retrieve the network traffic from Cerberus Robot Proxy (when activated at robot level) and calculate a json message that can be used for direct controls on all attached controls. If Robot Executor is not activated, Action will end in NE Status and all attached controls ignored. Once all controls of that action are finished, current content are set back to normal value (could be an html or app page or another service).
 
 *[blue]#Value1#* : URL to filter. Network requests will be filtered based on that value. Any url that contain the value1 will be included in the network traffic.