Skip to content

Commit

Permalink
tftbase: remove deprecated TestCaseType aliases
Browse files Browse the repository at this point in the history 
Those values are basically the same as another one, respectively. They
are redundant.

Drop them.

This obviously changes behavior. It also will break existing
configurations, if they refer to one of those removed types (either by
enum name or number). However, note that ranges ("1-20") or the whole
range ("*") will still work (excluding the deleted types).
  • Loading branch information
@thom311
thom311 committed Jan 16, 2025
1 parent 3b71bac commit 45e3237
Show file tree
Hide file tree
Showing 18 changed files with 28,876 additions and 53,378 deletions.
5 changes: 0 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ kubeconfig_infra: (18)
| 8 | POD_TO_CLUSTER_IP_TO_HOST_DIFF_NODE |
| 9 | POD_TO_NODE_PORT_TO_POD_SAME_NODE |
| 10 | POD_TO_NODE_PORT_TO_POD_DIFF_NODE |
| 11 | POD_TO_NODE_PORT_TO_HOST_SAME_NODE |
| 12 | POD_TO_NODE_PORT_TO_HOST_DIFF_NODE |
| 13 | HOST_TO_HOST_SAME_NODE |
| 14 | HOST_TO_HOST_DIFF_NODE |
| 15 | HOST_TO_POD_SAME_NODE |
| 16 | HOST_TO_POD_DIFF_NODE |
| 17 | HOST_TO_CLUSTER_IP_TO_POD_SAME_NODE |
Expand All @@ -80,7 +76,6 @@ kubeconfig_infra: (18)
| 23 | HOST_TO_NODE_PORT_TO_HOST_SAME_NODE |
| 24 | HOST_TO_NODE_PORT_TO_HOST_DIFF_NODE |
| 25 | POD_TO_EXTERNAL |
| 26 | HOST_TO_EXTERNAL |
| 27 | POD_TO_POD_2ND_INTERFACE_SAME_NODE |
| 28 | POD_TO_POD_2ND_INTERFACE_DIFF_NODE |
| 29 | POD_TO_POD_MULTI_NETWORK_POLICY |
Expand Down
50 changes: 0 additions & 50 deletions eval-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,6 @@ IPERF_TCP:
threshold: 18
Reverse:
threshold: 18
- id: POD_TO_NODE_PORT_TO_HOST_SAME_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: POD_TO_NODE_PORT_TO_HOST_DIFF_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: HOST_TO_HOST_SAME_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: HOST_TO_HOST_DIFF_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: HOST_TO_POD_SAME_NODE
Normal:
threshold: 18
Expand Down Expand Up @@ -124,11 +104,6 @@ IPERF_TCP:
threshold: 18
Reverse:
threshold: 10
- id: HOST_TO_EXTERNAL
Normal:
threshold: 18
Reverse:
threshold: 10
- id: POD_TO_POD_2ND_INTERFACE_SAME_NODE
Normal:
threshold: 18
Expand Down Expand Up @@ -195,26 +170,6 @@ IPERF_UDP:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_NODE_PORT_TO_HOST_SAME_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_NODE_PORT_TO_HOST_DIFF_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_HOST_SAME_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_HOST_DIFF_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_POD_SAME_NODE
Normal:
threshold: 5
Expand Down Expand Up @@ -270,11 +225,6 @@ IPERF_UDP:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_EXTERNAL
Normal:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_POD_2ND_INTERFACE_SAME_NODE
Normal:
threshold: 5
Expand Down
15 changes: 0 additions & 15 deletions testConfig.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,21 +769,6 @@ def get_test_case(self) -> TestCaseType:
raise RuntimeError("No test_cases_idx set")
return self.get_tft().test_cases[self.test_cases_idx]

def test_case_skip_deprecated_alias(self) -> bool:
tc = self.get_test_case()
if tc.info.deprecated_alias_for is None:
# This is not an alias. We process it. Note that in this case we don't
# check for duplicates and if we have duplicated (non-aliased) test cases,
# we run them twice.
return False
if tc.info.deprecated_alias_for not in self.get_tft().test_cases:
# Process this alias, because the original doesn't appear in the list. Again,
# we don't check for duplicates of the alias.
return False
# The original value for the alias is present. We skip the alias, it would
# be the same as the original, and the user possibly doesn't want that.
return True

