fixup imports to use library.collectors.{controller,others}.*

Author: himdel

metrics_utility/automation_controller_billing/collectors.py

@@ -9,16 +9,16 @@
 from metrics_utility.base import register
 from metrics_utility.base.utils import get_max_gather_period_days, get_optional_collectors
 from metrics_utility.exceptions import MetricsException, MissingRequiredEnvVar
-from metrics_utility.library.collectors import config as config_collector
-from metrics_utility.library.collectors import execution_environments as execution_environments_collector
-from metrics_utility.library.collectors import job_host_summary as job_host_summary_collector
-from metrics_utility.library.collectors import job_host_summary_service as job_host_summary_service_collector
-from metrics_utility.library.collectors import main_host as main_host_collector
-from metrics_utility.library.collectors import main_indirectmanagednodeaudit as main_indirectmanagednodeaudit_collector
-from metrics_utility.library.collectors import main_jobevent as main_jobevent_collector
-from metrics_utility.library.collectors import main_jobevent_service as main_jobevent_service_collector
-from metrics_utility.library.collectors import total_workers_vcpu as total_workers_vcpu_collector
-from metrics_utility.library.collectors import unified_jobs as unified_jobs_collector
+from metrics_utility.library.collectors.controller import config as config_collector
+from metrics_utility.library.collectors.controller import execution_environments as execution_environments_collector
+from metrics_utility.library.collectors.controller import job_host_summary as job_host_summary_collector
+from metrics_utility.library.collectors.controller import job_host_summary_service as job_host_summary_service_collector
+from metrics_utility.library.collectors.controller import main_host as main_host_collector
+from metrics_utility.library.collectors.controller import main_indirectmanagednodeaudit as main_indirectmanagednodeaudit_collector
+from metrics_utility.library.collectors.controller import main_jobevent as main_jobevent_collector
+from metrics_utility.library.collectors.controller import main_jobevent_service as main_jobevent_service_collector
+from metrics_utility.library.collectors.controller import unified_jobs as unified_jobs_collector
+from metrics_utility.library.collectors.others import total_workers_vcpu as total_workers_vcpu_collector
 from metrics_utility.logger import logger
 
 

metrics_utility/test/gather/test_total_workers_vcpu.py

@@ -7,7 +7,7 @@
 
 from metrics_utility.automation_controller_billing.collectors import total_workers_vcpu
 from metrics_utility.exceptions import MissingRequiredEnvVar
-from metrics_utility.library.collectors.total_workers_vcpu import get_hour_boundaries
+from metrics_utility.library.collectors.others.total_workers_vcpu import get_hour_boundaries
 from metrics_utility.test.util import temporary_env
 
 
@@ -39,7 +39,7 @@ def test_returns_hardcoded_value_when_usage_based_billing_disabled(self):
         """Test that the function returns hardcoded value when METRICS_UTILITY_USAGE_BASED_METERING_ENABLED is not set or false (default behavior)."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.logger') as mock_logger,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.logger') as mock_logger,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -75,7 +75,7 @@ def test_usage_based_billing_enabled_case_insensitive(self):
         """Test that METRICS_UTILITY_USAGE_BASED_METERING_ENABLED is case insensitive."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -102,10 +102,10 @@ def test_uses_default_prometheus_url_when_not_set(self):
         """Test that the function uses default Prometheus URL when METRICS_UTILITY_PROMETHEUS_URL is not set."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.get_total_workers_cpu') as mock_get_cpu,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.get_cpu_timeline') as mock_get_timeline,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.logger') as mock_logger,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.get_total_workers_cpu') as mock_get_cpu,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.get_cpu_timeline') as mock_get_timeline,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.logger') as mock_logger,
             patch('metrics_utility.automation_controller_billing.collectors.logger') as mock_collectors_logger,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
@@ -172,7 +172,7 @@ def test_prometheus_client_creation_failure_raises_exception(self):
         """Test that PrometheusClient creation failure raises an exception."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -195,7 +195,7 @@ def test_prometheus_query_failure_raises_exception(self):
         """Test that Prometheus query failure raises an exception."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -222,8 +222,8 @@ def test_prometheus_query_returns_none_when_no_data_available(self):
         """Test that the function returns None when Prometheus query returns None (no data available)."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.logger') as mock_logger,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.logger') as mock_logger,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -254,8 +254,8 @@ def test_successful_prometheus_query_with_vcpu_calculation(self):
         """Test successful Prometheus query with vCPU calculation."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.logger') as mock_logger,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.logger') as mock_logger,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -303,7 +303,7 @@ def test_prometheus_client_initialized_correctly(self):
         """Test that PrometheusClient is initialized correctly."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -334,8 +334,8 @@ def test_prometheus_query_uses_correct_promql_with_hour_boundaries(self):
         """Test that the Prometheus query uses correct PromQL with hour boundaries."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.datetime') as mock_datetime,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.datetime') as mock_datetime,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -375,7 +375,7 @@ def test_vcpu_value_converted_to_int(self):
         """Test that vCPU values from Prometheus (floats) are properly converted to integers."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -398,7 +398,7 @@ def test_vcpu_value_converted_to_int(self):
                 assert result['total_workers_vcpu'] == 15  # Should be truncated to int
                 assert isinstance(result['total_workers_vcpu'], int)
 
