[Sts-sponsors] [Snap build #2091578] arm64 build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: arm64 * Pocket: UPDATES * State: Failed to build * Duration: 19 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091578/+files/buildlog_snap_ubuntu_jammy_arm64_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-arm64-073 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091578 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091580] ppc64el build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: ppc64el * Pocket: UPDATES * State: Failed to build * Duration: 10 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091580/+files/buildlog_snap_ubuntu_jammy_ppc64el_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-ppc64el-018 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091580 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091582] s390x build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: s390x * Pocket: UPDATES * State: Failed to build * Duration: 9 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091582/+files/buildlog_snap_ubuntu_jammy_s390x_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-s390x-004 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091582 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~cgrabowski/maas:backport_dns_tx_serialization_fix into maas:3.3
The proposal to merge ~cgrabowski/maas:backport_dns_tx_serialization_fix into maas:3.3 has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441968 -- Your team MAAS Committers is subscribed to branch maas:3.3. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091479] arm64 build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: arm64 * Pocket: UPDATES * State: Failed to build * Duration: 13 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091479/+files/buildlog_snap_ubuntu_jammy_arm64_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos01-arm64-018 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091479 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091480] ppc64el build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: ppc64el * Pocket: UPDATES * State: Failed to build * Duration: 11 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091480/+files/buildlog_snap_ubuntu_jammy_ppc64el_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-ppc64el-018 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091480 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091481] s390x build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: s390x * Pocket: UPDATES * State: Failed to build * Duration: 11 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091481/+files/buildlog_snap_ubuntu_jammy_s390x_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-s390x-011 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091481 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~cgrabowski/maas:backport_dns_tx_serialization_fix into maas:3.3
Christian Grabowski has proposed merging
~cgrabowski/maas:backport_dns_tx_serialization_fix into maas:3.3.
Commit message:
skip checking serial if a newer one exists
update interface+ip trigger to ignore controllers handled in other trigger
(cherry picked from commit ae7eced99c283210adde310e1d7324cf94ef1a77)
Requested reviews:
Christian Grabowski (cgrabowski)
For more details, see:
https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441968
--
Your team MAAS Committers is subscribed to branch maas:3.3.
diff --git a/src/maasserver/region_controller.py b/src/maasserver/region_controller.py
index de5e1e8..1c8e014 100644
--- a/src/maasserver/region_controller.py
+++ b/src/maasserver/region_controller.py
@@ -101,6 +101,7 @@ class RegionControllerService(Service):
self._queued_updates = []
self._dns_update_in_progress = False
self._dns_requires_full_reload = True
+self._dns_latest_serial = None
self.postgresListener = postgresListener
self.dnsResolver = Resolver(
resolv=None,
@@ -232,6 +233,16 @@ class RegionControllerService(Service):
self._dns_update_in_progress = False
return d
+def _set_latest_serial(result):
+if result:
+(serial, _, _) = result
+if (
+not self._dns_latest_serial
+or self._dns_latest_serial < serial
+):
+self._dns_latest_serial = serial
+return result
+
defers = []
if self.needsDNSUpdate:
self.needsDNSUpdate = False
@@ -244,6 +255,7 @@ class RegionControllerService(Service):
requires_reload=self._dns_requires_full_reload,
)
d.addCallback(_clear_dynamic_dns_updates)
+d.addCallback(_set_latest_serial)
d.addCallback(self._checkSerial)
d.addCallback(self._logDNSReload)
# Order here matters, first needsDNSUpdate is set then pass the
@@ -284,6 +296,11 @@ class RegionControllerService(Service):
if result is None:
return None
serial, reloaded, domain_names = result
+
+# check that there is not a newer serial we should query instead
+if self._dns_latest_serial and self._dns_latest_serial > serial:
+return result
+
if not reloaded:
raise DNSReloadError(
"Failed to reload DNS; timeout or rdnc command failed."
diff --git a/src/maasserver/tests/test_region_controller.py b/src/maasserver/tests/test_region_controller.py
index e5a1f09..1a9ee32 100644
--- a/src/maasserver/tests/test_region_controller.py
+++ b/src/maasserver/tests/test_region_controller.py
@@ -163,6 +163,11 @@ class TestRegionControllerService(MAASServerTestCase):
mock_dns_update_all_zones = self.patch(
region_controller, "dns_update_all_zones"
)
+mock_dns_update_all_zones.returnValue = (
+random.randint(1, 1000),
+True,
+[factory.make_name("domain") for _ in range(3)],
+)
service.startProcessing()
yield service.processingDefer
mock_dns_update_all_zones.assert_called_once()
@@ -947,3 +952,18 @@ class TestRegionControllerServiceTransactional(MAASTransactionServerTestCase):
call(dynamic_updates=expected_updates, requires_reload=False),
]
)
+
+@wait_for_reactor
+@inlineCallbacks
+def test_check_serial_is_skipped_if_a_newer_serial_exists(self):
+domain = yield deferToDatabase(factory.make_Domain)
+update_result = (random.randint(0, 10), True, [domain.name])
+service = RegionControllerService(sentinel.listener)
+
+query = self.patch(service.dnsResolver, "lookupAuthority")
+
+service._dns_latest_serial = update_result[0] + 1
+
+yield service._checkSerial(update_result)
+
+query.assert_not_called()
diff --git a/src/maasserver/triggers/system.py b/src/maasserver/triggers/system.py
index 9aa7e41..989f99f 100644
--- a/src/maasserver/triggers/system.py
+++ b/src/maasserver/triggers/system.py
@@ -2061,6 +2061,7 @@ def render_dns_dynamic_update_interface_static_ip_address(op):
CREATE OR REPLACE FUNCTION sys_dns_updates_interface_ip_{op}()
RETURNS trigger as $$
DECLARE
+ node_type int;
current_hostname text;
domain text;
iface_name text;
@@ -2070,26 +2071,30 @@ def render_dns_dynamic_update_interface_static_ip_address(op):
ASSERT TG_WHEN = 'AFTER', 'May only run as an AFTER trigger';
ASSERT TG_LEVEL <> 'STATEMENT', 'Should not be used as a STATEMENT level trigger', TG_NAME;
IF (TG_OP = 'INSERT' AND TG_LEVEL = 'ROW') THEN
-SELECT iface.name, node.hostname, domain_tbl.name, COALESCE(domain_tbl.ttl, 0) INTO iface_name, current_hostname, domain, address_ttl
+
[Sts-sponsors] [Merge] ~cgrabowski/maas:backport_dns_tx_serialization_fix into maas:3.3
The proposal to merge ~cgrabowski/maas:backport_dns_tx_serialization_fix into maas:3.3 has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441968 -- Your team MAAS Committers is subscribed to branch maas:3.3. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~cgrabowski/maas:backport_dns_tx_serialization_fix into maas:3.3
Review: Approve self-approving backport -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441968 Your team MAAS Committers is subscribed to branch maas:3.3. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~cgrabowski/maas:fix_dns_tx_serialization into maas:master
The proposal to merge ~cgrabowski/maas:fix_dns_tx_serialization into maas:master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 -- Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~cgrabowski/maas:fix_dns_tx_serialization into maas:master
The proposal to merge ~cgrabowski/maas:fix_dns_tx_serialization into maas:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 -- Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: d161385a8d3f045786adc9de3089895b853d07af -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~cgrabowski/maas:fix_dns_tx_serialization into maas:master
jenkins: !test -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-tester/2406/console COMMIT: d161385a8d3f045786adc9de3089895b853d07af -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~cgrabowski/maas:fix_dns_tx_serialization into maas:master
jenkins: !test -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-tester/2405/console COMMIT: d161385a8d3f045786adc9de3089895b853d07af -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~cgrabowski/maas:fix_dns_tx_serialization into maas:master
Review: Approve +1 -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-tester/2404/console COMMIT: 7bc0cde0ab971840e75efed644f7256e9c0df177 -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b fix_dns_tx_serialization lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-tester/2403/console COMMIT: 139936def8b8cb1e50fd2c1fa45e959995f80054 -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~cgrabowski/maas:fix_dns_tx_serialization into maas:master
Christian Grabowski has proposed merging
~cgrabowski/maas:fix_dns_tx_serialization into maas:master.
Commit message:
skip checking serial if a newer one exists
update interface+ip trigger to ignore controllers handled in other trigger
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441964
--
Your team MAAS Committers is subscribed to branch maas:master.
diff --git a/src/maasserver/region_controller.py b/src/maasserver/region_controller.py
index de5e1e8..eb193be 100644
--- a/src/maasserver/region_controller.py
+++ b/src/maasserver/region_controller.py
@@ -101,6 +101,7 @@ class RegionControllerService(Service):
self._queued_updates = []
self._dns_update_in_progress = False
self._dns_requires_full_reload = True
+self._dns_latest_serial = None
self.postgresListener = postgresListener
self.dnsResolver = Resolver(
resolv=None,
@@ -232,6 +233,13 @@ class RegionControllerService(Service):
self._dns_update_in_progress = False
return d
+def _set_latest_serial(result):
+if result:
+(serial, _, _ ) = result
+if not self._dns_latest_serial or self._dns_latest_serial < serial:
+self._dns_latest_serial = serial
+return result
+
defers = []
if self.needsDNSUpdate:
self.needsDNSUpdate = False
@@ -244,6 +252,7 @@ class RegionControllerService(Service):
requires_reload=self._dns_requires_full_reload,
)
d.addCallback(_clear_dynamic_dns_updates)
+d.addCallback(_set_latest_serial)
d.addCallback(self._checkSerial)
d.addCallback(self._logDNSReload)
# Order here matters, first needsDNSUpdate is set then pass the
@@ -284,6 +293,11 @@ class RegionControllerService(Service):
if result is None:
return None
serial, reloaded, domain_names = result
+
+# check that there is not a newer serial we should query instead
+if self._dns_latest_serial and self._dns_latest_serial > serial:
+return result
+
if not reloaded:
raise DNSReloadError(
"Failed to reload DNS; timeout or rdnc command failed."
diff --git a/src/maasserver/tests/test_region_controller.py b/src/maasserver/tests/test_region_controller.py
index e5a1f09..ef75417 100644
--- a/src/maasserver/tests/test_region_controller.py
+++ b/src/maasserver/tests/test_region_controller.py
@@ -163,6 +163,11 @@ class TestRegionControllerService(MAASServerTestCase):
mock_dns_update_all_zones = self.patch(
region_controller, "dns_update_all_zones"
)
+mock_dns_update_all_zones.returnValue = (
+random.randint(1, 1000),
+True,
+[factory.make_name("domain") for _ in range(3)],
+)
service.startProcessing()
yield service.processingDefer
mock_dns_update_all_zones.assert_called_once()
@@ -947,3 +952,19 @@ class TestRegionControllerServiceTransactional(MAASTransactionServerTestCase):
call(dynamic_updates=expected_updates, requires_reload=False),
]
)
+
+@wait_for_reactor
+@inlineCallbacks
+def test_check_serial_is_skipped_if_a_newer_serial_exists(self):
+domain = yield deferToDatabase(factory.make_Domain)
+update_result = (random.randint(0, 10), True, [domain.name])
+record = yield deferToDatabase(factory.make_DNSResource, domain=domain)
+service = RegionControllerService(sentinel.listener)
+
+query = self.patch(service.dnsResolver, "lookupAuthority")
+
+service._dns_latest_serial = update_result[0]+1
+
+yield service._checkSerial(update_result)
+
+query.assert_not_called()
diff --git a/src/maasserver/triggers/system.py b/src/maasserver/triggers/system.py
index c6313f9..3c38339 100644
--- a/src/maasserver/triggers/system.py
+++ b/src/maasserver/triggers/system.py
@@ -2061,6 +2061,7 @@ def render_dns_dynamic_update_interface_static_ip_address(op):
CREATE OR REPLACE FUNCTION sys_dns_updates_interface_ip_{op}()
RETURNS trigger as $$
DECLARE
+ node_type int;
current_hostname text;
domain text;
iface_name text;
@@ -2070,26 +2071,30 @@ def render_dns_dynamic_update_interface_static_ip_address(op):
ASSERT TG_WHEN = 'AFTER', 'May only run as an AFTER trigger';
ASSERT TG_LEVEL <> 'STATEMENT', 'Should not be used as a STATEMENT level trigger', TG_NAME;
IF (TG_OP = 'INSERT' AND TG_LEVEL = 'ROW') THEN
-SELECT iface.name, node.hostname, domain_tbl.name, COALESCE(domain_tbl.ttl, 0) INTO iface_name, current_hostname, domain, address_ttl
+SELECT iface.name, node.hostname,
[Sts-sponsors] [Snap build #2091327] arm64 build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: arm64 * Pocket: UPDATES * State: Failed to build * Duration: 21 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091327/+files/buildlog_snap_ubuntu_jammy_arm64_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-arm64-024 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091327 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-script-models into maas:master
The proposal to merge ~bjornt/maas:move-metadataserver-script-models into maas:master has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441920 -- Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] -b move-metadataserver-script-models lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas - LANDING FAILED
LANDING -b move-metadataserver-script-models lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: FAILED BUILD LOG: http://maas-ci.internal:8080/job/maas-tester/2401/console -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441920 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091329] s390x build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: s390x * Pocket: UPDATES * State: Failed to build * Duration: 10 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091329/+files/buildlog_snap_ubuntu_jammy_s390x_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-s390x-015 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091329 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091328] ppc64el build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: ppc64el * Pocket: UPDATES * State: Failed to build * Duration: 10 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091328/+files/buildlog_snap_ubuntu_jammy_ppc64el_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-ppc64el-010 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091328 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-script-models into maas:master
The proposal to merge ~bjornt/maas:move-metadataserver-script-models into maas:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441920 -- Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441938 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:connection-column-MAASENG-1557. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441949 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix-iso-duration-value lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b fix-iso-duration-value lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: 48b0c4f6e42943fd8de9f9106172b1f4746aabe6 -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441958 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-iso-duration-value into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-node-models into maas:master
The proposal to merge ~bjornt/maas:move-metadataserver-node-models into maas:master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441919 -- Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091285] arm64 build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: arm64 * Pocket: UPDATES * State: Failed to build * Duration: 20 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091285/+files/buildlog_snap_ubuntu_jammy_arm64_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-arm64-030 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091285 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main
Looks like there's a merge conflict in frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:add-a11y-tests. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~bjornt/maas:current-script-set-foreign-key-constraints into maas:master
Review: Approve nice, +1 -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441925 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441938 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:connection-column-MAASENG-1557. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441949 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-iso-duration-value into maas-site-manager:main
Peter Makowski has proposed merging
~petermakowski/maas-site-manager:fix-iso-duration-value into
maas-site-manager:main.
Commit message:
fix: use reduced iso duration format
Requested reviews:
MAAS Lander (maas-lander): unittests
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441958
--
Your team MAAS Committers is requested to review the proposed merge of
~petermakowski/maas-site-manager:fix-iso-duration-value into
maas-site-manager:main.
diff --git a/frontend/src/components/TokensCreate/TokensCreate.test.tsx b/frontend/src/components/TokensCreate/TokensCreate.test.tsx
index 2519f7f..550cc77 100644
--- a/frontend/src/components/TokensCreate/TokensCreate.test.tsx
+++ b/frontend/src/components/TokensCreate/TokensCreate.test.tsx
@@ -68,7 +68,7 @@ describe("TokensCreate", () => {
expect(tokensMutationMock).toHaveBeenCalledTimes(1);
expect(tokensMutationMock).toHaveBeenCalledWith({
amount: 1,
- expires: "P0Y0M7DT0H0M0S",
+ expires: "P7DT0H0M0S",
});
});
});
diff --git a/frontend/src/components/TokensCreate/utils.test.ts b/frontend/src/components/TokensCreate/utils.test.ts
index 0271d0c..cbbded8 100644
--- a/frontend/src/components/TokensCreate/utils.test.ts
+++ b/frontend/src/components/TokensCreate/utils.test.ts
@@ -1,7 +1,13 @@
import { humanIntervalToISODuration } from "./utils";
describe("humanIntervalToISODuration", () => {
+ it("returns a valid ISO duration string for weeks, days, hours and seconds", () => {
+expect(humanIntervalToISODuration("5 weeks 7 days 3 hours 30 seconds")).toEqual("P42DT3H0M30S");
+ });
+ it("returns a valid ISO duration string for weeks", () => {
+expect(humanIntervalToISODuration("2 weeks")).toEqual("P14DT0H0M0S");
+ });
it("returns a valid ISO duration string for hours and seconds", () => {
-expect(humanIntervalToISODuration("1 week 1 days 3 hours 30 seconds")).toEqual("P0Y0M8DT3H0M30S");
+expect(humanIntervalToISODuration("1 hours 10 seconds")).toEqual("P0DT1H0M10S");
});
});
diff --git a/frontend/src/components/TokensCreate/utils.ts b/frontend/src/components/TokensCreate/utils.ts
index 718d876..d23b6d2 100644
--- a/frontend/src/components/TokensCreate/utils.ts
+++ b/frontend/src/components/TokensCreate/utils.ts
@@ -1,9 +1,26 @@
-import { formatISODuration, intervalToDuration } from "date-fns";
import humanInterval from "human-interval";
+function intervalToDuration(ms: number) {
+ let seconds = Math.floor(ms / 1000);
+ const days = Math.floor(seconds / (24 * 3600));
+ seconds %= 24 * 3600;
+ const hours = Math.floor(seconds / 3600);
+ seconds %= 3600;
+ const minutes = Math.floor(seconds / 60);
+ seconds %= 60;
+ return {
+days,
+hours,
+minutes,
+seconds,
+ };
+}
+
+// return ISO 8601 duration only using days, hours, minutes and seconds
export const humanIntervalToISODuration = (intervalString: string) => {
const intervalNumber = humanInterval(intervalString);
if (intervalNumber) {
-return formatISODuration(intervalToDuration({ start: 0, end: intervalNumber }));
+const duration = intervalToDuration(intervalNumber);
+return `P${duration.days}DT${duration.hours}H${duration.minutes}M${duration.seconds}S`;
}
};
--
Mailing list: https://launchpad.net/~sts-sponsors
Post to : sts-sponsors@lists.launchpad.net
Unsubscribe : https://launchpad.net/~sts-sponsors
More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091287] ppc64el build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: ppc64el * Pocket: UPDATES * State: Failed to build * Duration: 11 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091287/+files/buildlog_snap_ubuntu_jammy_ppc64el_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-ppc64el-011 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091287 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main
Review: Approve code, qa LGTM! -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441949 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Snap build #2091289] s390x build of maas-master snap package (maas) in ubuntu jammy-updates
* Snap Package: maas-master * Archive: ~maas-committers/ubuntu/latest-deps * Distroseries: None * Architecture: s390x * Pocket: UPDATES * State: Failed to build * Duration: 10 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091289/+files/buildlog_snap_ubuntu_jammy_s390x_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-s390x-019 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2091289 Your team MAAS Committers is the requester of the build. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-node-models into maas:master
The proposal to merge ~bjornt/maas:move-metadataserver-node-models into maas:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441919 -- Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-node-models into maas:master
Review: Approve +1 -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441919 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-script-models into maas:master
Review: Approve +1 -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441920 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main
Review: Approve code, qa LGTM! -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441938 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:connection-column-MAASENG-1557. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b dgx-platform-kernels-lookup lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b dgx-platform-kernels-lookup lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-tester/2399/console COMMIT: d70b694d5f1bcc683dc330d9781bab2f18fe6012 -- https://code.launchpad.net/~igor-brovtsin/maas/+git/maas/+merge/441824 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix-validation-onSubmit-MAASENG-1571 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b fix-validation-onSubmit-MAASENG-1571 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: 20f90f8c8dfc6710eecb5044fd312694447df6ff -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441949 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main has been updated. Commit message changed to: update connection column MAASENG-1557 - fix line-height 0 text collapsing issue - cleanup redundant table resizer code - update last_seen mock to return date within the last 15 minutes For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441938 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main
Diff comments:
> diff --git a/frontend/src/components/TokensCreate/TokensCreate.test.tsx
> b/frontend/src/components/TokensCreate/TokensCreate.test.tsx
> index 2519f7f..4665b36 100644
> --- a/frontend/src/components/TokensCreate/TokensCreate.test.tsx
> +++ b/frontend/src/components/TokensCreate/TokensCreate.test.tsx
> @@ -29,46 +29,54 @@ afterAll(() => {
>mockServer.close();
> });
>
> -describe("TokensCreate", () => {
> - it("renders the form", async () => {
> -renderWithMemoryRouter();
> -expect(screen.getByRole("form", { name: /Generate new enrolment tokens/i
> })).toBeInTheDocument();
> - });
> +it("renders the form", async () => {
> + renderWithMemoryRouter();
> + expect(screen.getByRole("form", { name: /Generate new enrolment tokens/i
> })).toBeInTheDocument();
> +});
>
> - it("if not all required fields have been entered the submit button is
> disabled", async () => {
> -renderWithMemoryRouter();
> -const amount = screen.getByLabelText(/Amount of tokens to generate/i);
> -const expires = screen.getByLabelText(/Expiration time/i);
> -expect(screen.getByRole("button", { name: /Generate tokens/i
> })).toBeDisabled();
> -await userEvent.type(amount, "1");
> -await userEvent.type(expires, "1 month");
> -expect(screen.getByRole("button", { name: /Generate tokens/i
> })).toBeEnabled();
> - });
> +it("if not all required fields have been entered the submit button is
> disabled", async () => {
> + renderWithMemoryRouter();
> + const amount = screen.getByLabelText(/Amount of tokens to generate/i);
> + const expires = screen.getByLabelText(/Expiration time/i);
> + expect(screen.getByRole("button", { name: /Generate tokens/i
> })).toBeDisabled();
> + await userEvent.type(amount, "1");
> + await userEvent.type(expires, "1 month");
> + expect(screen.getByRole("button", { name: /Generate tokens/i
> })).toBeEnabled();
> +});
>
> - it("displays an error for invalid expiration value", async () => {
> -renderWithMemoryRouter();
> -const expires = screen.getByLabelText(/Expiration time/i);
> -await userEvent.type(expires, "2");
> -await userEvent.tab();
> -expect(expires).toHaveErrorMessage(
> - /Time unit must be a `string` type with a value of weeks, days, hours,
> and\/or minutes./i,
> -);
> - });
> +it("displays an error for invalid expiration value", async () => {
> + renderWithMemoryRouter();
> + const expires = screen.getByLabelText(/Expiration time/i);
> + await userEvent.type(expires, "2");
> + await userEvent.tab();
> + expect(expires).toHaveErrorMessage(
> +/Time unit must be a `string` type with a value of weeks, days, hours,
> and\/or minutes./i,
> + );
> +});
>
> - it("can generate enrolment tokens", async () => {
> -renderWithMemoryRouter();
> -const amount = screen.getByLabelText(/Amount of tokens to generate/i);
> -const expires = screen.getByLabelText(/Expiration time/i);
> -expect(screen.getByRole("button", { name: /Generate tokens/i
> })).toBeDisabled();
> -// can specify the number of tokens to generate
> -await userEvent.type(amount, "1");
> -// can specify the token expiration time (e.g. 1 week)
> -await userEvent.type(expires, "1 week");
> -await userEvent.click(screen.getByRole("button", { name: /Generate
> tokens/i }));
> -expect(tokensMutationMock).toHaveBeenCalledTimes(1);
> -expect(tokensMutationMock).toHaveBeenCalledWith({
> - amount: 1,
> - expires: "P0Y0M7DT0H0M0S",
> -});
> +it("can generate enrolment tokens", async () => {
> + renderWithMemoryRouter();
> + const amount = screen.getByLabelText(/Amount of tokens to generate/i);
> + const expires = screen.getByLabelText(/Expiration time/i);
> + expect(screen.getByRole("button", { name: /Generate tokens/i
> })).toBeDisabled();
> + // can specify the number of tokens to generate
> + await userEvent.type(amount, "1");
> + // can specify the token expiration time (e.g. 1 week)
> + await userEvent.type(expires, "1 week");
> + await userEvent.click(screen.getByRole("button", { name: /Generate
> tokens/i }));
> + expect(tokensMutationMock).toHaveBeenCalledTimes(1);
> + expect(tokensMutationMock).toHaveBeenCalledWith({
> +amount: 1,
> +expires: "P0Y0M7DT0H0M0S",
>});
> });
> +
> +it("does not display error message on blur if the value has not chagned",
> async () => {
This is the only change in the tests file, the others are just due to removal
of the describe block.
> + renderWithMemoryRouter();
> + const amount = screen.getByLabelText(/Amount of tokens to generate/i);
> + await userEvent.type(amount, "{tab}");
> + expect(amount).not.toHaveErrorMessage(/Error/i);
> + // enter a value and then delete it
> + await userEvent.type(amount, "1{backspace}");
> + expect(amount).toHaveErrorMessage(/Error/i);
> +});
--
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441949
Your team MAAS Committers is req
Re: [Sts-sponsors] [UNITTESTS] -b connection-column-MAASENG-1557 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b connection-column-MAASENG-1557 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: 6057e0308564d1b3afac44a757fb0eab2be13219 -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441938 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix-validation-onSubmit-MAASENG-1571 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b fix-validation-onSubmit-MAASENG-1571 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-site-manager-tester/506/console COMMIT: f3562516b1e4f18364514c25f00e3ceae8fcc44a -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441949 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into maas-site-manager:main
Peter Makowski has proposed merging
~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into
maas-site-manager:main.
Commit message:
fix validation onSubmit MAASENG-1571
Requested reviews:
MAAS Lander (maas-lander): unittests
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441949
## QA Steps
Go to /sites
Select a site
Click "Remove"
Click on the text input field
Click cancel
The side panel should close
Click "Remove" again
Press "Esc" button
The side panel should close
Go to /settings/tokens
Click "Generate tokens"
Click cancel
The side panel should close
--
Your team MAAS Committers is requested to review the proposed merge of
~petermakowski/maas-site-manager:fix-validation-onSubmit-MAASENG-1571 into
maas-site-manager:main.
diff --git a/frontend/src/_utils.scss b/frontend/src/_utils.scss
index b666356..514f0bf 100644
--- a/frontend/src/_utils.scss
+++ b/frontend/src/_utils.scss
@@ -38,9 +38,6 @@
.u-no-border {
border: 0 !important;
}
-.u-no-line-height {
- line-height: 0 !important;
-}
.u-padding-top--medium {
padding-top: $spv--medium !important;
}
diff --git a/frontend/src/api/types.ts b/frontend/src/api/types.ts
index c124177..486a255 100644
--- a/frontend/src/api/types.ts
+++ b/frontend/src/api/types.ts
@@ -16,14 +16,12 @@ export type Site = {
id: string;
name: string;
url: string; // ,
- connection: Stats["connection"];
- last_seen: string; // ,
country: string; // ,
city: string;
zip: string;
street: string;
timezone: string; // IANA time zone name,
- stats: Stats;
+ stats: Stats | null;
};
export type PaginatedQueryResult = {
diff --git a/frontend/src/components/RemoveRegions/RemoveRegions.test.tsx b/frontend/src/components/RemoveRegions/RemoveRegions.test.tsx
index e5414c3..5b1c6ef 100644
--- a/frontend/src/components/RemoveRegions/RemoveRegions.test.tsx
+++ b/frontend/src/components/RemoveRegions/RemoveRegions.test.tsx
@@ -19,10 +19,18 @@ it("if the correct phrase has been entered the 'Remove' button becomes enabled."
expect(screen.getByRole("button", { name: /Remove/i })).toBeEnabled();
});
-it("if the confirmation string is not correct and the user unfoxuses the input field a error state is shown.", async () => {
+it("if the confirmation string is not correct and the user unfocuses the input field a error state is shown.", async () => {
render();
expect(screen.getByRole("button", { name: /Remove/i })).toBeDisabled();
await userEvent.type(screen.getByRole("textbox"), "incorrect string{tab}");
expect(screen.getByText(/Confirmation string is not correct/i)).toBeInTheDocument();
expect(screen.getByRole("button", { name: /Remove/i })).toBeDisabled();
});
+
+it("does not display error message on blur if the value has not chagned", async () => {
+ render();
+ expect(screen.getByRole("button", { name: /Remove/i })).toBeDisabled();
+ await userEvent.type(screen.getByRole("textbox"), "{tab}");
+ expect(screen.queryByText(/Confirmation string is not correct/i)).not.toBeInTheDocument();
+ expect(screen.getByRole("button", { name: /Remove/i })).toBeDisabled();
+});
diff --git a/frontend/src/components/RemoveRegions/RemoveRegions.tsx b/frontend/src/components/RemoveRegions/RemoveRegions.tsx
index 4136519..1f6f32a 100644
--- a/frontend/src/components/RemoveRegions/RemoveRegions.tsx
+++ b/frontend/src/components/RemoveRegions/RemoveRegions.tsx
@@ -60,6 +60,7 @@ const RemoveRegions = () => {
initialValues={initialValues}
onSubmit={handleSubmit}
validate={createHandleValidate({ expectedConfirmTextValue })}
+ validateOnBlur={false}
>
{({ isSubmitting, errors, touched, isValid, dirty }) => (
diff --git a/frontend/src/components/RequestsTable/RequestsTable.tsx b/frontend/src/components/RequestsTable/RequestsTable.tsx
index b4ccfc1..5a3bd3d 100644
--- a/frontend/src/components/RequestsTable/RequestsTable.tsx
+++ b/frontend/src/components/RequestsTable/RequestsTable.tsx
@@ -32,11 +32,10 @@ const RequestsTable = ({
const columns = useMemo(
() => [
- {
+ columnHelper.accessor("name", {
id: "select",
-accessorKey: "name",
header: ({ table }) => ,
-cell: ({ row, getValue }: { row: Row; getValue: Getter }) => {
+cell: ({ row, getValue }) => {
return (
);
},
- },
+ }),
columnHelper.accessor("name", {
id: "name",
header: () => Name,
diff --git a/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.test.tsx b/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.test.tsx
index 88e355c..3ebdf1b 100644
--- a/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.test.tsx
+++ b/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.test.tsx
@@ -1,8 +1
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:add-a11y-tests. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] -b add-a11y-tests lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - LANDING FAILED
LANDING -b add-a11y-tests lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: FAILED BUILD LOG: http://maas-ci.internal:8080/job/maas-site-manager-tester/505/console -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:add-a11y-tests. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b connection-column-MAASENG-1557 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b connection-column-MAASENG-1557 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-site-manager-tester/504/console COMMIT: 086ed720cbcbda3426e7644762a4223525a343d0 -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441938 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:add-a11y-tests. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:add-a11y-tests. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] -b add-a11y-tests lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - LANDING FAILED
LANDING -b add-a11y-tests lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: FAILED BUILD LOG: http://maas-ci.internal:8080/job/maas-site-manager-tester/502/console -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:add-a11y-tests. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:fix-mobile-nav. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b connection-column-MAASENG-1557 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b connection-column-MAASENG-1557 lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-site-manager-tester/500/console COMMIT: 8cdce76ff8f5ed31df538599a9359d18c3074a9e -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441938 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:add-a11y-tests. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:fix-mobile-nav. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main
Review: Approve code, qa -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:add-a11y-tests. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main
Diff comments:
> diff --git
> a/frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx
> b/frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx
> index a4c2b15..a6a4354 100644
> ---
> a/frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx
> +++
> b/frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx
> @@ -46,15 +45,20 @@ const TokensTable = ({
>{
> id: "select",
> header: ({ table }) => ,
> -cell: ({ row }) => (
> -
> - - checked={row.getIsSelected()}
> - disabled={!row.getCanSelect()}
> - onChange={row.getToggleSelectedHandler()}
> +cell: ({ row, getValue }) => (
> +
> + + aria-label={`select ${getValue()}`}
> + className="p-checkbox__input"
>type="checkbox"
> + {...{
> +checked: row.getIsSelected(),
> +disabled: !row.getCanSelect(),
> +onChange: row.getToggleSelectedHandler(),
> + }}
> />
> -
> +
> +
> ),
>},
>{
--
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890
Your team MAAS Committers is subscribed to branch
~petermakowski/maas-site-manager:add-a11y-tests.
--
Mailing list: https://launchpad.net/~sts-sponsors
Post to : sts-sponsors@lists.launchpad.net
Unsubscribe : https://launchpad.net/~sts-sponsors
More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into maas-site-manager:main
Peter Makowski has proposed merging
~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into
maas-site-manager:main.
Commit message:
update connection column MAASENG-1557
- fix line-height 0 text collapsing issue
- cleanup redundant table resizer code
Requested reviews:
MAAS Lander (maas-lander): unittests
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441938
https://warthogs.atlassian.net/browse/MAASENG-1557
QA Steps
Go to sites
Verify that last seen is displayed in human readable format, e.g. 1 minute ago
Verify that rows for sites which have "Waiting for first" status are greyed out
except from the "name" column
--
Your team MAAS Committers is requested to review the proposed merge of
~petermakowski/maas-site-manager:connection-column-MAASENG-1557 into
maas-site-manager:main.
diff --git a/frontend/src/_utils.scss b/frontend/src/_utils.scss
index b666356..514f0bf 100644
--- a/frontend/src/_utils.scss
+++ b/frontend/src/_utils.scss
@@ -38,9 +38,6 @@
.u-no-border {
border: 0 !important;
}
-.u-no-line-height {
- line-height: 0 !important;
-}
.u-padding-top--medium {
padding-top: $spv--medium !important;
}
diff --git a/frontend/src/api/types.ts b/frontend/src/api/types.ts
index c124177..486a255 100644
--- a/frontend/src/api/types.ts
+++ b/frontend/src/api/types.ts
@@ -16,14 +16,12 @@ export type Site = {
id: string;
name: string;
url: string; // ,
- connection: Stats["connection"];
- last_seen: string; // ,
country: string; // ,
city: string;
zip: string;
street: string;
timezone: string; // IANA time zone name,
- stats: Stats;
+ stats: Stats | null;
};
export type PaginatedQueryResult = {
diff --git a/frontend/src/components/RequestsTable/RequestsTable.tsx b/frontend/src/components/RequestsTable/RequestsTable.tsx
index b4ccfc1..5a3bd3d 100644
--- a/frontend/src/components/RequestsTable/RequestsTable.tsx
+++ b/frontend/src/components/RequestsTable/RequestsTable.tsx
@@ -32,11 +32,10 @@ const RequestsTable = ({
const columns = useMemo(
() => [
- {
+ columnHelper.accessor("name", {
id: "select",
-accessorKey: "name",
header: ({ table }) => ,
-cell: ({ row, getValue }: { row: Row; getValue: Getter }) => {
+cell: ({ row, getValue }) => {
return (
);
},
- },
+ }),
columnHelper.accessor("name", {
id: "name",
header: () => Name,
diff --git a/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.test.tsx b/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.test.tsx
index 88e355c..3ebdf1b 100644
--- a/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.test.tsx
+++ b/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.test.tsx
@@ -1,8 +1,20 @@
+import * as timezoneMock from "timezone-mock";
+
import ConnectionInfo, { connectionIcons, connectionLabels } from "./ConnectionInfo";
import { connections } from "@/mocks/factories";
import { render, screen } from "@/test-utils";
+beforeEach(() => {
+ vi.useFakeTimers();
+ timezoneMock.register("Etc/GMT");
+});
+
+afterEach(() => {
+ timezoneMock.unregister();
+ vi.useRealTimers();
+});
+
connections.forEach((connection) => {
it(`displays correct connection status icon and label for ${connection} connection`, () => {
const { container } = render();
@@ -11,3 +23,15 @@ connections.forEach((connection) => {
expect(container.querySelector(".status-icon")).toHaveClass(connectionIcons[connection]);
});
});
+
+it("displays last seen text relative to local time correctly", () => {
+ const date = new Date("2000-01-01T12:00:00Z");
+ vi.setSystemTime(date);
+ render();
+ expect(screen.getByText("2 minutes ago")).toBeInTheDocument();
+});
+
+it("displays 'waiting for first' text for the unknown status", () => {
+ render();
+ expect(screen.getByText(/waiting for first/i)).toBeInTheDocument();
+});
diff --git a/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.tsx b/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.tsx
index 3eeef54..764d9da 100644
--- a/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.tsx
+++ b/frontend/src/components/SitesList/SitesTable/ConnectionInfo/ConnectionInfo.tsx
@@ -1,50 +1,63 @@
import classNames from "classnames";
import get from "lodash/get";
-import type { Site } from "@/api/types";
+import type { Stats } from "@/api/types";
import docsUrls from "@/base/docsUrls";
import ExternalLink from "@/components/ExternalLink";
import TooltipButton from "@/components/base/TooltipButton";
+import { formatDistanceToNow } from "@/utils";
-export const connectionIcons: Record = {
+export const connectionIcons: Record = {
stable: "is-stable",
Re: [Sts-sponsors] [UNITTESTS] -b dgx-introduce-platform lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b dgx-introduce-platform lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: fa2f8d1501de37bd541697a53b07c0d1c79677be -- https://code.launchpad.net/~igor-brovtsin/maas/+git/maas/+merge/441293 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:update-api-shapes into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:update-api-shapes into maas-site-manager:main has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441774 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:update-api-shapes. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b dgx-platform-kernels-lookup lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b dgx-platform-kernels-lookup lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-tester/2397/console COMMIT: b4577184097988d3f03b730c6093e4bdc98490b2 -- https://code.launchpad.net/~igor-brovtsin/maas/+git/maas/+merge/441824 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:update-api-shapes into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:update-api-shapes into maas-site-manager:main has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441774 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:update-api-shapes. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~igor-brovtsin/maas:dgx-introduce-platform into maas:master
Had to move the commits that modified the boot resources handling to `dgx-platform-kernels-lookup` -- https://code.launchpad.net/~igor-brovtsin/maas/+git/maas/+merge/441293 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~ack/maas-kpi:log-bugs into maas-kpi:master
The proposal to merge ~ack/maas-kpi:log-bugs into maas-kpi:master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~ack/maas-kpi/+git/maas-kpi/+merge/441932 -- Your team MAAS Committers is subscribed to branch maas-kpi:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:add-a11y-tests into maas-site-manager:main
Review: Needs Information
One question/comment before approving, see diff comments
Diff comments:
> diff --git
> a/frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx
> b/frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx
> index a4c2b15..a6a4354 100644
> ---
> a/frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx
> +++
> b/frontend/src/components/TokensList/components/TokensTable/TokensTable.tsx
> @@ -46,15 +45,20 @@ const TokensTable = ({
>{
> id: "select",
> header: ({ table }) => ,
> -cell: ({ row }) => (
> -
> - - checked={row.getIsSelected()}
> - disabled={!row.getCanSelect()}
> - onChange={row.getToggleSelectedHandler()}
> +cell: ({ row, getValue }) => (
> +
> + + aria-label={`select ${getValue()}`}
> + className="p-checkbox__input"
>type="checkbox"
> + {...{
> +checked: row.getIsSelected(),
> +disabled: !row.getCanSelect(),
> +onChange: row.getToggleSelectedHandler(),
> + }}
> />
> -
> +
> +
> ),
>},
>{
--
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441890
Your team MAAS Committers is subscribed to branch
~petermakowski/maas-site-manager:add-a11y-tests.
--
Mailing list: https://launchpad.net/~sts-sponsors
Post to : sts-sponsors@lists.launchpad.net
Unsubscribe : https://launchpad.net/~sts-sponsors
More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~ack/maas-kpi:log-bugs into maas-kpi:master
The proposal to merge ~ack/maas-kpi:log-bugs into maas-kpi:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ack/maas-kpi/+git/maas-kpi/+merge/441932 -- Your team MAAS Committers is subscribed to branch maas-kpi:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b log-bugs lp:~ack/maas-kpi/+git/maas-kpi into -b master lp:~maas-committers/maas-kpi - TESTS PASS
Review: Approve UNIT TESTS -b log-bugs lp:~ack/maas-kpi/+git/maas-kpi into -b master lp:~maas-committers/maas-kpi STATUS: SUCCESS COMMIT: 74322dc15d455ea450d4ae55525f114f86e6cc84 -- https://code.launchpad.net/~ack/maas-kpi/+git/maas-kpi/+merge/441932 Your team MAAS Committers is subscribed to branch maas-kpi:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~ack/maas-kpi:log-bugs into maas-kpi:master
Review: Approve +1 -- https://code.launchpad.net/~ack/maas-kpi/+git/maas-kpi/+merge/441932 Your team MAAS Committers is subscribed to branch maas-kpi:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~ack/maas-kpi:log-bugs into maas-kpi:master
Alberto Donato has proposed merging ~ack/maas-kpi:log-bugs into maas-kpi:master.
Commit message:
log collected bugs to stderr
Requested reviews:
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~ack/maas-kpi/+git/maas-kpi/+merge/441932
--
Your team MAAS Committers is requested to review the proposed merge of
~ack/maas-kpi:log-bugs into maas-kpi:master.
diff --git a/maaskpi/base.py b/maaskpi/base.py
index fe0de1e..2c023b4 100644
--- a/maaskpi/base.py
+++ b/maaskpi/base.py
@@ -1,4 +1,5 @@
import argparse
+import sys
from contextlib import contextmanager
from influxdb.line_protocol import make_lines
@@ -33,21 +34,23 @@ class Collector:
self.parser.add_argument(
"-o",
"--output",
-default="/dev/stdout",
-nargs="?",
+type=argparse.FileType("wb"),
+default=sys.stdout.buffer,
help="Path to the file where the metrics are written to",
)
self.registry = CollectorRegistry()
+def log(self, msg):
+print(msg, file=sys.stderr)
+
def run_collect(self, args):
return self.collect()
def run(self):
args = self.parser.parse_args()
-with open(args.output, "wb") as destination:
-for series in self.run_collect(args):
-with get_and_reset(series) as points:
-destination.write(make_lines({"points": points}).encode("utf-8"))
+for series in self.run_collect(args):
+with get_and_reset(series) as points:
+args.output.write(make_lines({"points": points}).encode("utf-8"))
class LaunchpadCollector(Collector):
diff --git a/maaskpi/bugs.py b/maaskpi/bugs.py
index 0fb1b3a..3bb6de2 100644
--- a/maaskpi/bugs.py
+++ b/maaskpi/bugs.py
@@ -1,5 +1,3 @@
-import sys
-
from influxdb import SeriesHelper
from .base import LaunchpadCollector
@@ -47,6 +45,7 @@ class BugsCollector(LaunchpadCollector):
def _collect_bugs(
self, record_series, lp_project, project_label, ignored_related_projects=()
):
+self.log(f"Tasks for {project_label}:")
counts = dict.fromkeys(record_series.Meta.fields, 0)
for task in lp_project.searchTasks():
ignore = ignored_related_projects and any(
@@ -56,25 +55,25 @@ class BugsCollector(LaunchpadCollector):
if ignore:
continue
+bug = task.bug
status = task.status
if status == "Incomplete":
-if task.date_incomplete < task.bug.date_last_message:
+if task.date_incomplete < bug.date_last_message:
status += "WithResponse"
else:
status += "WithoutResponse"
counts[status_to_field(status)] += 1
+self.log(f"{bug.id} | {status:25} | {bug.title}")
# influx mutates state in the class via the constructor
record_series(**counts, project=project_label)
def collect(self, lp):
-print("Searching maas tasks", file=sys.stderr)
self._collect_bugs(
OpenBugsSeries,
lp.projects["maas"],
"core",
ignored_related_projects=[lp.projects["maas-ui"]],
)
-print("Searching maas-ui tasks", file=sys.stderr)
self._collect_bugs(OpenBugsSeries, lp.projects["maas-ui"], "ui")
yield OpenBugsSeries
--
Mailing list: https://launchpad.net/~sts-sponsors
Post to : sts-sponsors@lists.launchpad.net
Unsubscribe : https://launchpad.net/~sts-sponsors
More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
Review: Approve LGTM! -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:fix-mobile-nav. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:strict-router-types into maas-site-manager:main
Looks like tests in src/routes.test.tsx are failing, will review once this is fixed -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441882 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:strict-router-types into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b update-api-shapes lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b update-api-shapes lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: e975b833ae577021fbc551ccba5e29485f6a9ba2 -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441774 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:update-api-shapes. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:update-api-shapes into maas-site-manager:main
Review: Approve LGTM - note: I was unable to test this with the real backend due to local issues -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441774 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:update-api-shapes. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b update-api-shapes lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS FAILED
Review: Needs Fixing UNIT TESTS -b update-api-shapes lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: FAILED LOG: http://maas-ci.internal:8080/job/maas-site-manager-tester/497/console COMMIT: 1d5ad33915ba59092c071ccd5bb8461c8b9cc9a0 -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441774 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:update-api-shapes into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix-mobile-nav lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b fix-mobile-nav lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: aa04b9fe7bb827ab0dd64cde972cb7c755436763 -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b current-script-set-foreign-key-constraints lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b current-script-set-foreign-key-constraints lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: a3e3cca65c0b7f99704fb9af05338d4558d980b8 -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441925 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:update-api-shapes into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:update-api-shapes into
maas-site-manager:main has been updated.
Description changed to:
- update API data shapes
- update pagination to start at index 1
QA Steps
Go to sites, tokens, and requests pages and make sure they load correctly using
the mock API
Comment out the following lines from main.tsx:
if (isDev) {
const { worker } = await import("./mocks/browser");
await worker.start();
}
Make sure you have the backend running and setup with test data (follow
instructions in backend/README.md)
Go to sites, tokens, and requests pages and make sure they load correctly using
the real API
For more details, see:
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441774
--
Your team MAAS Committers is requested to review the proposed merge of
~petermakowski/maas-site-manager:update-api-shapes into maas-site-manager:main.
--
Mailing list: https://launchpad.net/~sts-sponsors
Post to : sts-sponsors@lists.launchpad.net
Unsubscribe : https://launchpad.net/~sts-sponsors
More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b move-metadataserver-script-models lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b move-metadataserver-script-models lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: e0ad609a767b0191a36a0be65e8891cffb2fc492 -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441920 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Commit message changed to: fix: primary and secondary navigation on mobile - hide secondary navigation on mobile - fix primary navigation collapse on mobile - simplify stylesheet declarations For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Description changed to: ### QA Steps Open google chrome Go to MAAS Site Manager Toggle device toolbar (ctrl/cmd + shift + M) Choose mobile phone dimensions (e.g. Google Pixel) Go to /sites and verify that there is no empty space below the primary navigation Go to /settings Verify that the secondary navigation is shown Open the primary navigation by clicking "Menu" Navigate to a different page Click to collapse navigation Open primary navigation again Click to collapse navigation Navigation should collapse ### Screenshots After https://share.cleanshot.com/FjTKcBrk https://share.cleanshot.com/QsBJB800 For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b fix-mobile-nav lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b fix-mobile-nav lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: 3041107e81df6b3112a9fd42bc808348a95b2d01 -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [UNITTESTS] -b move-metadataserver-node-models lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b move-metadataserver-node-models lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: bf5d6dc2c7a7168a4eea707317f8cc887765d5f2 -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441919 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~bjornt/maas:current-script-set-foreign-key-constraints into maas:master
Björn Tillenius has proposed merging
~bjornt/maas:current-script-set-foreign-key-constraints into maas:master with
~bjornt/maas:move-metadataserver-script-models as a prerequisite.
Commit message:
Add foreign key constraints for:
* Node.current_testing_script_set
* Node.current_installation_script_set
* Node.current_commissioning_script_set
A bug in Django caused those not be created, since they referenced
a model in a different app (maasserver -> metadataserver)
This patch adds those constraints by temporarily changing the fields
to be integer fields, clean up the data (since there might be incorrect
foreign key links), and then change back the columns to be foreign keys.
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441925
--
Your team MAAS Committers is subscribed to branch maas:master.
diff --git a/src/maasserver/migrations/maasserver/0298_current_script_set_foreign_keys_drop_indexes.py b/src/maasserver/migrations/maasserver/0298_current_script_set_foreign_keys_drop_indexes.py
new file mode 100644
index 000..b7ac4bf
--- /dev/null
+++ b/src/maasserver/migrations/maasserver/0298_current_script_set_foreign_keys_drop_indexes.py
@@ -0,0 +1,39 @@
+# Generated by Django 3.2.12 on 2022-11-21 14:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+dependencies = [
+("maasserver", "0297_move_metadata_script_models"),
+]
+
+operations = [
+migrations.AlterField(
+model_name="node",
+name="current_commissioning_script_set",
+field=models.IntegerField(
+blank=True,
+db_column="current_commissioning_script_set_id",
+null=True,
+),
+),
+migrations.AlterField(
+model_name="node",
+name="current_installation_script_set",
+field=models.IntegerField(
+blank=True,
+db_column="current_installation_script_set_id",
+null=True,
+),
+),
+migrations.AlterField(
+model_name="node",
+name="current_testing_script_set",
+field=models.IntegerField(
+blank=True,
+db_column="current_testing_script_set_id",
+null=True,
+),
+),
+]
diff --git a/src/maasserver/migrations/maasserver/0299_current_script_set_foreign_keys_cleanup.py b/src/maasserver/migrations/maasserver/0299_current_script_set_foreign_keys_cleanup.py
new file mode 100644
index 000..b62b994
--- /dev/null
+++ b/src/maasserver/migrations/maasserver/0299_current_script_set_foreign_keys_cleanup.py
@@ -0,0 +1,37 @@
+# Generated by Django 3.2.12 on 2022-11-21 14:03
+
+from django.db import migrations, models
+
+
+def clean_up_missing_scriptset_links(apps, schema_editor):
+"""Clean up current_foo_script_set_id that have been removed.
+
+A node points to the current commissioning, installation, and
+testing script set. But since there was no foreign key constraint
+in the database, the corresponding script set might have been removed
+already.
+"""
+ScriptSet = apps.get_model("maasserver", "ScriptSet")
+Node = apps.get_model("maasserver", "Node")
+Node.objects.exclude(
+current_testing_script_set__isnull=False,
+current_testing_script_set__in=ScriptSet.objects.all(),
+).update(current_testing_script_set=None)
+Node.objects.exclude(
+current_commissioning_script_set__isnull=False,
+current_commissioning_script_set__in=ScriptSet.objects.all(),
+).update(current_commissioning_script_set=None)
+Node.objects.exclude(
+current_installation_script_set__isnull=False,
+current_installation_script_set__in=ScriptSet.objects.all(),
+).update(current_installation_script_set=None)
+
+
+class Migration(migrations.Migration):
+dependencies = [
+("maasserver", "0298_current_script_set_foreign_keys_drop_indexes"),
+]
+
+operations = [
+migrations.RunPython(clean_up_missing_scriptset_links),
+]
diff --git a/src/maasserver/migrations/maasserver/0300_current_script_set_foreign_keys_readd.py b/src/maasserver/migrations/maasserver/0300_current_script_set_foreign_keys_readd.py
new file mode 100644
index 000..80c728b
--- /dev/null
+++ b/src/maasserver/migrations/maasserver/0300_current_script_set_foreign_keys_readd.py
@@ -0,0 +1,46 @@
+# Generated by Django 3.2.12 on 2022-11-21 14:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+dependencies = [
+("maasserver", "0299_current_script_set_foreign_keys_cleanup"),
+]
+
+operations = [
+migrations.AlterField(
+model_name="node",
+name="current_commissioning_script_set",
+field=models.F
Re: [Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-script-models into maas:master
This is the same as https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441919, but for the script models. -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441920 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-script-models into maas:master
Björn Tillenius has proposed merging ~bjornt/maas:move-metadataserver-script-models into maas:master with ~bjornt/maas:move-metadataserver-node-models as a prerequisite. Commit message: Move Script metadataserver models to maasserver. Requested reviews: MAAS Maintainers (maas-maintainers) For more details, see: https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441920 -- Your team MAAS Committers is subscribed to branch maas:master. diff --git a/src/maasserver/api/commissioning_scripts.py b/src/maasserver/api/commissioning_scripts.py index 477b688..bf1e6e6 100644 --- a/src/maasserver/api/commissioning_scripts.py +++ b/src/maasserver/api/commissioning_scripts.py @@ -18,9 +18,9 @@ from maasserver.audit import create_audit_event from maasserver.enum import ENDPOINT from maasserver.exceptions import MAASAPIValidationError from maasserver.forms.script import ScriptForm +from maasserver.models import Script from metadataserver.enum import SCRIPT_TYPE from metadataserver.fields import Bin -from metadataserver.models import Script from provisioningserver.events import EVENT_TYPES diff --git a/src/maasserver/api/nodedevices.py b/src/maasserver/api/nodedevices.py index 354150a..f3243f7 100644 --- a/src/maasserver/api/nodedevices.py +++ b/src/maasserver/api/nodedevices.py @@ -11,8 +11,8 @@ from maasserver.api.utils import get_optional_param from maasserver.exceptions import MAASAPIValidationError from maasserver.models import Node, NodeDevice from maasserver.models.nodedevice import translate_bus +from maasserver.models.script import translate_hardware_type from maasserver.permissions import NodePermission -from metadataserver.models.script import translate_hardware_type class NodeDevicesHandler(OperationsHandler): diff --git a/src/maasserver/api/nodes.py b/src/maasserver/api/nodes.py index 41eeeab..4294776 100644 --- a/src/maasserver/api/nodes.py +++ b/src/maasserver/api/nodes.py @@ -46,6 +46,7 @@ from maasserver.forms import BulkNodeSetZoneForm from maasserver.forms.ephemeral import TestForm from maasserver.models import Filesystem, Interface, Node, OwnerData from maasserver.models.nodeprobeddetails import get_single_probed_details +from maasserver.models.scriptset import get_status_from_qs from maasserver.node_constraint_filter_forms import ReadNodesForm from maasserver.permissions import NodePermission from maasserver.utils.forms import compose_invalid_choice_text @@ -56,7 +57,6 @@ from metadataserver.enum import ( SCRIPT_STATUS, SCRIPT_STATUS_CHOICES, ) -from metadataserver.models.scriptset import get_status_from_qs NODES_SELECT_RELATED = ( "bmc", diff --git a/src/maasserver/api/results.py b/src/maasserver/api/results.py index 4b16445..424d7a9 100644 --- a/src/maasserver/api/results.py +++ b/src/maasserver/api/results.py @@ -11,10 +11,9 @@ from formencode.validators import Int from maasserver.api.support import OperationsHandler from maasserver.api.utils import get_optional_list, get_optional_param -from maasserver.models import Node +from maasserver.models import Node, ScriptResult from maasserver.permissions import NodePermission from metadataserver.enum import SCRIPT_STATUS -from metadataserver.models import ScriptResult class NodeResultsHandler(OperationsHandler): diff --git a/src/maasserver/api/scriptresults.py b/src/maasserver/api/scriptresults.py index 8ca1855..6051a56 100644 --- a/src/maasserver/api/scriptresults.py +++ b/src/maasserver/api/scriptresults.py @@ -22,11 +22,10 @@ from piston3.utils import rc from maasserver.api.support import admin_method, operation, OperationsHandler from maasserver.api.utils import get_optional_param from maasserver.exceptions import MAASAPIValidationError -from maasserver.models import Node +from maasserver.models import Node, ScriptSet +from maasserver.models.script import translate_hardware_type +from maasserver.models.scriptset import translate_result_type from maasserver.permissions import NodePermission -from metadataserver.models import ScriptSet -from metadataserver.models.script import translate_hardware_type -from metadataserver.models.scriptset import translate_result_type def fmt_time(dt): diff --git a/src/maasserver/api/scripts.py b/src/maasserver/api/scripts.py index 40b2221..6f3f2ea 100644 --- a/src/maasserver/api/scripts.py +++ b/src/maasserver/api/scripts.py @@ -19,8 +19,8 @@ from maasserver.audit import create_audit_event from maasserver.enum import ENDPOINT from maasserver.exceptions import MAASAPIValidationError from maasserver.forms.script import ScriptForm -from metadataserver.models import Script -from metadataserver.models.script import ( +from maasserver.models import Script +from maasserver.models.script import ( translate_hardware_type, translate_script_type, ) diff --git a/src/maasserver/api/tests/test_commissioning.py b/src/maasserver/api/tests/test_commissioning.py index d413ddc..6b4903c 100644 --- a/src/maasserver/api/tests/test_commissioning.py +++
Re: [Sts-sponsors] [UNITTESTS] -b dgx-introduce-platform lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b dgx-introduce-platform lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: 3e7a6b6a2739205cb9d84a454b6406b1967933bd -- https://code.launchpad.net/~igor-brovtsin/maas/+git/maas/+merge/441293 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
Re: [Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-node-models into maas:master
The migrations use SeparateDatabaseAndState, so that removing the model from metadataserver and adding it to maasserver doesn't drop the table and recreated it. Instead we drop only the Python models, and the only DB changes is the rename of the table. -- https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441919 Your team MAAS Committers is subscribed to branch maas:master. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Description changed to: ### QA Steps Open google chrome Go to MAAS Site Manager Toggle device toolbar (ctrl/cmd + shift + M) Choose mobile phone dimensions (e.g. Google Pixel) Go to /sites and verify that there is no empty space below the primary navigation Go to /settings Verify that the secondary navigation is shown ### Screenshots After https://share.cleanshot.com/FjTKcBrk https://share.cleanshot.com/QsBJB800 For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Description changed to: ### QA Steps Open google chrome Go to MAAS Site Manager Toggle device toolbar (ctrl/cmd + shift + M) Choose mobile phone dimensions (e.g. Google Pixel) Go to /sites and verify that there is no empty space below the primary navigation Go to /settings Verify that the secondary navigation is shown ### Screenshots After https://share.cleanshot.com/FjTKcBrk https://share.cleanshot.com/QsBJB800 For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Description changed to: ### QA Steps Open google chrome Go to MAAS Site Manager Toggle device toolbar (ctrl/cmd + shift + M) Choose mobile phone dimensions (e.g. Google Pixel) Go to /sites and verify that there is no empty space below the primary navigation Go to /settings Verify that the secondary navigation is shown ### Screenshots After https://share.cleanshot.com/FjTKcBrk https://share.cleanshot.com/QsBJB800 https://media.cleanshot.cloud/media/61681/CNp26dSdTSxKkMqdUhJ15cURXyo7UICDxygnRRBZ.jpeg?Expires=1682516950&Signature=kJfuqiLSs25zMyGOd2gyt9vi30RE24wC8wK40BpwR4K-rpUEecwgsd~nrJC92wQDt51P3OLpJ3q9qBB4QGSlbFmdszfb36wcBDUvIw3QIMmiB-we6MTsOdYQejR0nkn~0DaZzGcgU14WAISFVHAY5eQxDHIxVrJUffWa4uJ-K5Ep6xWNw9aJr19Eil3cz5~YHv5MlqitdC2y5yK72yIg0yrIWmkUmYPIiqJYRkUJRuNPwCwswIoz81Vrssfe~Mr7nVx37ktZQNTVnCl1T0Roia5vl72amWeqcP62r~MfD50PyKs7BiJ2GpZh1-D3PMXqElioasTPWaxzHyhvKiPUXQ__&Key-Pair-Id=K269JMAT9ZF4GZ For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Description changed to: ### QA Steps Open google chrome Go to MAAS Site Manager Toggle device toolbar (ctrl/cmd + shift + M) Choose mobile phone dimensions (e.g. Google Pixel) Go to /sites and verify that there is no empty space below the primary navigation Go to /settings Verify that the secondary navigation is shown ### Screenshots After https://share.cleanshot.com/FjTKcBrk https://share.cleanshot.com/QsBJB800 https://media.cleanshot.cloud/media/61681/CNp26dSdTSxKkMqdUhJ15cURXyo7UICDxygnRRBZ.jpeg For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~bjornt/maas:move-metadataserver-node-models into maas:master
Björn Tillenius has proposed merging ~bjornt/maas:move-metadataserver-node-models into maas:master. Commit message: Move Node metadataserver models to maasserver. Requested reviews: MAAS Maintainers (maas-maintainers) For more details, see: https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/441919 -- Your team MAAS Maintainers is requested to review the proposed merge of ~bjornt/maas:move-metadataserver-node-models into maas:master. diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py index 0477be6..ca98aae 100644 --- a/src/maasserver/api/tests/test_machine.py +++ b/src/maasserver/api/tests/test_machine.py @@ -42,7 +42,7 @@ from maasserver.enum import ( from maasserver.exceptions import StaticIPAddressExhaustion from maasserver.models import Config, Domain, Filesystem, Machine, Node from maasserver.models import node as node_module -from maasserver.models import StaticIPAddress +from maasserver.models import NodeKey, NodeUserData, StaticIPAddress from maasserver.models.bmc import Pod from maasserver.models.node import RELEASABLE_STATUSES from maasserver.models.signals.testing import SignalsDisabled @@ -74,7 +74,6 @@ from maastesting.matchers import ( ) from metadataserver.builtin_scripts import load_builtin_scripts from metadataserver.enum import SCRIPT_TYPE -from metadataserver.models import NodeKey, NodeUserData from metadataserver.nodeinituser import get_node_init_user from provisioningserver.refresh.node_info_scripts import NODE_INFO_SCRIPTS from provisioningserver.utils.enum import map_enum diff --git a/src/maasserver/api/tests/test_node.py b/src/maasserver/api/tests/test_node.py index 32a99cc..519a583 100644 --- a/src/maasserver/api/tests/test_node.py +++ b/src/maasserver/api/tests/test_node.py @@ -15,6 +15,7 @@ from maasserver.api import auth from maasserver.enum import NODE_STATUS, NODE_STATUS_CHOICES, POWER_STATE from maasserver.models import Config, Node from maasserver.models import node as node_module +from maasserver.models import NodeKey from maasserver.testing.api import APITestCase from maasserver.testing.architecture import make_usable_architecture from maasserver.testing.factory import factory @@ -34,7 +35,6 @@ from metadataserver.enum import ( SCRIPT_STATUS_CHOICES, SCRIPT_TYPE, ) -from metadataserver.models import NodeKey from metadataserver.models.scriptset import get_status_from_qs from metadataserver.nodeinituser import get_node_init_user from provisioningserver.refresh.node_info_scripts import ( diff --git a/src/maasserver/clusterrpc/tests/test_osystems.py b/src/maasserver/clusterrpc/tests/test_osystems.py index 7e8abb9..f98334b 100644 --- a/src/maasserver/clusterrpc/tests/test_osystems.py +++ b/src/maasserver/clusterrpc/tests/test_osystems.py @@ -23,12 +23,12 @@ from maasserver.clusterrpc.osystems import ( validate_license_key, ) from maasserver.enum import BOOT_RESOURCE_TYPE, PRESEED_TYPE +from maasserver.models import NodeKey from maasserver.rpc import getAllClients from maasserver.rpc.testing.fixtures import RunningClusterRPCFixture from maasserver.testing.architecture import make_usable_architecture from maasserver.testing.factory import factory from maasserver.testing.testcase import MAASServerTestCase -from metadataserver.models import NodeKey from provisioningserver.rpc.exceptions import NoSuchOperatingSystem diff --git a/src/maasserver/clusterrpc/tests/test_pods.py b/src/maasserver/clusterrpc/tests/test_pods.py index 36badc6..45a3075 100644 --- a/src/maasserver/clusterrpc/tests/test_pods.py +++ b/src/maasserver/clusterrpc/tests/test_pods.py @@ -27,6 +27,7 @@ from maasserver.clusterrpc.pods import ( send_pod_commissioning_results, ) from maasserver.exceptions import PodProblem +from maasserver.models import NodeKey from maasserver.testing.factory import factory from maasserver.testing.testcase import ( MAASServerTestCase, @@ -35,7 +36,6 @@ from maasserver.testing.testcase import ( from maastesting.crochet import wait_for from maastesting.matchers import MockCalledOnceWith from maastesting.testcase import MAASTestCase -from metadataserver.models import NodeKey from provisioningserver.drivers.pod import ( DiscoveredCluster, DiscoveredPod, diff --git a/src/maasserver/compose_preseed.py b/src/maasserver/compose_preseed.py index 97974b6..2ccc0a0 100644 --- a/src/maasserver/compose_preseed.py +++ b/src/maasserver/compose_preseed.py @@ -620,8 +620,7 @@ def compose_preseed(request, preseed_type, node): :return: Preseed data containing the information the node needs in order to access the metadata service: its URL and auth token. """ -# Circular import. -from metadataserver.models import NodeKey +from maasserver.models import NodeKey token = NodeKey.objects.get_token_for_node(node) if preseed_type == PRESEED_TYPE.COMMISSIONING: diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Description changed to: ### QA Steps Open google chrome Go to MAAS Site Manager Toggle device toolbar (ctrl/cmd + shift + M) Choose mobile phone dimensions (e.g. Google Pixel) Go to /sites and verify that there is no empty space below the primary navigation Go to /settings Verify that the secondary navigation is shown ### Screenshots After https://share.cleanshot.com/FjTKcBrk https://share.cleanshot.com/QsBJB800 For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main has been updated. Description changed to: ### QA Steps Open google chrome Go to MAAS Site Manager Toggle device toolbar (ctrl/cmd + shift + M) Choose mobile phone dimensions (e.g. Google Pixel) Go to /sites and verify that there is no empty space below the primary navigation Go to /settings Verify that the secondary navigation is shown ### Screenshots After https://media.cleanshot.cloud/media/61681/CNp26dSdTSxKkMqdUhJ15cURXyo7UICDxygnRRBZ.jpeg?Expires=1682516710&Signature=kw1HGJGPU5xNXIFEB~RYPxZXEVkReymsIIWIVpmu3p58RMn72NWaLVP8G90dddoczpxdfUuIfCOGAfe-KsqC6CGBoXoy9lKDD48vcWsuOnv0ShdB85NbNuYhK8boFN3C3DWBvrbYJhtU-7EarTr8HVrgIEC0ExJNQEyac-WtdiEI9Amn6iliaztoF5I4lezrkrxWVIV3qUT0YfOFnnnUs8G9F~WDMi9pgZjn3TXiRFIZZjcQG1wvyS-UUVR5GhDD3KTv~lG6wTOF~m8cQYnFkVsxFI319GjJeI5mbJEZY08sr2eIRffX6y7UPrZb9YIV0pPFUUmjg8~dfQ6cLf1VaQ__&Key-Pair-Id=K269JMAT9ZF4GZ"; /> https://share.cleanshot.com/FjTKcBrk https://share.cleanshot.com/QsBJB800 For more details, see: https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441918 -- Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:fix-mobile-nav into maas-site-manager:main. -- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
