Rename:

connection_rate -> tcp_connection_rate
connection_burst -> tcp_connection_burst
concurrent_connections -> concurrent_tcp_connections

Author: voodam

framework/client.py

@@ -83,7 +83,7 @@ def cleanup(self):
             self.node.remove_file(f)
 
     def copy_files(self):
-        for (name, content) in self.files:
+        for name, content in self.files:
             self.node.copy_file(name, content)
 
     def is_busy(self, verbose=True):

reconf/test_stress_grace.py

@@ -12,7 +12,6 @@
 
 
 class SchedStickyGraceRatioSched(reconf_stress.LiveReconfStress):
-
     sg_name = "default"
     sched = "ratio static"
     defconfig = (
@@ -50,7 +49,6 @@ def test_ratio_del_srvs(self):
 
 
 class SchedStickyGraceHashSched(SchedStickyGraceRatioSched):
-
     sched = "hash"
 
 

reconf/test_stress_sticky.py

@@ -12,7 +12,6 @@
 
 
 class SchedSticky(reconf_stress.LiveReconfStress):
-
     sg_name = "default"
     sched = "ratio static"
     defconfig = (

sessions/test_sticky_sess_stress.py

@@ -15,7 +15,6 @@
 
 
 class OneClient(stress.StressTest):
-
     config = (
         "cache 0;\n"
         "sticky {\n"
@@ -75,7 +74,6 @@ def test(self):
 
 
 class LotOfClients(OneClient):
-
     # Override maximum number of clients
     clients_num = min(int(tf_cfg.cfg.get("General", "concurrent_connections")), 1000)
 

t_frang/test_concurrent_connections.py

@@ -1,4 +1,4 @@
-"""Functional tests for `concurrent_connections` in Tempesta config."""
+"""Functional tests for `concurrent_tcp_connections` in Tempesta config."""
 
 __author__ = "Tempesta Technologies, Inc."
 __copyright__ = "Copyright (C) 2019-2023 Tempesta Technologies, Inc."
@@ -107,10 +107,10 @@ def _base_scenario(self, clients: list, responses: int):
 
     def test_three_clients_same_ip(self):
         """
-        For three clients with same IP and concurrent_connections 2, ip_block off:
+        For three clients with same IP and concurrent_tcp_connections 2, ip_block off:
             - Tempesta serves only two clients.
         """
-        self.set_frang_config(frang_config="concurrent_connections 2;\n\tip_block off;")
+        self.set_frang_config(frang_config="concurrent_tcp_connections 2;\n\tip_block off;")
 
         self._base_scenario(
             clients=[
@@ -125,10 +125,10 @@ def test_three_clients_same_ip(self):
 
     def test_three_clients_different_ip(self):
         """
-        For three clients with different IP and concurrent_connections 2:
+        For three clients with different IP and concurrent_tcp_connections 2:
             - Tempesta serves three clients.
         """
-        self.set_frang_config(frang_config="concurrent_connections 2;\n\tip_block off;")
+        self.set_frang_config(frang_config="concurrent_tcp_connections 2;\n\tip_block off;")
         self._base_scenario(
             clients=[
                 self.get_client("deproxy-interface-1"),
@@ -142,10 +142,10 @@ def test_three_clients_different_ip(self):
 
     def test_three_clients_same_ip_with_block_ip(self):
         """
-        For three clients with same IP and concurrent_connections 2, ip_block on:
+        For three clients with same IP and concurrent_tcp_connections 2, ip_block on:
             - Tempesta does not serve clients.
         """
-        self.set_frang_config(frang_config="concurrent_connections 2;\n\tip_block on;")
+        self.set_frang_config(frang_config="concurrent_tcp_connections 2;\n\tip_block on;")
         self._base_scenario(
             clients=[
                 self.get_client("deproxy-1"),
@@ -163,7 +163,7 @@ def test_clear_client_connection_stats(self):
         Check that Tempesta cleared client connection stats and
         new connections are established.
         """
-        self.set_frang_config(frang_config="concurrent_connections 2;\n\tip_block on;")
+        self.set_frang_config(frang_config="concurrent_tcp_connections 2;\n\tip_block on;")
 
         client = self.get_client("parallel-curl")
 

t_frang/test_connection_rate_burst.py

@@ -1,4 +1,4 @@
-"""Tests for Frang directive `connection_rate` and 'connection_burst'."""
+"""Tests for Frang directive `*_connection_rate` and '*_connection_burst'."""
 import time
 
 from helpers import util
@@ -147,7 +147,7 @@ def test_connection_rate_on_the_limit(self):
 
 
 class FrangTcp(FrangTls):
-    """Tests for 'connection_burst' and 'connection_rate'."""
+    """Tests for 'tcp_connection_burst' and 'tcp_connection_rate'."""
 
     clients = [
         {
@@ -178,8 +178,8 @@ class FrangTcp(FrangTls):
 
     burst_warning = ERROR.format("burst")
     rate_warning = ERROR.format("rate")
-    burst_config = "connection_burst 5;\n\tconnection_rate 20;"
-    rate_config = "connection_burst 2;\n\tconnection_rate 4;"
+    burst_config = "tcp_connection_burst 5;\n\ttcp_connection_rate 20;"
+    rate_config = "tcp_connection_burst 2;\n\ttcp_connection_rate 4;"
 
 
 class FrangConnectionRateDifferentIp(FrangTestCase):
@@ -207,7 +207,7 @@ class FrangConnectionRateDifferentIp(FrangTestCase):
     tempesta = {
         "config": """
             frang_limits {
-                connection_rate 2;
+                tcp_connection_rate 2;
                 ip_block on;
             }
             listen 80;
@@ -250,7 +250,7 @@ class FrangConnectionBurstDifferentIp(FrangConnectionRateDifferentIp):
     tempesta = {
         "config": """
             frang_limits {
-                connection_burst 2;
+                tcp_connection_burst 2;
                 ip_block on;
             }
             listen 80;
@@ -451,7 +451,7 @@ def test_rate(self):
 
 
 class FrangTcpVsBoth(FrangTlsVsBoth):
-    """Tests for tls and non-tls connections 'connection_burst' and 'connection_rate'"""
+    """Tests for tls and non-tls connections 'tcp_connection_burst' and 'tcp_connection_rate'"""
 
     tempesta_template = {
         "config": """
@@ -478,12 +478,12 @@ class FrangTcpVsBoth(FrangTlsVsBoth):
     optional_client_id = "curl-https"
     burst_warning = ERROR.format("burst")
     rate_warning = ERROR.format("rate")
-    burst_config = "connection_burst 3;"
-    rate_config = "connection_rate 3;"
+    burst_config = "tcp_connection_burst 3;"
+    rate_config = "tcp_connection_rate 3;"
 
     def test_burst(self):
         """
-        Set `connection_burst 3` and create 4 tls and 4 non-tls connections.
+        Set `tcp_connection_burst 3` and create 4 tls and 4 non-tls connections.
         Connections of both types will be blocked (4+4 > 3*2).
         """
         self.set_frang_config(frang_config=self.burst_config)
@@ -498,7 +498,7 @@ def test_burst(self):
 
     def test_rate(self):
         """
-        Set connection_rate 3` and create 2 tls and 2 non-tls connections.
+        Set tcp_connection_rate 3` and create 2 tls and 2 non-tls connections.
         Connections of both types will be blocked (2+2 > 3).
         """
         self.set_frang_config(frang_config=self.rate_config + self.no_shc_config)

t_frang/test_ip_block.py

@@ -142,7 +142,7 @@ def test_two_client_one_ip_with_ip_block_off(self):
 
 class FrangIpBlockConnectionLimits(FrangIpBlockBase):
     """
-    For `connection_rate 1` and `block_action attack reply`.
+    For `tcp_connection_rate 1` and `block_action attack reply`.
     Create two client connections, send valid requests and receive:
         - for different ip and ip_block on or off - 200 and 200 response;
         - for single ip and ip_block on - RST and RST;
@@ -153,7 +153,7 @@ class FrangIpBlockConnectionLimits(FrangIpBlockBase):
         "config": """
 frang_limits {
     http_strict_host_checking false;
-    connection_rate 1;
+    tcp_connection_rate 1;
     ip_block on;
 }
 listen 80;
@@ -202,7 +202,7 @@ def test_two_clients_one_ip_with_ip_block_off(self):
             "config": """
 frang_limits {
     http_strict_host_checking false;
-    connection_rate 1;
+    tcp_connection_rate 1;
     ip_block off;
 }
 listen 80;

t_stress/test_wordpress.py

@@ -7,7 +7,6 @@
 
 from framework import tester
 from helpers import remote, sysnet, tf_cfg
-
 from t_stress.test_stress import CustomMtuMixin
 
 __author__ = "Tempesta Technologies, Inc."
@@ -22,7 +21,6 @@
 
 
 class BaseWorpressStress(CustomMtuMixin, tester.TempestaTest, base=True):
-
     tempesta_tmpl = """
         listen 443 proto=%s;
         server ${server_ip}:8000;