[Sts-sponsors] [Merge] ~alexsander-souza/maas:fix_vmfs_alignment into maas:master
The proposal to merge ~alexsander-souza/maas:fix_vmfs_alignment into maas:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/442113 -- 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] [Bug 2018109] [NEW] Merge simplestreams from Debian unstable for mantic
Public bug reported: Scheduled-For: Backlog Upstream: tbd Debian: Ubuntu: 0.1.0-48-gb936edd4-0ubuntu2 The simplestreams team team has maintained this package in the past and may be handling this merge. If it turns out this needs a sync rather than a merge, please change the tag 'needs-merge' to 'needs-sync', and (optionally) update the title as desired. ### Old Ubuntu Delta ### simplestreams (0.1.0-48-gb936edd4-0ubuntu2) lunar; urgency=medium * d/p/test-rotate-example-keys: update test key to fix FTBFS. Thanks to Dominik Viererbe. -- Robie Basak Wed, 05 Apr 2023 15:23:55 + simplestreams (0.1.0-48-gb936edd4-0ubuntu1) jammy; urgency=medium * New upstream snapshot. - Remove requests read timeout, whilst retaining connect timeout [Adam Collard] - Add support for setting image visibility [Colin Watson] -- Paride Legovini Wed, 24 Nov 2021 18:41:45 +0100 simplestreams (0.1.0-46-gb1f40d99-0ubuntu1) impish; urgency=medium * New upstream snapshot. - install-deps: install cargo as a tox dependency [Paride Legovini] - Add 10s timeout to out-going requests to avoid blocking. [Adam Collard] - simplestreams: fix use of deprecated LOG.warn method - Use cloud-images.ubuntu.com rsync module instead of uec-images [Philip Roche] - Revert 'Skip disk-kvm-img as unsuable under LXD' [Stéphane Graber] - Make focal the current LTS [Robert C Jennings] - Drop fast path use of keystoneauth1 sessions object. [James Page] - Add build-packages to fix build failures on non-amd64 archs. [James Page] - Add snap packaging for simplestreams [James Page] - Add support for setting image custom properties [James Page] - Unpin linting tools to allow them to work on Ubuntu 20.04 LTS. [James Page] - make-test-data: Add missing change for uefi1 combined lxd sha [Robert C Jennings] - Present LXD KVM with Xenial images [Robert C Jennings] - Skip disk-kvm-img as unsuable under LXD [Stéphane Graber] - https://bugs.launchpad.net/simplestreams/+bug/1833435 [Daniele Rondina] - Fix file matching for disk-kvm.img [Robert C Jennings] - tools/js2signed: change shebang to /usr/bin/env python3 - Fix file matching for disk-kvm.img [Stéphane Graber] - Add combined-disk-kvm-img_sha256 to download.json [Stéphane Graber] - debian: run the tests only against Python 3 [Paride Legovini] - debian: stop building Python 2 package -- Paride Legovini Tue, 18 May 2021 12:22:08 +0200 simplestreams (0.1.0-25-gba75825b-0ubuntu1) eoan; urgency=medium * New upstream snapshot. - Add combined_disk1-img_sha256 to download.json [Stéphane Graber] - Apply filters to items before filtering versions [Philip Roche] - Add KVM images to eoan. [Pat Viafore] * d/control: remove python-simplestreams-openstack -- Daniel Watkins Tue, 20 Aug 2019 10:31:20 -0400 simplestreams (0.1.0-22-g409fdc15-0ubuntu1) disco; urgency=medium * debian/README.source: update to refer to upstream packaging ubuntu/devel branch. * debian/new-upstream-snapshot: remove obsolete bzr tool. * New upstream snapshot. - tools: rename export-tarball to make-tarball. - Do not run flake8 during 'make test', remove 'trusty-flake8' tox env. - Add SSL support to simplestreams/openstack.py [Alex Kavanagh] (LP: #1802407) - Add 'ubuntu' alias to CURRENT_LTS. [Daniel Watkins] - tenv: Put topdir/bin before topdir/tools in PATH [Daniel Watkins] -- Scott Moser Mon, 07 Jan 2019 15:38:04 -0500 simplestreams (0.1.0-17-g693795b-0ubuntu1) disco; urgency=medium * debian/control: Update packaging to include python3-simplestreams-openstack. * debian/control: drop obsolete conficts/replaces. * debian/: fix lintian warnings and errors. - package-uses-deprecated-debhelper-compat-version: change to 9 9 is what is in 16.04 (and 12.04), so stick with that for now. - build-depends-on-build-essential-package-without-using-version: drop the make dependency. - ancient-python-version-field: no need to specify X-python-version or X-python3-version any more. - ancient-standards-version: move debian/control Standards-Version to 4.2.1 - priority-extra-is-replaced-by-priority-optional: replace extra with optional * debian/control: new package python3-simplestreams-openstack. * New upstream snapshot. - Move sstream-mirror-glance from tools/ to bin/. - glance: Support Glance version 2. [David Ames] (LP: #1790904) - Move to git. - sstream-mirror-glance update to python3 and include in shipped files. -- Scott Moser Tue, 13 Nov 2018 10:43:34 -0500 simplestreams (0.1.0~bzr460-0ubuntu1) bionic; urgency=medium * New upstream snapshot. - Glance: handle Keystone v2 session based authentication. [David Ames] (LP: #1611987) -- Scott Moser Thu, 12 Apr 2018 12:50:58 -0400 simplestreams (0.1.0~bzr459-0ubuntu1) bionic; urgency=medium * New upstream
Re: [Sts-sponsors] [UNITTESTS] -b fix_vmfs_alignment lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b fix_vmfs_alignment lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: 775f5808df9adbee0eb4bbfc94bbef094349a9ae -- https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/442113 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] ~alexsander-souza/maas:fix_vmfs_alignment into maas:master
Review: Approve +1 -- https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/442113 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] ~alexsander-souza/maas:fix_vmfs_alignment into maas:master
Alexsander de Souza has proposed merging
~alexsander-souza/maas:fix_vmfs_alignment into maas:master.
Commit message:
fix VMFS alignment
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/442113
--
Your team MAAS Maintainers is requested to review the proposed merge of
~alexsander-souza/maas:fix_vmfs_alignment into maas:master.
diff --git a/src/maasserver/storage_layouts.py b/src/maasserver/storage_layouts.py
index 4056191..af36b8b 100644
--- a/src/maasserver/storage_layouts.py
+++ b/src/maasserver/storage_layouts.py
@@ -919,7 +919,7 @@ class VMFS7StorageLayout(VMFS6StorageLayout):
EFI System 1 100MB
Basic Data 5 4GB
Basic Data 6 4GB
-VMFSL 7 23.8GB
+VMFSL 7 23.9GB
VMFS8 Remaining
"""
@@ -931,11 +931,11 @@ class VMFS7StorageLayout(VMFS6StorageLayout):
# EFI System
{"index": 1, "size": 100 * 1024**2, "bootable": True},
# Basic Data
-{"index": 5, "size": 4 * 1024**3},
+{"index": 5, "size": 4095 * 1024**2},
# Basic Data
-{"index": 6, "size": 4 * 1024**3},
+{"index": 6, "size": 4095 * 1024**2},
# VMFSL
-{"index": 7, "size": 24320 * 1024**2},
+{"index": 7, "size": 25662832128},
# VMFS
{"index": 8, "size": 0},
],
diff --git a/src/maasserver/tests/test_storage_layouts.py b/src/maasserver/tests/test_storage_layouts.py
index e499adc..1316b7e 100644
--- a/src/maasserver/tests/test_storage_layouts.py
+++ b/src/maasserver/tests/test_storage_layouts.py
@@ -1945,6 +1945,23 @@ class TestVMFS6StorageLayout(MAASServerTestCase):
class TestVMFS7StorageLayout(MAASServerTestCase):
+def gen_partition_map(self, disk, disk_size=None):
+dstore_size = disk_size or (
+disk.size
+- 100 * 1024**2
+- 4095 * 1024**2
+- 4095 * 1024**2
+- 25662832128
+- 8405504 # total rounding
+)
+return {
+f"{disk.name}-part1": 100 * 1024**2,
+f"{disk.name}-part5": 4095 * 1024**2,
+f"{disk.name}-part6": 4095 * 1024**2,
+f"{disk.name}-part7": 25662832128,
+f"{disk.name}-part8": dstore_size,
+}
+
def test_init_sets_up_all_fields(self):
node = factory.make_Node(with_boot_disk=False)
layout = VMFS7StorageLayout(node)
@@ -1961,20 +1978,7 @@ class TestVMFS7StorageLayout(MAASServerTestCase):
self.assertEqual("vmfs7", layout.configure())
pt = node.boot_disk.get_partitiontable()
self.assertEqual(
-{
-f"{node.boot_disk.name}-part1": 100 * 1024**2,
-f"{node.boot_disk.name}-part5": 4 * 1024**3,
-f"{node.boot_disk.name}-part6": 4 * 1024**3,
-f"{node.boot_disk.name}-part7": 24320 * 1024**2,
-f"{node.boot_disk.name}-part8": (
-node.boot_disk.size
-- 100 * 1024**2
-- 4 * 1024**3
-- 4 * 1024**3
-- 24320 * 1024**2
-- 8 * 1024**2 # rounding
-),
-},
+self.gen_partition_map(node.boot_disk),
{part.name: part.size for part in pt.partitions.all()},
)
@@ -2003,20 +2007,7 @@ class TestVMFS7StorageLayout(MAASServerTestCase):
self.assertEqual("vmfs7", layout.configure())
pt = root_disk.get_partitiontable()
self.assertEqual(
-{
-f"{root_disk.name}-part1": 100 * 1024**2,
-f"{root_disk.name}-part5": 4 * 1024**3,
-f"{root_disk.name}-part6": 4 * 1024**3,
-f"{root_disk.name}-part7": 24320 * 1024**2,
-f"{root_disk.name}-part8": (
-root_disk.size
-- 100 * 1024**2
-- 4 * 1024**3
-- 4 * 1024**3
-- 24320 * 1024**2
-- 8 * 1024**2
-),
-},
+self.gen_partition_map(root_disk),
{part.name: part.size for part in pt.partitions.all()},
)
@@ -2029,13 +2020,7 @@ class TestVMFS7StorageLayout(MAASServerTestCase):
self.assertEqual("vmfs7", layout.configure())
pt = node.boot_disk.get_partitiontable()
self.assertEqual(
-{
-f"{node.boot_disk.name}-part1": 100 * 1024**2,
-f"{node.boot_disk.name}-part5": 4 * 1024**3,
-f"{node.boot_disk.name}-part6": 4 * 1024**3,
-f"{node.boot_disk.name}-part7": 24320 * 1024**2,
-f"{node.boot_disk.name}-part8": 10 * 1024**3,
-},
+
[Sts-sponsors] [Merge] ~alexsander-souza/maas:fix_vmfs_layout into maas:master
The proposal to merge ~alexsander-souza/maas:fix_vmfs_layout into maas:master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/442046 -- 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] ~alexsander-souza/maas:fix_vmfs_layout into maas:master
The proposal to merge ~alexsander-souza/maas:fix_vmfs_layout into maas:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/442046 -- 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_vmfs_layout lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b fix_vmfs_layout lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: e3100fdb971656b8ca0fbccbcbe47313cfb38d2a -- https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/442046 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] ~alexsander-souza/maas:fix_vmfs_layout into maas:master
Review: Approve +1 small nits inline Diff comments: > diff --git a/src/maasserver/models/partition.py > b/src/maasserver/models/partition.py > index 84a8fba..76515e5 100644 > --- a/src/maasserver/models/partition.py > +++ b/src/maasserver/models/partition.py > @@ -304,44 +304,26 @@ class Partition(CleanSave, TimestampedModel): > } > ) > > -def is_vmfs6_partition(self): > -# Avoid circular imports. > -from maasserver.storage_layouts import VMFS6StorageLayout > - > -vmfs_layout = VMFS6StorageLayout(self.get_node()) > -vmfs_bd = vmfs_layout.is_layout() > -if vmfs_bd is None: > -return False > -if vmfs_bd.id != self.partition_table.block_device_id: > -return False > -if self.index >= len(vmfs_layout.base_partitions) + 2: > -# A user may apply the VMFS6 layout and leave space at the end of > -# the disk for additional VMFS datastores. Those partitions may > be > -# deleted, the base partitions may not as they are part of the > DD. > -# The + 2 is to account for partition 4 being skipped. > -return False > -return True > - > -def is_vmfs7_partition(self): > +def is_vmfs_partition(self): > # Avoid circular imports. > -from maasserver.storage_layouts import VMFS7StorageLayout > - > -vmfs_layout = VMFS7StorageLayout(self.get_node()) > -vmfs_bd = vmfs_layout.is_layout() > -if vmfs_bd is None: > -return False > -if vmfs_bd.id != self.partition_table.block_device_id: > -return False > -if self.index < len(vmfs_layout.base_partitions) + 3: > -# A user may apply the VMFS7 layout and leave space at the end of > -# the disk for additional VMFS datastores. Those partitions may > be > -# deleted, the base partitions may not as they are part of the > DD. > -# The + 3 is to account for partition 2-4 being skipped. > -return True > -return False > +from maasserver.storage_layouts import ( > +VMFS6StorageLayout, > +VMFS7StorageLayout, > +) > > -def is_vmfs_partition(self): > -return self.is_vmfs6_partition() or self.is_vmfs7_partition() > +part_blk_dev_id = self.partition_table.block_device_id > + > +for layout_class in (VMFS7StorageLayout, VMFS6StorageLayout): > +vmfs_layout = layout_class(self.get_node()) please get the node once outside of the loop > +vmfs_bd = vmfs_layout.is_layout() > +if vmfs_bd is None or vmfs_bd.id != part_blk_dev_id: > +continue > +if self.index <= vmfs_layout.last_base_partition_index: > +# A user may apply the VMFS layout and leave space at the > end of > +# the disk for additional VMFS datastores. Those partitions > may be > +# deleted, the base partitions may not as they are part of > the DD. > +return True > +return False > > def delete(self): > """Delete the partition. > diff --git a/src/maasserver/models/tests/test_partition.py > b/src/maasserver/models/tests/test_partition.py > index 4956d8f..2c9f3bb 100644 > --- a/src/maasserver/models/tests/test_partition.py > +++ b/src/maasserver/models/tests/test_partition.py > @@ -544,45 +544,26 @@ class TestPartition(MAASServerTestCase): > [partition.index for partition in partitions], > ) > > -def test_is_vmfs6_partition(self): > -node = factory.make_Node(with_boot_disk=False) > -bd = factory.make_PhysicalBlockDevice( > -node=node, size=LARGE_BLOCK_DEVICE > -) > -layout = VMFS6StorageLayout(node) > -layout.configure() > -pt = bd.get_partitiontable() > -for partition in pt.partitions.all(): > -self.assertTrue(partition.is_vmfs6_partition()) > - > -def test_is_vmfs7_partition(self): > -node = factory.make_Node(with_boot_disk=False) > -bd = factory.make_PhysicalBlockDevice( > -node=node, size=LARGE_BLOCK_DEVICE > -) > -layout = VMFS7StorageLayout(node) > -layout.configure() > -pt = bd.get_partitiontable() > -for partition in pt.partitions.all(): > -if partition.index >= 8: > -self.assertFalse(partition.is_vmfs7_partition()) > -else: > -self.assertTrue(partition.is_vmfs7_partition()) > - > def test_is_vmfs_partition(self): > node = factory.make_Node(with_boot_disk=False) > bd = factory.make_PhysicalBlockDevice( > node=node, size=LARGE_BLOCK_DEVICE > ) > -vmfs_layout = random.choice([VMFS6StorageLayout, VMFS7StorageLayout]) > -layout = vmfs_layout(node) > -layout_name = layout.
Re: [Sts-sponsors] [UNITTESTS] -b go_network_discovery lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b go_network_discovery lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: 867b724e8c4c7d0ce8e249a619b19b3286b05c75 -- https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/441702 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:refactor-auth-context-useReducer into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:refactor-auth-context-useReducer 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/442091 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:refactor-auth-context-useReducer. -- 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 refactor-auth-context-useReducer lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - LANDING FAILED
LANDING -b refactor-auth-context-useReducer 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/540/console -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/442091 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:refactor-auth-context-useReducer. -- 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:strict-router-types into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:strict-router-types 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/441882 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:strict-router-types. -- 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 1583-add-sticky-styling lp:~nickdv99/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b 1583-add-sticky-styling lp:~nickdv99/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: 8bd23e3c592a6c560f6084ed58de5b783f428ad3 -- https://code.launchpad.net/~nickdv99/maas-site-manager/+git/site-manager/+merge/442096 Your team MAAS Committers is requested to review the proposed merge of ~nickdv99/maas-site-manager:1583-add-sticky-styling 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 strict-router-types lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b strict-router-types lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: 592c5a8423531db43a960d9126b99290fd2dcaaf -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441882 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:strict-router-types. -- 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:refactor-auth-context-useReducer into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:refactor-auth-context-useReducer 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/442091 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:refactor-auth-context-useReducer. -- 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:strict-router-types into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:strict-router-types 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/441882 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:strict-router-types. -- 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] ~nickdv99/maas-site-manager:1583-add-sticky-styling into maas-site-manager:main
Nick De Villiers has proposed merging
~nickdv99/maas-site-manager:1583-add-sticky-styling into maas-site-manager:main.
Commit message:
feat(tokens): Add sticky styling to header
Requested reviews:
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~nickdv99/maas-site-manager/+git/site-manager/+merge/442096
Note: The header will scroll up slightly before sticking. This is due to
top-padding on the main content class resulting in the table being visible
above the header when scrolling, meaning that I had to delay the sticky effect
by the same height as the padding (0.75rem).
QA steps:
- Go to /settings/tokens
- Scroll down
- Ensure header sticks to the top of the viewport
--
Your team MAAS Committers is requested to review the proposed merge of
~nickdv99/maas-site-manager:1583-add-sticky-styling into maas-site-manager:main.
diff --git a/frontend/src/App.scss b/frontend/src/App.scss
index d67a3b7..71f09cf 100644
--- a/frontend/src/App.scss
+++ b/frontend/src/App.scss
@@ -66,6 +66,7 @@
@import "@/components/SitesList/SitesTable/SitesTable";
@import "@/components/Placeholder/Placeholder";
@import "@/components/TokensList/components/TokensTable/TokensTable";
+@import "@/components/TokensList/TokensList";
@import "@/components/base/CopyButton/CopyButton";
@import "@/components/base/TablePagination/TablePagination";
@import "@/components/base/PaginationBar/PaginationBar";
diff --git a/frontend/src/components/TokensList/_TokensList.scss b/frontend/src/components/TokensList/_TokensList.scss
new file mode 100644
index 000..25d995b
--- /dev/null
+++ b/frontend/src/components/TokensList/_TokensList.scss
@@ -0,0 +1,7 @@
+.tokens-list-header {
+ position: sticky;
+ top: -0.75rem;
+ background-color: white;
+ z-index: 1;
+ padding-top: 0.75rem;
+}
--
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:strict-router-types into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:strict-router-types 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/441882 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:strict-router-types. -- 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 strict-router-types lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - LANDING FAILED
LANDING -b strict-router-types 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/535/console -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441882 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:strict-router-types. -- 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:invalidate-queries-on-mutation into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:invalidate-queries-on-mutation 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/442026 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:invalidate-queries-on-mutation. -- 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:refactor-auth-context-useReducer into maas-site-manager:main
Review: Approve code, qa Nice one, LGTM -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/442091 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:refactor-auth-context-useReducer. -- 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:invalidate-queries-on-mutation into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:invalidate-queries-on-mutation 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/442026 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:invalidate-queries-on-mutation. -- 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:strict-router-types into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:strict-router-types 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/441882 -- Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:strict-router-types. -- 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:invalidate-queries-on-mutation into maas-site-manager:main
Review: Approve code, qa LGTM -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/442026 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:invalidate-queries-on-mutation. -- 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 refactor-auth-context-useReducer lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b refactor-auth-context-useReducer lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: 67088993b669c556f753832804e5c0d79546873e -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/442091 Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:refactor-auth-context-useReducer 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:strict-router-types into maas-site-manager:main
Review: Approve Looks good to me! -- https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441882 Your team MAAS Committers is subscribed to branch ~petermakowski/maas-site-manager:strict-router-types. -- 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 #2093291] 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/2093291/+files/buildlog_snap_ubuntu_jammy_s390x_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos01-s390x-011 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2093291 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 #2093289] 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: 10 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2093289/+files/buildlog_snap_ubuntu_jammy_arm64_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos01-arm64-019 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2093289 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 #2093290] 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: 9 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2093290/+files/buildlog_snap_ubuntu_jammy_ppc64el_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos01-ppc64el-019 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2093290 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] ~petermakowski/maas-site-manager:strict-router-types into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:strict-router-types 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/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
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:strict-router-types into maas-site-manager:main
The proposal to merge ~petermakowski/maas-site-manager:strict-router-types 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/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
[Sts-sponsors] [Merge] ~petermakowski/maas-site-manager:refactor-auth-context-useReducer into maas-site-manager:main
Peter Makowski has proposed merging
~petermakowski/maas-site-manager:refactor-auth-context-useReducer into
maas-site-manager:main.
Commit message:
refactor: auth context useReducer
- split context providers into AppContext and AuthContext
Requested reviews:
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/442091
refactor auth context to use useReducer
next step will be extracting async logic to middleware
QA Steps
Verify you can login to site manager and logout successfully
--
Your team MAAS Committers is requested to review the proposed merge of
~petermakowski/maas-site-manager:refactor-auth-context-useReducer into
maas-site-manager:main.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index cee9a8b..51431fb 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -2,10 +2,9 @@ import "./App.scss";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
-import { AppContextProvider, AuthContextProvider } from "./context";
-import routes from "./routes";
-
import apiClient from "@/api";
+import { AppContextProvider, AuthContextProvider } from "@/context";
+import routes from "@/routes";
const queryClient = new QueryClient();
const router = createBrowserRouter(routes);
diff --git a/frontend/src/components/MainLayout/MainLayout.tsx b/frontend/src/components/MainLayout/MainLayout.tsx
index ee4e970..3347511 100644
--- a/frontend/src/components/MainLayout/MainLayout.tsx
+++ b/frontend/src/components/MainLayout/MainLayout.tsx
@@ -5,13 +5,12 @@ import { Col, Row, useOnEscapePressed, usePrevious } from "@canonical/react-comp
import classNames from "classnames";
import { matchPath, Outlet, useLocation } from "react-router-dom";
-import SecondaryNavigation from "../SecondaryNavigation";
-
import { routesConfig } from "@/base/routesConfig";
import type { RoutePath } from "@/base/routesConfig";
import DocumentTitle from "@/components/DocumentTitle/DocumentTitle";
import Navigation from "@/components/Navigation";
import RemoveRegions from "@/components/RemoveRegions";
+import SecondaryNavigation from "@/components/SecondaryNavigation";
import { useAppContext, useAuthContext } from "@/context";
import TokensCreate from "@/pages/tokens/create";
diff --git a/frontend/src/context/AppContext.tsx b/frontend/src/context/AppContext.tsx
new file mode 100644
index 000..c7c41ec
--- /dev/null
+++ b/frontend/src/context/AppContext.tsx
@@ -0,0 +1,26 @@
+import { createContext, useContext, useState } from "react";
+
+import type { OnChangeFn, RowSelectionState } from "@tanstack/react-table";
+
+export const AppContext = createContext<{
+ rowSelection: RowSelectionState;
+ setRowSelection: OnChangeFn;
+ sidebar: "removeRegions" | "createToken" | null;
+ setSidebar: (sidebar: "removeRegions" | "createToken" | null) => void;
+}>({
+ rowSelection: {},
+ setRowSelection: () => ({}),
+ sidebar: null,
+ setSidebar: () => null,
+});
+
+export const AppContextProvider = ({ children }: { children: React.ReactNode }) => {
+ const [rowSelection, setRowSelection] = useState({});
+ const [sidebar, setSidebar] = useState<"removeRegions" | "createToken" | null>(null);
+
+ return (
+{children}
+ );
+};
+
+export const useAppContext = () => useContext(AppContext);
diff --git a/frontend/src/context.tsx b/frontend/src/context/AuthContext.tsx
similarity index 51%
rename from frontend/src/context.tsx
rename to frontend/src/context/AuthContext.tsx
index 9cd0980..69387ba 100644
--- a/frontend/src/context.tsx
+++ b/frontend/src/context/AuthContext.tsx
@@ -1,40 +1,16 @@
-import { createContext, useContext, useEffect, useState } from "react";
+import type { Reducer } from "react";
+import React, { createContext, useContext, useReducer } from "react";
-import type { OnChangeFn, RowSelectionState } from "@tanstack/react-table";
import type { AxiosInstance } from "axios";
import useLocalStorageState from "use-local-storage-state";
-import type { LoginError } from "@/hooks/api";
import { useLoginMutation } from "@/hooks/api";
-
-export const AppContext = createContext<{
- rowSelection: RowSelectionState;
- setRowSelection: OnChangeFn;
- sidebar: "removeRegions" | "createToken" | null;
- setSidebar: (sidebar: "removeRegions" | "createToken" | null) => void;
-}>({
- rowSelection: {},
- setRowSelection: () => ({}),
- sidebar: null,
- setSidebar: () => null,
-});
-
-export const AppContextProvider = ({ children }: { children: React.ReactNode }) => {
- const [rowSelection, setRowSelection] = useState({});
- const [sidebar, setSidebar] = useState<"removeRegions" | "createToken" | null>(null);
-
- return (
-{children}
- );
-};
+import type { LoginError } from "@/hooks/api";
type AuthStatus = "initial" | "authenticated" | "unauthorised";
interface AuthContextType {
status: AuthStatus;
- se
Re: [Sts-sponsors] [UNITTESTS] -b 1593-update-sites-page-pagination lp:~jonesogolo/maas-site-manager/+git/maas-site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b 1593-update-sites-page-pagination lp:~jonesogolo/maas-site-manager/+git/maas-site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: 0be8b6157adde113e83f32325ee2f3ebfa337e61 -- https://code.launchpad.net/~jonesogolo/maas-site-manager/+git/maas-site-manager/+merge/442089 Your team MAAS Committers is requested to review the proposed merge of ~jonesogolo/maas-site-manager:1593-update-sites-page-pagination 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] ~jonesogolo/maas-site-manager:1593-update-sites-page-pagination into maas-site-manager:main
Jones Ogolo has proposed merging
~jonesogolo/maas-site-manager:1593-update-sites-page-pagination into
maas-site-manager:main.
Commit message:
Add pagination bar to sites table, replacing the previous pagination component.
Requested reviews:
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~jonesogolo/maas-site-manager/+git/maas-site-manager/+merge/442089
QA steps:
- Goto '/sites'
- Ensure that you see a pagination bar tjat shows the sites count. e.g: Showing
xx out of xxx MAAS Regions
- Test the pagination buttons, input and items per page selector to ensure it
all works.
--
Your team MAAS Committers is requested to review the proposed merge of
~jonesogolo/maas-site-manager:1593-update-sites-page-pagination into
maas-site-manager:main.
diff --git a/frontend/src/components/SitesList/SitesList.tsx b/frontend/src/components/SitesList/SitesList.tsx
index 39a8c26..9a6c366 100644
--- a/frontend/src/components/SitesList/SitesList.tsx
+++ b/frontend/src/components/SitesList/SitesList.tsx
@@ -1,29 +1,35 @@
import { useEffect, useState } from "react";
-import { Pagination } from "@canonical/react-components";
-
import SitesTable from "./SitesTable";
import { useSitesQuery } from "@/hooks/api";
import useDebounce from "@/hooks/useDebouncedValue";
+import usePagination from "@/hooks/usePagination";
import { parseSearchTextToQueryParams } from "@/utils";
const DEFAULT_PAGE_SIZE = 50;
const SitesList = () => {
- const [page, setPage] = useState(1);
- const [size] = useState(DEFAULT_PAGE_SIZE);
+ const [totalDataCount, setTotalDataCount] = useState(0);
+ const { page, debouncedPage, size, handleNextClick, handlePreviousClick, handlePageSizeChange, setPage } =
+usePagination(DEFAULT_PAGE_SIZE, totalDataCount);
const [searchText, setSearchText] = useState("");
const debounceSearchText = useDebounce(searchText);
const { data, isLoading, isFetchedAfterMount } = useSitesQuery(
-{ page: `${page}`, size: `${size}` },
+{ page: `${debouncedPage}`, size: `${size}` },
parseSearchTextToQueryParams(debounceSearchText),
);
useEffect(() => {
setPage(1);
- }, [searchText]);
+ }, [searchText, setPage]);
+
+ useEffect(() => {
+if (data && "total" in data) {
+ setTotalDataCount(data.total);
+}
+ }, [data]);
return (
@@ -31,16 +37,18 @@ const SitesList = () => {
data={data}
isFetchedAfterMount={isFetchedAfterMount}
isLoading={isLoading}
-setSearchText={setSearchText}
- />
- {
- setPage(page);
+paginationProps={{
+ currentPage: page,
+ dataContext: "MAAS Regions",
+ handlePageSizeChange,
+ isLoading,
+ itemsPerPage: size,
+ onNextClick: handleNextClick,
+ onPreviousClick: handlePreviousClick,
+ setCurrentPage: setPage,
+ totalItems: data?.total || 0,
}}
-totalItems={data?.total || 0}
+setSearchText={setSearchText}
/>
);
diff --git a/frontend/src/components/SitesList/SitesTable/SitesTable.test.tsx b/frontend/src/components/SitesList/SitesTable/SitesTable.test.tsx
index 9b753ef..89f78d3 100644
--- a/frontend/src/components/SitesList/SitesTable/SitesTable.test.tsx
+++ b/frontend/src/components/SitesList/SitesTable/SitesTable.test.tsx
@@ -32,6 +32,17 @@ it("displays an empty sites table", () => {
data={sitesQueryResultFactory.build()}
isFetchedAfterMount={true}
isLoading={false}
+ paginationProps={{
+currentPage: 1,
+dataContext: "MAAS Regions",
+handlePageSizeChange: () => {},
+isLoading: false,
+itemsPerPage: 1,
+onNextClick: () => {},
+onPreviousClick: () => {},
+setCurrentPage: () => {},
+totalItems: 0,
+ }}
setSearchText={() => {}}
/>,
);
@@ -46,6 +57,17 @@ it("displays rows with details for each site", () => {
data={sitesQueryResultFactory.build({ items, total: 1, page: 1, size: 1 })}
isFetchedAfterMount={true}
isLoading={false}
+ paginationProps={{
+currentPage: 1,
+dataContext: "MAAS Regions",
+handlePageSizeChange: () => {},
+isLoading: false,
+itemsPerPage: 1,
+onNextClick: () => {},
+onPreviousClick: () => {},
+setCurrentPage: () => {},
+totalItems: 1,
+ }}
setSearchText={() => {}}
/>,
);
@@ -67,6 +89,17 @@ it("displays correctly paginated results", () => {
data={sitesQueryResultFactory.build({ items, total: 100, page: 1, size: pageLength })}
isFetchedAfterMount={true}
isLoading={false}
+ paginationProps={{
+currentPage: 1,
+dataContext: "MAAS Regions",
+handlePageSizeChange: () => {},
+isLoading: false,
+itemsPerPage: pageLength,
+onNextClick: () => {},
+onPreviousClick: () => {},
+setCurrentPage: (
[Sts-sponsors] [Merge] ~ack/maas:script-result-assertion-message into maas:master
The proposal to merge ~ack/maas:script-result-assertion-message into maas:master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~ack/maas/+git/maas/+merge/442068 -- 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 #2093249] 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: 25 minutes * Build Log: https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2093249/+files/buildlog_snap_ubuntu_jammy_arm64_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-arm64-039 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2093249 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 #2093251] 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/2093251/+files/buildlog_snap_ubuntu_jammy_s390x_maas-master_BUILDING.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/bos02-s390x-007 -- https://launchpad.net/~maas-committers/maas/+snap/maas-master/+build/2093251 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 #2093250] 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/2093250/+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/2093250 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] ~ack/maas:script-result-assertion-message into maas:master
The proposal to merge ~ack/maas:script-result-assertion-message into maas:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ack/maas/+git/maas/+merge/442068 -- 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] ~troyanov/maas:maasagent-cleanup into maas:master
The proposal to merge ~troyanov/maas:maasagent-cleanup into maas:master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442035 -- 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 dgx-platform-kernels-lookup lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b dgx-platform-kernels-lookup lp:~igor-brovtsin/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: b0a37b3da1d3078b328849c559c425c66a6187e2 -- 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] ~troyanov/maas:maasagent-cleanup into maas:master
The proposal to merge ~troyanov/maas:maasagent-cleanup into maas:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442035 -- 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 maasagent-cleanup lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b maasagent-cleanup lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: 8af3dcb3fa68b498a8cb6a3b969a5be647096938 -- https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442035 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] ~troyanov/maas:maasagent-cleanup into maas:master
jenkins: !test -- https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442035 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 strict-router-types lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager - TESTS PASS
Review: Approve UNIT TESTS -b strict-router-types lp:~petermakowski/maas-site-manager/+git/site-manager into -b main lp:~maas-committers/maas-site-manager STATUS: SUCCESS COMMIT: e27c37f2dbc4d2eb31f90c3291523df4003fa384 -- 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 script-result-assertion-message lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
Review: Approve UNIT TESTS -b script-result-assertion-message lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas STATUS: SUCCESS COMMIT: 4cac41d5466db5e0f836fb6e1a57be537e382d29 -- https://code.launchpad.net/~ack/maas/+git/maas/+merge/442068 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] ~ack/maas:script-result-assertion-message into maas:master
Review: Approve -- https://code.launchpad.net/~ack/maas/+git/maas/+merge/442068 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:script-result-assertion-message into maas:master
Alberto Donato has proposed merging ~ack/maas:script-result-assertion-message
into maas:master.
Commit message:
add message to assertion on script result status for debugging
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/442068
--
Your team MAAS Maintainers is requested to review the proposed merge of
~ack/maas:script-result-assertion-message into maas:master.
diff --git a/src/maasserver/models/scriptresult.py b/src/maasserver/models/scriptresult.py
index cdd89f3..cda4bc3 100644
--- a/src/maasserver/models/scriptresult.py
+++ b/src/maasserver/models/scriptresult.py
@@ -264,9 +264,11 @@ class ScriptResult(CleanSave, TimestampedModel):
# rack controller to create a new ScriptSet.
if self.script_set.node.is_commissioning():
# Allow PENDING, APPLYING_NETCONF, INSTALLING, and RUNNING scripts
-# incase the node didn't inform MAAS the Script was being run, it
+# in case the node didn't inform MAAS the Script was being run, it
# just uploaded results.
-assert self.status in SCRIPT_STATUS_RUNNING_OR_PENDING
+assert (
+self.status in SCRIPT_STATUS_RUNNING_OR_PENDING
+), f"Status for scriptresult {self.id} is not running or pending ({self.status})"
if timedout:
self.status = SCRIPT_STATUS.TIMEDOUT
--
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