def get_connection(self) -> ConfConnection:
if self.connections_idx < 0:
raise RuntimeError("No connections_idx set")
Expand Down
50 changes: 0 additions & 50 deletions tests/eval-config-2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,6 @@ IPERF_TCP:
Reverse:
threshold: 20
id: 10
- Normal:
threshold: 35
Reverse:
threshold: 36
id: 11
- Normal:
threshold: 20
Reverse:
threshold: 20
id: 12
- Normal:
threshold: 29
Reverse:
threshold: 29
id: 13
- Normal:
threshold: 20
Reverse:
threshold: 20
id: 14
- Normal:
threshold: 33
Reverse:
Expand Down Expand Up @@ -124,11 +104,6 @@ IPERF_TCP:
Reverse:
threshold: 11
id: 25
- Normal:
threshold: 21
Reverse:
threshold: 10
id: 26
- Normal:
threshold: 24
Reverse:
Expand Down Expand Up @@ -195,26 +170,6 @@ IPERF_UDP:
Reverse:
threshold: 5
id: 10
- Normal:
threshold: 5
Reverse:
threshold: 5
id: 11
- Normal:
threshold: 5
Reverse:
threshold: 5
id: 12
- Normal:
threshold: 5
Reverse:
threshold: 5
id: 13
- Normal:
threshold: 5
Reverse:
threshold: 5
id: 14
- Normal:
threshold: 5
Reverse:
Expand Down Expand Up @@ -270,11 +225,6 @@ IPERF_UDP:
Reverse:
threshold: 5
id: 25
- Normal:
threshold: 5
Reverse:
threshold: 5
id: 26
- Normal:
threshold: 5
Reverse:
Expand Down
50 changes: 0 additions & 50 deletions tests/generate-eval-config-output0.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,6 @@ IPERF_TCP:
threshold: 18
Reverse:
threshold: 18
- id: POD_TO_NODE_PORT_TO_HOST_SAME_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: POD_TO_NODE_PORT_TO_HOST_DIFF_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: HOST_TO_HOST_SAME_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: HOST_TO_HOST_DIFF_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: HOST_TO_POD_SAME_NODE
Normal:
threshold: 18
Expand Down Expand Up @@ -124,11 +104,6 @@ IPERF_TCP:
threshold: 18
Reverse:
threshold: 10
- id: HOST_TO_EXTERNAL
Normal:
threshold: 18
Reverse:
threshold: 10
- id: POD_TO_POD_2ND_INTERFACE_SAME_NODE
Normal:
threshold: 18
Expand Down Expand Up @@ -195,26 +170,6 @@ IPERF_UDP:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_NODE_PORT_TO_HOST_SAME_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_NODE_PORT_TO_HOST_DIFF_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_HOST_SAME_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_HOST_DIFF_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_POD_SAME_NODE
Normal:
threshold: 5
Expand Down Expand Up @@ -270,11 +225,6 @@ IPERF_UDP:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_EXTERNAL
Normal:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_POD_2ND_INTERFACE_SAME_NODE
Normal:
threshold: 5
Expand Down
21 changes: 0 additions & 21 deletions tests/generate-eval-config-output1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,6 @@ IPERF_TCP:
Reverse:
threshold_rx: 14.2616
threshold_tx: 14.2296
- id: POD_TO_NODE_PORT_TO_HOST_SAME_NODE
Normal:
threshold_rx: 37.85750000000001
threshold_tx: 38.061
Reverse:
threshold_rx: 42.116
threshold_tx: 41.892
- id: POD_TO_NODE_PORT_TO_HOST_DIFF_NODE
Normal:
threshold_rx: 14.416
threshold_tx: 14.4512
Reverse:
threshold_rx: 14.149600000000001
threshold_tx: 14.1188
- id: HOST_TO_CLUSTER_IP_TO_POD_DIFF_NODE
Normal:
threshold_rx: 11.697000000000001
Expand Down Expand Up @@ -110,10 +96,3 @@ IPERF_TCP:
Reverse:
threshold_rx: 13.15476
threshold_tx: 13.128640000000003
- id: HOST_TO_EXTERNAL
Normal:
threshold_rx: 13.14088
threshold_tx: 13.169799999999999
Reverse:
threshold_rx: 13.17192
threshold_tx: 13.14536
56 changes: 0 additions & 56 deletions tests/generate-eval-config-output2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,30 +63,6 @@ IPERF_TCP:
Reverse:
threshold_rx: 14.2616
threshold_tx: 14.2296
- id: POD_TO_NODE_PORT_TO_HOST_SAME_NODE
Normal:
threshold_rx: 37.85750000000001
threshold_tx: 38.061
Reverse:
threshold_rx: 42.116
threshold_tx: 41.892
- id: POD_TO_NODE_PORT_TO_HOST_DIFF_NODE
Normal:
threshold_rx: 14.416
threshold_tx: 14.4512
Reverse:
threshold_rx: 14.149600000000001
threshold_tx: 14.1188
- id: HOST_TO_HOST_SAME_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: HOST_TO_HOST_DIFF_NODE
Normal:
threshold: 18
Reverse:
threshold: 18
- id: HOST_TO_POD_SAME_NODE
Normal:
threshold: 18
Expand Down Expand Up @@ -155,13 +131,6 @@ IPERF_TCP:
Reverse:
threshold_rx: 13.15476
threshold_tx: 13.128640000000003
- id: HOST_TO_EXTERNAL
Normal:
threshold_rx: 13.14088
threshold_tx: 13.169799999999999
Reverse:
threshold_rx: 13.17192
threshold_tx: 13.14536
- id: POD_TO_POD_2ND_INTERFACE_SAME_NODE
Normal:
threshold: 18
Expand Down Expand Up @@ -228,26 +197,6 @@ IPERF_UDP:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_NODE_PORT_TO_HOST_SAME_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_NODE_PORT_TO_HOST_DIFF_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_HOST_SAME_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_HOST_DIFF_NODE
Normal:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_POD_SAME_NODE
Normal:
threshold: 5
Expand Down Expand Up @@ -303,11 +252,6 @@ IPERF_UDP:
threshold: 5
Reverse:
threshold: 5
- id: HOST_TO_EXTERNAL
Normal:
threshold: 5
Reverse:
threshold: 5
- id: POD_TO_POD_2ND_INTERFACE_SAME_NODE
Normal:
threshold: 5
Expand Down
Loading

0 comments on commit 45e3237

Please sign in to comment.