From 2f348c084236c2e2c4a5b35f79dce69489c27a47 Mon Sep 17 00:00:00 2001 From: Antoine Brun Date: Mon, 21 Jul 2025 16:28:01 +0200 Subject: [PATCH 1/4] comment out the line reading mailAlerting --- msa_sdk/device.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msa_sdk/device.py b/msa_sdk/device.py index c6409c74..49b3192d 100644 --- a/msa_sdk/device.py +++ b/msa_sdk/device.py @@ -283,7 +283,7 @@ def read(self, by_ref=False): self.password = device_info["password"] self.password_admin = device_info["passwordAdmin"] self.log_enabled = device_info["logEnabled"] - self.mail_alerting = device_info["mailAlerting"] +# self.mail_alerting = device_info["mailAlerting"] self.use_nat = device_info["useNat"] self.snmp_community = device_info["snmpCommunity"] self.device_external = device_info["externalReference"] From d7345557445313bab02db2162e0a2db65e5128b4 Mon Sep 17 00:00:00 2001 From: Antoine Brun Date: Mon, 21 Jul 2025 16:33:16 +0200 Subject: [PATCH 2/4] set mail_alerting default to false / fix tests --- msa_sdk/device.py | 2 +- tests/test_device_get.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/msa_sdk/device.py b/msa_sdk/device.py index 49b3192d..b84493b5 100644 --- a/msa_sdk/device.py +++ b/msa_sdk/device.py @@ -12,7 +12,7 @@ def __init__(self, customer_id=None, name=None, manufacturer_id=None, model_id=None, login=None, password=None, password_admin=None, management_address=None, device_external=None, log_enabled=True, - log_more_enabled=True, mail_alerting=True, + log_more_enabled=True, mail_alerting=False, reporting=False, snmp_community="ubiqube", device_id=None, management_port=None, hostname=None): """ diff --git a/tests/test_device_get.py b/tests/test_device_get.py index 113d5b41..f4180631 100644 --- a/tests/test_device_get.py +++ b/tests/test_device_get.py @@ -38,7 +38,7 @@ def test_read_by_id(mock_post): assert device.password == '$ubiqube' assert device.password_admin == '' assert not device.log_enabled - assert not device.mail_alerting +# assert not device.mail_alerting assert not device.reporting assert device.use_nat assert device.snmp_community == '' @@ -98,7 +98,7 @@ def test_read_by_reference(mock_post): assert device.password == '$ubiqube' assert device.password_admin == '' assert not device.log_enabled - assert not device.mail_alerting +# assert not device.mail_alerting assert not device.reporting assert device.use_nat assert device.snmp_community == '' From fd8fa4fc3e9ff6352c8169d5c199035ee939689e Mon Sep 17 00:00:00 2001 From: Antoine Brun Date: Mon, 21 Jul 2025 17:08:57 +0200 Subject: [PATCH 3/4] remove mail_alerting and use_nat --- msa_sdk/device.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/msa_sdk/device.py b/msa_sdk/device.py index b84493b5..9c50ce66 100644 --- a/msa_sdk/device.py +++ b/msa_sdk/device.py @@ -12,7 +12,7 @@ def __init__(self, customer_id=None, name=None, manufacturer_id=None, model_id=None, login=None, password=None, password_admin=None, management_address=None, device_external=None, log_enabled=True, - log_more_enabled=True, mail_alerting=False, + log_more_enabled=True, reporting=False, snmp_community="ubiqube", device_id=None, management_port=None, hostname=None): """ @@ -39,8 +39,6 @@ def __init__(self, customer_id=None, name=None, manufacturer_id=None, log_enabled: Bool Log Enabled log_more_enabled: More logs - mail_alerting: Bool - Mail alerting reporting: Bool Reporting snmp_community: SNMP Community @@ -71,13 +69,11 @@ def __init__(self, customer_id=None, name=None, manufacturer_id=None, self.device_external = device_external self.log_enabled = log_enabled self.log_more_enabled = log_more_enabled - self.mail_alerting = mail_alerting self.reporting = reporting self.snmp_community = snmp_community self.api_path_v1 = "/device/v1" self.api_path = "/device" self.management_interface = None - self.use_nat = False self.configuration = {} self.device_id = device_id self.management_port = management_port @@ -108,11 +104,9 @@ def create(self): "modelId": self.model_id, "managementAddress": self.management_address, "reporting": self.reporting, - "useNat": self.use_nat, "logEnabled": self.log_enabled, "logMoreEnabled": self.log_more_enabled, "managementInterface": self.management_interface, - "mailAlerting": self.mail_alerting, "passwordAdmin": self.password_admin, "externalReference": self.device_external, "hostname": self.hostname, @@ -159,8 +153,6 @@ def update(self, field: str, value: str) -> dict: "password": self.password, "password_admin": self.password_admin, "log_enable": self.log_enabled, - "mailAlerting": self.mail_alerting, - "useNat": self.use_nat, "snmpCommunity": self.snmp_community } self.path = '{}/v2/{}'.format(self.api_path, self.device_id) @@ -283,8 +275,6 @@ def read(self, by_ref=False): self.password = device_info["password"] self.password_admin = device_info["passwordAdmin"] self.log_enabled = device_info["logEnabled"] -# self.mail_alerting = device_info["mailAlerting"] - self.use_nat = device_info["useNat"] self.snmp_community = device_info["snmpCommunity"] self.device_external = device_info["externalReference"] self.hostname = device_info["hostname"] From bf0f4eb32963fe62d6e803a4f1478a9916ad53de Mon Sep 17 00:00:00 2001 From: Antoine Brun Date: Mon, 21 Jul 2025 17:12:38 +0200 Subject: [PATCH 4/4] remove mail_alerting and use_nat --- tests/test_device_get.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/test_device_get.py b/tests/test_device_get.py index f4180631..47c2099d 100644 --- a/tests/test_device_get.py +++ b/tests/test_device_get.py @@ -38,9 +38,7 @@ def test_read_by_id(mock_post): assert device.password == '$ubiqube' assert device.password_admin == '' assert not device.log_enabled -# assert not device.mail_alerting assert not device.reporting - assert device.use_nat assert device.snmp_community == '' mock_call_get.assert_called_once() @@ -98,9 +96,7 @@ def test_read_by_reference(mock_post): assert device.password == '$ubiqube' assert device.password_admin == '' assert not device.log_enabled -# assert not device.mail_alerting assert not device.reporting - assert device.use_nat assert device.snmp_community == '' mock_call_get.assert_called_once()