-    @patch('metrics_utility.library.collectors.total_workers_vcpu.datetime')
+    @patch('metrics_utility.library.collectors.others.total_workers_vcpu.datetime')
     def test_timestamp_in_output_with_hour_boundaries(self, mock_datetime):
         """Test that the function includes proper timestamp based on hour boundaries."""
         # Mock the datetime.now() call
@@ -409,8 +409,8 @@ def test_timestamp_in_output_with_hour_boundaries(self, mock_datetime):
 
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.logger') as mock_logger,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.PrometheusClient') as mock_prom_client_class,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.logger') as mock_logger,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):
@@ -451,7 +451,7 @@ def test_usage_based_billing_disabled_unset_returns_hardcoded_value(self):
         """Test that when METRICS_UTILITY_USAGE_BASED_METERING_ENABLED is unset, it returns hardcoded value."""
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
-            patch('metrics_utility.library.collectors.total_workers_vcpu.logger') as mock_logger,
+            patch('metrics_utility.library.collectors.others.total_workers_vcpu.logger') as mock_logger,
             patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
             patch('builtins.open', mock_open(read_data='fake-token')),
         ):

metrics_utility/test/test_collectors.py

@@ -2,15 +2,13 @@
 
 from django.db.utils import ProgrammingError
 
-from metrics_utility.automation_controller_billing.collectors import (
-    main_indirectmanagednodeaudit_table,
-)
+from metrics_utility.automation_controller_billing.collectors import main_indirectmanagednodeaudit_table
 
 
 class TestMainIndirectManagedNodeAuditTable:
     """Test cases for the main_indirectmanagednodeaudit_table function"""
 
-    @patch('metrics_utility.library.collectors.main_indirectmanagednodeaudit.copy_table')
+    @patch('metrics_utility.library.collectors.controller.main_indirectmanagednodeaudit.copy_table')
     @patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors')
     def test_main_indirectmanagednodeaudit_table_success(self, mock_get_optional_collectors, mock_copy_table):
         """Test successful execution when table exists"""
@@ -46,7 +44,7 @@ def test_main_indirectmanagednodeaudit_table_not_in_optional_collectors(self, mo
         assert result is None
 
     @patch('metrics_utility.automation_controller_billing.collectors.logger')
-    @patch('metrics_utility.library.collectors.main_indirectmanagednodeaudit.copy_table')
+    @patch('metrics_utility.library.collectors.controller.main_indirectmanagednodeaudit.copy_table')
     @patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors')
     def test_main_indirectmanagednodeaudit_table_programming_error(self, mock_get_optional_collectors, mock_copy_table, mock_logger):
         """Test graceful handling when table doesn't exist (ProgrammingError)"""
@@ -71,7 +69,7 @@ def test_main_indirectmanagednodeaudit_table_programming_error(self, mock_get_op
         assert 'Falling back to behavior without indirect managed node audit data.' in warning_call[0][0]
         assert warning_call[0][1] is mock_copy_table.side_effect
 
-    @patch('metrics_utility.library.collectors.main_indirectmanagednodeaudit.copy_table')
+    @patch('metrics_utility.library.collectors.controller.main_indirectmanagednodeaudit.copy_table')
     @patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors')
     def test_main_indirectmanagednodeaudit_table_query_format(self, mock_get_optional_collectors, mock_copy_table):
         """Test that the SQL query contains expected elements"""
@@ -104,7 +102,7 @@ def test_main_indirectmanagednodeaudit_table_query_format(self, mock_get_optiona
         assert '2024-01-02T00:00:00' in query
 
     @patch('metrics_utility.automation_controller_billing.collectors.logger')
-    @patch('metrics_utility.library.collectors.main_indirectmanagednodeaudit.copy_table')
+    @patch('metrics_utility.library.collectors.controller.main_indirectmanagednodeaudit.copy_table')
     @patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors')
     def test_main_indirectmanagednodeaudit_table_logs_specific_error(self, mock_get_optional_collectors, mock_copy_table, mock_logger):
         """Test that the specific error message is logged correctly"""

metrics_utility/test/test_prometheus_client.py

@@ -12,7 +12,7 @@
 import pytest
 import requests
 
-from metrics_utility.library.collectors.prometheus_client import PrometheusClient
+from metrics_utility.library.collectors.others.prometheus_client import PrometheusClient
 
 
 class TestPrometheusClient: