From 3c2b6a80e36805893818471cc98a21add588bb4e Mon Sep 17 00:00:00 2001 From: Alexandre Yang Date: Wed, 2 Aug 2023 10:29:04 +0200 Subject: [PATCH] Rename assert_extend_generic_entity_sensor to match profile name --- .../test_profile__generic_entity_sensor.py | 4 ++-- .../test_e2e_core_profiles/test_profile_extreme_switching.py | 4 ++-- .../test_profile_nvidia_cumulus_linux_switch.py | 4 ++-- .../test_profile_nvidia_mellanox_switchx.py | 4 ++-- snmp/tests/test_e2e_core_profiles/utils.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/snmp/tests/test_e2e_core_profiles/test_profile__generic_entity_sensor.py b/snmp/tests/test_e2e_core_profiles/test_profile__generic_entity_sensor.py index 66a64bbf6b68e..3132f651b1ef1 100644 --- a/snmp/tests/test_e2e_core_profiles/test_profile__generic_entity_sensor.py +++ b/snmp/tests/test_e2e_core_profiles/test_profile__generic_entity_sensor.py @@ -10,7 +10,7 @@ from ..test_e2e_core_metadata import assert_device_metadata from .utils import ( assert_common_metrics, - assert_extend_entity_sensor, + assert_extend_generic_entity_sensor, create_e2e_core_test_config, get_device_ip_from_config, ) @@ -32,7 +32,7 @@ def test_e2e_profile__generic_entity_sensor(dd_agent_check): # --- TEST METRICS --- assert_common_metrics(aggregator, common_tags) - assert_extend_entity_sensor(aggregator, common_tags) + assert_extend_generic_entity_sensor(aggregator, common_tags) aggregator.assert_all_metrics_covered() diff --git a/snmp/tests/test_e2e_core_profiles/test_profile_extreme_switching.py b/snmp/tests/test_e2e_core_profiles/test_profile_extreme_switching.py index b2ca43acd1ae4..9ff495c1b1192 100644 --- a/snmp/tests/test_e2e_core_profiles/test_profile_extreme_switching.py +++ b/snmp/tests/test_e2e_core_profiles/test_profile_extreme_switching.py @@ -10,7 +10,7 @@ from ..test_e2e_core_metadata import assert_device_metadata from .utils import ( assert_common_metrics, - assert_extend_entity_sensor, + assert_extend_generic_entity_sensor, assert_extend_generic_if, create_e2e_core_test_config, get_device_ip_from_config, @@ -33,7 +33,7 @@ def test_e2e_profile_extreme_switching(dd_agent_check): # --- TEST EXTENDED METRICS --- assert_extend_generic_if(aggregator, common_tags) - assert_extend_entity_sensor(aggregator, common_tags) + assert_extend_generic_entity_sensor(aggregator, common_tags) # --- TEST METRICS --- assert_common_metrics(aggregator, common_tags) diff --git a/snmp/tests/test_e2e_core_profiles/test_profile_nvidia_cumulus_linux_switch.py b/snmp/tests/test_e2e_core_profiles/test_profile_nvidia_cumulus_linux_switch.py index 30d9af017aa8c..e5380178f8519 100644 --- a/snmp/tests/test_e2e_core_profiles/test_profile_nvidia_cumulus_linux_switch.py +++ b/snmp/tests/test_e2e_core_profiles/test_profile_nvidia_cumulus_linux_switch.py @@ -10,7 +10,7 @@ from ..test_e2e_core_metadata import assert_device_metadata from .utils import ( assert_common_metrics, - assert_extend_entity_sensor, + assert_extend_generic_entity_sensor, assert_extend_generic_if, assert_extend_generic_ucd, create_e2e_core_test_config, @@ -35,7 +35,7 @@ def test_e2e_profile_nvidia_cumulus_linux_switch(dd_agent_check): # --- TEST EXTENDED METRICS --- assert_extend_generic_if(aggregator, common_tags) assert_extend_generic_ucd(aggregator, common_tags) - assert_extend_entity_sensor(aggregator, common_tags) + assert_extend_generic_entity_sensor(aggregator, common_tags) # --- TEST METRICS --- assert_common_metrics(aggregator, common_tags) diff --git a/snmp/tests/test_e2e_core_profiles/test_profile_nvidia_mellanox_switchx.py b/snmp/tests/test_e2e_core_profiles/test_profile_nvidia_mellanox_switchx.py index e6d58edd6f28f..38d038254ad94 100644 --- a/snmp/tests/test_e2e_core_profiles/test_profile_nvidia_mellanox_switchx.py +++ b/snmp/tests/test_e2e_core_profiles/test_profile_nvidia_mellanox_switchx.py @@ -10,7 +10,7 @@ from ..test_e2e_core_metadata import assert_device_metadata from .utils import ( assert_common_metrics, - assert_extend_entity_sensor, + assert_extend_generic_entity_sensor, assert_extend_generic_host_resources, assert_extend_generic_if, create_e2e_core_test_config, @@ -35,7 +35,7 @@ def test_e2e_profile_nvidia_mellanox_switchx(dd_agent_check): # --- TEST METRICS --- assert_common_metrics(aggregator, common_tags) assert_extend_generic_if(aggregator, common_tags) - assert_extend_entity_sensor(aggregator, common_tags) + assert_extend_generic_entity_sensor(aggregator, common_tags) assert_extend_generic_host_resources(aggregator, common_tags) aggregator.assert_all_metrics_covered() diff --git a/snmp/tests/test_e2e_core_profiles/utils.py b/snmp/tests/test_e2e_core_profiles/utils.py index a9117011afe5e..8bba54a2b8d33 100644 --- a/snmp/tests/test_e2e_core_profiles/utils.py +++ b/snmp/tests/test_e2e_core_profiles/utils.py @@ -191,7 +191,7 @@ def assert_extend_generic_host_resources(aggregator, common_tags): assert_extend_generic_host_resources_base(aggregator, common_tags) -def assert_extend_entity_sensor(aggregator, common_tags): +def assert_extend_generic_entity_sensor(aggregator, common_tags): # fmt: off """Add the following to the snmprec 1.3.6.1.2.1.99.1.1.1.1.8|2|9