Update dependencies, improve CI workflow, and enhance code formatting
- Updated the `sientia-dataops-library` dependency version from 1.4.3 to 1.4.6 in `requirements.txt`. - Modified the GitHub Actions workflow to install development and runtime dependencies separately, improving clarity and organization. - Added code formatting and linting checks using Ruff, along with type checking using mypy, to ensure code quality. - Updated `.gitignore` to include additional cache directories and log files. - Refactored code in various files for consistency in string formatting and improved logging messages.
This commit is contained in:
@@ -1,14 +1,16 @@
|
||||
from unittest.mock import AsyncMock, MagicMock, patch
|
||||
|
||||
from pytest import fixture, mark
|
||||
from sientia_do.notifications.models import NotificationLevel
|
||||
|
||||
from ingestor.managers.ingestor_manager import IngestorManager
|
||||
|
||||
metadata = {
|
||||
"metadata": {
|
||||
"model_id": "test_model",
|
||||
"model_name": "test_model",
|
||||
"workflow_name": "test_workflow",
|
||||
"schema_name": "test_schedule",
|
||||
'metadata': {
|
||||
'model_id': 'test_model',
|
||||
'model_name': 'test_model',
|
||||
'workflow_name': 'test_workflow',
|
||||
'schema_name': 'test_schedule',
|
||||
},
|
||||
}
|
||||
|
||||
@@ -18,20 +20,17 @@ metadata = {
|
||||
@patch('ingestor.managers.ingestor_manager.ResourceManager')
|
||||
def ingestor_manager(data_manager_mock, resource_manager_mock):
|
||||
ingestor = IngestorManager(
|
||||
kafka_servers="localhost:9092",
|
||||
redis_data={
|
||||
"host": "localhost",
|
||||
"port": 6379
|
||||
},
|
||||
kafka_servers='localhost:9092',
|
||||
redis_data={'host': 'localhost', 'port': 6379},
|
||||
lease_ttl=60,
|
||||
heartbeat_ttl=60,
|
||||
poll_interval=5,
|
||||
mongo_connection_string="mongodb://localhost:27017",
|
||||
mongo_database="sientia",
|
||||
mongo_connection_string='mongodb://localhost:27017',
|
||||
mongo_database='sientia',
|
||||
export_to_kafka=False,
|
||||
logger=MagicMock(),
|
||||
notification_handler=MagicMock(),
|
||||
metadata=metadata["metadata"],
|
||||
metadata=metadata['metadata'],
|
||||
)
|
||||
|
||||
ingestor.send_notification = MagicMock()
|
||||
@@ -43,41 +42,39 @@ def ingestor_manager(data_manager_mock, resource_manager_mock):
|
||||
@patch('ingestor.managers.ingestor_manager.DataManager')
|
||||
@patch('ingestor.managers.ingestor_manager.ResourceManager')
|
||||
@patch('ingestor.managers.ingestor_manager.NotificationHandler')
|
||||
def test___init__(notification_handler_mock, resource_manager_mock, data_manager_mock, opc_manager_mock):
|
||||
|
||||
def test___init__(
|
||||
notification_handler_mock, resource_manager_mock, data_manager_mock, opc_manager_mock
|
||||
):
|
||||
ingestor = IngestorManager(
|
||||
kafka_servers="localhost:9092",
|
||||
redis_data={
|
||||
"host": "localhost",
|
||||
"port": 6379
|
||||
},
|
||||
kafka_servers='localhost:9092',
|
||||
redis_data={'host': 'localhost', 'port': 6379},
|
||||
lease_ttl=60,
|
||||
heartbeat_ttl=60,
|
||||
poll_interval=5,
|
||||
mongo_connection_string="mongodb://localhost:27017",
|
||||
mongo_database="sientia",
|
||||
mongo_connection_string='mongodb://localhost:27017',
|
||||
mongo_database='sientia',
|
||||
export_to_kafka=False,
|
||||
logger=MagicMock(),
|
||||
notification_handler=MagicMock(),
|
||||
metadata=metadata["metadata"],
|
||||
metadata=metadata['metadata'],
|
||||
)
|
||||
|
||||
opc_manager_mock.assert_not_called()
|
||||
data_manager_mock.assert_called_once_with(
|
||||
kafka_servers="localhost:9092",
|
||||
mongo_connection_string="mongodb://localhost:27017",
|
||||
mongo_database="sientia",
|
||||
kafka_servers='localhost:9092',
|
||||
mongo_connection_string='mongodb://localhost:27017',
|
||||
mongo_database='sientia',
|
||||
export_to_kafka=False,
|
||||
metadata=metadata["metadata"],
|
||||
metadata=metadata['metadata'],
|
||||
logger=ingestor.logger,
|
||||
notification_handler=ingestor.notification_handler,
|
||||
)
|
||||
resource_manager_mock.assert_called_once_with(
|
||||
host="localhost",
|
||||
host='localhost',
|
||||
port=6379,
|
||||
lease_ttl=60,
|
||||
heartbeat_ttl=60,
|
||||
metadata=metadata["metadata"],
|
||||
metadata=metadata['metadata'],
|
||||
logger=ingestor.logger,
|
||||
notification_handler=ingestor.notification_handler,
|
||||
username=None,
|
||||
@@ -101,12 +98,11 @@ async def test_initialize_opc_from_config(opc_manager, ingestor_manager):
|
||||
'cert_path': '/path/to/cert',
|
||||
'private_key_path': '/path/to/private_key',
|
||||
'server_cert_path': '/path/to/server_cert',
|
||||
'pod_id': 'test_pod'
|
||||
'pod_id': 'test_pod',
|
||||
}
|
||||
|
||||
opc_manager.return_value = MagicMock(connect=AsyncMock())
|
||||
result = await ingestor_manager.initialize_opc_from_config(
|
||||
server_config)
|
||||
result = await ingestor_manager.initialize_opc_from_config(server_config)
|
||||
|
||||
opc_manager.assert_called_once_with(
|
||||
name=server_config['name'],
|
||||
@@ -118,7 +114,7 @@ async def test_initialize_opc_from_config(opc_manager, ingestor_manager):
|
||||
cert_path=server_config['cert_path'],
|
||||
private_key_path=server_config['private_key_path'],
|
||||
server_cert_path=server_config['server_cert_path'],
|
||||
metadata=metadata["metadata"],
|
||||
metadata=metadata['metadata'],
|
||||
)
|
||||
|
||||
assert result == opc_manager.return_value
|
||||
@@ -135,25 +131,24 @@ async def test_initialize_opc_from_config_exception(traceback_mock, opc_manager,
|
||||
'server_uri': 'http://opcua-server.simulator',
|
||||
'cert_path': '/path/to/cert',
|
||||
'private_key_path': '/path/to/private_key',
|
||||
'server_cert_path': '/path/to/server_cert'
|
||||
'server_cert_path': '/path/to/server_cert',
|
||||
}
|
||||
|
||||
ingestor_manager.logger.error = MagicMock()
|
||||
opc_manager.side_effect = Exception("Initialization error")
|
||||
opc_manager.side_effect = Exception('Initialization error')
|
||||
|
||||
result = await ingestor_manager.initialize_opc_from_config(
|
||||
server_config)
|
||||
result = await ingestor_manager.initialize_opc_from_config(server_config)
|
||||
|
||||
assert result is None
|
||||
|
||||
traceback_mock.format_exc.assert_called_once()
|
||||
ingestor_manager.send_notification.assert_called_once_with(
|
||||
metadata=metadata["metadata"],
|
||||
metadata=metadata['metadata'],
|
||||
notification_id=f'OPC_CONNECTION_ERROR_{server_config["name"]}',
|
||||
message='Error initializing OPC manager: Initialization error',
|
||||
block="opc_manager",
|
||||
block='opc_manager',
|
||||
level=NotificationLevel.ERROR,
|
||||
attachment_content=traceback_mock.format_exc.return_value
|
||||
attachment_content=traceback_mock.format_exc.return_value,
|
||||
)
|
||||
|
||||
|
||||
@@ -161,46 +156,33 @@ async def test_initialize_opc_from_config_exception(traceback_mock, opc_manager,
|
||||
@patch('ingestor.managers.ingestor_manager.OpcManager')
|
||||
@patch('ingestor.managers.ingestor_manager.metrics')
|
||||
async def test_update_opc_servers(metrics, opc_manager, ingestor_manager):
|
||||
manager1 = MagicMock(
|
||||
config={"config": "config1"}
|
||||
)
|
||||
manager2 = MagicMock(
|
||||
config={"config": "config2"}
|
||||
)
|
||||
manager3 = MagicMock(
|
||||
config={"config": "config3"}
|
||||
)
|
||||
manager1 = MagicMock(config={'config': 'config1'})
|
||||
manager2 = MagicMock(config={'config': 'config2'})
|
||||
manager3 = MagicMock(config={'config': 'config3'})
|
||||
|
||||
async def mock_initialize_from_config(config):
|
||||
if config == {"config": "config1"}:
|
||||
if config == {'config': 'config1'}:
|
||||
return manager1
|
||||
elif config == {"config": "config2"}:
|
||||
elif config == {'config': 'config2'}:
|
||||
return manager2
|
||||
elif config == {"config": "config3"}:
|
||||
elif config == {'config': 'config3'}:
|
||||
return manager3
|
||||
else:
|
||||
return None
|
||||
|
||||
ingestor_manager.initialize_opc_from_config = AsyncMock(
|
||||
side_effect=mock_initialize_from_config
|
||||
)
|
||||
ingestor_manager.initialize_opc_from_config = AsyncMock(side_effect=mock_initialize_from_config)
|
||||
|
||||
ingestor_manager.managed_tags = {
|
||||
"slot1": {
|
||||
"server1": {"config": "config1"},
|
||||
"server2": {"config": "config2"},
|
||||
'server5': {"config": "config5"}
|
||||
'slot1': {
|
||||
'server1': {'config': 'config1'},
|
||||
'server2': {'config': 'config2'},
|
||||
'server5': {'config': 'config5'},
|
||||
},
|
||||
"slot2": {
|
||||
"server3": {"config": "config3"},
|
||||
"server1": {"config": "config1"}
|
||||
}
|
||||
'slot2': {'server3': {'config': 'config3'}, 'server1': {'config': 'config1'}},
|
||||
}
|
||||
|
||||
mock = MagicMock(
|
||||
config={"config": "old_config2"})
|
||||
ingestor_manager.opc_managers['server3'] = AsyncMock(
|
||||
config={"config": "config3"})
|
||||
mock = MagicMock(config={'config': 'old_config2'})
|
||||
ingestor_manager.opc_managers['server3'] = AsyncMock(config={'config': 'config3'})
|
||||
ingestor_manager.opc_managers['server2'] = mock
|
||||
ingestor_manager.opc_managers['server4'] = AsyncMock()
|
||||
|
||||
@@ -208,29 +190,23 @@ async def test_update_opc_servers(metrics, opc_manager, ingestor_manager):
|
||||
|
||||
assert len(ingestor_manager.opc_managers) == 3
|
||||
|
||||
ingestor_manager.initialize_opc_from_config.assert_any_call(
|
||||
{"config": "config1"})
|
||||
ingestor_manager.initialize_opc_from_config.assert_any_call(
|
||||
{"config": "config2"})
|
||||
ingestor_manager.initialize_opc_from_config.assert_any_call(
|
||||
{"config": "config5"})
|
||||
ingestor_manager.initialize_opc_from_config.assert_any_call({'config': 'config1'})
|
||||
ingestor_manager.initialize_opc_from_config.assert_any_call({'config': 'config2'})
|
||||
ingestor_manager.initialize_opc_from_config.assert_any_call({'config': 'config5'})
|
||||
assert ingestor_manager.initialize_opc_from_config.call_count == 3
|
||||
|
||||
assert ingestor_manager.opc_managers['server1'].config == {
|
||||
"config": "config1"}
|
||||
assert ingestor_manager.opc_managers['server2'].config == {
|
||||
"config": "config2"}
|
||||
assert ingestor_manager.opc_managers['server3'].config == {
|
||||
"config": "config3"}
|
||||
assert ingestor_manager.opc_managers['server1'].config == {'config': 'config1'}
|
||||
assert ingestor_manager.opc_managers['server2'].config == {'config': 'config2'}
|
||||
assert ingestor_manager.opc_managers['server3'].config == {'config': 'config3'}
|
||||
assert 'server4' not in ingestor_manager.opc_managers
|
||||
assert 'server5' not in ingestor_manager.opc_managers
|
||||
|
||||
assert ingestor_manager.opc_managers['server2'] != mock
|
||||
|
||||
metrics.OPC_MANAGERS_ACTIVE.labels.assert_called_once_with(
|
||||
pod_id=ingestor_manager.pod_id)
|
||||
metrics.OPC_MANAGERS_ACTIVE.labels.assert_called_once_with(pod_id=ingestor_manager.pod_id)
|
||||
metrics.OPC_MANAGERS_ACTIVE.labels.return_value.set.assert_called_once_with(
|
||||
len(ingestor_manager.opc_managers))
|
||||
len(ingestor_manager.opc_managers)
|
||||
)
|
||||
|
||||
|
||||
def test_declare_active(ingestor_manager):
|
||||
@@ -246,8 +222,7 @@ def test_get_active_ingestors(ingestor_manager):
|
||||
|
||||
|
||||
def test_get_active_ingestors_empty(ingestor_manager):
|
||||
ingestor_manager.resource_manager.get_all_ingestors = MagicMock(
|
||||
return_value=None)
|
||||
ingestor_manager.resource_manager.get_all_ingestors = MagicMock(return_value=None)
|
||||
result = ingestor_manager.get_active_ingestors()
|
||||
assert result == []
|
||||
ingestor_manager.resource_manager.get_all_ingestors.assert_called_once()
|
||||
@@ -255,8 +230,7 @@ def test_get_active_ingestors_empty(ingestor_manager):
|
||||
|
||||
@patch('ingestor.managers.ingestor_manager.metrics')
|
||||
def test_get_number_of_leases_success(metrics, ingestor_manager):
|
||||
ingestor_manager.resource_manager.get_all_leases = MagicMock(
|
||||
return_value=["lease1", "lease2"])
|
||||
ingestor_manager.resource_manager.get_all_leases = MagicMock(return_value=['lease1', 'lease2'])
|
||||
result = ingestor_manager.get_number_of_leases()
|
||||
assert result == 2
|
||||
ingestor_manager.resource_manager.get_all_leases.assert_called_once()
|
||||
@@ -265,8 +239,7 @@ def test_get_number_of_leases_success(metrics, ingestor_manager):
|
||||
|
||||
@patch('ingestor.managers.ingestor_manager.metrics')
|
||||
def test_get_number_of_leases_empty(metrics, ingestor_manager):
|
||||
ingestor_manager.resource_manager.get_all_leases = MagicMock(
|
||||
return_value=None)
|
||||
ingestor_manager.resource_manager.get_all_leases = MagicMock(return_value=None)
|
||||
result = ingestor_manager.get_number_of_leases()
|
||||
assert result == 0
|
||||
ingestor_manager.resource_manager.get_all_leases.assert_called_once()
|
||||
@@ -275,8 +248,7 @@ def test_get_number_of_leases_empty(metrics, ingestor_manager):
|
||||
|
||||
@patch('ingestor.managers.ingestor_manager.metrics')
|
||||
def test_get_number_of_slots_success(metrics, ingestor_manager):
|
||||
ingestor_manager.resource_manager.get_all_slots = MagicMock(
|
||||
return_value=["slot1", "slot2"])
|
||||
ingestor_manager.resource_manager.get_all_slots = MagicMock(return_value=['slot1', 'slot2'])
|
||||
result = ingestor_manager.get_number_of_slots()
|
||||
assert result == 2
|
||||
ingestor_manager.resource_manager.get_all_slots.assert_called_once()
|
||||
@@ -285,8 +257,7 @@ def test_get_number_of_slots_success(metrics, ingestor_manager):
|
||||
|
||||
@patch('ingestor.managers.ingestor_manager.metrics')
|
||||
def test_get_number_of_slots_empty(metrics, ingestor_manager):
|
||||
ingestor_manager.resource_manager.get_all_slots = MagicMock(
|
||||
return_value=None)
|
||||
ingestor_manager.resource_manager.get_all_slots = MagicMock(return_value=None)
|
||||
result = ingestor_manager.get_number_of_slots()
|
||||
assert result == 0
|
||||
ingestor_manager.resource_manager.get_all_slots.assert_called_once()
|
||||
@@ -294,39 +265,32 @@ def test_get_number_of_slots_empty(metrics, ingestor_manager):
|
||||
|
||||
|
||||
def test_get_slot_leases_1_success(ingestor_manager):
|
||||
ingestor_manager.resource_manager.lease_tag = MagicMock(
|
||||
return_value=True)
|
||||
ingestor_manager.resource_manager.get_tag_slot = MagicMock(
|
||||
return_value={"tags": ["tag1"]})
|
||||
ingestor_manager.resource_manager.lease_tag = MagicMock(return_value=True)
|
||||
ingestor_manager.resource_manager.get_tag_slot = MagicMock(return_value={'tags': ['tag1']})
|
||||
|
||||
ingestor_manager.number_of_slots = 1
|
||||
result = ingestor_manager.get_slot_leases()
|
||||
|
||||
assert result == {
|
||||
"1": {"tags": ["tag1"]}
|
||||
}
|
||||
assert result == {'1': {'tags': ['tag1']}}
|
||||
|
||||
|
||||
def test_get_slot_leases_2_success(ingestor_manager):
|
||||
ingestor_manager.resource_manager.lease_tag = MagicMock(
|
||||
side_effect=[True, True])
|
||||
ingestor_manager.resource_manager.lease_tag = MagicMock(side_effect=[True, True])
|
||||
ingestor_manager.resource_manager.get_tag_slot = MagicMock(
|
||||
side_effect=[{"tags": ["tag1"]}, {"tags": ["tag2"]}])
|
||||
side_effect=[{'tags': ['tag1']}, {'tags': ['tag2']}]
|
||||
)
|
||||
|
||||
ingestor_manager.number_of_slots = 2
|
||||
result = ingestor_manager.get_slot_leases(max_slots=2)
|
||||
|
||||
assert result == {
|
||||
"1": {"tags": ["tag1"]},
|
||||
"2": {"tags": ["tag2"]}
|
||||
}
|
||||
assert result == {'1': {'tags': ['tag1']}, '2': {'tags': ['tag2']}}
|
||||
|
||||
|
||||
def test_get_slot_leases_2_1_none(ingestor_manager):
|
||||
ingestor_manager.resource_manager.lease_tag = MagicMock(
|
||||
side_effect=[True, True])
|
||||
ingestor_manager.resource_manager.lease_tag = MagicMock(side_effect=[True, True])
|
||||
ingestor_manager.resource_manager.get_tag_slot = MagicMock(
|
||||
side_effect=[None, {"tags": ["tag1"]}])
|
||||
side_effect=[None, {'tags': ['tag1']}]
|
||||
)
|
||||
|
||||
ingestor_manager.number_of_slots = 1
|
||||
result = ingestor_manager.get_slot_leases(max_slots=1)
|
||||
@@ -335,10 +299,8 @@ def test_get_slot_leases_2_1_none(ingestor_manager):
|
||||
|
||||
|
||||
def test_get_slot_leases_1_failure(ingestor_manager):
|
||||
ingestor_manager.resource_manager.lease_tag = MagicMock(
|
||||
return_value=False)
|
||||
ingestor_manager.resource_manager.get_tag_slot = MagicMock(
|
||||
return_value={"tags": ["tag1"]})
|
||||
ingestor_manager.resource_manager.lease_tag = MagicMock(return_value=False)
|
||||
ingestor_manager.resource_manager.get_tag_slot = MagicMock(return_value={'tags': ['tag1']})
|
||||
|
||||
result = ingestor_manager.get_slot_leases()
|
||||
ingestor_manager.resource_manager.get_tag_slot.assert_not_called()
|
||||
@@ -349,42 +311,30 @@ def test_get_slot_leases_1_failure(ingestor_manager):
|
||||
@mark.asyncio
|
||||
async def test_unsubscribe_slot(ingestor_manager):
|
||||
ingestor_manager.managed_tags = {
|
||||
"slot1": {
|
||||
"server1": {"tags": "config1"},
|
||||
"server2": {"tags": "config2"}
|
||||
},
|
||||
"slot2": {
|
||||
"server3": {"tags": "config3"},
|
||||
"server1": {"tags": "config1"}
|
||||
}
|
||||
'slot1': {'server1': {'tags': 'config1'}, 'server2': {'tags': 'config2'}},
|
||||
'slot2': {'server3': {'tags': 'config3'}, 'server1': {'tags': 'config1'}},
|
||||
}
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": AsyncMock(),
|
||||
"server2": AsyncMock(),
|
||||
"server3": AsyncMock()
|
||||
'server1': AsyncMock(),
|
||||
'server2': AsyncMock(),
|
||||
'server3': AsyncMock(),
|
||||
}
|
||||
await ingestor_manager.unsubscribe_slot("slot1")
|
||||
await ingestor_manager.unsubscribe_slot('slot1')
|
||||
|
||||
ingestor_manager.opc_managers["server1"].unsubscribe.assert_called_once_with(
|
||||
"slot1")
|
||||
ingestor_manager.opc_managers["server2"].unsubscribe.assert_called_once_with(
|
||||
"slot1")
|
||||
ingestor_manager.opc_managers["server3"].unsubscribe.assert_not_called()
|
||||
ingestor_manager.opc_managers['server1'].unsubscribe.assert_called_once_with('slot1')
|
||||
ingestor_manager.opc_managers['server2'].unsubscribe.assert_called_once_with('slot1')
|
||||
ingestor_manager.opc_managers['server3'].unsubscribe.assert_not_called()
|
||||
|
||||
|
||||
def test_update_slot_config(ingestor_manager):
|
||||
ingestor_manager.managed_tags = {
|
||||
"slot1": {"config": "old_config"},
|
||||
"slot2": {"config": "new_config"},
|
||||
"slot3": {"config": "old_config"}
|
||||
'slot1': {'config': 'old_config'},
|
||||
'slot2': {'config': 'new_config'},
|
||||
'slot3': {'config': 'old_config'},
|
||||
}
|
||||
|
||||
ingestor_manager.resource_manager.get_tag_slot = MagicMock(
|
||||
side_effect=[
|
||||
{"config": "updated_config"},
|
||||
{"config": "new_config"},
|
||||
None
|
||||
]
|
||||
side_effect=[{'config': 'updated_config'}, {'config': 'new_config'}, None]
|
||||
)
|
||||
|
||||
ingestor_manager.update_opc_servers = MagicMock()
|
||||
@@ -393,179 +343,130 @@ def test_update_slot_config(ingestor_manager):
|
||||
|
||||
ingestor_manager.update_slot_config()
|
||||
|
||||
assert ingestor_manager.managed_tags["slot1"] == {
|
||||
"config": "updated_config"}
|
||||
assert ingestor_manager.managed_tags["slot2"] == {
|
||||
"config": "new_config"}
|
||||
assert "slot3" not in ingestor_manager.managed_tags
|
||||
assert ingestor_manager.managed_tags['slot1'] == {'config': 'updated_config'}
|
||||
assert ingestor_manager.managed_tags['slot2'] == {'config': 'new_config'}
|
||||
assert 'slot3' not in ingestor_manager.managed_tags
|
||||
|
||||
ingestor_manager.resource_manager.renew_tag_lease.assert_any_call("slot1")
|
||||
ingestor_manager.resource_manager.renew_tag_lease.assert_any_call("slot3")
|
||||
ingestor_manager.resource_manager.renew_tag_lease.assert_any_call("slot2")
|
||||
ingestor_manager.resource_manager.renew_tag_lease.assert_any_call('slot1')
|
||||
ingestor_manager.resource_manager.renew_tag_lease.assert_any_call('slot3')
|
||||
ingestor_manager.resource_manager.renew_tag_lease.assert_any_call('slot2')
|
||||
assert ingestor_manager.resource_manager.renew_tag_lease.call_count == 3
|
||||
|
||||
|
||||
@patch('ingestor.managers.ingestor_manager.metrics')
|
||||
def test_drop_slot_leases(metrics, ingestor_manager):
|
||||
ingestor_manager.resource_manager.drop_tag_lease = MagicMock()
|
||||
ingestor_manager.drop_slot_leases(["1", "2"])
|
||||
ingestor_manager.drop_slot_leases(['1', '2'])
|
||||
|
||||
ingestor_manager.resource_manager.drop_tag_lease.assert_any_call("1")
|
||||
ingestor_manager.resource_manager.drop_tag_lease.assert_any_call("2")
|
||||
ingestor_manager.resource_manager.drop_tag_lease.assert_any_call('1')
|
||||
ingestor_manager.resource_manager.drop_tag_lease.assert_any_call('2')
|
||||
|
||||
metrics.SLOTS_RELEASED.labels.assert_any_call(
|
||||
pod_id=ingestor_manager.pod_id)
|
||||
metrics.SLOTS_RELEASED.labels.assert_any_call(pod_id=ingestor_manager.pod_id)
|
||||
metrics.SLOTS_RELEASED.labels.return_value.inc.assert_any_call()
|
||||
|
||||
|
||||
@mark.asyncio
|
||||
async def test_manage_server_no_server(ingestor_manager):
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": MagicMock(),
|
||||
"server2": MagicMock()
|
||||
}
|
||||
server_config = {
|
||||
'tags': 'config1'
|
||||
}
|
||||
ingestor_manager.opc_managers = {'server1': MagicMock(), 'server2': MagicMock()}
|
||||
server_config = {'tags': 'config1'}
|
||||
|
||||
result = await ingestor_manager.manage_server(
|
||||
'slot1', 'server3', server_config, server_config)
|
||||
result = await ingestor_manager.manage_server('slot1', 'server3', server_config, server_config)
|
||||
|
||||
assert result == 1
|
||||
ingestor_manager.opc_managers["server1"].create_subscription.assert_not_called(
|
||||
)
|
||||
ingestor_manager.opc_managers["server1"].subscribe.assert_not_called()
|
||||
ingestor_manager.opc_managers['server1'].create_subscription.assert_not_called()
|
||||
ingestor_manager.opc_managers['server1'].subscribe.assert_not_called()
|
||||
|
||||
|
||||
@mark.asyncio
|
||||
async def test_manage_server_create_subscription_failure(ingestor_manager):
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": MagicMock(),
|
||||
"server2": MagicMock()
|
||||
}
|
||||
ingestor_manager.subscriptions = {
|
||||
"server1": MagicMock()
|
||||
}
|
||||
server_config = {
|
||||
'tags': 'config1'
|
||||
}
|
||||
ingestor_manager.opc_managers = {'server1': MagicMock(), 'server2': MagicMock()}
|
||||
ingestor_manager.subscriptions = {'server1': MagicMock()}
|
||||
server_config = {'tags': 'config1'}
|
||||
|
||||
ingestor_manager.opc_managers["server1"].create_subscription.side_effect = Exception(
|
||||
"Subscription error")
|
||||
ingestor_manager.opc_managers['server1'].create_subscription.side_effect = Exception(
|
||||
'Subscription error'
|
||||
)
|
||||
|
||||
result = await ingestor_manager.manage_server(
|
||||
'slot1', 'server1', server_config, server_config)
|
||||
result = await ingestor_manager.manage_server('slot1', 'server1', server_config, server_config)
|
||||
|
||||
assert result == 2
|
||||
ingestor_manager.opc_managers["server1"].create_subscription.assert_called_once_with(
|
||||
'slot1')
|
||||
ingestor_manager.opc_managers["server1"].subscribe.assert_not_called()
|
||||
ingestor_manager.opc_managers['server1'].create_subscription.assert_called_once_with('slot1')
|
||||
ingestor_manager.opc_managers['server1'].subscribe.assert_not_called()
|
||||
|
||||
|
||||
@mark.asyncio
|
||||
async def test_manage_server(ingestor_manager):
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": AsyncMock(),
|
||||
"server2": AsyncMock()
|
||||
}
|
||||
ingestor_manager.subscriptions = {
|
||||
"server1": AsyncMock()
|
||||
}
|
||||
server_config = {
|
||||
'tags': 'config1'
|
||||
}
|
||||
ingestor_manager.opc_managers = {'server1': AsyncMock(), 'server2': AsyncMock()}
|
||||
ingestor_manager.subscriptions = {'server1': AsyncMock()}
|
||||
server_config = {'tags': 'config1'}
|
||||
|
||||
result = await ingestor_manager.manage_server(
|
||||
'slot1', 'server1', server_config, server_config)
|
||||
result = await ingestor_manager.manage_server('slot1', 'server1', server_config, server_config)
|
||||
|
||||
assert result == 0
|
||||
ingestor_manager.opc_managers["server1"].create_subscription.assert_called_once_with(
|
||||
'slot1')
|
||||
ingestor_manager.opc_managers["server1"].subscribe.assert_called_once_with(
|
||||
'slot1', 'config1', ingestor_manager.poll_interval)
|
||||
ingestor_manager.opc_managers['server1'].create_subscription.assert_called_once_with('slot1')
|
||||
ingestor_manager.opc_managers['server1'].subscribe.assert_called_once_with(
|
||||
'slot1', 'config1', ingestor_manager.poll_interval
|
||||
)
|
||||
|
||||
|
||||
@patch('ingestor.managers.ingestor_manager.traceback')
|
||||
@mark.asyncio
|
||||
async def test_manage_server_subscribe_failure(traceback_mock, ingestor_manager):
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": AsyncMock(),
|
||||
"server2": AsyncMock()
|
||||
}
|
||||
ingestor_manager.subscriptions = {
|
||||
"server1": AsyncMock()
|
||||
}
|
||||
server_config = {
|
||||
'tags': 'config1'
|
||||
}
|
||||
ingestor_manager.opc_managers = {'server1': AsyncMock(), 'server2': AsyncMock()}
|
||||
ingestor_manager.subscriptions = {'server1': AsyncMock()}
|
||||
server_config = {'tags': 'config1'}
|
||||
|
||||
ingestor_manager.opc_managers["server1"].subscribe.side_effect = Exception(
|
||||
"Subscription error")
|
||||
ingestor_manager.opc_managers['server1'].subscribe.side_effect = Exception('Subscription error')
|
||||
|
||||
result = await ingestor_manager.manage_server(
|
||||
'slot1', 'server1', server_config, server_config)
|
||||
result = await ingestor_manager.manage_server('slot1', 'server1', server_config, server_config)
|
||||
|
||||
assert result == 2
|
||||
ingestor_manager.opc_managers["server1"].create_subscription.assert_called_once_with(
|
||||
'slot1')
|
||||
ingestor_manager.opc_managers["server1"].subscribe.assert_called_once_with(
|
||||
'slot1', 'config1', ingestor_manager.poll_interval)
|
||||
ingestor_manager.opc_managers["server1"].unsubscribe.assert_called_once_with(
|
||||
'slot1')
|
||||
ingestor_manager.opc_managers['server1'].create_subscription.assert_called_once_with('slot1')
|
||||
ingestor_manager.opc_managers['server1'].subscribe.assert_called_once_with(
|
||||
'slot1', 'config1', ingestor_manager.poll_interval
|
||||
)
|
||||
ingestor_manager.opc_managers['server1'].unsubscribe.assert_called_once_with('slot1')
|
||||
|
||||
traceback_mock.format_exc.assert_called_once()
|
||||
|
||||
ingestor_manager.send_notification.assert_called_once_with(
|
||||
metadata=metadata["metadata"],
|
||||
metadata=metadata['metadata'],
|
||||
notification_id='OPC_SUBSCRIPTION_ERROR_slot1:server1',
|
||||
message='Failed to subscribe to tags from slot1:server1\n{\'tags\': \'config1\'}: Subscription error',
|
||||
block="opc_manager",
|
||||
message="Failed to subscribe to tags from slot1:server1\n{'tags': 'config1'}: Subscription error",
|
||||
block='opc_manager',
|
||||
level=NotificationLevel.ERROR,
|
||||
attachment_content=traceback_mock.format_exc.return_value
|
||||
attachment_content=traceback_mock.format_exc.return_value,
|
||||
)
|
||||
|
||||
ingestor_manager.logger.warning.assert_any_call(
|
||||
"Removing subscription from server server1 for slot slot1"
|
||||
'Removing subscription from server server1 for slot slot1'
|
||||
)
|
||||
|
||||
|
||||
@mark.asyncio
|
||||
async def test_subscribe_to_tags(ingestor_manager):
|
||||
ingestor_manager.manage_server = AsyncMock(
|
||||
side_effect=[0, 1, 2])
|
||||
ingestor_manager.managed_tags = {
|
||||
"slot1": MagicMock(),
|
||||
"slot2": MagicMock()
|
||||
}
|
||||
ingestor_manager.manage_server = AsyncMock(side_effect=[0, 1, 2])
|
||||
ingestor_manager.managed_tags = {'slot1': MagicMock(), 'slot2': MagicMock()}
|
||||
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": AsyncMock(),
|
||||
"server2": AsyncMock()
|
||||
}
|
||||
ingestor_manager.subscriptions = {
|
||||
"server1": AsyncMock()
|
||||
}
|
||||
ingestor_manager.opc_managers = {'server1': AsyncMock(), 'server2': AsyncMock()}
|
||||
ingestor_manager.subscriptions = {'server1': AsyncMock()}
|
||||
tags = {
|
||||
'slot1': {
|
||||
"server1": {"tags": "config1"},
|
||||
"server2": {"tags": "config2"},
|
||||
'server3': {"tags": "config3"},
|
||||
'server1': {'tags': 'config1'},
|
||||
'server2': {'tags': 'config2'},
|
||||
'server3': {'tags': 'config3'},
|
||||
}
|
||||
}
|
||||
|
||||
await ingestor_manager.subscribe_to_tags(tags)
|
||||
|
||||
ingestor_manager.manage_server.assert_any_call(
|
||||
'slot1', 'server1', {"tags": "config1"}, tags)
|
||||
ingestor_manager.manage_server.assert_any_call(
|
||||
'slot1', 'server2', {"tags": "config2"}, tags)
|
||||
ingestor_manager.manage_server.assert_any_call(
|
||||
'slot1', 'server3', {"tags": "config3"}, tags)
|
||||
ingestor_manager.manage_server.assert_any_call('slot1', 'server1', {'tags': 'config1'}, tags)
|
||||
ingestor_manager.manage_server.assert_any_call('slot1', 'server2', {'tags': 'config2'}, tags)
|
||||
ingestor_manager.manage_server.assert_any_call('slot1', 'server3', {'tags': 'config3'}, tags)
|
||||
|
||||
assert ingestor_manager.manage_server.call_count == 3
|
||||
|
||||
ingestor_manager.managed_tags['slot1'].pop.assert_called_once_with(
|
||||
'server3', None)
|
||||
ingestor_manager.managed_tags['slot1'].pop.assert_called_once_with('server3', None)
|
||||
|
||||
|
||||
@patch('ingestor.managers.ingestor_manager.metrics')
|
||||
@@ -574,17 +475,14 @@ def test_check_opc_servers_integrity_all_healthy(metrics, ingestor_manager):
|
||||
opc_manager1 = MagicMock()
|
||||
opc_manager1.check_cycles.return_value = None
|
||||
opc_manager1.check_opc_listenning.return_value = False
|
||||
opc_manager1.config = {"config": "config1"}
|
||||
opc_manager1.config = {'config': 'config1'}
|
||||
|
||||
opc_manager2 = MagicMock()
|
||||
opc_manager2.check_cycles.return_value = None
|
||||
opc_manager2.check_opc_listenning.return_value = False
|
||||
opc_manager2.config = {"config": "config2"}
|
||||
opc_manager2.config = {'config': 'config2'}
|
||||
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": opc_manager1,
|
||||
"server2": opc_manager2
|
||||
}
|
||||
ingestor_manager.opc_managers = {'server1': opc_manager1, 'server2': opc_manager2}
|
||||
|
||||
# Mock the initialize_opc_from_config method
|
||||
ingestor_manager.initialize_opc_from_config = MagicMock()
|
||||
@@ -601,10 +499,10 @@ def test_check_opc_servers_integrity_all_healthy(metrics, ingestor_manager):
|
||||
# Verify that no reinitialization was needed
|
||||
ingestor_manager.initialize_opc_from_config.assert_not_called()
|
||||
|
||||
metrics.OPC_MANAGERS_ACTIVE.labels.assert_called_once_with(
|
||||
pod_id=ingestor_manager.pod_id)
|
||||
metrics.OPC_MANAGERS_ACTIVE.labels.assert_called_once_with(pod_id=ingestor_manager.pod_id)
|
||||
metrics.OPC_MANAGERS_ACTIVE.labels.return_value.set.assert_called_once_with(
|
||||
len(ingestor_manager.opc_managers))
|
||||
len(ingestor_manager.opc_managers)
|
||||
)
|
||||
|
||||
|
||||
def test_check_opc_servers_integrity_server_lost(ingestor_manager):
|
||||
@@ -612,16 +510,13 @@ def test_check_opc_servers_integrity_server_lost(ingestor_manager):
|
||||
opc_manager = MagicMock()
|
||||
opc_manager.check_cycles.return_value = None
|
||||
opc_manager.check_opc_listenning.return_value = True # Server is lost
|
||||
opc_manager.config = {"config": "config1"}
|
||||
opc_manager.config = {'config': 'config1'}
|
||||
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": opc_manager
|
||||
}
|
||||
ingestor_manager.opc_managers = {'server1': opc_manager}
|
||||
|
||||
# Mock the initialize_opc_from_config method to return a new manager
|
||||
new_manager = MagicMock()
|
||||
ingestor_manager.initialize_opc_from_config = MagicMock(
|
||||
return_value=new_manager)
|
||||
ingestor_manager.initialize_opc_from_config = MagicMock(return_value=new_manager)
|
||||
|
||||
# Call the method
|
||||
ingestor_manager.check_opc_servers_integrity()
|
||||
@@ -632,26 +527,18 @@ def test_check_opc_servers_integrity_server_lost_with_tags(ingestor_manager):
|
||||
opc_manager = MagicMock()
|
||||
opc_manager.check_cycles.return_value = None
|
||||
opc_manager.check_opc_listenning.return_value = True # Server is lost
|
||||
opc_manager.config = {"config": "config1"}
|
||||
opc_manager.config = {'config': 'config1'}
|
||||
|
||||
ingestor_manager.opc_managers = {
|
||||
"server1": opc_manager
|
||||
}
|
||||
ingestor_manager.opc_managers = {'server1': opc_manager}
|
||||
|
||||
# Setup managed tags
|
||||
ingestor_manager.managed_tags = {
|
||||
"slot1": {
|
||||
"server1": {
|
||||
"config": "config1",
|
||||
"tags": {"tag1": "value1"}
|
||||
}
|
||||
}
|
||||
'slot1': {'server1': {'config': 'config1', 'tags': {'tag1': 'value1'}}}
|
||||
}
|
||||
|
||||
# Mock the initialize_opc_from_config method to return a new manager
|
||||
new_manager = MagicMock()
|
||||
ingestor_manager.initialize_opc_from_config = MagicMock(
|
||||
return_value=new_manager)
|
||||
ingestor_manager.initialize_opc_from_config = MagicMock(return_value=new_manager)
|
||||
|
||||
# Call the method
|
||||
ingestor_manager.check_opc_servers_integrity()
|
||||
|
||||
Reference in New Issue
Block a user