Skip to content

Commit db3c4d5

Browse files
committed
fix:Lint
1 parent 065bb01 commit db3c4d5

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

examples/alarm/alarm.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@
6363
)
6464
query_response = client.query_alarms(query_request)
6565

66-
# Acknowledge the alarm using its instance ID
67-
ack_response = client.acknowledge_alarms(ids=[id])
66+
# Acknowledge all queried alarms
67+
queried_alarm_ids = [alarm.instance_id for alarm in query_response.alarms]
68+
ack_response = client.acknowledge_alarms(ids=queried_alarm_ids)
6869

6970
# Clear the alarm
7071
clear_request = CreateOrUpdateAlarmRequest(

nisystemlink/clients/alarm/_alarm_client.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,7 @@ def delete_alarm(self, id: str) -> None:
112112
...
113113

114114
@post("delete-instances-by-instance-id", args=[Field("instanceIds")])
115-
def delete_alarms(
116-
self, ids: List[str]
117-
) -> models.DeleteByInstanceIdResponse:
115+
def delete_alarms(self, ids: List[str]) -> models.DeleteByInstanceIdResponse:
118116
"""Deletes multiple alarm instances by their instance IDs.
119117
120118
Args:

tests/integration/alarm/test_alarm_client.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import uuid
22
from datetime import datetime, timezone
3-
from typing import Callable, Generator, List
3+
from typing import List
44

55
import pytest
66
from nisystemlink.clients.alarm import AlarmClient
@@ -26,7 +26,7 @@ def client(enterprise_config: HttpConfiguration) -> AlarmClient:
2626

2727

2828
@pytest.fixture
29-
def unique_identifier() -> Callable[[], str]:
29+
def unique_identifier():
3030
"""Unique alarm id for this test."""
3131

3232
def _unique_identifier() -> str:
@@ -36,7 +36,7 @@ def _unique_identifier() -> str:
3636

3737

3838
@pytest.fixture
39-
def create_alarms(client: AlarmClient) -> Generator[Callable[[str, int, str], str], None, None]:
39+
def create_alarms(client: AlarmClient):
4040
"""Fixture to return a factory that creates alarms.
4141
4242
Returns instance_id (referred to as 'id' in tests) for each created alarm.
@@ -73,7 +73,7 @@ def _create_alarms(
7373
class TestAlarmClient:
7474

7575
def test__create_single_alarm__one_alarm_created_with_right_field_values(
76-
self, client: AlarmClient, unique_identifier: Callable[[], str]
76+
self, client: AlarmClient, unique_identifier
7777
):
7878
alarm_id = unique_identifier()
7979
occurred_at = datetime.now(timezone.utc)
@@ -158,7 +158,7 @@ def test__create_single_alarm__one_alarm_created_with_right_field_values(
158158
client.delete_alarm(id)
159159

160160
def test__query_alarms_with_all_fields__returns_complete_response(
161-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
161+
self, client: AlarmClient, create_alarms, unique_identifier
162162
):
163163
# Create two alarms with different severity levels
164164
alarm_id_1 = unique_identifier()
@@ -215,7 +215,7 @@ def test__query_alarms_with_all_fields__returns_complete_response(
215215
assert len(alarm_1_result.transitions) == 2
216216

217217
def test__create_multiple_alarms_and_query_alarms_with_take__only_take_returned(
218-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
218+
self, client: AlarmClient, create_alarms, unique_identifier
219219
):
220220
create_alarms(unique_identifier(), severity_level=3)
221221
create_alarms(unique_identifier(), severity_level=4)
@@ -227,7 +227,7 @@ def test__create_multiple_alarms_and_query_alarms_with_take__only_take_returned(
227227
assert len(query_response.alarms) == 1
228228

229229
def test__query_alarms_with_filter_and_count__returns_exact_count(
230-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
230+
self, client: AlarmClient, create_alarms, unique_identifier
231231
):
232232
alarm_id_1 = unique_identifier()
233233
alarm_id_2 = unique_identifier()
@@ -245,7 +245,7 @@ def test__query_alarms_with_filter_and_count__returns_exact_count(
245245
assert query_response.total_count == 2
246246

247247
def test__get_alarm__returns_alarm_with_all_fields(
248-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
248+
self, client: AlarmClient, create_alarms, unique_identifier
249249
):
250250
alarm_id = unique_identifier()
251251
id = create_alarms(alarm_id)
@@ -260,7 +260,7 @@ def test__get_alarm__returns_alarm_with_all_fields(
260260
assert len(alarm.transitions) >= 1
261261

262262
def test__query_alarm_by_alarm_id__matches_expected(
263-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
263+
self, client: AlarmClient, create_alarms, unique_identifier
264264
):
265265
alarm_id = unique_identifier()
266266
id = create_alarms(alarm_id)
@@ -275,7 +275,7 @@ def test__query_alarm_by_alarm_id__matches_expected(
275275
assert query_response.alarms[0].alarm_id == alarm_id
276276

277277
def test__acknowledge_alarm__verifies_all_response_fields(
278-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
278+
self, client: AlarmClient, create_alarms, unique_identifier
279279
):
280280
# Create multiple alarms
281281
id1 = create_alarms(unique_identifier(), severity_level=3)
@@ -305,7 +305,7 @@ def test__acknowledge_alarm__verifies_all_response_fields(
305305
assert alarm1.acknowledged_by is not None
306306

307307
def test__acknowledge_alarm_with_force_clear__alarm_cleared(
308-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
308+
self, client: AlarmClient, create_alarms, unique_identifier
309309
):
310310
id = create_alarms(unique_identifier())
311311

@@ -319,7 +319,7 @@ def test__acknowledge_alarm_with_force_clear__alarm_cleared(
319319
alarm = client.get_alarm(id)
320320
assert alarm.clear is True
321321

322-
def test__delete_alarm__returns_none(self, client: AlarmClient, unique_identifier: Callable[[], str]):
322+
def test__delete_alarm__returns_none(self, client: AlarmClient, unique_identifier):
323323
alarm_id = unique_identifier()
324324
request = CreateOrUpdateAlarmRequest(
325325
alarm_id=alarm_id,
@@ -342,7 +342,7 @@ def test__delete_alarm__returns_none(self, client: AlarmClient, unique_identifie
342342
assert len(query_response.alarms) == 0
343343

344344
def test__delete_alarms__verifies_all_response_fields(
345-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
345+
self, client: AlarmClient, create_alarms, unique_identifier
346346
):
347347
alarm_id1 = unique_identifier()
348348
alarm_id2 = unique_identifier()
@@ -375,7 +375,7 @@ def test__delete_alarms__verifies_all_response_fields(
375375
assert len(query_response.alarms) == 0
376376

377377
def test__update_alarm_severity__severity_updated(
378-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
378+
self, client: AlarmClient, create_alarms, unique_identifier
379379
):
380380
alarm_id = unique_identifier()
381381
create_alarms(alarm_id)
@@ -396,7 +396,7 @@ def test__update_alarm_severity__severity_updated(
396396
assert alarm.current_severity_level == 5
397397

398398
def test__clear_alarm__alarm_cleared(
399-
self, client: AlarmClient, create_alarms: Callable[[str, int, str], str], unique_identifier: Callable[[], str]
399+
self, client: AlarmClient, create_alarms, unique_identifier
400400
):
401401
alarm_id = unique_identifier()
402402
create_alarms(alarm_id)
@@ -470,7 +470,7 @@ def test__query_alarm_with_non_existent_alarm_id__returns_empty_list(
470470
assert len(query_response.alarms) == 0
471471

472472
def test__create_alarm_with_invalid_severity__raises_ApiException_BadRequest(
473-
self, client: AlarmClient, unique_identifier: Callable[[], str]
473+
self, client: AlarmClient, unique_identifier
474474
):
475475
request = CreateOrUpdateAlarmRequest(
476476
alarm_id=unique_identifier(),

0 commit comments

Comments
 (0)